@openshift-assisted/ui-lib 2.9.14-cim → 2.10.0-cim

package/lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpForm.tsx

@@ -5,7 +5,7 @@ import { Formik, FormikConfig, useFormikContext, yupToFormErrors } from 'formik'
 import isEqual from 'lodash-es/isEqual.js';
 import { useAlerts, useFormikAutoSave } from '../../../../../common';
 import { useErrorMonitor } from '../../../../../common/components/ErrorHandling/ErrorMonitorContext';
-import { getApiErrorMessage } from '../../../../api';
+import { getApiErrorMessage } from '../../../../../common/api';
 import { StaticIpFormProps } from './propTypes';
 import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
 

package/lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpHostsArray.tsx

@@ -11,7 +11,7 @@ import {
   FlexItem,
   Grid,
 } from '@patternfly/react-core';
-import { MinusCircleIcon } from '@patternfly/react-icons';
+import { MinusCircleIcon } from '@patternfly/react-icons/dist/js/icons/minus-circle-icon';
 import { FieldArray, FieldArrayRenderProps, useField } from 'formik';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import { getFormikArrayItemFieldName, LoadingState } from '../../../../../common';

package/lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/MacIpMapping.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { GridItem, Grid, Button } from '@patternfly/react-core';
 import { ArrayHelpers, FieldArray } from 'formik';
-import { PlusCircleIcon } from '@patternfly/react-icons';
+import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon';
 import { getFormikArrayItemFieldName, RemovableField } from '../../../../../../common';
 import { OcmInputField } from '../../../../ui/OcmFormFields';
 import { useSelector } from 'react-redux';

package/lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlViewFields.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { TextVariants, TextContent, Text, FormGroup, Grid } from '@patternfly/react-core';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { Language } from '@patternfly/react-code-editor';
 import { useField } from 'formik';
 import { getFieldId, NMSTATE_EXAMPLES_LINK, PopoverIcon } from '../../../../../../common';

package/lib/ocm/components/clusterDetail/AssistedInstallerDetailCard.tsx

@@ -8,7 +8,6 @@ import {
   AssistedInstallerOCMPermissionTypesListType,
   CpuArchitecture,
   ErrorState,
-  FeatureGateContextProvider,
   FeatureListType,
   LoadingState,
   ResourceUIState,
@@ -29,6 +28,7 @@ import { BackButton } from '../ui/Buttons/BackButton';
 import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { usePullSecret } from '../../hooks';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useFeatureDetection } from '../../hooks/use-feature-detection';
 
 type AssistedInstallerDetailCardProps = {
   aiClusterId: string;
@@ -91,6 +91,7 @@ const AssistedInstallerDetailCard = ({
   allEnabledFeatures,
   permissions,
 }: AssistedInstallerDetailCardProps) => {
+  useFeatureDetection(allEnabledFeatures);
   const { cluster, uiState } = useClusterPolling(aiClusterId);
   const pullSecret = usePullSecret();
   const {
@@ -131,32 +132,30 @@ const AssistedInstallerDetailCard = ({
 
   const isOutdatedClusterData = uiState === ResourceUIState.POLLING_ERROR;
   return (
-    <FeatureGateContextProvider features={allEnabledFeatures}>
-      <AlertsContextProvider>
-        <SentryErrorMonitorContextProvider>
-          <ModalDialogsContextProvider>
-            <ClusterDefaultConfigurationProvider
-              loadingUI={<LoadingCard />}
-              errorUI={<LoadingDefaultConfigFailedCard />}
+    <AlertsContextProvider>
+      <SentryErrorMonitorContextProvider>
+        <ModalDialogsContextProvider>
+          <ClusterDefaultConfigurationProvider
+            loadingUI={<LoadingCard />}
+            errorUI={<LoadingDefaultConfigFailedCard />}
+          >
+            <NewFeatureSupportLevelProvider
+              loadingUi={<LoadingCard />}
+              cluster={cluster}
+              cpuArchitecture={infraEnv.cpuArchitecture as CpuArchitecture}
+              openshiftVersion={cluster.openshiftVersion}
+              platformType={cluster.platform?.type}
             >
-              <NewFeatureSupportLevelProvider
-                loadingUi={<LoadingCard />}
-                cluster={cluster}
-                cpuArchitecture={infraEnv.cpuArchitecture as CpuArchitecture}
-                openshiftVersion={cluster.openshiftVersion}
-                platformType={cluster.platform?.type}
-              >
-                {content}
-              </NewFeatureSupportLevelProvider>
-              {isOutdatedClusterData && <ClusterPollingErrorModal />}
-              <CancelInstallationModal />
-              <ResetClusterModal />
-              <DiscoveryImageModal />
-            </ClusterDefaultConfigurationProvider>
-          </ModalDialogsContextProvider>
-        </SentryErrorMonitorContextProvider>
-      </AlertsContextProvider>
-    </FeatureGateContextProvider>
+              {content}
+            </NewFeatureSupportLevelProvider>
+            {isOutdatedClusterData && <ClusterPollingErrorModal />}
+            <CancelInstallationModal />
+            <ResetClusterModal />
+            <DiscoveryImageModal />
+          </ClusterDefaultConfigurationProvider>
+        </ModalDialogsContextProvider>
+      </SentryErrorMonitorContextProvider>
+    </AlertsContextProvider>
   );
 };
 

package/lib/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.tsx

@@ -3,18 +3,14 @@ import { Provider } from 'react-redux';
 import { storeDay1 } from '../../store';
 import { useSelector } from 'react-redux';
 
-import {
-  AlertsContextProvider,
-  CpuArchitecture,
-  FeatureGateContextProvider,
-  FeatureListType,
-} from '../../../common';
+import { AlertsContextProvider, CpuArchitecture, FeatureListType } from '../../../common';
 import ClusterProperties from './ClusterProperties';
 import { Grid } from '@patternfly/react-core';
 import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import useInfraEnv from '../../hooks/useInfraEnv';
 import { usePullSecret } from '../../hooks';
 import { selectCurrentClusterState } from '../../store/slices/current-cluster/selectors';
+import { useFeatureDetection } from '../../hooks/use-feature-detection';
 
 type AssistedInstallerExtraDetailCardProps = {
   allEnabledFeatures: FeatureListType;
@@ -23,6 +19,7 @@ type AssistedInstallerExtraDetailCardProps = {
 const AssistedInstallerExtraDetailCard: React.FC<AssistedInstallerExtraDetailCardProps> = ({
   allEnabledFeatures,
 }) => {
+  useFeatureDetection(allEnabledFeatures);
   const { data: cluster } = useSelector(selectCurrentClusterState);
   const pullSecret = usePullSecret();
   const { infraEnv } = useInfraEnv(
@@ -40,21 +37,19 @@ const AssistedInstallerExtraDetailCard: React.FC<AssistedInstallerExtraDetailCar
   }
 
   return (
-    <FeatureGateContextProvider features={allEnabledFeatures}>
-      <AlertsContextProvider>
-        <NewFeatureSupportLevelProvider
-          loadingUi={<div />}
-          cluster={cluster}
-          cpuArchitecture={infraEnv?.cpuArchitecture as CpuArchitecture}
-          openshiftVersion={cluster.openshiftVersion}
-          platformType={cluster.platform?.type}
-        >
-          <Grid className="pf-u-mt-md">
-            <ClusterProperties cluster={cluster} externalMode />
-          </Grid>
-        </NewFeatureSupportLevelProvider>
-      </AlertsContextProvider>
-    </FeatureGateContextProvider>
+    <AlertsContextProvider>
+      <NewFeatureSupportLevelProvider
+        loadingUi={<div />}
+        cluster={cluster}
+        cpuArchitecture={infraEnv?.cpuArchitecture as CpuArchitecture}
+        openshiftVersion={cluster.openshiftVersion}
+        platformType={cluster.platform?.type}
+      >
+        <Grid className="pf-u-mt-md">
+          <ClusterProperties cluster={cluster} externalMode />
+        </Grid>
+      </NewFeatureSupportLevelProvider>
+    </AlertsContextProvider>
   );
 };
 

package/lib/ocm/components/clusterDetail/CancelInstallationModal.tsx

@@ -8,7 +8,7 @@ import {
   Text,
   TextContent,
 } from '@patternfly/react-core';
-import { getApiErrorMessage, handleApiError } from '../../api';
+import { getApiErrorMessage, handleApiError } from '../../../common/api';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
 import { ErrorState, LoadingState } from '../../../common';

package/lib/ocm/components/clusterDetail/ClusterDetail.tsx

@@ -9,14 +9,7 @@ import {
   GridItem,
   Grid,
 } from '@patternfly/react-core';
-import {
-  ToolbarButton,
-  Alerts,
-  getEnabledHosts,
-  selectOlmOperators,
-  isSNO,
-  useFeature,
-} from '../../../common';
+import { ToolbarButton, Alerts, getEnabledHosts, selectOlmOperators, isSNO } from '../../../common';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import ClusterToolbar from '../clusters/ClusterToolbar';
 import { getClusterDetailId } from './utils';
@@ -29,12 +22,13 @@ import { onFetchEvents } from '../fetching/fetchEvents';
 import { getClusterProgressAlerts } from './getProgressBarAlerts';
 import { ClustersAPI } from '../../services/apis';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
-import { handleApiError, isInOcm } from '../../api';
+import { handleApiError, isInOcm } from '../../../common/api';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import OcmClusterProgressItems from '../clusterConfiguration/OcmClusterProgressItems';
 import ClusterDetailsButtonGroup from './ClusterDetailsButtonGroup';
 import ClusterSummaryExpandable from './ClusterSummaryExpandable';
 import HostInventoryExpandable from './HostInventoryExpandable';
+import { useFeature } from '../../hooks/use-feature';
 
 type ClusterDetailProps = {
   cluster: Cluster;

package/lib/ocm/components/clusterDetail/ClusterDetailStatusMessages.tsx

@@ -9,9 +9,9 @@ import {
 } from '../../../common';
 
 import { useDefaultConfiguration } from '../clusterConfiguration/ClusterDefaultConfigurationContext';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { calculateClusterDateDiff } from '../../../common/services/DateAndTime';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 import { ExternalPlatformLinks } from '../clusterConfiguration/platformIntegration/constants';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import { Cluster, PlatformType } from '@openshift-assisted/types/assisted-installer-service';

package/lib/ocm/components/clusterDetail/ClusterDetailsButtonGroup.tsx

@@ -30,7 +30,7 @@ const ClusterDetailsButtonGroup: React.FC<ClusterDetailsButtonGroupProps> = ({
   credentialsError,
   showKubeConfig = true,
 }) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { cancelInstallationDialog, resetClusterDialog } = useModalDialogsContext();
   const hasConsoleUrlAndNoError = credentials?.consoleUrl !== undefined && !credentialsError;
 
@@ -88,7 +88,7 @@ const ClusterDetailsButtonGroup: React.FC<ClusterDetailsButtonGroupProps> = ({
           data-testid="cluster-installation-logs-button"
           variant={ButtonVariant.link}
           onClick={() => {
-            void downloadClusterInstallationLogs(addAlert, cluster.id);
+            void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
           }}
           isDisabled={!canDownloadClusterLogs(cluster)}
         >

package/lib/ocm/components/clusterDetail/ClusterInstallationError.tsx

@@ -23,7 +23,7 @@ const ClusterInstallationError: React.FC<ClusterInstallationErrorProps> = ({
   cluster,
   title = 'Cluster installation failed',
 }) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { resetClusterDialog } = useModalDialogsContext();
 
   return (
@@ -41,7 +41,7 @@ const ClusterInstallationError: React.FC<ClusterInstallationErrorProps> = ({
             </AlertActionLink>
             <AlertActionLink
               onClick={() => {
-                void downloadClusterInstallationLogs(addAlert, cluster.id);
+                void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
               }}
               isDisabled={!canDownloadClusterLogs(cluster)}
               id={getID('button-download-installation-logs')}

package/lib/ocm/components/clusterDetail/HostInventoryExpandable.tsx

@@ -5,6 +5,7 @@ import { getMostSevereHostStatus } from './utils';
 import { ExpandableSection } from '@patternfly/react-core';
 import './HostInventoryExpandable.css';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type HostInventoryExpandableProps = {
   cluster: Cluster;
@@ -24,11 +25,12 @@ const ExpandableSectionTitle = ({
 );
 
 const HostInventoryExpandable = ({ cluster }: HostInventoryExpandableProps) => {
+  const { t } = useTranslation();
   const [isExpanded, setIsExpanded] = useState(false);
   const hosts = cluster.hosts || [];
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
   const mostSevereHostStatus = getMostSevereHostStatus(hosts);
-  const hostStatusDef = mostSevereHostStatus ? hostStatus[mostSevereHostStatus] : null;
+  const hostStatusDef = mostSevereHostStatus ? hostStatus(t)[mostSevereHostStatus] : null;
 
   return (
     <ExpandableSection

package/lib/ocm/components/clusterDetail/OpenShiftVersionDetail.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { getOpenshiftVersionText } from '../../../common';
 import { useOpenshiftVersions } from '../../hooks';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
 import { Popover, Text, TextContent, TextVariants } from '@patternfly/react-core';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';

package/lib/ocm/components/clusterDetail/ProgressBarAlerts.tsx

@@ -14,7 +14,7 @@ import {
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { downloadClusterInstallationLogs } from './utils';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 import {
   NewFeatureSupportLevelData,
   useNewFeatureSupportLevel,
@@ -92,7 +92,7 @@ export const HostInstallationWarning = ({
   failedOperators = [],
   message,
 }: InstallationProgressWarningProps) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { t } = useTranslation();
   const featureSupportLevel = useNewFeatureSupportLevel();
 
@@ -107,7 +107,7 @@ export const HostInstallationWarning = ({
             <AlertActionLink
               id="cluster-installation-logs-button"
               onClick={() => {
-                void downloadClusterInstallationLogs(addAlert, cluster.id);
+                void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
               }}
               isDisabled={!canDownloadClusterLogs(cluster)}
             >
@@ -143,7 +143,7 @@ export const HostsInstallationFailed = ({
   totalHosts,
   isCriticalNumberOfWorkersFailed,
 }: InstallationProgressWarningProps) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { resetClusterDialog } = useModalDialogsContext();
   const getID = (suffix: string) => `cluster-install-error-${suffix}`;
   let title, message;
@@ -185,7 +185,7 @@ export const HostsInstallationFailed = ({
             <AlertActionLink
               id="cluster-installation-logs-button"
               onClick={() => {
-                void downloadClusterInstallationLogs(addAlert, cluster.id);
+                void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
               }}
               isDisabled={!canDownloadClusterLogs(cluster)}
             >

package/lib/ocm/components/clusterDetail/ResetClusterModal.tsx

@@ -8,10 +8,10 @@ import {
   Text,
   TextContent,
 } from '@patternfly/react-core';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons';
-import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
+import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
 
-import { getApiErrorMessage, handleApiError } from '../../api';
+import { getApiErrorMessage, handleApiError } from '../../../common/api';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { calculateCollectedLogsCount } from '../clusters/utils';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';

package/lib/ocm/components/clusterDetail/utils.tsx

@@ -1,10 +1,9 @@
-import { saveAs } from 'file-saver';
 import get from 'lodash-es/get.js';
-import { isInOcm, handleApiError, getApiErrorMessage } from '../../api';
+import { isInOcm, handleApiError, getApiErrorMessage } from '../../../common/api';
 import { AlertsContextType, hostStatusOrder } from '../../../common';
 import { ClustersAPI } from '../../services/apis';
 import { ClustersService } from '../../services';
-import { stringToJSON } from '../../../common/utils';
+import { downloadFile, stringToJSON } from '../../../common/utils';
 import {
   Cluster,
   Host,
@@ -15,7 +14,9 @@ import {
 export const downloadClusterInstallationLogs = async (
   addAlert: AlertsContextType['addAlert'],
   clusterId: string,
+  clearAlerts: AlertsContextType['clearAlerts'],
 ) => {
+  clearAlerts();
   try {
     if (isInOcm) {
       const { data } = await ClustersAPI.getPresignedForClusterFiles({
@@ -24,10 +25,10 @@ export const downloadClusterInstallationLogs = async (
         hostId: undefined,
         logsType: 'all',
       });
-      saveAs(data.url);
+      downloadFile(data.url);
     } else {
       const { data, fileName } = await ClustersService.downloadLogs(clusterId);
-      saveAs(data, fileName);
+      downloadFile('', data, fileName);
     }
   } catch (e) {
     handleApiError(e, (e) => {

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

@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import { useAlerts, LoadingState, ClusterWizardStep, ErrorState } from '../../../common';
 import { usePullSecret } from '../../hooks';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { canNextClusterDetails, ClusterWizardFlowStateNew } from './wizardTransition';

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

@@ -15,7 +15,7 @@ import {
 import { canNextClusterDetails } from './wizardTransition';
 import { OpenshiftVersionOptionType, getFormikErrorFields } from '../../../common';
 import ClusterWizardFooter from './ClusterWizardFooter';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 import {
   ClusterDetailsService,
   ClusterDetailsUpdateParams,

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

@@ -12,15 +12,12 @@ import { HostsNetworkConfigurationType } from '../../services';
 import { defaultWizardSteps, staticIpFormViewSubSteps } from './constants';
 import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
 import { getStaticIpInfo } from '../clusterConfiguration/staticIp/data/fromInfraEnv';
-import {
-  AssistedInstallerOCMPermissionTypesListType,
-  useFeature,
-  useAlerts,
-} from '../../../common';
+import { AssistedInstallerOCMPermissionTypesListType, useAlerts } from '../../../common';
 import useSetClusterPermissions from '../../hooks/useSetClusterPermissions';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 import { useUISettings } from '../../hooks';
 import { AlertVariant } from '@patternfly/react-core';
+import { useFeature } from '../../hooks/use-feature';
 
 const addStepToClusterWizard = (
   wizardStepIds: ClusterWizardStepsType[],

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

@@ -12,7 +12,7 @@ import {
 import HostInventory from '../clusterConfiguration/HostInventory';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { canNextHostDiscovery } from './wizardTransition';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
 import ClusterWizardFooter from './ClusterWizardFooter';
 import ClusterWizardNavigation from './ClusterWizardNavigation';

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

@@ -20,7 +20,7 @@ import ClusterWizardNavigation from '../clusterWizard/ClusterWizardNavigation';
 import { OperatorsStep } from './OperatorsStep';
 import { ClustersService, OperatorsService } from '../../services';
 import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import { canNextOperators } from './wizardTransition';
 import { Cluster, MonitoredOperator } from '@openshift-assisted/types/assisted-installer-service';
 

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

@@ -7,10 +7,14 @@ import OdfCheckbox from '../clusterConfiguration/operators/OdfCheckbox';
 import LvmCheckbox from '../clusterConfiguration/operators/LvmCheckbox';
 import MceCheckbox from '../clusterConfiguration/operators/MceCheckbox';
 import { selectIsCurrentClusterSNO } from '../../store/slices/current-cluster/selectors';
+import { isOCPVersionEqualsOrMajor } from '../utils';
 
 export const OperatorsStep = (props: ClusterOperatorProps) => {
   const isSNO = useSelector(selectIsCurrentClusterSNO);
-
+  const isVersionEqualsOrMajorThan4_15 = isOCPVersionEqualsOrMajor(
+    props.openshiftVersion || '',
+    '4.15',
+  );
   return (
     <Stack hasGutter data-testid={'operators-form'}>
       <StackItem>
@@ -22,7 +26,18 @@ export const OperatorsStep = (props: ClusterOperatorProps) => {
       <StackItem>
         <MceCheckbox />
       </StackItem>
-      <StackItem>{isSNO ? <LvmCheckbox {...props} /> : <OdfCheckbox />}</StackItem>
+      {isVersionEqualsOrMajorThan4_15 ? (
+        <>
+          <StackItem>
+            <LvmCheckbox {...props} />
+          </StackItem>
+          <StackItem>
+            <OdfCheckbox />
+          </StackItem>
+        </>
+      ) : (
+        <StackItem>{isSNO ? <LvmCheckbox {...props} /> : <OdfCheckbox />}</StackItem>
+      )}
     </Stack>
   );
 };

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { TextContent, Text, Split, SplitItem } from '@patternfly/react-core';
-import { ASSISTED_INSTALLER_DOCUMENTATION_LINK, ExternalLink } from '../../../common';
+import { ASSISTED_INSTALLER_DOCUMENTATION_LINK, ExternalLink, isInOcm } from '../../../common';
 
 export const AssistedInstallerHeader = () => {
   return (
@@ -14,11 +14,13 @@ export const AssistedInstallerHeader = () => {
             Assisted Installer documentation
           </ExternalLink>
         </SplitItem>
-        <SplitItem>
-          <Text component="a" data-testid="whats-new-link">
-            What's new in Assisted Installer?
-          </Text>
-        </SplitItem>
+        {isInOcm && (
+          <SplitItem>
+            <Text component="a" data-testid="whats-new-link">
+              What's new in Assisted Installer?
+            </Text>
+          </SplitItem>
+        )}
       </Split>
     </TextContent>
   );

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

@@ -7,7 +7,7 @@ import {
 } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
 import { routeBasePath } from '../../config';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 
 const ClusterBreadcrumbs = ({ clusterName }: { clusterName?: string }) => (
   <PageSection variant={PageSectionVariants.light}>

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

@@ -1,17 +1,13 @@
 import React from 'react';
-import {
-  global_danger_color_100 as dangerColor,
-  global_success_color_100 as okColor,
-  global_warning_color_100 as warningColor,
-} from '@patternfly/react-tokens';
-import {
-  ExclamationCircleIcon,
-  ExclamationTriangleIcon,
-  FileAltIcon,
-  CheckCircleIcon,
-  InProgressIcon,
-  BanIcon,
-} from '@patternfly/react-icons';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
+import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
+import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
+import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
+import { FileAltIcon } from '@patternfly/react-icons/dist/js/icons/file-alt-icon';
+import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
+import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
+import { BanIcon } from '@patternfly/react-icons/dist/js/icons/ban-icon';
 import { clusterStatusLabels, WithTestID } from '../../../common';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';

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

@@ -8,7 +8,7 @@ import {
   Text,
   PageSection,
 } from '@patternfly/react-core';
-import { AddCircleOIcon } from '@patternfly/react-icons';
+import { AddCircleOIcon } from '@patternfly/react-icons/dist/js/icons/add-circle-o-icon';
 import {
   ResourceUIState,
   Alerts,
@@ -20,7 +20,7 @@ import {
 } from '../../../common';
 import ClustersTable from './ClustersTable';
 import { fetchClustersAsync, deleteCluster } from '../../store/slices/clusters/slice';
-import { handleApiError, getApiErrorMessage } from '../../api';
+import { handleApiError, getApiErrorMessage } from '../../../common/api';
 import ClusterBreadcrumbs from './ClusterBreadcrumbs';
 import { routeBasePath } from '../../config';
 import { ClustersService } from '../../services';

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

@@ -18,7 +18,8 @@ import {
   ToolbarGroup,
   Tooltip,
 } from '@patternfly/react-core';
-import { FilterIcon, SyncIcon } from '@patternfly/react-icons';
+import { FilterIcon } from '@patternfly/react-icons/dist/js/icons/filter-icon';
+import { SyncIcon } from '@patternfly/react-icons/dist/js/icons/sync-icon';
 import { clusterStatusLabels, isSelectEventChecked, ToolbarButton } from '../../../common';
 import { ResourceUIState } from '../../../common';
 import { fetchClustersAsync } from '../../store/slices/clusters/slice';

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

@@ -1,6 +1,7 @@
-import { CheckCircleIcon, InfoCircleIcon } from '@patternfly/react-icons';
+import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
+import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import React from 'react';
-import { global_success_color_100 as okColor } from '@patternfly/react-tokens';
+import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
 import { Text, TextList, TextListItem, TextContent } from '@patternfly/react-core';
 import {
   FeatureId,

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

@@ -218,3 +218,19 @@ export const isFeatureSupportedAndAvailable = (supportLevel: SupportLevel | unde
 
 export const hostsNetworkConfigurationDisabledReason =
   "DHCP only is the supported hosts' network configuration when external partner integrations is selected";
+
+export const getOdfIncompatibleWithLvmsReason = (operatorValues: OperatorsValues) => {
+  const mustDisableOdf = operatorValues.useOdfLogicalVolumeManager;
+  // In versions >= 4.15, it's not possible to select ODF + LVMS
+  return mustDisableOdf
+    ? `Currently, you can not install ${ODF_OPERATOR_LABEL} operator at the same time as ${LVMS_OPERATOR_LABEL} operator.`
+    : undefined;
+};
+
+export const getLvmsIncompatibleWithOdfReason = (operatorValues: OperatorsValues) => {
+  const mustDisableLvms = operatorValues.useOpenShiftDataFoundation;
+  // In versions >= 4.15, it's not possible to select ODF + LVMS
+  return mustDisableLvms
+    ? `Currently, you can not install ${LVMS_OPERATOR_LABEL} operator at the same time as ${ODF_OPERATOR_LABEL} operator.`
+    : undefined;
+};