@openshift-assisted/ui-lib 2.9.0-cim → 2.9.5-cim

package/lib/cim/components/ClusterDeployment/ClusterDeploymentNetworkingForm.tsx

@@ -15,7 +15,6 @@ import {
   StackItem,
 } from '@patternfly/react-core';
 import {
-  ClusterDefaultConfig,
   CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4,
   getHostSubnets,
   SecurityFields,
@@ -36,6 +35,7 @@ import { useFormikContext } from 'formik';
 import { getGridSpans } from './helpers';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Trans } from 'react-i18next';
+import { ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
 
 // TODO(mlibra): So far a constant. Should be queried from somewhere.
 export const defaultNetworkSettings: ClusterDefaultConfig = CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4;
@@ -53,7 +53,6 @@ type ClusterDeploymentNetworkingFormProps = {
   onEditHost: AgentTableActions['onEditHost'];
   onEditRole: AgentTableActions['onEditRole'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
-  docVersion: string;
 };
 
 const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormProps> = ({
@@ -69,7 +68,6 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
   onEditHost,
   onEditRole,
   onSetInstallationDiskId,
-  docVersion,
 }) => {
   const { values, touched, setFieldValue, setFieldTouched } =
     useFormikContext<ClusterDeploymentNetworkingValues>();
@@ -142,7 +140,6 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
                 isVipDhcpAllocationDisabled
                 defaultNetworkSettings={defaultNetworkSettings}
                 hideManagedNetworking={getIsSNOCluster(agentClusterInstall)}
-                docVersion={docVersion}
               />
             </GridItem>
           </Grid>

package/lib/cim/components/ClusterDeployment/ClusterDeploymentNetworkingStep.tsx

@@ -35,7 +35,6 @@ type NetworkingFormProps = {
   onEditRole: AgentTableActions['onEditRole'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   isPreviewOpen: ClusterDeploymentDetailsNetworkingProps['isPreviewOpen'];
-  docVersion: string;
 };
 
 const NetworkingForm: React.FC<NetworkingFormProps> = ({
@@ -48,7 +47,6 @@ const NetworkingForm: React.FC<NetworkingFormProps> = ({
   onEditRole,
   isPreviewOpen,
   onSetInstallationDiskId,
-  docVersion,
 }) => {
   const [showFormErrors, setShowFormErrors] = React.useState(false);
   const [showClusterErrors, setShowClusterErrors] = React.useState(false);
@@ -151,7 +149,6 @@ const NetworkingForm: React.FC<NetworkingFormProps> = ({
             onEditRole={onEditRole}
             isPreviewOpen={isPreviewOpen}
             onSetInstallationDiskId={onSetInstallationDiskId}
-            docVersion={docVersion}
           />
         </GridItem>
       </Grid>

package/lib/cim/components/ClusterDeployment/ClusterDeploymentValidationsOverview.tsx

@@ -11,7 +11,7 @@ import {
   ListItem,
 } from '@patternfly/react-core';
 import { TFunction } from 'i18next';
-import { Cluster } from '../../../common/api/types';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import {
   ValidationsInfo,
   ValidationGroup as ClusterValidationGroup,

package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizard.tsx

@@ -86,8 +86,8 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
               infraEnv={infraEnv}
               fetchSecret={fetchSecret}
               onClose={onClose}
-              onChangeBMHHostname={(bmh, hostname) => {
-                console.log('onChangeBMHHostname is not implemented: ', hostname);
+              onChangeBMHHostname={(bmh, _hostname) => {
+                // console.log('onChangeBMHHostname is not implemented: ', hostname);
                 return Promise.resolve(bmh);
               }}
               onEditRole={hostActions.onEditRole}
@@ -115,7 +115,6 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
             fetchInfraEnv={fetchInfraEnv}
             isPreviewOpen={isPreviewOpen}
             onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
-            docVersion={rest.docVersion}
           />
         );
       case 'review':

package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizardContext.tsx

@@ -11,9 +11,9 @@ type ClusterDeploymentWizardContextType = {
 const ClusterDeploymentWizardContext = React.createContext<ClusterDeploymentWizardContextType>({
   currentStepId: 'cluster-details',
   setCurrentStepId: () => {
-    console.error(
-      'Tried to use ClusterDeploymentWizardContext but there was no provider rendered.',
-    );
+    // console.error(
+    //   'Tried to use ClusterDeploymentWizardContext but there was no provider rendered.',
+    // );
   },
 });
 

package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizardFooter.tsx

@@ -10,7 +10,7 @@ import {
 import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
 import { ClusterWizardStepHostStatusDeterminationObject } from '../../../common/types/hosts';
 import { ValidationsInfo } from '../../../common/types/clusters';
-import { Cluster } from '../../../common/api/types';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { ClusterWizardStepsType, wizardStepsValidationsMap } from './wizardTransition';
 import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
 import { AgentK8sResource } from '../../types/k8s/agent';

package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizardNavigation.tsx

@@ -19,7 +19,12 @@ const ClusterDeploymentWizardNavigation: React.FC<{
   const stepNames = wizardStepNames(t);
   return (
     <WizardNav>
-      <WizardNavItem key="installation-type" content="Installation type" step={0} isDisabled />
+      <WizardNavItem
+        key="installation-type"
+        content={t('ai:Installation type')}
+        step={0}
+        isDisabled
+      />
       <WizardNavItem
         key="cluster-details"
         content={stepNames['cluster-details']}
@@ -29,7 +34,7 @@ const ClusterDeploymentWizardNavigation: React.FC<{
         step={1}
         onNavItemClick={() => setCurrentStepId('cluster-details')}
       />
-      <WizardNavItem key="automation" content="Automation" step={2} isDisabled />
+      <WizardNavItem key="automation" content={t('ai:Automation')} step={2} isDisabled />
       {isCIMFlow(clusterDeployment) ? (
         <WizardNavItem
           key="hosts-selection"

package/lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx

@@ -13,7 +13,6 @@ import {
 } from '../../../common/components/clusterWizard/networkingSteps';
 import {
   canSelectNetworkTypeSDN,
-  ClusterDefaultConfig,
   getDefaultNetworkType,
   isAdvNetworkConf,
   isSNO,
@@ -23,10 +22,10 @@ import {
 } from '../../../common';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { NetworkTypeControlGroup } from '../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup';
+import { ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
 
 export type NetworkConfigurationProps = VirtualIPControlGroupProps & {
   defaultNetworkSettings: ClusterDefaultConfig;
-  docVersion: string;
   hideManagedNetworking?: boolean;
 };
 
@@ -36,7 +35,6 @@ const NetworkConfiguration = ({
   isVipDhcpAllocationDisabled,
   defaultNetworkSettings,
   hideManagedNetworking,
-  docVersion,
 }: NetworkConfigurationProps) => {
   const { t } = useTranslation();
   const { setFieldValue, values, touched, validateField } =
@@ -125,7 +123,7 @@ const NetworkConfiguration = ({
       {isUserManagedNetworking && (
         <UserManagedNetworkingTextContent
           shouldDisplayLoadBalancersBullet={isMultiNodeCluster}
-          docVersion={docVersion}
+          docVersion={cluster.openshiftVersion}
         />
       )}
 

package/lib/cim/components/ClusterDeployment/ShortCapacitySummary.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { fileSize } from '../../../common';
 import { AgentK8sResource } from '../../types';
 import { TFunction } from 'i18next';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { fileSize } from '../../../common/utils';
 
 export const getTotalCompute = (selectedAgents: AgentK8sResource[], t: TFunction) => {
   const totals = selectedAgents.reduce(

package/lib/cim/components/ClusterDeployment/helpers.ts

@@ -1,7 +1,7 @@
 import mapKeys from 'lodash-es/mapKeys.js';
 import camelCase from 'lodash-es/camelCase.js';
 import uniq from 'lodash-es/uniq.js';
-import { EventList } from '../../../common/api/types';
+import { EventList } from '@openshift-assisted/types/assisted-installer-service';
 import {
   AgentClusterInstallK8sResource,
   InfraEnvK8sResource,
@@ -15,6 +15,7 @@ import { ClusterDeploymentK8sResource, AgentK8sResource } from '../../types';
 import { INFRAENV_GENERATED_AI_FLOW, BMH_HOSTNAME_ANNOTATION } from '../common/constants';
 import { gridSpans } from '@patternfly/react-core';
 import { getErrorMessage } from '../../../common/utils';
+
 export const shouldShowClusterDeploymentValidationOverview = (
   agentClusterInstall?: AgentClusterInstallK8sResource,
 ) => {
@@ -111,9 +112,14 @@ export const getOnFetchEventsHandler =
   (
     fetchEvents: (url: string) => Promise<string>,
     aiNamespace: string,
+    agents: AgentK8sResource[],
     agentClusterInstall?: AgentClusterInstallK8sResource,
   ): EventListFetchProps['onFetchEvents'] =>
-  async (params, onSuccess, onError) => {
+  async (
+    { message, severities: severitiesFilter, hostIds, clusterLevel, deletedHosts },
+    onSuccess,
+    onError,
+  ) => {
     const eventsURL = getEventsURL(aiNamespace, agentClusterInstall);
     if (!eventsURL) {
       onError('Cannot determine events URL');
@@ -121,10 +127,51 @@ export const getOnFetchEventsHandler =
     }
     try {
       const result = await fetchEvents(eventsURL);
-      const data = formatEventsData(result);
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      onSuccess(data);
+      let data = formatEventsData(result);
+      const allNames = data.filter((d) => d.hostId).map((d) => d.hostId);
+
+      const severities = {
+        critical: data.filter((d) => d.severity === 'critical').length,
+        error: data.filter((d) => d.severity === 'error').length,
+        info: data.filter((d) => d.severity === 'info').length,
+        warning: data.filter((d) => d.severity === 'warning').length,
+      };
+
+      if (message) {
+        data = data.filter((d) => d.message.includes(message));
+      }
+      if (severitiesFilter && severitiesFilter.length > 0) {
+        data = data.filter((d) => severitiesFilter.includes(d.severity));
+      }
+
+      if (clusterLevel || deletedHosts || (hostIds && hostIds.length > 0)) {
+        data = data.filter((d) => {
+          if (clusterLevel && d.clusterId && !d.hostId) {
+            return d;
+          }
+          if (hostIds && hostIds.length > 0) {
+            const names = agents
+              .filter((a) => a.metadata?.uid && hostIds.includes(a.metadata.uid))
+              .map((a) => a.metadata?.name);
+            if (d.hostId && names.includes(d.hostId)) {
+              return d;
+            }
+          }
+          if (deletedHosts) {
+            const deleted = allNames.filter((n) => !agents.some((a) => a.metadata?.name === n));
+            if (d.hostId && deleted.includes(d.hostId)) {
+              return d;
+            }
+          }
+          return false;
+        });
+      }
+
+      onSuccess({
+        data,
+        totalEvents: data.length,
+        severities,
+      });
     } catch (e) {
       onError(getErrorMessage(e));
     }

package/lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts

@@ -1,5 +1,8 @@
 import * as Yup from 'yup';
-import { Cluster, ClusterDefaultConfig } from '../../../common/api';
+import {
+  Cluster,
+  ClusterDefaultConfig,
+} from '@openshift-assisted/types/assisted-installer-service';
 import { HostSubnets, NetworkConfigurationValues } from '../../../common/types/clusters';
 import {
   hostPrefixValidationSchema,

package/lib/cim/components/ClusterDeployment/types.ts

@@ -100,7 +100,6 @@ export type ClusterDeploymentDetailsNetworkingProps = Pick<
   onClose: () => void;
   fetchInfraEnv: (name: string, namespace: string) => Promise<InfraEnvK8sResource>;
   isPreviewOpen: boolean;
-  docVersion: string;
 };
 
 export type AgentSelectorChangeProps = {
@@ -162,7 +161,7 @@ export type ClusterDeploymentWizardProps = {
   getClusterDeploymentLink: InfraEnvAgentTableProps['getClusterDeploymentLink'];
   fetchSecret: EditBMHModalProps['fetchSecret'];
   onCreateBMH?: BMCFormProps['onCreateBMH'];
-  docVersion: string;
+  docVersion: string; // ACM version
   onCreateBmcByYaml: UploadActionModalProps['onCreateBmcByYaml'];
 };
 

package/lib/cim/components/ClusterDeployment/wizardTransition.test.ts

@@ -0,0 +1,247 @@
+import { test, describe, expect } from 'vitest';
+import cloneDeep from 'lodash-es/cloneDeep';
+import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
+import { AgentK8sResource } from '../../types/k8s/agent';
+import {
+  canNextFromHostDiscoveryStep,
+  canNextFromHostSelectionStep,
+  canNextFromNetworkingStep,
+} from './wizardTransition';
+import { ValidationGroup as ClusterValidationGroup } from '../../../common';
+import { ValidationGroup as HostValidationGroup } from '../../../common/types/hosts';
+import {
+  ClusterValidationId,
+  HostValidationId,
+} from '@openshift-assisted/types/assisted-installer-service';
+
+const agentClusterInstallBase: AgentClusterInstallK8sResource = {
+  apiVersion: 'foo-apiVersion',
+  kind: 'AgentClusterInstall',
+  metadata: {
+    name: 'test-cluster',
+    clusterName: 'test-cluster',
+    namespace: 'test-cluster',
+  },
+  spec: undefined,
+  status: {},
+};
+
+const agentSpec: AgentK8sResource['spec'] = {
+  approved: true,
+  role: 'auto-assign',
+  hostname: 'test-hostname',
+};
+
+const getAgentClusterInstall = (
+  validationGroupName: ClusterValidationGroup = 'hostsData',
+  clusterValidationIds: ClusterValidationId[] = [
+    'sufficient-masters-count',
+    'odf-requirements-satisfied',
+    'lso-requirements-satisfied',
+    'cnv-requirements-satisfied',
+  ],
+): AgentClusterInstallK8sResource => {
+  const agentClusterInstall: AgentClusterInstallK8sResource = cloneDeep(agentClusterInstallBase);
+  agentClusterInstall.status = {
+    debugInfo: {
+      state: 'insufficient',
+    },
+    validationsInfo: {
+      [validationGroupName]: [],
+    },
+  };
+
+  clusterValidationIds.forEach((clusterValidationId) => {
+    agentClusterInstall.status?.validationsInfo?.[validationGroupName]?.push({
+      id: clusterValidationId,
+      status: 'success',
+      message: 'A validation message',
+    });
+  });
+
+  return agentClusterInstall;
+};
+
+const getAgents = (
+  validationGroupName: HostValidationGroup = 'hardware',
+  hostValidationIds: HostValidationId[] = [
+    'odf-requirements-satisfied',
+    'lso-requirements-satisfied',
+    'cnv-requirements-satisfied',
+    'connected',
+  ],
+): AgentK8sResource[] => {
+  const agents: AgentK8sResource[] = [
+    {
+      spec: agentSpec,
+      status: {
+        inventory: {},
+        debugInfo: {
+          state: 'insufficient' /* or pending-for-input */,
+        },
+        validationsInfo: {
+          [validationGroupName]: [],
+        },
+      },
+    },
+  ];
+
+  hostValidationIds.forEach((hostValidationId) => {
+    agents[0].status?.validationsInfo?.[validationGroupName]?.push({
+      id: hostValidationId,
+      status: 'success',
+      message: 'A validation message',
+    });
+  });
+
+  return agents;
+};
+
+/*
+  These tests are focused not only on the hostDiscoveryStepValidationsMap but to the computation mechanics.
+  If there is a bug in a way how we calculate the true/false transition, please cover it here.
+ 
+  Various flows testing basics of the *ValidationMap configurations" is covered by a separate suite.
+*/
+describe('CIM wizardTransition calculation', () => {
+  test('Pass for a ready cluster', () => {
+    const agentClusterInstall: AgentClusterInstallK8sResource = cloneDeep(agentClusterInstallBase);
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(false);
+
+    agentClusterInstall.status = {
+      debugInfo: {
+        state: 'ready',
+      },
+      validationsInfo: {},
+    };
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(true);
+  });
+
+  test('An insufficient cluster, no agents', () => {
+    const agentClusterInstall = getAgentClusterInstall();
+
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(true);
+    agentClusterInstall.status.validationsInfo.hostsData[3].status = 'disabled';
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(true);
+    agentClusterInstall.status.validationsInfo.hostsData[3].status = 'pending';
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(false);
+    agentClusterInstall.status.validationsInfo.hostsData[3].status = 'error';
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(false);
+    agentClusterInstall.status.validationsInfo.hostsData[3].status = 'success';
+    agentClusterInstall.status.validationsInfo?.hostsData.push({
+      id: 'all-hosts-are-ready-to-install' /* Irrelevant for the wizard step */,
+      status: 'error',
+      message: 'A failing message',
+    });
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(true) /* Still true */;
+    // removing required validation
+    agentClusterInstall.status.validationsInfo.hostsData.splice(1, 1);
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(false);
+    // revert the change
+    agentClusterInstall.status?.validationsInfo?.hostsData?.push({
+      id: 'odf-requirements-satisfied',
+      status: 'success',
+      message: 'A validation message',
+    });
+    expect(canNextFromHostSelectionStep(agentClusterInstall, [])).toBe(true);
+  });
+
+  test('A ready cluster, testing agent states', () => {
+    const agentClusterInstall = getAgentClusterInstall();
+    const agentMissingRequiredValidations = getAgents('hardware', ['connected']);
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agentMissingRequiredValidations)).toBe(
+      false,
+    );
+
+    const agents = getAgents();
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agents)).toBe(true);
+    agents[0].status.validationsInfo.hardware[1].status = 'disabled';
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agents)).toBe(true);
+    agents[0].status.validationsInfo.hardware[1].status = 'error';
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agents)).toBe(false);
+  });
+
+  test('A ready cluster, passing agent states, testing agent validation groups', () => {
+    const agentClusterInstall = getAgentClusterInstall();
+    const agents = getAgents();
+
+    // Whole "hardware" group must be of success
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agents)).toBe(true);
+    agents[0].status.validationsInfo.hardware[3].status = 'error';
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agents)).toBe(false);
+
+    const agentsWitNonMandatoryGroup = getAgents();
+    // Adding irrelevant validation to a "non-mandatory" group (the infrastructure, only the "hardware" group is mandatory for this transition)
+    agentsWitNonMandatoryGroup[0].status.validationsInfo.infrastructure = [
+      {
+        id: 'belongs-to-machine-cidr' /* Irrelevant for the step, so should be still passing */,
+        status: 'error',
+        message: 'A host validation message',
+      },
+    ];
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agentsWitNonMandatoryGroup)).toBe(
+      true,
+    );
+
+    const agentsWithoutHardwareGroup = getAgents('hardware', []);
+    agents[0].status.validationsInfo.hardware = undefined;
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agentsWithoutHardwareGroup)).toBe(
+      false,
+    );
+
+    const agentsWitoutAllMandatoryGroup = getAgents('network', []);
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agentsWitoutAllMandatoryGroup)).toBe(
+      false,
+    );
+  });
+});
+
+describe('CIM wizardTransitions', () => {
+  test('canNextFromHostSelectionStep', () => {
+    // Driven by hostDiscoveryStepValidationsMap
+    const agentClusterInstall = getAgentClusterInstall();
+    const agents = getAgents();
+    expect(canNextFromHostSelectionStep(agentClusterInstall, agents)).toBe(true);
+  });
+
+  test('canNextFromHostDiscoveryStep', () => {
+    // Driven by hostDiscoveryStepValidationsMap, same as canNextFromHostSelectionStep
+    const agentClusterInstall = getAgentClusterInstall();
+    const agents = getAgents();
+    expect(canNextFromHostDiscoveryStep(agentClusterInstall, agents)).toBe(true);
+  });
+
+  test('canNextFromNetworkingStep', () => {
+    // Driven by the networkingStepValidationsMap
+    const agentClusterInstallWithoutNetworkGroup = getAgentClusterInstall();
+    expect(canNextFromNetworkingStep(agentClusterInstallWithoutNetworkGroup, [])).toBe(false);
+
+    const agentClusterInstallEmptyNetworkGroup = getAgentClusterInstall('network', []);
+    expect(canNextFromNetworkingStep(agentClusterInstallEmptyNetworkGroup, [])).toBe(true);
+
+    const agentClusterInstall = getAgentClusterInstall('network', [
+      // just some of them. Backend will provide a comprehensive list.
+      'api-vips-defined',
+      'api-vips-valid',
+    ]);
+    expect(canNextFromNetworkingStep(agentClusterInstall, [])).toBe(true);
+
+    // One validation from a mandatory group is failing
+    agentClusterInstall.status.validationsInfo.network[0].status = 'error';
+    expect(canNextFromNetworkingStep(agentClusterInstall, [])).toBe(false);
+    // Revert
+    agentClusterInstall.status.validationsInfo.network[0].status = 'success';
+    expect(canNextFromNetworkingStep(agentClusterInstall, [])).toBe(true);
+
+    const agents = getAgents('network', ['ntp-synced', 'has-default-route']);
+    expect(canNextFromNetworkingStep(agentClusterInstall, agents)).toBe(true);
+
+    // The ntp-synced is set as soft-validation, so still passing
+    agents[0].status.validationsInfo.network[0].status = 'error';
+    expect(canNextFromNetworkingStep(agentClusterInstall, agents)).toBe(true);
+
+    // The has-default-route is NOT set as soft-validation, so it should fail
+    agents[0].status.validationsInfo.network[1].status = 'error';
+    expect(canNextFromNetworkingStep(agentClusterInstall, agents)).toBe(false);
+  });
+});

package/lib/cim/components/Hypershift/DetailsPage/HypershiftKubeconfigDownload.tsx

@@ -31,7 +31,7 @@ const HypershiftKubeconfigDownload = ({
         const blob = new Blob([atob(kubeconfig)], { type: 'text/plain;charset=utf-8' });
         saveAs(blob, 'kubeconfig.yaml');
       } catch (e) {
-        console.error('Failed to fetch kubeconfig secret.', e);
+        // console.error('Failed to fetch kubeconfig secret.', e);
       }
     }
   };

package/lib/cim/components/Hypershift/DetailsPage/NodePoolsTable.tsx

@@ -25,11 +25,11 @@ import AddNodePoolModal from '../modals/AddNodePoolModal';
 import { AgentMachineK8sResource, HostedClusterK8sResource, NodePoolK8sResource } from '../types';
 import RemoveNodePoolModal from '../modals/RemoveNodePoolModal';
 import NodePoolStatus from './NodePoolStatus';
-import { fileSize } from '../../../../common';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { getNodepoolAgents } from '../utils';
 
 import './NodePoolsTable.css';
+import { fileSize } from '../../../../common/utils';
 
 type NodePoolsTableProps = {
   nodePools: NodePoolK8sResource[];

package/lib/cim/components/Hypershift/hooks/useSupportedOCPVersions.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { getErrorMessage } from '../../../../common/utils';
+// import { getErrorMessage } from '../../../../common/utils';
 import { ClusterImageSetK8sResource, ConfigMapK8sResource } from '../../../types';
 import { getOCPVersions } from '../../helpers';
 
@@ -21,7 +21,7 @@ export const useSupportedOCPVersions = (
           .versions;
         return ocpVersions.filter((v) => supportedVersions.find((sv) => v.version.startsWith(sv)));
       } catch (err) {
-        console.error('Could not parse supported versions config map value.', getErrorMessage(err));
+        // console.error('Could not parse supported versions config map value.', getErrorMessage(err));
       }
     }
     return ocpVersions;

package/lib/cim/components/Hypershift/modals/ManageHostsModal.tsx

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { AgentK8sResource } from '../../../types';
 import { NodePoolK8sResource, HostedClusterK8sResource, AgentMachineK8sResource } from '../types';
 import NodePoolForm, { NodePoolFormValues } from './NodePoolForm';
-import { formikLabelsToLabels, labelsToFormikValue } from '../utils';
+import { labelsToFormikValue } from '../utils';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { getErrorMessage } from '../../../../common/utils';
 
@@ -57,11 +57,6 @@ const ManageHostsModal = ({
         path: '/spec/replicas',
       });
     }
-    patches.push({
-      op: 'replace',
-      value: formikLabelsToLabels(values.agentLabels),
-      path: '/spec/platform/agent/agentLabelSelector/matchLabels',
-    });
     try {
       await onSubmit(nodePool, patches);
       onClose();

package/lib/cim/components/Hypershift/utils/nodepool.ts

@@ -15,7 +15,7 @@ export const getNodepoolAgents = (
       (am) =>
         am.metadata?.namespace ===
           `${hostedCluster.metadata?.namespace || ''}-${hostedCluster.metadata?.name || ''}` &&
-        am.metadata?.labels?.[CLUSTER_NAME_LABEL] === hostedCluster.metadata?.name &&
+        am.metadata?.labels?.[CLUSTER_NAME_LABEL] === hostedCluster.spec.infraID &&
         am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] === nodePool.metadata?.name &&
         am.status?.agentRef?.name &&
         am.status?.agentRef?.namespace,

package/lib/cim/components/InfraEnv/InfraEnvAgentTable.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Button, DropdownItem, Stack, StackItem } from '@patternfly/react-core';
 import noop from 'lodash-es/noop.js';
 
-import { Host } from '../../../common/api/types';
+import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import {
   discoveryTypeColumn,
   agentStatusColumn,
@@ -120,6 +120,7 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
     () =>
       [
         agentHostnameColumn(
+          t,
           hosts,
           agents,
           bareMetalHosts,
@@ -136,10 +137,10 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
           t,
         }),
         clusterColumn(agents, agentMachines, getClusterDeploymentLink, t),
-        discoveredAtColumn,
-        cpuCoresColumn,
-        memoryColumn,
-        disksColumn,
+        discoveredAtColumn(t),
+        cpuCoresColumn(t),
+        memoryColumn(t),
+        disksColumn(t),
       ].filter(Boolean),
     [
       hosts,
@@ -172,7 +173,7 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
         canEditHostname ? undefined : t('ai:Hostname cannot be changed for selected hosts.')
       }
     >
-      Change hostname
+      {t('ai:Change hostname')}
     </DropdownItem>,
     <MassApproveAction
       key="approve"