@openshift-assisted/ui-lib 2.14.7-cim → 2.15.1-cim

package/lib/common/config/constants.ts

@@ -8,13 +8,8 @@ import {
   HostValidationId,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { ValidationGroup as ClusterValidationGroup } from '../types/clusters';
-import { FeatureSupportLevelData } from '../components/featureSupportLevels/FeatureSupportLevelContext';
-import type { NewFeatureSupportLevelData } from '../components/newFeatureSupportLevels';
 import buildManifest from '@openshift-assisted/ui-lib/package.json';
 
-// TODO(mlibra): Retrieve branding dynamically, if needed, i.e. via injecting to the "window" object
-export const getProductBrandingCode = () => 'redhat';
-
 export const POLLING_INTERVAL = 10 * 1000;
 export const EVENTS_POLLING_INTERVAL = 10 * 1000 * 6;
 
@@ -134,6 +129,17 @@ export const hostValidationLabels = (t: TFunction): { [key in HostValidationId]:
   'serverless-requirements-satisfied': t('ai:Serverless requirements'),
   'servicemesh-requirements-satisfied': t('ai:Service Mesh requirements'),
   'openshift-ai-requirements-satisfied': t('ai:OpenShift AI requirements'),
+  'osc-requirements-satisfied': t('ai:OpenShift sandboxed containers requirements'),
+  'mtu-valid': t('ai:MTU requirements'),
+  'authorino-requirements-satisfied': '',
+  'nmstate-requirements-satisfied': '',
+  'amd-gpu-requirements-satisfied': t('ai:AMD GPU requirements'),
+  'kmm-requirements-satisfied': t('ai:Kernel Module Management requirements'),
+  'node-healthcheck-requirements-satisfied': t('ai:Node Healthcheck requirements'),
+  'self-node-remediation-requirements-satisfied': t('ai:Self Node Remediation requirements'),
+  'fence-agents-remediation-requirements-satisfied': t('ai:Fence Agents Remediation requirements'),
+  'node-maintenance-requirements-satisfied': t('ai:Node Maintenance requirements'),
+  'kube-descheduler-requirements-satisfied': t('ai:Kube Descheduler requirements'),
 });
 
 export const hostValidationFailureHints = (
@@ -190,6 +196,17 @@ export const hostValidationFailureHints = (
   'serverless-requirements-satisfied': '',
   'servicemesh-requirements-satisfied': '',
   'openshift-ai-requirements-satisfied': '',
+  'osc-requirements-satisfied': '',
+  'authorino-requirements-satisfied': '',
+  'mtu-valid': '',
+  'nmstate-requirements-satisfied': '',
+  'amd-gpu-requirements-satisfied': '',
+  'kmm-requirements-satisfied': '',
+  'node-healthcheck-requirements-satisfied': '',
+  'self-node-remediation-requirements-satisfied': '',
+  'fence-agents-remediation-requirements-satisfied': '',
+  'node-maintenance-requirements-satisfied': '',
+  'kube-descheduler-requirements-satisfied': '',
 });
 
 export const clusterValidationLabels = (
@@ -281,7 +298,6 @@ export const OPERATOR_NAME_CNV = 'cnv';
 export const OPERATOR_NAME_LSO = 'lso';
 export const OPERATOR_NAME_ODF = 'odf';
 export const OPERATOR_NAME_LVM = 'lvm';
-export const OPERATOR_NAME_LVMS = 'lvms';
 export const OPERATOR_NAME_MCE = 'mce';
 export const OPERATOR_NAME_MTV = 'mtv';
 export const OPERATOR_NAME_NODE_FEATURE_DISCOVERY = 'node-feature-discovery';
@@ -290,79 +306,32 @@ export const OPERATOR_NAME_PIPELINES = 'pipelines';
 export const OPERATOR_NAME_SERVICEMESH = 'servicemesh';
 export const OPERATOR_NAME_SERVERLESS = 'serverless';
 export const OPERATOR_NAME_OPENSHIFT_AI = 'openshift-ai';
+export const OPERATOR_NAME_OSC = 'osc';
+export const OPERATOR_NAME_NMSTATE = 'nmstate';
+export const OPERATOR_NAME_AUTHORINO = 'authorino';
+export const OPERATOR_NAME_AMD_GPU = 'amd-gpu';
+export const OPERATOR_NAME_KMM = 'kmm';
+export const OPERATOR_NAME_NODE_HEALTHCHECK = 'node-healthcheck';
+export const OPERATOR_NAME_SELF_NODE_REMEDIATION = 'self-node-remediation';
+export const OPERATOR_NAME_FENCE_AGENTS_REMEDIATION = 'fence-agents-remediation';
+export const OPERATOR_NAME_NODE_MAINTENANCE = 'node-maintenance';
+export const OPERATOR_NAME_KUBE_DESCHEDULER = 'kube-descheduler';
 
-const OperatorNames = [
-  OPERATOR_NAME_CNV,
-  OPERATOR_NAME_LSO,
-  OPERATOR_NAME_ODF,
-  OPERATOR_NAME_LVM,
-  OPERATOR_NAME_LVMS,
-  OPERATOR_NAME_MCE,
-  OPERATOR_NAME_MTV,
-  OPERATOR_NAME_NODE_FEATURE_DISCOVERY,
-  OPERATOR_NAME_NVIDIA_GPU,
-  OPERATOR_NAME_PIPELINES,
-  OPERATOR_NAME_SERVICEMESH,
-  OPERATOR_NAME_SERVERLESS,
-  OPERATOR_NAME_OPENSHIFT_AI,
-];
-export const ExposedOperatorNames = [
+export const singleClusterOperators = [
   OPERATOR_NAME_CNV,
-  OPERATOR_NAME_ODF,
-  OPERATOR_NAME_LVM,
-  OPERATOR_NAME_LVMS,
-  OPERATOR_NAME_MCE,
   OPERATOR_NAME_MTV,
-  OPERATOR_NAME_NODE_FEATURE_DISCOVERY,
-  OPERATOR_NAME_NVIDIA_GPU,
-  OPERATOR_NAME_PIPELINES,
-  OPERATOR_NAME_SERVICEMESH,
-  OPERATOR_NAME_SERVERLESS,
-  OPERATOR_NAME_OPENSHIFT_AI,
+  OPERATOR_NAME_NMSTATE,
+  OPERATOR_NAME_NODE_HEALTHCHECK,
+  OPERATOR_NAME_NODE_MAINTENANCE,
+  OPERATOR_NAME_FENCE_AGENTS_REMEDIATION,
+  OPERATOR_NAME_SELF_NODE_REMEDIATION,
+  OPERATOR_NAME_KUBE_DESCHEDULER,
 ];
 
-export type OperatorName = (typeof OperatorNames)[number];
-export type ExposedOperatorName = (typeof ExposedOperatorNames)[number];
-
-export const operatorLabelsCim = (
-  t: TFunction,
-  openshiftVersion: Cluster['openshiftVersion'],
-  featureSupportLevel: FeatureSupportLevelData,
-): { [key in ExposedOperatorName]: string } => {
-  const useLVMS =
-    featureSupportLevel.getFeatureSupportLevel(openshiftVersion || '', 'LVM') === 'supported';
-
-  return {
-    [OPERATOR_NAME_ODF]: t('ai:OpenShift Data Foundation'),
-    [OPERATOR_NAME_CNV]: t('ai:OpenShift Virtualization'),
-    [OPERATOR_NAME_LVM]: useLVMS
-      ? t('ai:Logical Volume Manager Storage')
-      : t('ai:Logical Volume Manager'),
-  };
-};
-
-export const operatorLabels = (
-  t: TFunction,
-  featureSupportLevel: NewFeatureSupportLevelData,
-): { [key in ExposedOperatorName]: string } => {
-  const useLVMS = featureSupportLevel.getFeatureSupportLevel('LVM') === 'supported';
-
-  return {
-    [OPERATOR_NAME_ODF]: t('ai:OpenShift Data Foundation'),
-    [OPERATOR_NAME_CNV]: t('ai:OpenShift Virtualization'),
-    [OPERATOR_NAME_LVM]: useLVMS
-      ? t('ai:Logical Volume Manager Storage')
-      : t('ai:Logical Volume Manager'),
-    [OPERATOR_NAME_MCE]: t('ai:Multicluster engine'),
-    [OPERATOR_NAME_NODE_FEATURE_DISCOVERY]: t('ai:Node Feature Discovery'),
-    [OPERATOR_NAME_NVIDIA_GPU]: t('ai:NVIDIA GPU'),
-    [OPERATOR_NAME_PIPELINES]: t('ai:Pipelines'),
-    [OPERATOR_NAME_SERVICEMESH]: t('ai:Service Mesh'),
-    [OPERATOR_NAME_SERVERLESS]: t('ai:Serverless'),
-    [OPERATOR_NAME_OPENSHIFT_AI]: t('ai:OpenShift AI'),
-  };
-};
+export const singleClusterBundles = ['virtualization'];
 
 export const AI_UI_TAG = 'ui_ocm';
 
 export const AI_ASSISTED_MIGRATION_TAG = 'assisted_migration';
+
+export const AI_CISCO_INTERSIGHT_TAG = 'cisco_intersight_ui';

package/lib/common/config/docs_links.ts

@@ -1,7 +1,15 @@
-const DEFAULT_OPENSHIFT_DOCS_VERSION = '4.15';
-
-export const getShortOpenshiftVersion = (ocpVersion?: string) =>
-  ocpVersion ? ocpVersion.split('.').slice(0, 2).join('.') : DEFAULT_OPENSHIFT_DOCS_VERSION;
+const DEFAULT_OPENSHIFT_DOCS_VERSION = 4.15;
+
+export const getShortOpenshiftVersion = (ocpVersion?: string) => {
+  if (!ocpVersion) {
+    return DEFAULT_OPENSHIFT_DOCS_VERSION;
+  }
+  const versionXY = Number(ocpVersion.split('.').slice(0, 2).join('.'));
+  if (!Number.isFinite(versionXY)) {
+    return DEFAULT_OPENSHIFT_DOCS_VERSION;
+  }
+  return versionXY < 4.14 ? 4.14 : versionXY;
+};
 
 export const getYearForAssistedInstallerDocumentationLink = () => {
   return new Date().getFullYear();
@@ -15,6 +23,9 @@ export const OPENSHIFT_LIFE_CYCLE_DATES_LINK =
 
 export const TECH_SUPPORT_LEVEL_LINK = 'https://access.redhat.com/support/offerings/techpreview';
 
+export const DEVELOPER_SUPPORT_LEVEL_LINK =
+  'https://access.redhat.com/support/offerings/devpreview';
+
 export const CLUSTER_MANAGER_SITE_LINK = 'https://console.redhat.com/openshift/install/pull-secret';
 
 export const PULL_SECRET_INFO_LINK = CLUSTER_MANAGER_SITE_LINK;
@@ -28,7 +39,11 @@ export const getEncryptingDiskDuringInstallationDocsLink = (ocpVersion?: string)
 export const getOpenShiftNetworkingDocsLink = (ocpVersion?: string) =>
   `https://docs.redhat.com/en/documentation/openshift_container_platform/${getShortOpenshiftVersion(
     ocpVersion,
-  )}/html/installing_on_bare_metal/installing-bare-metal#installation-network-user-infra_installing-bare-metal`;
+  )}/html/installing_on_bare_metal/${
+    getShortOpenshiftVersion(ocpVersion) > 4.17
+      ? 'user-provisioned-infrastructure'
+      : 'installing-bare-metal'
+  }#installation-network-user-infra_installing-bare-metal`;
 
 export const SSH_GENERATION_DOC_LINK = 'https://www.redhat.com/sysadmin/configure-ssh-keygen';
 
@@ -68,10 +83,16 @@ export const ODF_REQUIREMENTS_LINK =
   'https://docs.redhat.com/en/documentation/red_hat_openshift_data_foundation';
 
 export const OPENSHIFT_AI_REQUIREMENTS_LINK =
-  'https://docs.redhat.com/en/documentation/red_hat_openshift_ai_cloud_service/1/html/installing_the_openshift_ai_cloud_service/requirements-for-openshift-ai_install#requirements-for-openshift-ai_install';
+  'https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.16/html/installing_and_uninstalling_openshift_ai_self-managed/installing-and-deploying-openshift-ai_install#requirements-for-openshift-ai-self-managed_install';
+
+export const OSC_REQUIREMENTS_LINK =
+  'https://docs.redhat.com/en/documentation/openshift_sandboxed_containers/1.8/html/user_guide/deploying-osc-bare-metal#osc-resource-requirements_deploying-bare-metal';
 
 export const CNV_LINK = 'https://cloud.redhat.com/learn/topics/virtualization/';
 
+export const KMM_LINK =
+  'https://docs.redhat.com/en/documentation/openshift_container_platform/4.12/html/specialized_hardware_and_driver_enablement/kernel-module-management-operator';
+
 export const ODF_LINK = 'https://www.redhat.com/en/resources/openshift-data-foundation-datasheet';
 
 export const getMceDocsLink = (ocpVersion?: string) =>
@@ -84,6 +105,23 @@ export const getLvmsDocsLink = (ocpVersion?: string) =>
     ocpVersion,
   )}/html/storage/configuring-persistent-storage#overview-of-lvm-storage-functionality_ways-to-provision-local-storage`;
 
+export const NODE_HEALTHCHECK_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/node-health-check-operator';
+
+export const SELF_NODE_REMEDIATION_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/self-node-remediation-operator-remediate-nodes';
+
+export const FENCE_AGENTS_REMEDIATION_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/fence-agents-remediation-operator-remediate-nodes';
+
+export const NODE_MAINTENANCE_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/node-maintenance-operator';
+
+export const getKubeDeschedulerLink = (ocpVersion?: string) =>
+  `https://docs.redhat.com/en/documentation/openshift_container_platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/html/nodes/controlling-pod-placement-onto-nodes-scheduling#descheduler`;
+
 //Others
 export const REDHAT_CONSOLE_OPENSHIFT = 'https://console.redhat.com/openshift';
 
@@ -104,3 +142,46 @@ export const MTV_LINK =
 
 export const OPENSHIFT_AI_LINK =
   'https://www.redhat.com/en/technologies/cloud-computing/openshift/openshift-ai';
+
+export const OSC_LINK = 'https://docs.redhat.com/en/documentation/openshift_sandboxed_containers';
+
+export const getMtuLink = (ocpVersion?: string) =>
+  `https://docs.redhat.com/en/documentation/openshift_container_platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/html/networking/changing-cluster-network-mtu#nw-cluster-mtu-change-about_changing-cluster-network-mtu`;
+
+export const AUTHORINO_OPERATOR_LINK = 'https://github.com/Kuadrant/authorino-operator';
+
+export const getLsoLink = (ocpVersion?: string) =>
+  `https://docs.openshift.com/container-platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/storage/persistent_storage/persistent_storage_local/ways-to-provision-local-storage.html`;
+
+export const getNmstateLink = (ocpVersion?: string) =>
+  `https://docs.openshift.com/container-platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/networking/networking_operators/k8s-nmstate-about-the-k8s-nmstate-operator.html`;
+
+export const getNodeFeatureDiscoveryLink = (ocpVersion?: string) =>
+  `https://docs.openshift.com/container-platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/hardware_enablement/psap-node-feature-discovery-operator.html`;
+
+export const getNvidiaGpuLink = (ocpVersion?: string) =>
+  `https://docs.openshift.com/container-platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/virt/virtual_machines/advanced_vm_management/virt-configuring-virtual-gpus.html`;
+
+export const PIPELINES_OPERATOR_LINK =
+  'https://docs.openshift.com/pipelines/1.17/install_config/installing-pipelines.html';
+
+export const getServiceMeshLink = (ocpVersion?: string) =>
+  `https://docs.openshift.com/container-platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/service_mesh/v1x/preparing-ossm-installation.html`;
+
+export const SERVERLESS_OPERATOR_LINK =
+  'https://docs.openshift.com/serverless/1.28/install/install-serverless-operator.html#serverless-install-web-console_install-serverless-operator';
+
+export const KUBECONFIG_INFO_LINK =
+  'https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/cli_tools/openshift-cli-oc#about-switches-between-cli-profiles_managing-cli-profiles';

package/lib/common/hooks/index.ts

@@ -1,2 +1,3 @@
 export { default as useStateSafely } from './useStateSafely';
 export { default as useDeepCompareMemoize } from './useDeepCompareMemoize';
+export { useTranslation } from './use-translation-wrapper';

package/lib/common/index.ts

@@ -1,7 +1,3 @@
-import './configurations';
-import './styles.css';
-import './utils';
-
 export * from './components';
 export * from './api';
 export * from './types';
@@ -9,4 +5,6 @@ export * from './config';
 export * from './features';
 export * from './reducers';
 export * from './selectors';
+export * from './hooks';
+export * from './utils';
 export { ResourceUIState } from './types/resource-ui-state';

package/lib/common/selectors/clusterSelectors.ts

@@ -1,7 +1,6 @@
 import head from 'lodash-es/head.js';
 import { SupportedPlatformIntegrations, ValidationsInfo } from '../types';
 import { Cluster, Ip } from '@openshift-assisted/types/assisted-installer-service';
-import { ExposedOperatorName } from '../config';
 import { stringToJSON } from '../utils';
 
 export const selectMachineNetworkCIDR = ({
@@ -46,7 +45,7 @@ export const selectOlmOperators = (cluster?: Pick<Cluster, 'monitoredOperators'>
 
 export const hasEnabledOperators = (
   monitoredOperators: Cluster['monitoredOperators'],
-  searchOperator: ExposedOperatorName,
+  searchOperator: string,
 ) => {
   return selectMonitoredOperators(monitoredOperators).some(
     (operator) => operator.name && operator.name === searchOperator,
@@ -122,3 +121,11 @@ export const isClusterPlatformTypeVM = ({ platform }: Pick<Cluster, 'platform'>)
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   SupportedPlatformIntegrations.includes(platform?.type ?? 'none');
+
+export const numberOfEnabledOperators = (monitoredOperators: Cluster['monitoredOperators']) => {
+  return monitoredOperators
+    ? selectMonitoredOperators(
+        monitoredOperators.filter((operator) => operator.operatorType === 'olm'),
+      ).length
+    : 0;
+};

package/lib/common/types/clusters.ts

@@ -58,13 +58,9 @@ export type HostDiscoveryValues = V2ClusterUpdateParams & {
 export type StorageValues = V2ClusterUpdateParams & {
   nodeLabeling: string;
 };
-export type OperatorsValues = V2ClusterUpdateParams & {
-  useOpenShiftDataFoundation: boolean;
-  useOdfLogicalVolumeManager: boolean;
-  useContainerNativeVirtualization: boolean;
-  useMultiClusterEngine: boolean;
-  useMigrationToolkitforVirtualization: boolean;
-  useOpenShiftAI: boolean;
+export type OperatorsValues = {
+  selectedBundles: string[];
+  selectedOperators: string[];
 };
 
 export type SupportedPlatformType = Extract<PlatformType, 'vsphere' | 'nutanix' | 'external'>;

package/lib/common/types/ui-settings.ts

@@ -2,4 +2,5 @@ export type UISettingsValues = {
   addCustomManifests?: boolean;
   customManifestsAdded?: boolean;
   customManifestsUpdated?: boolean;
+  bundlesSelected?: string[];
 };

package/lib/common/utils.ts

@@ -106,3 +106,8 @@ export const downloadFile = (fileUrl?: string, dataBlob?: Blob, fileName?: strin
   link.click();
   document.body.removeChild(link);
 };
+
+export const getMajorMinorVersion = (version = '') => {
+  const match = /[0-9].[0-9][0-9]?/g.exec(version);
+  return match?.[0] || '';
+};

package/lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Modal, ModalVariant } from '@patternfly/react-core';
-import { WizardHeader } from '@patternfly/react-core/deprecated';
+import { WizardHeader } from '@patternfly/react-core';
 import classNames from 'classnames';
 import { ClusterWizardStep } from '../../../../common';
 import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';

package/lib/ocm/components/AddHosts/day2Wizard/Day2WizardNav.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { WizardNav, WizardNavItem } from '@patternfly/react-core/deprecated';
+import { WizardNav, WizardNavItem } from '@patternfly/react-core';
 import { Day2WizardStepsType, day2WizardStepNames, staticIpFormViewSubSteps } from './constants';
 import { useDay2WizardContext } from './Day2WizardContext';
 import { isStaticIpStep } from '../../clusterWizard/wizardTransition';
@@ -18,10 +18,10 @@ const Day2WizardNav = () => {
   const getNavItem = (idx: number, stepId: Day2WizardStepsType): React.ReactNode => {
     return (
       <WizardNavItem
-        step={idx}
+        stepIndex={idx}
         key={stepId}
         content={day2WizardStepNames[stepId]}
-        onNavItemClick={() => wizardContext.setCurrentStepId(stepId)}
+        onClick={() => wizardContext.setCurrentStepId(stepId)}
         isCurrent={wizardContext.currentStepId === stepId}
         isDisabled={isStepDisabled(idx, stepId)}
       />
@@ -31,14 +31,14 @@ const Day2WizardNav = () => {
   const getStaticIpFormViewNavItem = (idx: number): React.ReactNode => {
     return (
       <WizardNavItem
-        step={idx}
+        stepIndex={idx}
         isExpandable={true}
         content="Static network configurations"
         key="static-network-configuration-form-view"
         isCurrent={isStaticIpStep(wizardContext.currentStepId)}
         isDisabled={isStepIdxAfterCurrent(idx)}
       >
-        <WizardNav returnList>
+        <WizardNav isInnerList>
           {staticIpFormViewSubSteps.map((stepId, subIdx) => {
             return getNavItem(idx + subIdx, stepId);
           })}

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx

@@ -33,6 +33,9 @@ export const HostsClusterDetailTabContent = ({
   const [day2Cluster, setDay2Cluster] = useStateSafely<Cluster | null>(null);
   const pullSecret = usePullSecret();
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const ocmClusterMemo = React.useMemo(() => ocmCluster, []);
+
   const handleClickTryAgainLink = React.useCallback(() => {
     setError(undefined);
     setDay2Cluster(null);
@@ -53,19 +56,20 @@ export const HostsClusterDetailTabContent = ({
       setDay2Cluster(null);
       return;
     }
-    const day1ClusterHostCount = ocmCluster?.metrics?.nodes?.total || 0;
-    const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmCluster);
+
+    const day1ClusterHostCount = ocmClusterMemo?.metrics?.nodes?.total || 0;
+    const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmClusterMemo);
     if (day1ClusterHostCount === 0 || !openshiftClusterId) {
       setError(<UnableToAddHostsError onTryAgain={handleClickTryAgainLink} />);
     }
 
     if (!day2Cluster && pullSecret) {
-      const { apiVipDnsname, errorType } = getApiVipDnsName(ocmCluster);
+      const { apiVipDnsname, errorType } = getApiVipDnsName(ocmClusterMemo);
       if (errorType) {
         const wrongUrlMessage =
           errorType === 'console'
-            ? `Cluster Console URL is not valid (${ocmCluster.console?.url || ''})`
-            : `Cluster API URL is not valid (${ocmCluster.api?.url || ''})`;
+            ? `Cluster Console URL is not valid (${ocmClusterMemo.console?.url || ''})`
+            : `Cluster API URL is not valid (${ocmClusterMemo.api?.url || ''})`;
         setError(
           <>
             {wrongUrlMessage}, you can{' '}
@@ -85,11 +89,11 @@ export const HostsClusterDetailTabContent = ({
 
       const loadDay2Cluster = async () => {
         try {
-          const day2Cluster = await Day2ClusterService.fetchCluster(ocmCluster, pullSecret);
+          const day2Cluster = await Day2ClusterService.fetchCluster(ocmClusterMemo, pullSecret);
 
           const aiCluster = Day2ClusterService.completeAiClusterWithOcmCluster(
             day2Cluster,
-            ocmCluster,
+            ocmClusterMemo,
           );
           setDay2Cluster(aiCluster ?? null);
         } catch (e) {
@@ -103,13 +107,12 @@ export const HostsClusterDetailTabContent = ({
               />,
             );
           }
-          return;
         }
       };
 
       void loadDay2Cluster();
     }
-  }, [ocmCluster, pullSecret, day2Cluster, setDay2Cluster, isVisible, handleClickTryAgainLink]);
+  }, [pullSecret, day2Cluster, setDay2Cluster, isVisible, handleClickTryAgainLink, ocmClusterMemo]);
 
   const refreshCluster = React.useCallback(async () => {
     if (!day2Cluster?.id) {

package/lib/ocm/components/HostsClusterDetailTab/utils.ts

@@ -37,7 +37,11 @@ const makeState = (
 };
 
 export const getAddHostsTabState = (cluster: OcmClusterType): AddHostsTabState => {
-  const isClusterStateReady = /ready|installed/.test(cluster.state);
+  // Prioritize aiCluster.status over cluster.state to prevent inconsistencies
+  // where metrics might show the cluster as ready while installation is still in progress
+  const isClusterStateReady = cluster.aiCluster?.status
+    ? /ready|installed/.test(cluster.aiCluster.status)
+    : /ready|installed/.test(cluster.state);
   const wasInstalledUsingAssistedInstaller = cluster.product?.id === 'OCP-AssistedInstall';
   // Checking if the Day1 cluster has reported metrics, so it can be determined if it's an SNO / multi node and has required information
   const day1ClusterHostCount = cluster.metrics?.nodes?.total || 0;

package/lib/ocm/components/SentryErrorMonitorContextProvider.tsx

@@ -7,7 +7,6 @@ import {
 import { handleApiError } from '../../common/api';
 import { isApiError } from '../../common/api/utils';
 import { captureException } from '../sentry';
-import * as Sentry from '@sentry/browser';
 
 export const SentryErrorMonitorContextProvider: React.FC = ({ children }) => {
   const exceptionReporter: ExceptionReporter = (
@@ -18,7 +17,7 @@ export const SentryErrorMonitorContextProvider: React.FC = ({ children }) => {
     if (isApiError(error)) {
       handleApiError(error);
     } else {
-      captureException(error, message, severity as Sentry.Severity);
+      captureException(error, message, severity);
     }
   };
   return (