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

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.tsx

@@ -8,6 +8,8 @@ import {
   Text,
   TextVariants,
   TextContent,
+  TooltipProps,
+  Tooltip,
 } from '@patternfly/react-core';
 import { ENCRYPTING_DISK_DURING_INSTALLATION } from '../../../config';
 import PopoverIcon from '../../ui/PopoverIcon';
@@ -64,31 +66,40 @@ const DiskEncryptionModeTang = () => {
 export interface DiskEncryptionModeProps {
   isDisabled: boolean;
   diskEncryptionMode: DiskEncryption['mode'];
+  tooltipProps: TooltipProps;
 }
 
-export const DiskEncryptionMode = ({ diskEncryptionMode, isDisabled }: DiskEncryptionModeProps) => {
+export const DiskEncryptionMode = ({
+  diskEncryptionMode,
+  isDisabled,
+  tooltipProps,
+}: DiskEncryptionModeProps) => {
   const { t } = useTranslation();
   return (
     <Stack>
       <StackItem>
         <Flex>
           <FlexItem spacer={{ default: 'spacer3xl' }}>
-            <RadioField
-              isDisabled={isDisabled}
-              name="diskEncryptionMode"
-              label={<DiskEncryptionModeTPMv2 />}
-              id="TPMV2-button"
-              value="tpmv2"
-            />
+            <Tooltip {...tooltipProps}>
+              <RadioField
+                isDisabled={isDisabled}
+                name="diskEncryptionMode"
+                label={<DiskEncryptionModeTPMv2 />}
+                id="TPMV2-button"
+                value="tpmv2"
+              />
+            </Tooltip>
           </FlexItem>
           <FlexItem spacer={{ default: 'spacer3xl' }}>
-            <RadioField
-              isDisabled={isDisabled}
-              name="diskEncryptionMode"
-              label={<DiskEncryptionModeTang />}
-              id="tang-button"
-              value="tang"
-            />
+            <Tooltip {...tooltipProps}>
+              <RadioField
+                isDisabled={isDisabled}
+                name="diskEncryptionMode"
+                label={<DiskEncryptionModeTang />}
+                id="tang-button"
+                value="tang"
+              />
+            </Tooltip>
           </FlexItem>
         </Flex>
       </StackItem>
@@ -101,7 +112,7 @@ export const DiskEncryptionMode = ({ diskEncryptionMode, isDisabled }: DiskEncry
             </TextContent>
           </StackItem>
           &nbsp;
-          <TangServers isDisabled={isDisabled} />
+          <TangServers isDisabled={isDisabled} tooltipProps={tooltipProps} />
         </Stack>
       )}
     </Stack>

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/TangServers.tsx

@@ -1,12 +1,18 @@
 import React from 'react';
 import { FieldArray, useFormikContext } from 'formik';
-import { Stack, StackItem, TextInputTypes } from '@patternfly/react-core';
+import { Stack, StackItem, TextInputTypes, Tooltip, TooltipProps } from '@patternfly/react-core';
 import { ClusterDetailsValues } from '../../clusterWizard';
 import { InputField } from '../../ui';
 import { AddButton, RemovableField } from '../../ui/formik';
 import { useTranslation } from '../../../hooks/use-translation-wrapper';
 
-export const TangServers = ({ isDisabled = false }: { isDisabled: boolean }) => {
+export const TangServers = ({
+  isDisabled = false,
+  tooltipProps,
+}: {
+  isDisabled: boolean;
+  tooltipProps: TooltipProps;
+}) => {
   const { values } = useFormikContext<ClusterDetailsValues>();
   const { t } = useTranslation();
   return (
@@ -20,22 +26,26 @@ export const TangServers = ({ isDisabled = false }: { isDisabled: boolean }) =>
                 onRemove={() => remove(index)}
               >
                 <div>
-                  <InputField
-                    type={TextInputTypes.url}
-                    name={`diskEncryptionTangServers.${index}.url`}
-                    helperText={`Must start with "http://" or "https://". Optionally, end with ":<port>"`}
-                    label="Server URL"
-                    isRequired
-                    isDisabled={isDisabled}
-                  />
+                  <Tooltip {...tooltipProps}>
+                    <InputField
+                      type={TextInputTypes.url}
+                      name={`diskEncryptionTangServers.${index}.url`}
+                      helperText={`Must start with "http://" or "https://". Optionally, end with ":<port>"`}
+                      label="Server URL"
+                      isRequired
+                      isDisabled={isDisabled}
+                    />
+                  </Tooltip>
                   &thinsp;
-                  <InputField
-                    type={TextInputTypes.text}
-                    name={`diskEncryptionTangServers.${index}.thumbprint`}
-                    label="Server Thumbprint"
-                    isRequired
-                    isDisabled={isDisabled}
-                  />
+                  <Tooltip {...tooltipProps}>
+                    <InputField
+                      type={TextInputTypes.text}
+                      name={`diskEncryptionTangServers.${index}.thumbprint`}
+                      label="Server Thumbprint"
+                      isRequired
+                      isDisabled={isDisabled}
+                    />
+                  </Tooltip>
                 </div>
               </RemovableField>{' '}
             </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/clusterConfiguration/OpenShiftVersionSelect.tsx

@@ -12,6 +12,7 @@ import { OPENSHIFT_LIFE_CYCLE_DATES_LINK } from '../../config';
 import { OpenshiftVersionOptionType } from '../../types';
 import { SelectField } from '../ui';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
+import { SelectFieldProps } from '../ui/formik/types';
 
 const OpenShiftLifeCycleDatesLink = () => {
   const { t } = useTranslation();
@@ -54,8 +55,9 @@ const getOpenshiftVersionHelperText =
 
 type OpenShiftVersionSelectProps = {
   versions: OpenshiftVersionOptionType[];
+  onChange?: SelectFieldProps['onChange'];
 };
-const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps> = ({ versions }) => {
+const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps> = ({ versions, onChange }) => {
   const selectOptions = React.useMemo(
     () =>
       versions
@@ -75,6 +77,7 @@ const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps> = ({ version
       getHelperText={getOpenshiftVersionHelperText(versions)}
       isDisabled={versions.length === 0}
       isRequired
+      onChange={onChange}
     />
   );
 };

package/lib/common/components/clusterDetail/PostInstallAlert.tsx

@@ -0,0 +1,29 @@
+import * as React from 'react';
+import { Alert } from '@patternfly/react-core';
+import { ExternalLink } from '../ui';
+import { useTranslation } from '../../hooks/use-translation-wrapper';
+
+type PostInstallAlertProps = {
+  link: string;
+};
+
+const PostInstallAlert = ({ link }: PostInstallAlertProps) => {
+  const { t } = useTranslation();
+  return (
+    <Alert
+      variant="warning"
+      isInline
+      data-testid="alert-modify-platform-config"
+      title={
+        <p>
+          {t(
+            "ai:Modify your platform configuration to access your platform's features directly in OpenShift.",
+          )}{' '}
+          <ExternalLink href={link}>{t('ai:Learn more about configuration.')}</ExternalLink>
+        </p>
+      }
+    />
+  );
+};
+
+export default PostInstallAlert;

package/lib/common/components/clusterDetail/index.ts

@@ -2,3 +2,4 @@ export { default as ClusterPropertiesList } from './ClusterPropertiesList';
 export { default as ClusterProgress } from './ClusterProgress';
 export { default as ClusterCredentials } from './ClusterCredentials';
 export { default as KubeconfigDownload } from './KubeconfigDownload';
+export { default as PostInstallAlert } from './PostInstallAlert';

package/lib/common/components/clusterWizard/ReviewValidations.tsx

@@ -112,6 +112,9 @@ const FailingValidation = <S extends string>({
       </>
     );
   } else {
+    if (validation.id === 'platform-requirements-satisfied') {
+      fix = validation.message;
+    }
     // console.error(
     //   'Unknown validation ID detected in the ',
     //   clusterGroup || hostGroup,

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/NoPermissionsError.tsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import { EmptyState, EmptyStateBody, EmptyStateIcon, Title } from '@patternfly/react-core';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons';
+import { global_disabled_color_100 as iconColor } from '@patternfly/react-tokens';
+
+const NoPermissionsError = () => (
+  <EmptyState id="not-found">
+    <EmptyStateBody>
+      <EmptyStateIcon icon={ExclamationTriangleIcon} color={iconColor.value} />
+      <Title headingLevel="h2">Access permissions needed</Title>
+      <EmptyStateBody>
+        To create a cluster using the Assisted Installer, ask your organization administrator to
+        adjust your permissions.
+      </EmptyStateBody>
+    </EmptyStateBody>
+  </EmptyState>
+);
+
+export default NoPermissionsError;

package/lib/common/components/ui/formik/InputField.tsx

@@ -29,7 +29,6 @@ const InputField: React.FC<
       idPostfix,
       children,
       noDefaultOnChange,
-      inputError,
       description,
       labelInfo,
       showErrorMessage = true,
@@ -37,15 +36,15 @@ const InputField: React.FC<
     },
     ref: React.Ref<HTMLInputElement>,
   ) => {
-    const [field] = useField({
+    const [field, { error, touched }] = useField({
       name: props.name,
       validate,
     });
 
     const fieldId = getFieldId(props.name, 'input', idPostfix);
-    const errorMessage = useFieldErrorMsg({ name: props.name, inputError, validate });
+    const errorMessage = useFieldErrorMsg({ name: props.name, inputError: error, validate });
     const fieldHelperText = <HelperText fieldId={fieldId}>{helperText}</HelperText>;
-    const isValid = !errorMessage;
+    const isValid = !(touched && error);
 
     return (
       <Stack id={`form-control__${fieldId}`}>
@@ -88,7 +87,7 @@ const InputField: React.FC<
           </FormGroup>
         </StackItem>
         <StackItem>
-          {showErrorMessage && errorMessage && (
+          {showErrorMessage && !isValid && (
             <HelperText fieldId={fieldId} isError>
               {errorMessage}
             </HelperText>

package/lib/common/components/ui/formik/RichInputField.tsx

@@ -99,7 +99,8 @@ const RichInputField: React.FC<RichInputFieldPropsProps> = React.forwardRef(
       validate,
     });
     const fieldId = getFieldId(props.name, 'input', idPostfix);
-    const isValid = !touched || !error?.length;
+    const isValid = !(touched && error?.length);
+
     return (
       <FormGroup
         id={`form-control__${fieldId}`}
@@ -133,7 +134,10 @@ const RichInputField: React.FC<RichInputFieldPropsProps> = React.forwardRef(
               onChange && onChange(event);
             }}
             className="rich-input__text"
-            onBlur={() => setPopoverOpen(false)}
+            onBlur={() => {
+              setTouched(true, false);
+              setPopoverOpen(false);
+            }}
           />
           <Popover
             isVisible={popoverOpen}

package/lib/common/components/ui/formik/SelectField.tsx

@@ -49,7 +49,7 @@ const SelectField: React.FC<SelectFieldProps> = ({
             onChange={(value, event) => {
               //customHandleChange enables calling formik change handler explicitly, useful for example to have the previous value
               callFormikOnChange && field.onChange(event);
-              onChange && onChange(event);
+              onChange && onChange(value, event);
             }}
           >
             {options.map((option, index) => (

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

@@ -5,6 +5,7 @@ import {
   SelectOptionProps,
   TooltipProps,
   RadioProps,
+  FormSelectProps,
 } from '@patternfly/react-core';
 import { FieldValidator, FieldHelperProps } from 'formik';
 import { DropzoneProps, DropFileEventHandler } from 'react-dropzone';
@@ -37,7 +38,7 @@ export interface FieldProps {
 
 export interface SelectFieldProps extends FieldProps {
   options: FormSelectOptionProps[];
-  onChange?: (event: React.FormEvent<HTMLSelectElement>) => void;
+  onChange?: FormSelectProps['onChange'];
   getHelperText?: (value: string) => React.ReactNode | undefined;
   // onBlur?: (event: React.FormEvent<HTMLSelectElement>) => void;
 }

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/components/ui/index.ts

@@ -22,3 +22,4 @@ export { default as EventsList } from './EventsList';
 export { default as ClusterEventsToolbar } from './ClusterEventsToolbar';
 export { default as ModalProgress } from './ModalProgress';
 export { default as ConfirmationModal } from './ConfirmationModal';
+export { default as NoPermissionsError } from './NoPermissionsError';

package/lib/common/config/constants.ts

@@ -250,6 +250,7 @@ export const clusterValidationLabels = (
   'lvm-requirements-satisfied': t('ai:Logical Volume Manager requirements'),
   'cnv-requirements-satisfied': t('ai:CNV requirements'),
   'mce-requirements-satisfied': t('ai:MCE requirements'),
+  'platform-requirements-satisfied': t('ai:Platform requirements'),
 });
 
 export const clusterValidationGroupLabels = (
@@ -367,8 +368,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/features/featureGate.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 // Must conform Unleash constants
 export type AssistedInstallerFeatureType =
   | 'ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE'
-  | 'ASSISTED_INSTALLER_MULTIARCH_SUPPORTED'
   | 'ASSISTED_INSTALLER_PLATFORM_OCI';
 
 export type FeatureListType = {
@@ -22,13 +21,11 @@ export type AssistedInstallerPermissionTypesListType = {
 // Hardcoded for ACM
 export const ACM_ENABLED_FEATURES: FeatureListType = {
   ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE: false,
-  ASSISTED_INSTALLER_MULTIARCH_SUPPORTED: true,
 };
 
 // Hardcoded outside OCM
 export const STANDALONE_DEPLOYMENT_ENABLED_FEATURES: FeatureListType = {
   ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE: false,
-  ASSISTED_INSTALLER_MULTIARCH_SUPPORTED: true,
   ASSISTED_INSTALLER_PLATFORM_OCI: true,
 };
 
@@ -46,7 +43,6 @@ export const FeatureGateContextProvider: React.FC<{
   // hardcoded defaults
   // TODO (mortegag): Remove all multiarch capacity related code in the UI.
   const featuresWithDefaults: FeatureListType = {
-    ASSISTED_INSTALLER_MULTIARCH_SUPPORTED: true,
     ...features,
   };
 

package/lib/common/types/cpuArchitecture.ts

@@ -44,29 +44,24 @@ export const getAllCpuArchitectures = (): SupportedCpuArchitecture[] => [
 ];
 
 export const getSupportedCpuArchitectures = (
-  canSelectCpuArch: boolean,
   cpuArchitectures: CpuArchitecture[],
   day1CpuArchitecture?: SupportedCpuArchitecture,
 ): SupportedCpuArchitecture[] => {
   const newSupportedCpuArchs: SupportedCpuArchitecture[] = [];
   //Power/Z clusters can be only homogeneous clusters
   if (
-    (day1CpuArchitecture === CpuArchitecture.ppc64le ||
-      day1CpuArchitecture === CpuArchitecture.s390x) &&
-    canSelectCpuArch
+    day1CpuArchitecture === CpuArchitecture.ppc64le ||
+    day1CpuArchitecture === CpuArchitecture.s390x
   ) {
     newSupportedCpuArchs.push(day1CpuArchitecture);
   } else {
     cpuArchitectures.forEach((cpuArch) => {
       if (
         day1CpuArchitecture === undefined &&
-        (cpuArch === CpuArchitecture.ppc64le || cpuArch === CpuArchitecture.s390x) &&
-        canSelectCpuArch
+        (cpuArch === CpuArchitecture.ppc64le || cpuArch === CpuArchitecture.s390x)
       ) {
         newSupportedCpuArchs.push(cpuArch);
       } else if (
-        day1CpuArchitecture !== CpuArchitecture.ppc64le &&
-        day1CpuArchitecture !== CpuArchitecture.s390x &&
         cpuArch !== CpuArchitecture.MULTI &&
         cpuArch !== CpuArchitecture.USE_DAY1_ARCHITECTURE
       ) {

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/AddHosts/AddHosts.tsx

@@ -22,7 +22,6 @@ import {
   AddHostsContext,
   alertsSlice,
   canInstallHost,
-  useFeature,
 } from '../../../common';
 import InventoryAddHosts from './InventoryAddHost';
 import { onFetchEvents } from '../fetching/fetchEvents';
@@ -38,7 +37,6 @@ export const AddHosts = () => {
   const { cluster, resetCluster, canEdit } = React.useContext(AddHostsContext);
   const [isSubmitting, setSubmitting] = React.useState(false);
   const clusterVarieties = useClusterStatusVarieties(cluster);
-  const canSelectCpuArch = useFeature('ASSISTED_INSTALLER_MULTIARCH_SUPPORTED');
   const handleHostsInstall = React.useCallback(async () => {
     setSubmitting(true);
     try {
@@ -89,7 +87,7 @@ export const AddHosts = () => {
               </Grid>
             </StackItem>
             <StackItem>
-              <InventoryAddHosts cluster={cluster} canSelectCpuArch={canSelectCpuArch} />
+              <InventoryAddHosts cluster={cluster} />
             </StackItem>
           </Stack>
         </CardBody>

package/lib/ocm/components/AddHosts/InventoryAddHost.tsx

@@ -8,18 +8,12 @@ import Day2DiscoveryImageModalButton from './day2Wizard/Day2DiscoveryImageModalB
 import Day2Wizard from './day2Wizard/Day2Wizard';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
-const InventoryAddHosts = ({
-  cluster,
-  canSelectCpuArch,
-}: {
-  cluster?: Cluster;
-  canSelectCpuArch?: boolean;
-}) => {
+const InventoryAddHosts = ({ cluster }: { cluster?: Cluster }) => {
   if (!cluster) {
     return null;
   }
 
-  const showArmOnlyAlert = !canSelectCpuArch && cluster.cpuArchitecture === CpuArchitecture.ARM;
+  const showArmOnlyAlert = cluster.cpuArchitecture === CpuArchitecture.ARM;
   return (
     <Stack hasGutter>
       <StackItem>

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

@@ -12,7 +12,6 @@ import {
   HOW_TO_KNOW_IF_CLUSTER_SUPPORTS_MULTIPLE_CPU_ARCHS,
   LoadingState,
   SupportedCpuArchitecture,
-  useFeature,
 } from '../../../../common';
 import { HostsNetworkConfigurationType, InfraEnvsService } from '../../../services';
 import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
@@ -86,7 +85,6 @@ const Day2ClusterDetails = () => {
   const [initialValues, setInitialValues] = React.useState<Day2ClusterDetailValues | null>(null);
   const [isSubmitting, setSubmitting] = React.useState(false);
   const [isAlternativeCpuSelected, setIsAlternativeCpuSelected] = React.useState(false);
-  const canSelectCpuArch = useFeature('ASSISTED_INSTALLER_MULTIARCH_SUPPORTED');
   const { getCpuArchitectures } = useOpenshiftVersions();
   const cpuArchitecturesByVersionImage = getCpuArchitectures(day2Cluster.openshiftVersion);
   const day1CpuArchitecture = mapClusterCpuArchToInfraEnvCpuArch(day2Cluster.cpuArchitecture);
@@ -94,13 +92,8 @@ const Day2ClusterDetails = () => {
   const pullSecret = usePullSecret();
 
   const cpuArchitectures = React.useMemo(
-    () =>
-      getSupportedCpuArchitectures(
-        canSelectCpuArch,
-        cpuArchitecturesByVersionImage,
-        day1CpuArchitecture,
-      ),
-    [canSelectCpuArch, cpuArchitecturesByVersionImage, day1CpuArchitecture],
+    () => getSupportedCpuArchitectures(cpuArchitecturesByVersionImage, day1CpuArchitecture),
+    [cpuArchitecturesByVersionImage, day1CpuArchitecture],
   );
   React.useEffect(() => {
     const fetchAndSetInitialValues = async () => {
@@ -227,6 +220,7 @@ const Day2ClusterDetails = () => {
                     day1CpuArchitecture={initialValues.cpuArchitecture}
                     cpuArchitectures={cpuArchitectures}
                     onChange={(value) => handleChangeCpuArchitectureDropdown(value, initialValues)}
+                    platformType={day2Cluster.platform?.type}
                   />
                 </GridItem>
                 {isAlternativeCpuSelected && (
@@ -246,9 +240,10 @@ const Day2ClusterDetails = () => {
                     </Alert>
                   </GridItem>
                 )}
-
                 <GridItem>
-                  <Day2HostStaticIpConfigurations />
+                  <Day2HostStaticIpConfigurations
+                    isDisabled={day2Cluster.platform?.type === 'oci'}
+                  />
                 </GridItem>
               </Grid>
             </Form>