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

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

@@ -15,8 +15,8 @@ import {
   ClusterDetailsUpdateParams,
   ClustersService,
   ClusterCreateParamsWithStaticNetworking,
+  UISettingService,
 } from '../../services';
-import useClusterCustomManifests from '../../hooks/useClusterCustomManifests';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 
 type ClusterDetailsProps = {
@@ -33,10 +33,13 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   const { usedClusterNames } = useUsedClusterNames(cluster?.id || '');
   const pullSecret = usePullSecret();
   const { error: errorOCPVersions, loading: loadingOCPVersions, versions } = useOpenshiftVersions();
-  const { customManifests } = useClusterCustomManifests(cluster?.id || '', false);
 
   const handleClusterUpdate = React.useCallback(
-    async (clusterId: Cluster['id'], params: ClusterDetailsUpdateParams) => {
+    async (
+      clusterId: Cluster['id'],
+      params: ClusterDetailsUpdateParams,
+      addCustomManifests: boolean,
+    ) => {
       clearAlerts();
 
       try {
@@ -45,6 +48,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
           cluster?.tags,
           params,
         );
+        await clusterWizardContext.updateUISettings({ addCustomManifests });
         dispatch(updateCluster(updatedCluster));
 
         canNextClusterDetails({ cluster: updatedCluster }) && clusterWizardContext.moveNext();
@@ -60,23 +64,13 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
     [clearAlerts, addAlert, dispatch, cluster?.tags, clusterWizardContext],
   );
 
-  const handleCustomManifestsChange = React.useCallback(
-    async (clusterId: string, addCustomManifests: boolean) => {
-      const addCustomManifestsNew = customManifests ? customManifests.length === 0 : true;
-      if (addCustomManifests && addCustomManifestsNew && clusterId) {
-        await ClustersService.createDummyManifest(clusterId);
-      }
-    },
-    [customManifests],
-  );
-
   const handleClusterCreate = React.useCallback(
     async (params: ClusterCreateParamsWithStaticNetworking, addCustomManifests: boolean) => {
       clearAlerts();
       try {
         const cluster = await ClustersService.create(params);
         history.push(`${routeBasePath}/clusters/${cluster.id}`, ClusterWizardFlowStateNew);
-        await handleCustomManifestsChange(cluster.id, addCustomManifests);
+        await UISettingService.update(cluster.id, { addCustomManifests });
       } catch (e) {
         handleApiError(e, () =>
           addAlert({ title: 'Failed to create new cluster', message: getApiErrorMessage(e) }),
@@ -86,7 +80,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
         }
       }
     },
-    [clearAlerts, addAlert, dispatch, history, handleCustomManifestsChange],
+    [clearAlerts, history, addAlert, dispatch],
   );
 
   const navigation = <ClusterWizardNavigation cluster={cluster} />;
@@ -116,7 +110,6 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
       moveNext={() => clusterWizardContext.moveNext()}
       handleClusterUpdate={handleClusterUpdate}
       handleClusterCreate={handleClusterCreate}
-      handleCustomManifestsChange={handleCustomManifestsChange}
       navigation={navigation}
       infraEnv={infraEnv}
     />

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

@@ -46,9 +46,6 @@ type ClusterDetailsFormProps = {
   handleClusterUpdate: (
     clusterId: Cluster['id'],
     params: ClusterDetailsUpdateParams,
-  ) => Promise<void>;
-  handleCustomManifestsChange: (
-    clusterId: Cluster['id'],
     addCustomManifests: boolean,
   ) => Promise<void>;
 };
@@ -64,7 +61,6 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
     moveNext,
     handleClusterUpdate,
     handleClusterCreate,
-    handleCustomManifestsChange,
     navigation,
   } = props;
 
@@ -73,6 +69,7 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const featureSupportLevels = useNewFeatureSupportLevel();
   const { clearAlerts } = useAlerts();
+
   const handleSubmit = React.useCallback(
     async (values: OcmClusterDetailsValues) => {
       if (cluster) {
@@ -86,20 +83,13 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
           resetPlatform = 'baremetal';
         }
         const params = ClusterDetailsService.getClusterUpdateParams(values, resetPlatform);
-        await handleClusterUpdate(cluster.id, params);
-        await handleCustomManifestsChange(cluster.id, clusterWizardContext.addCustomManifests);
+        await handleClusterUpdate(cluster.id, params, values.addCustomManifest);
       } else {
         const params = ClusterDetailsService.getClusterCreateParams(values);
-        await handleClusterCreate(params, clusterWizardContext.addCustomManifests);
+        await handleClusterCreate(params, values.addCustomManifest);
       }
     },
-    [
-      cluster,
-      handleClusterCreate,
-      handleClusterUpdate,
-      handleCustomManifestsChange,
-      clusterWizardContext.addCustomManifests,
-    ],
+    [cluster, handleClusterCreate, handleClusterUpdate],
   );
 
   const handleOnNext = React.useCallback(
@@ -129,8 +119,17 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
         managedDomains,
         ocpVersions,
         urlSearchParams: search,
+        addCustomManifests: clusterWizardContext.customManifestsStep,
       }),
-    [infraEnv, cluster, pullSecret, managedDomains, ocpVersions, search],
+    [
+      infraEnv,
+      cluster,
+      pullSecret,
+      managedDomains,
+      ocpVersions,
+      search,
+      clusterWizardContext.customManifestsStep,
+    ],
   );
 
   const { t } = useTranslation();
@@ -146,7 +145,10 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
   return (
     <Formik
       initialValues={initialValues}
-      validate={getRichTextValidation(validationSchema)}
+      validate={(values) => {
+        clearAlerts();
+        return getRichTextValidation(validationSchema)(values);
+      }}
       onSubmit={handleSubmit}
     >
       {({ submitForm, isSubmitting, isValid, dirty, errors, touched }) => {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { HostsNetworkConfigurationType } from '../../services';
+import { HostsNetworkConfigurationType, UISettingsValues } from '../../services';
 import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
 import { ClusterWizardStepsType } from './wizardTransition';
 
@@ -11,10 +11,12 @@ export type ClusterWizardContextType = {
   wizardStepIds: ClusterWizardStepsType[];
   onUpdateStaticIpView(view: StaticIpView): void;
   onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void;
-  setAddCustomManifests(addCustomManifest: boolean): void;
-  addCustomManifests: boolean;
+  setCustomManifestsStep(addCustomManifest: boolean): void;
+  customManifestsStep: boolean;
   wizardPerPage: number;
   setWizardPerPage: (perPage: number) => void;
+  updateUISettings: (data: UISettingsValues) => Promise<void>;
+  uiSettings?: UISettingsValues;
 };
 
 export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);

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

@@ -18,9 +18,9 @@ import {
   useAlerts,
 } from '../../../common';
 import useSetClusterPermissions from '../../hooks/useSetClusterPermissions';
-import useClusterCustomManifests from '../../hooks/useClusterCustomManifests';
-import { ListManifestsExtended } from '../clusterConfiguration/manifestsConfiguration/data/dataTypes';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
+import { useUISettings } from '../../hooks';
+import { AlertVariant } from '@patternfly/react-core';
 
 const addStepToClusterWizard = (
   wizardStepIds: ClusterWizardStepsType[],
@@ -52,7 +52,7 @@ const removeStepFromClusterWizard = (
 const getWizardStepIds = (
   wizardStepIds: ClusterWizardStepsType[] | undefined,
   staticIpView?: StaticIpView | 'dhcp-selected',
-  addCustomManifests?: boolean,
+  customManifestsStep?: boolean,
   isSingleClusterFeatureEnabled?: boolean,
 ): ClusterWizardStepsType[] => {
   let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...defaultWizardSteps];
@@ -66,7 +66,7 @@ const getWizardStepIds = (
     stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
   }
 
-  if (addCustomManifests) {
+  if (customManifestsStep) {
     stepsCopy = addStepToClusterWizard(stepsCopy, 'networking', ['custom-manifests']);
   } else {
     stepsCopy = removeStepFromClusterWizard(stepsCopy, 'custom-manifests', 1);
@@ -79,12 +79,6 @@ const getWizardStepIds = (
   return stepsCopy;
 };
 
-const validateIfCustomsManifestsNeedToBeFilled = (
-  customManifests: ListManifestsExtended | undefined,
-): boolean => {
-  return (customManifests || []).some((customManifest) => customManifest.yamlContent === '');
-};
-
 const ClusterWizardContextProvider = ({
   children,
   cluster,
@@ -95,48 +89,71 @@ const ClusterWizardContextProvider = ({
   infraEnv?: InfraEnv;
   permissions?: AssistedInstallerOCMPermissionTypesListType;
 }>) => {
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const [currentStepId, setCurrentStepId] = React.useState<ClusterWizardStepsType>();
   const [wizardStepIds, setWizardStepIds] = React.useState<ClusterWizardStepsType[]>();
-  const [addCustomManifests, setAddCustomManifests] = React.useState<boolean>(false);
+  const [wizardPerPage, setWizardPerPage] = React.useState(10);
+  const [customManifestsStep, setCustomManifestsStep] = React.useState<boolean>(false);
   const { state: locationState } = useLocation<ClusterWizardFlowStateType>();
-  const { customManifests } = useClusterCustomManifests(cluster?.id || '', true);
+  const {
+    uiSettings,
+    updateUISettings,
+    loading: UISettingsLoading,
+    error: UISettingsError,
+  } = useUISettings(cluster?.id);
+  const { clearAlerts, addAlert, alerts } = useAlerts();
   const setClusterPermissions = useSetClusterPermissions();
-  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-  const { clearAlerts } = useAlerts();
-  const [wizardPerPage, setWizardPerPage] = React.useState(10);
 
   React.useEffect(() => {
-    const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
-    const customManifestsStepNeedsToBeFilled =
-      validateIfCustomsManifestsNeedToBeFilled(customManifests);
-    const hasManifests = (customManifests || []).length > 0;
-    const requiredStepId = getClusterWizardFirstStep(
-      locationState,
-      staticIpInfo,
-      cluster?.status,
-      cluster?.hosts,
-      isSingleClusterFeatureEnabled,
-      customManifestsStepNeedsToBeFilled,
-    );
-    const firstStepIds = getWizardStepIds(
-      wizardStepIds,
-      staticIpInfo?.view,
-      hasManifests,
-      isSingleClusterFeatureEnabled,
-    );
-    // Only move step if there is still none, or the user is at a forbidden step
-    const shouldMoveStep =
-      !currentStepId ||
-      (customManifestsStepNeedsToBeFilled && isStepAfter(currentStepId, requiredStepId));
-    if (shouldMoveStep) {
-      setCurrentStepId(requiredStepId);
+    if (!UISettingsLoading) {
+      const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
+      const customManifestsStepEnabled = !!uiSettings?.addCustomManifests;
+      const customManifestsStepNeedsToBeFilled = !!(
+        uiSettings?.addCustomManifests && !uiSettings?.customManifestsAdded
+      );
+
+      const requiredStepId = getClusterWizardFirstStep(
+        locationState,
+        staticIpInfo,
+        cluster?.status,
+        cluster?.hosts,
+        isSingleClusterFeatureEnabled,
+        customManifestsStepNeedsToBeFilled,
+      );
+
+      const firstStepIds = getWizardStepIds(
+        wizardStepIds,
+        staticIpInfo?.view,
+        customManifestsStepEnabled,
+        isSingleClusterFeatureEnabled,
+      );
+
+      // Only move step if there is still none, or the user is at a forbidden step
+      if (
+        !currentStepId ||
+        (customManifestsStepNeedsToBeFilled && isStepAfter(currentStepId, requiredStepId))
+      ) {
+        setCurrentStepId(requiredStepId);
+      }
+
+      setWizardStepIds(firstStepIds);
+      setClusterPermissions(cluster, permissions);
+      setCustomManifestsStep(!!uiSettings?.addCustomManifests);
+    }
+
+    if (
+      !!UISettingsError &&
+      !alerts.some((alert) => alert.title === "Couldn't retrieve UI settings")
+    ) {
+      addAlert({
+        title: "Couldn't retrieve UI settings",
+        message: UISettingsError,
+        variant: AlertVariant.warning,
+      });
     }
 
-    setWizardStepIds(firstStepIds);
-    setClusterPermissions(cluster, permissions);
-    setAddCustomManifests(hasManifests);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [customManifests]);
+  }, [uiSettings, UISettingsLoading, UISettingsError]);
 
   const contextValue = React.useMemo<ClusterWizardContextType | null>(() => {
     if (!wizardStepIds || !currentStepId) {
@@ -152,7 +169,7 @@ const ClusterWizardContextProvider = ({
       const newStepIds = getWizardStepIds(
         wizardStepIds,
         staticIpInfo.view,
-        addCustomManifests,
+        customManifestsStep,
         isSingleClusterFeatureEnabled,
       );
       setWizardStepIds(newStepIds);
@@ -165,8 +182,8 @@ const ClusterWizardContextProvider = ({
       setCurrentStepId(stepId);
     };
 
-    const onSetAddCustomManifests = (addCustomManifest: boolean) => {
-      setAddCustomManifests(addCustomManifest);
+    const onSetAddCustomManifestsStep = (addCustomManifest: boolean) => {
+      setCustomManifestsStep(addCustomManifest);
       setWizardStepIds(
         getWizardStepIds(
           wizardStepIds,
@@ -199,7 +216,7 @@ const ClusterWizardContextProvider = ({
           setCurrentStepId('static-ip-network-wide-configurations');
         }
         setWizardStepIds(
-          getWizardStepIds(wizardStepIds, view, addCustomManifests, isSingleClusterFeatureEnabled),
+          getWizardStepIds(wizardStepIds, view, customManifestsStep, isSingleClusterFeatureEnabled),
         );
       },
       onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
@@ -208,7 +225,7 @@ const ClusterWizardContextProvider = ({
             getWizardStepIds(
               wizardStepIds,
               StaticIpView.FORM,
-              addCustomManifests,
+              customManifestsStep,
               isSingleClusterFeatureEnabled,
             ),
           );
@@ -217,7 +234,7 @@ const ClusterWizardContextProvider = ({
             getWizardStepIds(
               wizardStepIds,
               'dhcp-selected',
-              addCustomManifests,
+              customManifestsStep,
               isSingleClusterFeatureEnabled,
             ),
           );
@@ -226,25 +243,29 @@ const ClusterWizardContextProvider = ({
       wizardStepIds,
       currentStepId,
       setCurrentStepId: onSetCurrentStepId,
-      addCustomManifests,
-      setAddCustomManifests: onSetAddCustomManifests,
-      customManifests,
+      customManifestsStep,
+      setCustomManifestsStep: onSetAddCustomManifestsStep,
       wizardPerPage,
       setWizardPerPage,
+      uiSettings,
+      updateUISettings,
     };
   }, [
     wizardStepIds,
     currentStepId,
     infraEnv,
-    addCustomManifests,
-    customManifests,
+    customManifestsStep,
     wizardPerPage,
     isSingleClusterFeatureEnabled,
     clearAlerts,
+    uiSettings,
+    updateUISettings,
   ]);
+
   if (!contextValue) {
     return null;
   }
+
   return (
     <>
       <ClusterWizardContext.Provider value={contextValue}>{children}</ClusterWizardContext.Provider>

package/lib/ocm/components/clusters/ClusterPage.tsx

@@ -171,8 +171,9 @@ const ClusterPageGeneric: React.FC<{ clusterId: string; showBreadcrumbs?: boolea
                 <NewFeatureSupportLevelProvider
                   loadingUi={<ClusterLoading />}
                   cluster={cluster}
-                  cpuArchitecture={infraEnv.cpuArchitecture}
+                  cpuArchitecture={infraEnv.cpuArchitecture as CpuArchitecture}
                   openshiftVersion={cluster.openshiftVersion}
+                  platformType={cluster.platform?.type}
                 >
                   {/* TODO(mlibra): Will be reworked within https://issues.redhat.com/browse/AGENT-522
                 <RebootNodeZeroModal cluster={cluster} />

package/lib/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.tsx

@@ -3,6 +3,7 @@ import {
   ActiveFeatureConfiguration,
   CpuArchitecture,
   FeatureId,
+  SupportedCpuArchitecture,
   getDefaultCpuArchitecture,
 } from '../../../common';
 import { useOpenshiftVersions, usePullSecret } from '../../hooks';
@@ -16,6 +17,7 @@ import {
 import useSupportLevelsAPI from '../../hooks/useSupportLevelsAPI';
 import {
   Cluster,
+  PlatformType,
   SupportLevel,
   SupportLevels,
 } from '@openshift-assisted/types/assisted-installer-service';
@@ -25,7 +27,8 @@ export type NewSupportLevelProviderProps = PropsWithChildren<{
   openshiftVersion?: string;
   loadingUi: React.ReactNode;
   cluster?: Cluster;
-  cpuArchitecture?: string;
+  cpuArchitecture?: CpuArchitecture;
+  platformType?: PlatformType;
 }>;
 
 export const getFeatureSupported = (featureSupportLevels: SupportLevels, featureId: FeatureId) => {
@@ -38,6 +41,7 @@ export const NewFeatureSupportLevelProvider: React.FC<NewSupportLevelProviderPro
   loadingUi,
   cpuArchitecture,
   openshiftVersion,
+  platformType,
 }) => {
   const { loading: loadingOCPVersions } = useOpenshiftVersions();
   const pullSecret = usePullSecret();
@@ -50,7 +54,12 @@ export const NewFeatureSupportLevelProvider: React.FC<NewSupportLevelProviderPro
     pullSecret,
     cluster?.openshiftVersion,
   );
-  const featureSupportLevels = useSupportLevelsAPI('features', openshiftVersion, cpuArchitecture);
+  const featureSupportLevels = useSupportLevelsAPI(
+    'features',
+    openshiftVersion,
+    cpuArchitecture,
+    platformType,
+  );
 
   const supportLevelData = React.useMemo<NewFeatureSupportLevelMap>(() => {
     if (!featureSupportLevels) {
@@ -108,7 +117,8 @@ export const NewFeatureSupportLevelProvider: React.FC<NewSupportLevelProviderPro
     (
       featureId: FeatureId,
       supportLevelDataNew?: NewFeatureSupportLevelMap,
-      cpuArchitecture?: string,
+      cpuArchitecture?: SupportedCpuArchitecture,
+      platformType?: PlatformType,
     ) => {
       const isSupported = isFeatureSupportedCallback(featureId, supportLevelDataNew);
       return getNewFeatureDisabledReason(
@@ -117,6 +127,7 @@ export const NewFeatureSupportLevelProvider: React.FC<NewSupportLevelProviderPro
         activeFeatureConfiguration,
         isSupported,
         cpuArchitecture,
+        platformType,
       );
     },
     [isFeatureSupportedCallback, cluster, activeFeatureConfiguration],

package/lib/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.tsx

@@ -93,14 +93,7 @@ export const LimitedSupportedCluster = ({
       <>
         <InfoCircleIcon size="sm" color="var(--pf-global--info-color--100)" />
         &nbsp;Your cluster will be subject to support limitations because it includes:
-        <TextList>
-          {getPreviewFeatureList(clusterFeatureSupportLevels)}
-          {clusterFeatureSupportLevels['CLUSTER_MANAGED_NETWORKING_WITH_VMS'] === 'unsupported' && (
-            <TextListItem>
-              Cluster-managed networking with some or all discovered hosts as virtual machines
-            </TextListItem>
-          )}
-        </TextList>
+        <TextList>{getPreviewFeatureList(clusterFeatureSupportLevels)}</TextList>
       </>
     )}
   </TextContent>

package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts

@@ -7,7 +7,12 @@ import {
   SupportedCpuArchitecture,
 } from '../../../common';
 import { architectureData } from '../clusterConfiguration/CpuArchitectureDropdown';
-import { Cluster, SupportLevel } from '@openshift-assisted/types/assisted-installer-service';
+import {
+  Cluster,
+  PlatformType,
+  SupportLevel,
+} from '@openshift-assisted/types/assisted-installer-service';
+import { ExternalPlatformLabels } from '../clusterConfiguration/platformIntegration/constants';
 
 const CNV_OPERATOR_LABEL = 'Openshift Virtualization';
 const LVMS_OPERATOR_LABEL = 'Logical Volume Manager Storage';
@@ -149,7 +154,8 @@ export const getNewFeatureDisabledReason = (
   cluster: Cluster | undefined,
   activeFeatureConfiguration: ActiveFeatureConfiguration,
   isSupported: boolean,
-  cpuArchitecture?: string,
+  cpuArchitecture?: SupportedCpuArchitecture,
+  platformType?: PlatformType,
 ): string | undefined => {
   switch (featureId) {
     case 'SNO': {
@@ -171,7 +177,9 @@ export const getNewFeatureDisabledReason = (
       return getNetworkTypeSelectionDisabledReason(cluster);
     }
     case 'CLUSTER_MANAGED_NETWORKING': {
-      return 'Cluster-managed networking is not supported for ARM architecture with this version of OpenShift.';
+      return `Cluster-managed networking is not supported when using ${
+        platformType ? ExternalPlatformLabels[platformType] : ''
+      }`;
     }
     case 'EXTERNAL_PLATFORM_OCI': {
       return getOciDisabledReason(cpuArchitecture, isSupported);
@@ -191,6 +199,13 @@ export const getNewFeatureDisabledReason = (
         return `Integration with vSphere is not available with the selected CPU architecture.`;
       }
     }
+    case 'USER_MANAGED_NETWORKING': {
+      if (!isSupported) {
+        return `User-Managed Networking is not supported when using ${
+          platformType ? ExternalPlatformLabels[platformType] : ''
+        }`;
+      }
+    }
     default: {
       return undefined;
     }

package/lib/ocm/components/hosts/HostsDiscoveryTable.tsx

@@ -35,6 +35,7 @@ const HostRowDetailExpand = ({ obj: host }: ExpandComponentProps<Host>) => (
     key={host.id}
     host={host}
     AdditionalNTPSourcesDialogToggleComponent={AdditionalNTPSourcesDialogToggle}
+    hideStorage
   />
 );
 

package/lib/ocm/hooks/index.ts

@@ -4,3 +4,4 @@ export { default as useUsedClusterNames } from './useUsedClusterNames';
 export { default as useInfraEnvId } from './useInfraEnvId';
 export { default as usePullSecret } from './usePullSecret';
 export { default as useClusterPreflightRequirements } from './useClusterPreflightRequirements';
+export { default as useUISettings } from './useUISettings';

package/lib/ocm/hooks/useOpenshiftVersions.tsx

@@ -3,17 +3,12 @@ import { CpuArchitecture, OpenshiftVersionOptionType } from '../../common';
 import { getApiErrorMessage, handleApiError } from '../api';
 import { SupportedOpenshiftVersionsAPI } from '../services/apis';
 import { getKeys } from '../../common/utils';
-import {
-  Cluster,
-  ImportClusterParams,
-  OpenshiftVersion,
-} from '@openshift-assisted/types/assisted-installer-service';
+import { Cluster, OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';
 
 type OpenShiftVersion = Cluster['openshiftVersion'];
 
 type UseOpenshiftVersionsType = {
   versions: OpenshiftVersionOptionType[];
-  normalizeClusterVersion: (version: OpenShiftVersion) => ImportClusterParams['openshiftVersion'];
   isSupportedOpenShiftVersion: (version: OpenShiftVersion) => boolean;
   getCpuArchitectures: (version: OpenShiftVersion) => CpuArchitecture[];
   error?: { title: string; message: string };
@@ -72,14 +67,6 @@ export default function useOpenshiftVersions(): UseOpenshiftVersionsType {
     }
   }, []);
 
-  const normalizeClusterVersion = React.useCallback(
-    (version: OpenShiftVersion) => {
-      const matchingVersion = findVersionItemByVersion(version);
-      return matchingVersion?.value || version;
-    },
-    [findVersionItemByVersion],
-  );
-
   const isSupportedOpenShiftVersion = React.useCallback(
     (version: OpenShiftVersion) => {
       if (versions.length === 0) {
@@ -109,7 +96,6 @@ export default function useOpenshiftVersions(): UseOpenshiftVersionsType {
     error,
     loading: !error && versions.length === 0,
     versions,
-    normalizeClusterVersion,
     isSupportedOpenShiftVersion,
     getCpuArchitectures,
   };