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

package/lib/cim/components/Agent/BMCForm.tsx

@@ -152,7 +152,7 @@ const getValidationSchema = (usedHostnames: string[], origHostname: string, t: T
   return Yup.object({
     name: Yup.string().required(t('ai:Required field')),
     hostname: richNameValidationSchema(t, usedHostnames, origHostname),
-    bmcAddress: bmcAddressValidationSchema(t).required(t('ai:Required field')),
+    bmcAddress: bmcAddressValidationSchema(t),
     username: Yup.string().required(t('ai:Required field')),
     password: Yup.string().required(t('ai:Required field')),
     bootMACAddress: macAddressValidationSchema,
@@ -278,7 +278,7 @@ const BMCForm: React.FC<BMCFormProps> = ({
                 name="bootMACAddress"
                 placeholder={t('ai:Enter an address')}
                 description={t(
-                  "ai:The MAC address of the host's network connected NIC that wll be used to provision the host.",
+                  "ai:The MAC address of the host's network connected NIC that will be used to provision the host. Required for libvirt VMs driven by vbmc.",
                 )}
               />
               <InputField
@@ -301,7 +301,7 @@ const BMCForm: React.FC<BMCFormProps> = ({
                     name="nmState"
                     language={Language.yaml}
                     description={t(
-                      'ai:Upload a YAML file in NMstate format that includes your network configuration (static IPs, bonds, etc.).',
+                      'ai:Upload a YAML file in NMstate format (not the entire NMstate config CR) that includes your network configuration (static IPs, bonds, etc.).',
                     )}
                   />
                   <MacMapping />

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

@@ -17,7 +17,7 @@ import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } fro
 import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
 import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
 import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
-import { getAICluster, getOCPVersions } from '../helpers';
+import { getAICluster, getNetworkType, getOCPVersions } from '../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
@@ -47,7 +47,10 @@ export const useDetailsFormik = ({
   usedClusterNames,
   infraEnv,
   isNutanix,
-}: UseDetailsFormikArgs): [ClusterDetailsValues, Lazy] => {
+}: UseDetailsFormikArgs): [
+  ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
+  Lazy,
+] => {
   const { t } = useTranslation();
   const featureSupportLevels = useFeatureSupportLevel();
   const ocpVersions = getOCPVersions(clusterImages, isNutanix);
@@ -64,12 +67,21 @@ export const useDetailsFormik = ({
     [agentClusterInstall, clusterDeployment, agents, infraEnv],
   );
   const initialValues = React.useMemo(
-    () =>
-      getClusterDetailsInitialValues({
+    () => {
+      const initValues = getClusterDetailsInitialValues({
         managedDomains: [], // not supported
         cluster,
         ocpVersions,
-      }),
+      });
+
+      const ocpVersion = ocpVersions.find(
+        (ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
+      );
+      return {
+        ...initValues,
+        networkType: getNetworkType(ocpVersion),
+      };
+    },
     [], // eslint-disable-line react-hooks/exhaustive-deps
   );
 

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

@@ -15,6 +15,7 @@ import { ClusterDetailsValues } from '../../../common/components/clusterWizard/t
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import ArmCheckbox from './ArmCheckbox';
 import { SNOControlGroup } from '../../../common';
+import { getNetworkType } from '../helpers';
 
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
@@ -49,7 +50,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   extensionAfter,
   isNutanix,
 }) => {
-  const { values } = useFormikContext<ClusterDetailsValues>();
+  const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain, highAvailabilityMode } = values;
   const nameInputRef = React.useRef<HTMLInputElement>();
   React.useEffect(() => {
@@ -99,7 +100,13 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
           {t('ai:OpenShift')} {forceOpenshiftVersion}
         </StaticTextField>
       ) : (
-        <OpenShiftVersionSelect versions={versions} />
+        <OpenShiftVersionSelect
+          versions={versions}
+          onChange={(value) => {
+            const ocpVersion = versions.find((v) => v.value === value);
+            setFieldValue('networkType', getNetworkType(ocpVersion));
+          }}
+        />
       )}
       {!isNutanix && (
         <>

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

@@ -88,3 +88,8 @@ export const getMajorMinorVersion = (version = '') => {
   const match = /[0-9].[0-9][0-9]?/g.exec(version);
   return match?.[0] || '';
 };
+
+export const getNetworkType = (
+  ocpVersion: OpenshiftVersionOptionType | undefined,
+): 'OVNKubernetes' | 'OpenShiftSDN' =>
+  parseFloat(getMajorMinorVersion(ocpVersion?.version)) >= 4.12 ? 'OVNKubernetes' : 'OpenShiftSDN';

package/lib/common/api/accounts-management-service/access-token-api.ts

@@ -3,7 +3,7 @@ import { AccessTokenCfg } from '@openshift-assisted/types/accounts-management-se
 
 export const AccessTokenAPI = {
   makeBaseURI() {
-    return `/api/accounts_mgmt/v1/access_token`;
+    return '/api/accounts_mgmt/v1/access_token';
   },
 
   async fetchPullSecret() {

package/lib/common/api/accounts-management-service/current-account-api.ts

@@ -0,0 +1,13 @@
+import { ocmClient as client } from '../axiosClient';
+import { Account } from '@openshift-assisted/types/accounts-management-service';
+
+export const CurrentAccountApi = {
+  makeBaseURI() {
+    return '/api/accounts_mgmt/v1/current_account';
+  },
+
+  async getCurrentAccount() {
+    const response = await client?.get<Account>(CurrentAccountApi.makeBaseURI());
+    return response?.data;
+  },
+};

package/lib/common/api/accounts-management-service/organizations-api.ts

@@ -0,0 +1,15 @@
+import { ocmClient as client } from '../axiosClient';
+import { Organization } from '@openshift-assisted/types/accounts-management-service';
+
+export const OrganizationsApi = {
+  makeBaseURI() {
+    return '/api/accounts_mgmt/v1/organizations';
+  },
+
+  async getOrganization(orgId: string, fetchCapabilities = true, fetchLabels = false) {
+    const response = await client?.get<Organization>(`${OrganizationsApi.makeBaseURI()}/${orgId}`, {
+      params: { fetchCapabilities, fetchLabels },
+    });
+    return response?.data;
+  },
+};

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

@@ -0,0 +1,24 @@
+import { clientWithoutCaseConverter as client } from '../../api/axiosClient';
+import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
+
+const config = {
+  headers: {
+    'Content-Type': 'application/json',
+  },
+};
+
+const UISettingsAPI = {
+  makeBaseURI(clusterId: Cluster['id']) {
+    return `/v2/clusters/${clusterId ? clusterId : ''}/ui-settings`;
+  },
+
+  get(clusterId: Cluster['id']) {
+    return client.get<string>(UISettingsAPI.makeBaseURI(clusterId));
+  },
+
+  put(clusterId: Cluster['id'], data: string) {
+    return client.put<string>(UISettingsAPI.makeBaseURI(clusterId), data, config);
+  },
+};
+
+export default UISettingsAPI;

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

@@ -6,3 +6,4 @@ export { default as HostsAPI } from './HostsAPI';
 export { default as InfraEnvsAPI } from './InfraEnvsAPI';
 export { default as EventsAPI } from './EventsAPI';
 export { default as NewFeatureSupportLevelsAPI } from './NewFeatureSupportLevelsAPI';
+export { default as UISettingsAPI } from './UISettingsAPI';

package/lib/common/api/authorization-service/all-apis.ts

@@ -0,0 +1,28 @@
+import { ocmClient as client } from '../axiosClient';
+import {
+  AccessReviewResponse,
+  FeatureReviewResponse,
+  SelfAccessReview,
+} from '@openshift-assisted/types/authorization-service';
+
+export const AuthorizationApi = {
+  makeBaseURI() {
+    return '/api/authorizations/v1/';
+  },
+
+  async selfFeatureReview(featureId: string) {
+    const response = await client?.post<FeatureReviewResponse>(
+      `${AuthorizationApi.makeBaseURI()}/self_feature_review`,
+      { feature: featureId },
+    );
+    return response?.data;
+  },
+
+  async selfAccessReview(params: SelfAccessReview) {
+    const response = await client?.post<AccessReviewResponse>(
+      `${AuthorizationApi.makeBaseURI()}/self_access_review`,
+      params,
+    );
+    return response?.data;
+  },
+};

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

@@ -104,7 +104,11 @@ const DiskEncryptionControlGroup = ({
           condition={enableDiskEncryptionOnMasters || (enableDiskEncryptionOnWorkers && !isSNO)}
         >
           <StackItem>
-            <DiskEncryptionMode diskEncryptionMode={diskEncryptionMode} isDisabled={isDisabled} />
+            <DiskEncryptionMode
+              diskEncryptionMode={diskEncryptionMode}
+              isDisabled={isDisabled}
+              tooltipProps={tooltipProps}
+            />
           </StackItem>
         </RenderIf>
       </Stack>

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/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/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/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 = (

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/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>