@openshift-assisted/ui-lib 2.9.6-cim → 2.9.7-cim

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

@@ -12,12 +12,14 @@ type DetailsFormBodyProps = {
   clusterImages: ClusterImageSetK8sResource[];
   onValuesChanged: (values: ClusterDetailsValues, initRender: boolean) => void;
   extensionAfter: ClusterDetailsFormFieldsProps['extensionAfter'];
+  isNutanix?: boolean;
 };
 
 const DetailsFormBody: React.FC<DetailsFormBodyProps> = ({
   onValuesChanged,
   clusterImages,
   extensionAfter,
+  isNutanix,
 }) => {
   const { values } = useFormikContext<ClusterDetailsValues>();
   const initRenderRef = React.useRef(true);
@@ -27,7 +29,11 @@ const DetailsFormBody: React.FC<DetailsFormBodyProps> = ({
   }, []);
 
   return (
-    <ClusterDeploymentDetailsForm clusterImages={clusterImages} extensionAfter={extensionAfter} />
+    <ClusterDeploymentDetailsForm
+      clusterImages={clusterImages}
+      extensionAfter={extensionAfter}
+      isNutanix={isNutanix}
+    />
   );
 };
 
@@ -45,6 +51,7 @@ const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepP
   const [initialValues, validationSchema] = useDetailsFormik({
     clusterImages,
     usedClusterNames,
+    isNutanix: !!rest.isNutanix,
   });
   return (
     <Formik

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

@@ -14,6 +14,7 @@ type ClusterDeploymentDetailsFormProps = {
   clusterDeployment?: ClusterDeploymentK8sResource;
   agentClusterInstall?: AgentClusterInstallK8sResource;
   extensionAfter?: ClusterDetailsFormFieldsProps['extensionAfter'];
+  isNutanix?: boolean;
 };
 
 const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
@@ -21,8 +22,12 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
   clusterDeployment,
   clusterImages,
   extensionAfter,
+  isNutanix,
 }) => {
-  const ocpVersions = React.useMemo(() => getOCPVersions(clusterImages), [clusterImages]);
+  const ocpVersions = React.useMemo(
+    () => getOCPVersions(clusterImages, isNutanix),
+    [clusterImages, isNutanix],
+  );
   const forceOpenshiftVersion = agentClusterInstall
     ? getSelectedVersion(clusterImages, agentClusterInstall)
     : undefined;
@@ -45,6 +50,7 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
           isEditFlow={isEditFlow}
           forceOpenshiftVersion={forceOpenshiftVersion}
           extensionAfter={extensionAfter}
+          isNutanix={isNutanix}
         />
       </StackItem>
     </Stack>

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

@@ -36,6 +36,7 @@ type UseDetailsFormikArgs = {
   agentClusterInstall?: AgentClusterInstallK8sResource;
   agents?: AgentK8sResource[];
   infraEnv?: InfraEnvK8sResource;
+  isNutanix: boolean;
 };
 
 export const useDetailsFormik = ({
@@ -45,10 +46,11 @@ export const useDetailsFormik = ({
   clusterImages,
   usedClusterNames,
   infraEnv,
+  isNutanix,
 }: UseDetailsFormikArgs): [ClusterDetailsValues, Lazy] => {
   const { t } = useTranslation();
   const featureSupportLevels = useFeatureSupportLevel();
-  const ocpVersions = getOCPVersions(clusterImages);
+  const ocpVersions = getOCPVersions(clusterImages, isNutanix);
   const cluster = React.useMemo(
     () =>
       clusterDeployment && agentClusterInstall
@@ -98,6 +100,7 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
   onClose,
   isPreviewOpen,
   infraEnv,
+  isNutanix,
 }) => {
   const { addAlert } = useAlerts();
   const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
@@ -109,6 +112,7 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
     clusterImages,
     usedClusterNames,
     infraEnv,
+    isNutanix,
   });
   const next = () =>
     isCIMFlow(clusterDeployment)
@@ -165,6 +169,7 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
                   agentClusterInstall={agentClusterInstall}
                   clusterDeployment={clusterDeployment}
                   clusterImages={clusterImages}
+                  isNutanix={isNutanix}
                 />
               </GridItem>
             </Grid>

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

@@ -140,6 +140,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   aiConfigMap,
   onEditRole: onEditRoleInit,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
   const [showClusterErrors, setShowClusterErrors] = React.useState(false);
@@ -279,6 +280,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
             onSetInstallationDiskId={onSetInstallationDiskId}
             onAutoSelectChange={onAutoSelectChange}
             onHostSelect={onHostSelect}
+            isNutanix={isNutanix}
           />
         </GridItem>
       </Grid>

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

@@ -26,6 +26,7 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
   onAutoSelectChange,
   onHostSelect,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const { values } = useFormikContext<ClusterDeploymentHostsSelectionValues>();
   const { autoSelectHosts } = values;
@@ -35,18 +36,19 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
   const cdNamespace = clusterDeployment?.metadata?.namespace;
   const cpuArchitecture = getClusterDeploymentCpuArchitecture(clusterDeployment);
 
-  const availableAgents = React.useMemo(
-    () =>
-      getAgentsForSelection(agents).filter(
-        (agent) =>
-          (agent.spec.clusterDeploymentName?.name === cdName &&
-            agent.spec.clusterDeploymentName?.namespace === cdNamespace) ||
-          (!agent.spec.clusterDeploymentName?.name &&
-            !agent.spec.clusterDeploymentName?.namespace &&
-            agent.status?.inventory.cpu?.architecture === cpuArchitecture),
-      ),
-    [agents, cdNamespace, cdName, cpuArchitecture],
-  );
+  const availableAgents = React.useMemo(() => {
+    const filtered = getAgentsForSelection(agents).filter(
+      (agent) =>
+        (agent.spec.clusterDeploymentName?.name === cdName &&
+          agent.spec.clusterDeploymentName?.namespace === cdNamespace) ||
+        (!agent.spec.clusterDeploymentName?.name &&
+          !agent.spec.clusterDeploymentName?.namespace &&
+          agent.status?.inventory.cpu?.architecture === cpuArchitecture),
+    );
+    return isNutanix
+      ? filtered.filter((a) => a.status?.inventory?.systemVendor?.manufacturer === 'Nutanix')
+      : filtered;
+  }, [agents, cdNamespace, cdName, cpuArchitecture, isNutanix]);
   const { t } = useTranslation();
   return (
     <Grid hasGutter>

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

@@ -53,6 +53,7 @@ type ClusterDeploymentNetworkingFormProps = {
   onEditHost: AgentTableActions['onEditHost'];
   onEditRole: AgentTableActions['onEditRole'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
+  isNutanix: boolean;
 };
 
 const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormProps> = ({
@@ -68,6 +69,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
   onEditHost,
   onEditRole,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const { values, touched, setFieldValue, setFieldTouched } =
     useFormikContext<ClusterDeploymentNetworkingValues>();
@@ -139,7 +141,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
                 hostSubnets={hostSubnets}
                 isVipDhcpAllocationDisabled
                 defaultNetworkSettings={defaultNetworkSettings}
-                hideManagedNetworking={getIsSNOCluster(agentClusterInstall)}
+                hideManagedNetworking={getIsSNOCluster(agentClusterInstall) || isNutanix}
               />
             </GridItem>
           </Grid>

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

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

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

@@ -36,6 +36,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
   fetchKlusterletAddonConfig,
   onSaveISOParams,
   onCreateBMH,
+  isNutanix,
   ...rest
 }) => {
   const [currentStepId, setCurrentStepId] = React.useState<ClusterDeploymentWizardStepsType>(
@@ -70,6 +71,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
               aiConfigMap={aiConfigMap}
               onEditRole={hostActions.onEditRole}
               onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
+              isNutanix={isNutanix}
             />
           );
         }
@@ -115,6 +117,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
             fetchInfraEnv={fetchInfraEnv}
             isPreviewOpen={isPreviewOpen}
             onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
+            isNutanix={isNutanix}
           />
         );
       case 'review':
@@ -142,6 +145,7 @@ const ClusterDeploymentWizard: React.FC<ClusterDeploymentWizardProps> = ({
             onClose={onClose}
             isPreviewOpen={isPreviewOpen}
             infraEnv={infraEnv}
+            isNutanix={isNutanix}
           />
         );
     }

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

@@ -21,6 +21,7 @@ export type ClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
   extensionAfter?: { [key: string]: React.ReactElement };
   versions: OpenshiftVersionOptionType[];
+  isNutanix?: boolean;
 };
 
 export const BaseDnsHelperText: React.FC<{ name?: string; baseDnsDomain?: string }> = ({
@@ -46,6 +47,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   versions,
   forceOpenshiftVersion,
   extensionAfter,
+  isNutanix,
 }) => {
   const { values } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain, highAvailabilityMode } = values;
@@ -99,8 +101,12 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
       ) : (
         <OpenShiftVersionSelect versions={versions} />
       )}
-      <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
-      <ArmCheckbox versions={versions} />
+      {!isNutanix && (
+        <>
+          <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
+          <ArmCheckbox versions={versions} />
+        </>
+      )}
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
       {!isEditFlow && <PullSecret />}
       {extensionAfter?.['pullSecret'] && extensionAfter['pullSecret']}

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

@@ -87,6 +87,7 @@ export type ClusterDeploymentDetailsStepProps = ClusterDeploymentDetailsProps &
   onSaveDetails: (values: ClusterDeploymentDetailsValues) => Promise<unknown>;
   onClose: () => void;
   isPreviewOpen: boolean;
+  isNutanix: boolean;
 };
 
 export type ClusterDeploymentDetailsNetworkingProps = Pick<
@@ -100,6 +101,7 @@ export type ClusterDeploymentDetailsNetworkingProps = Pick<
   onClose: () => void;
   fetchInfraEnv: (name: string, namespace: string) => Promise<InfraEnvK8sResource>;
   isPreviewOpen: boolean;
+  isNutanix: boolean;
 };
 
 export type AgentSelectorChangeProps = {
@@ -163,6 +165,7 @@ export type ClusterDeploymentWizardProps = {
   docVersion: string; // ACM version
   onCreateBmcByYaml: UploadActionModalProps['onCreateBmcByYaml'];
   provisioningConfigResult: ProvisioningConfigResult;
+  isNutanix: boolean;
 };
 
 export type FetchSecret = (name: string, namespace: string) => Promise<SecretK8sResource>;
@@ -176,6 +179,7 @@ export type ClusterDeploymentHostsSelectionProps = {
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   onAutoSelectChange: VoidFunction;
   onHostSelect: VoidFunction;
+  isNutanix: boolean;
 };
 
 export type InfraEnvAgentTableProps = Pick<

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

@@ -13,7 +13,7 @@ export const useSupportedOCPVersions = (
   supportedVersionsCM?: ConfigMapK8sResource,
 ) => {
   return React.useMemo(() => {
-    const ocpVersions = getOCPVersions(clusterImages);
+    const ocpVersions = getOCPVersions(clusterImages, false);
     const supportedVersionsString = supportedVersionsCM?.data?.['supported-versions'];
     if (supportedVersionsString) {
       try {

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

@@ -36,9 +36,16 @@ const getSupportLevelFromChannel = (
 
 export const getOCPVersions = (
   clusterImageSets: ClusterImageSetK8sResource[],
+  isNutanix?: boolean | undefined,
 ): OpenshiftVersionOptionType[] => {
   const versions = clusterImageSets
-    .filter((clusterImageSet) => clusterImageSet.metadata?.labels?.visible !== 'false')
+    .filter((clusterImageSet) => {
+      let supportedPlatform = true;
+      if (isNutanix && clusterImageSet.spec?.releaseImage) {
+        supportedPlatform = clusterImageSet.spec.releaseImage.endsWith('-x86_64');
+      }
+      return supportedPlatform && clusterImageSet.metadata?.labels?.visible !== 'false';
+    })
     .map((clusterImageSet): OpenshiftVersionOptionType => {
       const version = getVersionFromReleaseImage(clusterImageSet.spec?.releaseImage);
       return {

package/lib/common/api/assisted-service/ClustersAPI.ts

@@ -7,7 +7,6 @@ import {
   Credentials,
   Host,
   ImportClusterParams,
-  PlatformType,
   PreflightHardwareRequirements,
   PresignedUrl,
   ListManifests,
@@ -62,10 +61,6 @@ const ClustersAPI = {
     return `${ClustersAPI.makeDownloadsBaseURI(clusterId)}/files-presigned`;
   },
 
-  makeSupportedPlatformsBaseURI(clusterId: Cluster['id']) {
-    return `${ClustersAPI.makeBaseURI(clusterId)}/supported-platforms`;
-  },
-
   makeActionsBaseURI(clusterId: string) {
     return `${ClustersAPI.makeBaseURI(clusterId)}/actions`;
   },
@@ -126,10 +121,6 @@ const ClustersAPI = {
     });
   },
 
-  getSupportedPlatforms(clusterId: Cluster['id']) {
-    return client.get<PlatformType[]>(`${ClustersAPI.makeSupportedPlatformsBaseURI(clusterId)}`);
-  },
-
   getPreflightRequirements(clusterId: Cluster['id']) {
     return client.get<PreflightHardwareRequirements>(
       `${ClustersAPI.makeBaseURI(clusterId)}/preflight-requirements`,

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { useFormikContext } from 'formik';
-import { TFunction } from 'i18next';
 import { useSelector } from 'react-redux';
 import { Alert, AlertVariant, Grid, Tooltip } from '@patternfly/react-core';
 import { VirtualIPControlGroup, VirtualIPControlGroupProps } from './VirtualIPControlGroup';
@@ -23,16 +22,13 @@ import {
 import { StackTypeControlGroup } from './StackTypeControl';
 import { AvailableSubnetsControl } from './AvailableSubnetsControl';
 import AdvancedNetworkFields from './AdvancedNetworkFields';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import { OcmCheckbox } from '../../ui/OcmFormFields';
 import { NetworkTypeControlGroup } from '../../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup';
-import { useClusterSupportedPlatforms } from '../../../hooks';
 import {
   NewFeatureSupportLevelData,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
-import { SupportedPlatformIntegrationType } from '../../../hooks/useClusterSupportedPlatforms';
 import {
   Cluster,
   ClusterDefaultConfig,
@@ -78,12 +74,9 @@ const getManagedNetworkingDisabledReason = (
   }
 };
 
-const getUserManagedDisabledReason = (
-  supportedPlatformIntegration: SupportedPlatformIntegrationType,
-  t: TFunction,
-) => {
-  if (['nutanix', 'vsphere'].includes(supportedPlatformIntegration)) {
-    return t('ai:User-Managed Networking is not supported when using Nutanix or vSphere');
+const getUserManagedDisabledReason = (featureSupportLevelData: NewFeatureSupportLevelData) => {
+  if (!featureSupportLevelData.isFeatureSupported('USER_MANAGED_NETWORKING')) {
+    return featureSupportLevelData.getFeatureDisabledReason('USER_MANAGED_NETWORKING');
   }
 };
 
@@ -96,9 +89,7 @@ const getClusterManagedDisabledReason = (featureSupportLevelData: NewFeatureSupp
 const getManagedNetworkingState = (
   isDualStack: boolean,
   isOracleCloudInfrastructure: boolean,
-  supportedPlatformIntegration: SupportedPlatformIntegrationType,
   featureSupportLevelData: NewFeatureSupportLevelData,
-  t: TFunction,
 ): {
   isDisabled: boolean;
   clusterManagedDisabledReason?: string;
@@ -110,7 +101,7 @@ const getManagedNetworkingState = (
     featureSupportLevelData,
   );
   const cmnReason = getClusterManagedDisabledReason(featureSupportLevelData);
-  const umnReason = getUserManagedDisabledReason(supportedPlatformIntegration, t);
+  const umnReason = getUserManagedDisabledReason(featureSupportLevelData);
 
   return {
     isDisabled: !!(cmnReason || umnReason || networkingReason),
@@ -125,9 +116,7 @@ const NetworkConfiguration = ({
   isVipDhcpAllocationDisabled,
   defaultNetworkSettings,
 }: NetworkConfigurationProps) => {
-  const { t } = useTranslation();
   const featureSupportLevelData = useNewFeatureSupportLevel();
-  const { supportedPlatformIntegration } = useClusterSupportedPlatforms(cluster.id);
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const { setFieldValue, values, validateField } = useFormikContext<NetworkConfigurationValues>();
 
@@ -205,11 +194,9 @@ const NetworkConfiguration = ({
       getManagedNetworkingState(
         isDualStack,
         cluster.platform?.type === 'oci',
-        supportedPlatformIntegration,
         featureSupportLevelData,
-        t,
       ),
-    [isDualStack, cluster.platform?.type, supportedPlatformIntegration, featureSupportLevelData, t],
+    [isDualStack, cluster.platform?.type, featureSupportLevelData],
   );
 
   return (

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx

@@ -39,7 +39,7 @@ import {
   updateClusterBase,
 } from '../../../store/slices/current-cluster/slice';
 import { isUnknownServerError, getApiErrorMessage, handleApiError } from '../../../api';
-import { useClusterSupportedPlatforms, usePullSecret } from '../../../hooks';
+import { usePullSecret } from '../../../hooks';
 import {
   Cluster,
   ClusterDefaultConfig,
@@ -66,13 +66,12 @@ const NetworkConfigurationForm: React.FC<{
     useFormikContext<NetworkConfigurationValues>();
   const isAutoSaveRunning = useFormikAutoSave();
   const errorFields = getFormikErrorFields(errors, touched);
-  const { supportedPlatformIntegration } = useClusterSupportedPlatforms(cluster.id);
 
   // DHCP allocation is currently not supported for Nutanix hosts
   // https://issues.redhat.com/browse/MGMT-12382
   const isHostsPlatformTypeNutanix = React.useMemo(
-    () => supportedPlatformIntegration === 'nutanix',
-    [supportedPlatformIntegration],
+    () => cluster.platform?.type === 'nutanix',
+    [cluster.platform],
   );
 
   React.useEffect(() => {

package/lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx

@@ -13,13 +13,7 @@ import {
 import { CaretDownIcon } from '@patternfly/react-icons';
 import { useField } from 'formik';
 import { CpuArchitecture, DeveloperPreview, FeatureId, getFieldId } from '../../../../common';
-
-import {
-  ExternalPlaformIds,
-  ExternalPlatformLabels,
-  ExternalPlatformLinks,
-  ExternalPlatformTooltips,
-} from './constants';
+import { ExternalPlaformIds, ExternalPlatformLabels, ExternalPlatformLinks } from './constants';
 import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 import {
   NewFeatureSupportLevelData,
@@ -41,7 +35,6 @@ type ExternalPlatformDropdownProps = {
 export type ExternalPlatformInfo = {
   label: string;
   href?: string;
-  tooltip?: string;
   disabledReason?: string;
 };
 
@@ -83,7 +76,6 @@ const getExternalPlatformTypes = (
       [platform]: {
         label: ExternalPlatformLabels[platform],
         href: ExternalPlatformLinks[platform],
-        tooltip: ExternalPlatformTooltips[platform],
         disabledReason: getDisabledReasonForExternalPlatform(
           isSNO,
           newFeatureSupportLevelContext,
@@ -162,18 +154,14 @@ export const ExternalPlatformDropdown = ({
   }, [dropdownIsDisabled, externalPlatformTypes]);
 
   const enabledItems = Object.keys(externalPlatformTypes).map((platform) => {
-    const { label, href, tooltip, disabledReason } = externalPlatformTypes[
+    const { label, href, disabledReason } = externalPlatformTypes[
       platform as PlatformType
     ] as ExternalPlatformInfo;
     return (
       <DropdownItem key={platform} id={platform} isAriaDisabled={disabledReason !== undefined}>
         <Split>
           <SplitItem>
-            <Tooltip
-              hidden={disabledReason === undefined && tooltip === undefined}
-              content={disabledReason !== undefined ? disabledReason : tooltip}
-              position="top"
-            >
+            <Tooltip hidden={!disabledReason} content={disabledReason} position="top">
               <div>
                 {label}
                 {platform === 'oci' && <DeveloperPreview testId={'oci-support-level`'} />}

package/lib/ocm/components/clusterConfiguration/platformIntegration/constants.tsx

@@ -5,7 +5,7 @@ export const ExternalPlatformLabels: { [key in PlatformType]: string } = {
   baremetal: 'No platform integration',
   none: 'No platform integration',
   nutanix: 'Nutanix',
-  oci: 'Oracle  (Requires a custom manifest)',
+  oci: 'Oracle Cloud Infrastructure (Requires a custom manifest)',
   vsphere: 'vSphere',
 };
 
@@ -14,10 +14,6 @@ export const ExternalPlatformLinks: Partial<{ [key in PlatformType]: string }> =
   vsphere: VSPHERE_CONFIG_LINK,
 };
 
-export const ExternalPlatformTooltips: Partial<{ [key in PlatformType]: string }> = {
-  oci: "To integrate with an external partner (for example, Oracle Cloud), you'll need to provide a custom manifest.",
-};
-
 export const ExternalPlaformIds: { [key in PlatformType]: string } = {
   baremetal: '',
   none: '',

package/lib/ocm/components/clusterWizard/ClusterDetails.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
-import { useAlerts, LoadingState, ClusterWizardStep } from '../../../common';
+import { useAlerts, LoadingState, ClusterWizardStep, ErrorState } from '../../../common';
 import { usePullSecret } from '../../hooks';
 import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
 import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
@@ -34,9 +34,6 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   const pullSecret = usePullSecret();
   const { error: errorOCPVersions, loading: loadingOCPVersions, versions } = useOpenshiftVersions();
   const { customManifests } = useClusterCustomManifests(cluster?.id || '', false);
-  React.useEffect(() => {
-    errorOCPVersions && addAlert(errorOCPVersions);
-  }, [errorOCPVersions, addAlert]);
 
   const handleClusterUpdate = React.useCallback(
     async (clusterId: Cluster['id'], params: ClusterDetailsUpdateParams) => {
@@ -92,14 +89,22 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
     [clearAlerts, addAlert, dispatch, history, handleCustomManifestsChange],
   );
 
+  const navigation = <ClusterWizardNavigation cluster={cluster} />;
   if (pullSecret === undefined || !managedDomains || loadingOCPVersions || !usedClusterNames) {
     return (
-      <ClusterWizardStep navigation={<ClusterWizardNavigation cluster={cluster} />}>
+      <ClusterWizardStep navigation={navigation}>
         <LoadingState />
       </ClusterWizardStep>
     );
   }
-  const navigation = <ClusterWizardNavigation cluster={cluster} />;
+
+  if (!cluster && errorOCPVersions) {
+    return (
+      <ClusterWizardStep navigation={navigation}>
+        <ErrorState title="Failed to retrieve OpenShift versions" />
+      </ClusterWizardStep>
+    );
+  }
 
   return (
     <ClusterDetailsForm

package/lib/ocm/hooks/index.ts

@@ -1,5 +1,4 @@
 export { default as useOpenshiftVersions } from './useOpenshiftVersions';
-export { default as useClusterSupportedPlatforms } from './useClusterSupportedPlatforms';
 export { default as useManagedDomains } from './useManagedDomains';
 export { default as useUsedClusterNames } from './useUsedClusterNames';
 export { default as useInfraEnvId } from './useInfraEnvId';

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.9.6-cim",
-    "@openshift-assisted/types": "2.9.6-cim",
+    "@openshift-assisted/locales": "2.9.7-cim",
+    "@openshift-assisted/types": "2.9.7-cim",
     "axios-case-converter": "^0.11.1",
     "camel-case": "^4.1.2",
     "cidr-tools": "^4.3.0",
@@ -26,7 +26,6 @@
   },
   "description": "React component library for the Assisted Installer UI",
   "devDependencies": {
-    "@openshift-assisted/eslint-config-assisted-ui": "^1.0.0",
     "@tsconfig/recommended": "^1.0.2",
     "@types/file-saver": "^2.0.1",
     "@types/human-date": "^1.4.0",
@@ -128,5 +127,5 @@
       ]
     }
   },
-  "version": "2.9.6-cim"
+  "version": "2.9.7-cim"
 }

package/build/@types/ocm/hooks/useClusterSupportedPlatforms.d.ts

@@ -1,11 +0,0 @@
-import { AxiosError } from 'axios';
-import { SupportedPlatformType } from '../../common';
-import { APIErrorMixin } from '../../common/api/utils';
-export type SupportedPlatformIntegrationType = 'no-active-integrations' | SupportedPlatformType;
-export default function useClusterSupportedPlatforms(clusterId: string): {
-    isPlatformIntegrationSupported: boolean;
-    supportedPlatformIntegration: SupportedPlatformIntegrationType;
-    isLoading: boolean;
-    error: AxiosError<APIErrorMixin, any> | undefined;
-};
-//# sourceMappingURL=useClusterSupportedPlatforms.d.ts.map

package/build/@types/ocm/hooks/useClusterSupportedPlatforms.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useClusterSupportedPlatforms.d.ts","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useClusterSupportedPlatforms.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAInC,OAAO,EAKL,qBAAqB,EACtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,MAAM,MAAM,gCAAgC,GAAG,wBAAwB,GAAG,qBAAqB,CAAC;AAgBhG,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,SAAS,EAAE,MAAM;;;;;EAsCrE"}