Merge pull request #48 from mareklibra/add.id

Add element IDs to simplify tests
openshift-assisted · Jun 26, 2020 · 1a4c2cc · 1a4c2cc
2 parents 56a673f + 9fa220c
commit 1a4c2cc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/src/components/clusterConfiguration/discoveryImageModal.tsx b/src/components/clusterConfiguration/discoveryImageModal.tsx
@@ -40,7 +40,11 @@ export const DiscoveryImageModalButton: React.FC<DiscoveryImageModalButtonProps>
 
   return (
     <>
-      <ButtonComponent variant={ButtonVariant.primary} onClick={() => setIsModalOpen(true)}>
+      <ButtonComponent
+        variant={ButtonVariant.primary}
+        onClick={() => setIsModalOpen(true)}
+        id="button-download-discovery-iso"
+      >
         Download discovery ISO
       </ButtonComponent>
       {isModalOpen && <DiscoveryImageModal closeModal={closeModal} imageInfo={imageInfo} />}

diff --git a/src/components/clusters/ClusterStatus.tsx b/src/components/clusters/ClusterStatus.tsx
@@ -45,7 +45,7 @@ const ClusterStatus: React.FC<ClusterStatusProps> = ({ cluster }) => {
         minWidth="30rem"
         maxWidth="50rem"
       >
-        <Button variant={ButtonVariant.link} isInline>
+        <Button variant={ButtonVariant.link} isInline id={`button-cluster-status-${cluster.name}`}>
           {icon} {title}
         </Button>
       </Popover>

diff --git a/src/components/clusters/ClustersTable.tsx b/src/components/clusters/ClustersTable.tsx
@@ -52,6 +52,7 @@ const ClustersTable: React.FC<ClustersTableProps> = ({ rows, deleteCluster }) =>
     (rowData) => [
       {
         title: 'Delete',
+        id: `button-delete-${rowData.props.name}`,
         isDisabled:
           getClusterTableStatusCell(rowData).sortableValue === CLUSTER_STATUS_LABELS.installing,
         onClick: (event: React.MouseEvent, rowIndex: number, rowData: IRowData) => {

diff --git a/src/components/clusters/newClusterModal.tsx b/src/components/clusters/newClusterModal.tsx
@@ -40,7 +40,7 @@ export const NewClusterModalButton: React.FC<NewClusterModalButtonProps> = ({
   ButtonComponent = Button,
   onClick,
 }) => (
-  <ButtonComponent variant={ButtonVariant.primary} onClick={onClick}>
+  <ButtonComponent variant={ButtonVariant.primary} onClick={onClick} id="button-create-new-cluster">
     Create New Cluster
   </ButtonComponent>
 );

diff --git a/src/components/hosts/HostsTable.tsx b/src/components/hosts/HostsTable.tsx
@@ -92,6 +92,8 @@ const hostToHostTableRow = (openRows: OpenRows) => (host: Host): IRow => {
       fullWidth: true,
       cells: [{ title: <HostDetail key={id} inventory={inventory} /> }],
       key: `${host.id}-detail`,
+      extraData: host,
+      inventory,
     },
   ];
 };
@@ -234,7 +236,9 @@ const HostsTable: React.FC<HostsTableProps> = ({ cluster }) => {
 
   const actionResolver = React.useCallback(
     (rowData: IRowData) => {
-      const host = rowData.extraData;
+      const host: Host = rowData.extraData;
+      const hostname = rowData.inventory?.hostname;
+
       if (!host) {
         // I.e. row with detail
         return [];
@@ -244,26 +248,28 @@ const HostsTable: React.FC<HostsTableProps> = ({ cluster }) => {
       if (host.status === 'disabled') {
         actions.push({
           title: 'Enable in cluster',
+          id: `button-enable-in-cluster-${hostname}`,
           onClick: onHostEnable,
         });
       }
       if (['discovering', 'disconnected', 'known', 'insufficient'].includes(host.status)) {
         actions.push({
           title: 'Disable in cluster',
+          id: `button-disable-in-cluster-${hostname}`,
           onClick: onHostDisable,
         });
       }
       actions.push({
         title: 'View Host Events History',
+        id: `button-view-host-events-${hostname}`,
         onClick: onViewHostEvents,
       });
       if (!['installing', 'installing-in-progress', 'error', 'installed'].includes(host.status)) {
         actions.push({
           title: 'Delete',
-          onClick: (event: React.MouseEvent, rowIndex: number, rowData: IRowData) => {
-            const hostId = rowData.extraData.id;
-            const hostname = rowData.inventory.hostname;
-            setHostToDelete({ id: hostId, hostname });
+          id: `button-delete-host-${hostname}`,
+          onClick: () => {
+            setHostToDelete({ id: host.id, hostname });
           },
         });
       }

diff --git a/src/selectors/clusters.tsx b/src/selectors/clusters.tsx
@@ -31,7 +31,7 @@ const clusterToClusterTableRow = (cluster: Cluster): IRow => {
     cells: [
       {
         title: (
-          <Link key={name} to={`/clusters/${id}`}>
+          <Link key={name} to={`/clusters/${id}`} id={`cluster-link-${name}`}>
             {name}
           </Link>
         ),