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

package/lib/cim/components/modals/AddHostModal.tsx

@@ -74,6 +74,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
             hasDHCP={hasDHCP}
             isIPXE={isIPXE}
             allowEmpty
+            docVersion={docVersion}
           />
         )}
         {dialogType === 'download' && (
@@ -90,6 +91,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
                 infraEnv={infraEnv}
                 onReset={agentClusterInstall ? () => setDialogType('config') : undefined}
                 hasDHCP={hasDHCP}
+                docVersion={docVersion}
               />
             )}
           </>
@@ -104,11 +106,13 @@ const GeneratingIsoDownload = ({
   onClose,
   onReset,
   hasDHCP,
+  docVersion,
 }: {
   infraEnv: InfraEnvK8sResource;
   onClose: VoidFunction;
   onReset?: VoidFunction;
   hasDHCP: boolean;
+  docVersion: string;
 }) => {
   const { t } = useTranslation();
   return infraEnv.status?.isoDownloadURL ? (
@@ -117,6 +121,7 @@ const GeneratingIsoDownload = ({
       downloadUrl={infraEnv.status.isoDownloadURL}
       onReset={onReset}
       hasDHCP={hasDHCP}
+      docVersion={docVersion}
     />
   ) : (
     <EmptyState>

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/common/api/assisted-service/NewFeatureSupportLevelsAPI.ts

@@ -9,12 +9,16 @@ const NewFeatureSupportLevelsAPI = {
     return `/v2/support-levels`;
   },
 
-  featuresSupportLevel(openshiftVersion: string, cpuArchitecture?: string) {
-    let queryParams = '?';
-    queryParams += openshiftVersion ? `openshift_version=${openshiftVersion}&` : '';
-    queryParams += cpuArchitecture ? `cpu_architecture=${cpuArchitecture}` : '';
+  featuresSupportLevel(openshiftVersion: string, cpuArchitecture?: string, platformType?: string) {
     return clientWithoutCaseConverter.get<FeaturesSupportsLevel>(
-      `${NewFeatureSupportLevelsAPI.makeBaseURI()}/features${queryParams}`,
+      `${NewFeatureSupportLevelsAPI.makeBaseURI()}/features`,
+      {
+        params: {
+          openshift_version: openshiftVersion,
+          cpu_architecture: cpuArchitecture,
+          platform_type: platformType,
+        },
+      },
     );
   },
 

package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx

@@ -27,10 +27,10 @@ import { ProxyFieldsType, StatusErrorType } from '../../types';
 import ProxyFields from './ProxyFields';
 import UploadSSH from './UploadSSH';
 import DiscoveryImageTypeControlGroup from './DiscoveryImageTypeControlGroup';
-import { OCP_STATIC_IP_DOC } from '../../config/constants';
+import { getOCPStaticIPDocLink } from '../../config/constants';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
-export const StaticIPInfo: React.FC = () => {
+export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
   const { t } = useTranslation();
   return (
     <Alert
@@ -45,7 +45,7 @@ export const StaticIPInfo: React.FC = () => {
         icon={<ExternalLinkAltIcon />}
         iconPosition="right"
         isInline
-        onClick={() => window.open(OCP_STATIC_IP_DOC, '_blank', 'noopener')}
+        onClick={() => window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener')}
       >
         {t('ai:View documentation')}
       </Button>
@@ -77,6 +77,7 @@ type DiscoveryImageConfigFormProps = Proxy & {
   imageType?: ImageType;
   isIPXE?: boolean;
   allowEmpty?: boolean;
+  docVersion: string;
 };
 
 export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> = ({
@@ -91,6 +92,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
   hasDHCP,
   isIPXE,
   allowEmpty,
+  docVersion,
 }) => {
   const initialValues: DiscoveryImageFormValues = {
     sshPublicKey: sshPublicKey || '',
@@ -127,7 +129,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
                 </StackItem>
                 {hasDHCP === false && (
                   <StackItem>
-                    <StaticIPInfo />
+                    <StaticIPInfo docVersion={docVersion} />
                   </StackItem>
                 )}
                 <StackItem>

package/lib/common/components/clusterConfiguration/DownloadIso.tsx

@@ -23,6 +23,7 @@ export type DownloadISOProps = {
   downloadUrl?: string;
   onClose: () => void;
   onReset?: () => void;
+  docVersion?: string;
 };
 
 const DownloadIso = ({
@@ -32,6 +33,7 @@ const DownloadIso = ({
   onReset,
   hasDHCP,
   isSNO = false,
+  docVersion,
 }: DownloadISOProps) => {
   const wgetCommand = `wget -O ${fileName} '${downloadUrl || ''}'`;
   const { t } = useTranslation();
@@ -53,7 +55,7 @@ const DownloadIso = ({
           </StackItem>
           {hasDHCP === false && (
             <StackItem>
-              <StaticIPInfo />
+              <StaticIPInfo docVersion={docVersion} />
             </StackItem>
           )}
           <StackItem>

package/lib/common/components/hosts/HostRowDetail.tsx

@@ -36,6 +36,7 @@ type HostDetailProps = {
     hostId: Host['id'],
     diskId: Disk['id'],
   ) => Promise<unknown>;
+  hideStorage?: boolean;
 };
 
 type SectionColumnProps = {
@@ -115,6 +116,7 @@ export const HostDetail = ({
   AdditionalNTPSourcesDialogToggleComponent,
   hideNTPStatus = false,
   updateDiskSkipFormatting,
+  hideStorage,
 }: HostDetailProps) => {
   const { t } = useTranslation();
   const { id, validationsInfo: hostValidationsInfo } = host;
@@ -205,7 +207,7 @@ export const HostDetail = ({
           value={ntpValidationStatus}
         />
       </SectionColumn>
-      {onDiskRole && canEditDisks && (
+      {!hideStorage && (
         <StorageDetail
           host={host}
           onDiskRole={onDiskRole}

package/lib/common/components/newFeatureSupportLevels/types.ts

@@ -1,9 +1,10 @@
 import {
   ArchitectureSupportLevelId,
   FeatureSupportLevelId,
+  PlatformType,
   SupportLevel,
 } from '@openshift-assisted/types/assisted-installer-service';
-import { CpuArchitecture, FeatureId } from '../../types';
+import { CpuArchitecture, FeatureId, SupportedCpuArchitecture } from '../../types';
 
 export type NewFeatureSupportLevelMap = Record<FeatureSupportLevelId, SupportLevel>;
 export type ArchitectureSupportLevelMap = Record<ArchitectureSupportLevelId, SupportLevel>;
@@ -23,7 +24,8 @@ export type NewFeatureSupportLevelData = {
   getFeatureDisabledReason(
     featureId: FeatureId,
     supportLevelData?: NewFeatureSupportLevelMap,
-    cpuArchitecture?: string,
+    cpuArchitecture?: SupportedCpuArchitecture,
+    platformType?: PlatformType,
   ): string | undefined;
   isFeatureSupported(featureId: FeatureId, supportLevelData?: NewFeatureSupportLevelMap): boolean;
   activeFeatureConfiguration?: ActiveFeatureConfiguration;

package/lib/common/components/ui/formik/validationSchemas.ts

@@ -226,15 +226,25 @@ export const vipRangeValidationSchema = (
     },
   );
 
-const vipUniqueValidationSchema = ({ ingressVips, apiVips }: NetworkConfigurationValues) =>
+const vipUniqueValidationSchema = (
+  { ingressVips, apiVips, apiVip, ingressVip }: NetworkConfigurationValues,
+  useIPArray: boolean,
+) =>
   Yup.string().test(
     'vip-uniqueness-validation',
     'The Ingress and API IP addresses cannot be the same.',
     (value) => {
-      if (!value || ingressVips?.length === 0 || apiVips?.length === 0) {
-        return true;
+      if (useIPArray) {
+        if (!value || ingressVips?.length === 0 || apiVips?.length === 0) {
+          return true;
+        }
+        return selectApiVip({ apiVips }) !== selectIngressVip({ ingressVips });
+      } else {
+        if (!value) {
+          return true;
+        }
+        return apiVip !== ingressVip;
       }
-      return selectApiVip({ apiVips }) !== selectIngressVip({ ingressVips });
     },
   );
 
@@ -276,7 +286,7 @@ export const vipValidationSchema = (
       !vipDhcpAllocation && managedNetworkingType !== 'userManaged',
     then: requiredOnceSet(initialValue, 'Required. Please provide an IP address')
       .concat(vipRangeValidationSchema(hostSubnets, values, true))
-      .concat(vipUniqueValidationSchema(values))
+      .concat(vipUniqueValidationSchema(values, false))
       .when('hostSubnet', {
         is: (hostSubnet) => hostSubnet !== NO_SUBNET_SET,
         then: Yup.string().required('Required. Please provide an IP address'),
@@ -295,7 +305,7 @@ export const vipNoSuffixValidationSchema = (
       .concat(ipNoSuffixValidationSchema)
       .concat(vipRangeValidationSchema(hostSubnets, values, false))
       .concat(vipBroadcastValidationSchema(values))
-      .concat(vipUniqueValidationSchema(values))
+      .concat(vipUniqueValidationSchema(values, true))
       .when('hostSubnet', {
         is: (hostSubnet) => hostSubnet !== NO_SUBNET_SET,
         then: Yup.string().required('Required. Please provide an IP address'),

package/lib/common/config/constants.ts

@@ -367,8 +367,8 @@ export const operatorLabels = (
   };
 };
 
-export const OCP_STATIC_IP_DOC =
-  'https://docs.openshift.com/container-platform/latest/scalability_and_performance/ztp-deploying-disconnected.html#ztp-configuring-a-static-ip_ztp-deploying-disconnected';
+export const getOCPStaticIPDocLink = (docVersion = '2.8') =>
+  `https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/${docVersion}/html-single/clusters/index#on-prem-creating-your-cluster-with-the-cli-nmstateconfig`;
 
 export const AI_UI_TAG = 'ui_ocm';
 

package/lib/common/types/featureSupportLevel.ts

@@ -1,17 +1,18 @@
 import {
-  FeatureSupportLevel,
   FeatureSupportLevelId,
   SupportLevel,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { ArrayElementType } from './typescriptExtensions';
 
-type Features = Required<ArrayElementType<FeatureSupportLevel['features']>>;
+type Features = Required<ArrayElementType<FeatureSupportLevelId>>;
 export type FeatureId =
   | FeatureSupportLevelId
   | Features['featureId']
-  | 'ODF'
-  | 'CNV'
-  | 'NETWORK_TYPE_SELECTION';
+  | 'NETWORK_TYPE_SELECTION'
+  | 'ARM64_ARCHITECTURE'
+  | 'ARM64_ARCHITECTURE_WITH_CLUSTER_MANAGED_NETWORKING'
+  | 'DUAL_STACK_NETWORKING'
+  | 'MULTIARCH_RELEASE_IMAGE';
 
 export type FeatureIdToSupportLevel = {
   [id in FeatureId]?: SupportLevel;

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

@@ -190,8 +190,9 @@ export const HostsClusterDetailTabContent = ({
       <NewFeatureSupportLevelProvider
         loadingUi={<LoadingState />}
         cluster={day2Cluster}
-        cpuArchitecture={infraEnv?.cpuArchitecture}
+        cpuArchitecture={infraEnv?.cpuArchitecture as CpuArchitecture}
         openshiftVersion={day2Cluster.openshiftVersion}
+        platformType={day2Cluster.platform?.type}
       >
         <AddHosts />
       </NewFeatureSupportLevelProvider>

package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx

@@ -4,16 +4,18 @@ import { CaretDownIcon } from '@patternfly/react-icons';
 import { useField } from 'formik';
 import {
   CpuArchitecture,
-  FeatureId,
   getDefaultCpuArchitecture,
   getFieldId,
   SupportedCpuArchitecture,
 } from '../../../common';
-import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import {
+  ArchitectureSupportLevelId,
+  Cluster,
+} from '@openshift-assisted/types/assisted-installer-service';
 
 export type CpuArchitectureItem = {
   description: string;
-  featureSupportLevelId?: FeatureId;
+  featureSupportLevelId?: ArchitectureSupportLevelId;
   label: string;
 };
 

package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx

@@ -14,6 +14,7 @@ import {
   StaticTextField,
   useFeature,
   getSupportedCpuArchitectures,
+  SupportedCpuArchitecture,
 } from '../../../common';
 import DiskEncryptionControlGroup from '../../../common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
@@ -74,7 +75,7 @@ export const OcmClusterDetailsFormFields = ({
   const featureSupportLevelData = useSupportLevelsAPI(
     'features',
     values.openshiftVersion,
-    values.cpuArchitecture,
+    values.cpuArchitecture as SupportedCpuArchitecture,
   );
   const cpuArchitectures = React.useMemo(
     () => getSupportedCpuArchitectures(isMultiArchSupported, cpuArchitecturesByVersionImage),
@@ -171,7 +172,7 @@ export const OcmClusterDetailsFormFields = ({
       ) : (
         <ExternalPlatformDropdown
           onChange={handleExternalPartnerIntegrationsChange}
-          cpuArchitecture={values.cpuArchitecture}
+          cpuArchitecture={values.cpuArchitecture as SupportedCpuArchitecture}
           showOciOption={isOracleCloudPlatformIntegrationEnabled}
           featureSupportLevelData={featureSupportLevelData}
           isSNO={isSNO({ highAvailabilityMode })}

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

@@ -1,13 +1,13 @@
 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 { Grid, Tooltip } from '@patternfly/react-core';
 import { VirtualIPControlGroup, VirtualIPControlGroupProps } from './VirtualIPControlGroup';
 import {
   canBeDualStack,
   canSelectNetworkTypeSDN,
   clusterNetworksEqual,
+  CpuArchitecture,
   DUAL_STACK,
   HostSubnets,
   isSNO,
@@ -23,20 +23,20 @@ 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,
+  NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
-import { SupportedPlatformIntegrationType } from '../../../hooks/useClusterSupportedPlatforms';
 import {
   Cluster,
   ClusterDefaultConfig,
+  PlatformType,
 } from '@openshift-assisted/types/assisted-installer-service';
+import useSupportLevelsAPI from '../../../hooks/useSupportLevelsAPI';
 
 export type NetworkConfigurationProps = VirtualIPControlGroupProps & {
   hostSubnets: HostSubnets;
@@ -79,26 +79,38 @@ const getManagedNetworkingDisabledReason = (
 };
 
 const getUserManagedDisabledReason = (
-  supportedPlatformIntegration: SupportedPlatformIntegrationType,
-  t: TFunction,
+  featureSupportLevelContext: NewFeatureSupportLevelData,
+  platformType?: PlatformType,
+  featureSupportLevelMap?: NewFeatureSupportLevelMap | null,
 ) => {
-  if (['nutanix', 'vsphere'].includes(supportedPlatformIntegration)) {
-    return t('ai:User-Managed Networking is not supported when using Nutanix or vSphere');
+  if (!featureSupportLevelContext.isFeatureSupported('USER_MANAGED_NETWORKING')) {
+    return featureSupportLevelContext.getFeatureDisabledReason(
+      'USER_MANAGED_NETWORKING',
+      featureSupportLevelMap ?? undefined,
+      undefined,
+      platformType,
+    );
   }
 };
 
-const getClusterManagedDisabledReason = (featureSupportLevelData: NewFeatureSupportLevelData) => {
-  if (!featureSupportLevelData.isFeatureSupported('CLUSTER_MANAGED_NETWORKING')) {
-    return featureSupportLevelData.getFeatureDisabledReason('CLUSTER_MANAGED_NETWORKING');
+const getClusterManagedDisabledReason = (
+  featureSupportLevelContext: NewFeatureSupportLevelData,
+  featureSupportLevelMap?: NewFeatureSupportLevelMap | null,
+) => {
+  if (!featureSupportLevelContext.isFeatureSupported('CLUSTER_MANAGED_NETWORKING')) {
+    return featureSupportLevelContext.getFeatureDisabledReason(
+      'CLUSTER_MANAGED_NETWORKING',
+      featureSupportLevelMap ?? undefined,
+    );
   }
 };
 
 const getManagedNetworkingState = (
   isDualStack: boolean,
   isOracleCloudInfrastructure: boolean,
-  supportedPlatformIntegration: SupportedPlatformIntegrationType,
   featureSupportLevelData: NewFeatureSupportLevelData,
-  t: TFunction,
+  platformType?: PlatformType,
+  featureSupportLevelMap?: NewFeatureSupportLevelMap | null,
 ): {
   isDisabled: boolean;
   clusterManagedDisabledReason?: string;
@@ -109,8 +121,15 @@ const getManagedNetworkingState = (
     isOracleCloudInfrastructure,
     featureSupportLevelData,
   );
-  const cmnReason = getClusterManagedDisabledReason(featureSupportLevelData);
-  const umnReason = getUserManagedDisabledReason(supportedPlatformIntegration, t);
+  const cmnReason = getClusterManagedDisabledReason(
+    featureSupportLevelData,
+    featureSupportLevelMap,
+  );
+  const umnReason = getUserManagedDisabledReason(
+    featureSupportLevelData,
+    platformType,
+    featureSupportLevelMap,
+  );
 
   return {
     isDisabled: !!(cmnReason || umnReason || networkingReason),
@@ -125,9 +144,13 @@ const NetworkConfiguration = ({
   isVipDhcpAllocationDisabled,
   defaultNetworkSettings,
 }: NetworkConfigurationProps) => {
-  const { t } = useTranslation();
-  const featureSupportLevelData = useNewFeatureSupportLevel();
-  const { supportedPlatformIntegration } = useClusterSupportedPlatforms(cluster.id);
+  const featureSupportLevelContext = useNewFeatureSupportLevel();
+  const featureSupportLevelData = useSupportLevelsAPI(
+    'features',
+    cluster.openshiftVersion,
+    cluster.cpuArchitecture as CpuArchitecture,
+    cluster.platform?.type,
+  );
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const { setFieldValue, values, validateField } = useFormikContext<NetworkConfigurationValues>();
 
@@ -205,11 +228,11 @@ const NetworkConfiguration = ({
       getManagedNetworkingState(
         isDualStack,
         cluster.platform?.type === 'oci',
-        supportedPlatformIntegration,
+        featureSupportLevelContext,
+        cluster.platform?.type,
         featureSupportLevelData,
-        t,
       ),
-    [isDualStack, cluster.platform?.type, supportedPlatformIntegration, featureSupportLevelData, t],
+    [isDualStack, cluster.platform?.type, featureSupportLevelContext, featureSupportLevelData],
   );
 
   return (
@@ -227,19 +250,6 @@ const NetworkConfiguration = ({
         />
       )}
 
-      {!isUserManagedNetworking &&
-        !featureSupportLevelData.isFeatureSupported('CLUSTER_MANAGED_NETWORKING_WITH_VMS') && (
-          <Alert
-            title="Your cluster will be subject to support limitations"
-            variant={AlertVariant.info}
-            isInline={true}
-            data-testid="networking-vms-alert"
-          >
-            Some or all of your discovered hosts are virtual machines, so selecting the
-            cluster-managed networking option will limit your installed cluster's support.
-          </Alert>
-        )}
-
       {(isSNOCluster || !isUserManagedNetworking) && (
         <StackTypeControlGroup
           clusterId={cluster.id}
@@ -268,7 +278,7 @@ const NetworkConfiguration = ({
         <VirtualIPControlGroup
           cluster={cluster}
           isVipDhcpAllocationDisabled={isVipDhcpAllocationDisabled}
-          supportLevel={featureSupportLevelData.getFeatureSupportLevel('VIP_AUTO_ALLOC')}
+          supportLevel={featureSupportLevelContext.getFeatureSupportLevel('VIP_AUTO_ALLOC')}
         />
       )}
 

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

@@ -12,20 +12,21 @@ import {
 } from '@patternfly/react-core';
 import { CaretDownIcon } from '@patternfly/react-icons';
 import { useField } from 'formik';
-import { CpuArchitecture, DeveloperPreview, FeatureId, getFieldId } from '../../../../common';
-
 import {
-  ExternalPlaformIds,
-  ExternalPlatformLabels,
-  ExternalPlatformLinks,
-  ExternalPlatformTooltips,
-} from './constants';
+  CpuArchitecture,
+  DeveloperPreview,
+  FeatureId,
+  SupportedCpuArchitecture,
+  getFieldId,
+} from '../../../../common';
+import { ExternalPlaformIds, ExternalPlatformLabels, ExternalPlatformLinks } from './constants';
 import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 import {
   NewFeatureSupportLevelData,
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
+import { architectureData } from '../CpuArchitectureDropdown';
 
 const INPUT_NAME = 'platform';
 const fieldId = getFieldId(INPUT_NAME, 'input');
@@ -33,7 +34,7 @@ const fieldId = getFieldId(INPUT_NAME, 'input');
 type ExternalPlatformDropdownProps = {
   showOciOption: boolean;
   onChange: (selectedPlatform: PlatformType) => void;
-  cpuArchitecture?: string;
+  cpuArchitecture?: SupportedCpuArchitecture;
   featureSupportLevelData: NewFeatureSupportLevelMap | null;
   isSNO: boolean;
 };
@@ -41,7 +42,6 @@ type ExternalPlatformDropdownProps = {
 export type ExternalPlatformInfo = {
   label: string;
   href?: string;
-  tooltip?: string;
   disabledReason?: string;
 };
 
@@ -50,7 +50,7 @@ const getDisabledReasonForExternalPlatform = (
   newFeatureSupportLevelContext: NewFeatureSupportLevelData,
   platform: PlatformType,
   featureSupportLevelData?: NewFeatureSupportLevelMap | null,
-  cpuArchitecture?: string,
+  cpuArchitecture?: SupportedCpuArchitecture,
 ): string | undefined => {
   if (!isSNO) {
     return newFeatureSupportLevelContext.getFeatureDisabledReason(
@@ -73,7 +73,7 @@ const getExternalPlatformTypes = (
   isSNO: boolean,
   newFeatureSupportLevelContext: NewFeatureSupportLevelData,
   featureSupportLevelData?: NewFeatureSupportLevelMap | null,
-  cpuArchitecture?: string,
+  cpuArchitecture?: SupportedCpuArchitecture,
 ): Partial<{ [key in PlatformType]: ExternalPlatformInfo }> => {
   const platforms = ['none', 'nutanix', showOciOption && 'oci', 'vsphere'] as PlatformType[];
 
@@ -83,7 +83,6 @@ const getExternalPlatformTypes = (
       [platform]: {
         label: ExternalPlatformLabels[platform],
         href: ExternalPlatformLinks[platform],
-        tooltip: ExternalPlatformTooltips[platform],
         disabledReason: getDisabledReasonForExternalPlatform(
           isSNO,
           newFeatureSupportLevelContext,
@@ -119,7 +118,7 @@ export const ExternalPlatformDropdown = ({
   >({});
 
   const tooltipDropdownDisabled = `Platform integration is not supported when ${
-    cpuArchitecture || ''
+    cpuArchitecture ? architectureData[cpuArchitecture].label : ''
   } is selected`;
 
   const handleClick = (event: MouseEvent<HTMLButtonElement>, href: string) => {
@@ -162,18 +161,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: '',