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

package/lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx

@@ -8,35 +8,65 @@ import {
   FormGroup,
   Split,
   SplitItem,
+  Tooltip,
 } from '@patternfly/react-core';
 import { CaretDownIcon } from '@patternfly/react-icons';
 import { useField } from 'formik';
-import { getFieldId } from '../../../../common';
-import {
-  ExternalPlatformLabels,
-  ExternalPlatformLinks,
-  ExternalPlatformTooltips,
-} from './constants';
+import { CpuArchitecture, DeveloperPreview, FeatureId, getFieldId } from '../../../../common';
+import { ExternalPlaformIds, ExternalPlatformLabels, ExternalPlatformLinks } from './constants';
 import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
+import {
+  NewFeatureSupportLevelData,
+  NewFeatureSupportLevelMap,
+  useNewFeatureSupportLevel,
+} from '../../../../common/components/newFeatureSupportLevels';
 
 const INPUT_NAME = 'platform';
 const fieldId = getFieldId(INPUT_NAME, 'input');
 
 type ExternalPlatformDropdownProps = {
   showOciOption: boolean;
-  disabledOciTooltipContent: React.ReactNode;
-  isOciDisabled: boolean;
   onChange: (selectedPlatform: PlatformType) => void;
+  cpuArchitecture?: string;
+  featureSupportLevelData: NewFeatureSupportLevelMap | null;
+  isSNO: boolean;
 };
 
 export type ExternalPlatformInfo = {
   label: string;
   href?: string;
-  tooltip?: string;
+  disabledReason?: string;
+};
+
+const getDisabledReasonForExternalPlatform = (
+  isSNO: boolean,
+  newFeatureSupportLevelContext: NewFeatureSupportLevelData,
+  platform: PlatformType,
+  featureSupportLevelData?: NewFeatureSupportLevelMap | null,
+  cpuArchitecture?: string,
+): string | undefined => {
+  if (!isSNO) {
+    return newFeatureSupportLevelContext.getFeatureDisabledReason(
+      ExternalPlaformIds[platform] as FeatureId,
+      featureSupportLevelData ?? undefined,
+      cpuArchitecture,
+    );
+  } else if (platform === 'nutanix' || platform === 'vsphere') {
+    return `${ExternalPlatformLabels[platform]} integration is not supported for Single-Node OpenShift.`;
+  } else if (
+    cpuArchitecture === CpuArchitecture.ppc64le ||
+    cpuArchitecture === CpuArchitecture.s390x
+  ) {
+    return `Plaform integration is not supported for Single-Node OpenShift with the selected CPU architecture.`;
+  }
 };
 
 const getExternalPlatformTypes = (
   showOciOption: boolean,
+  isSNO: boolean,
+  newFeatureSupportLevelContext: NewFeatureSupportLevelData,
+  featureSupportLevelData?: NewFeatureSupportLevelMap | null,
+  cpuArchitecture?: string,
 ): Partial<{ [key in PlatformType]: ExternalPlatformInfo }> => {
   const platforms = ['none', 'nutanix', showOciOption && 'oci', 'vsphere'] as PlatformType[];
 
@@ -46,44 +76,98 @@ const getExternalPlatformTypes = (
       [platform]: {
         label: ExternalPlatformLabels[platform],
         href: ExternalPlatformLinks[platform],
-        tooltip: ExternalPlatformTooltips[platform],
+        disabledReason: getDisabledReasonForExternalPlatform(
+          isSNO,
+          newFeatureSupportLevelContext,
+          platform,
+          featureSupportLevelData ?? undefined,
+          cpuArchitecture,
+        ),
       },
     }),
     {},
   );
 };
 
+export const areAllExternalPlatformIntegrationDisabled = (
+  externalPlatformTypes: Partial<{ [key in PlatformType]: ExternalPlatformInfo }>,
+): boolean => {
+  return Object.values(externalPlatformTypes)
+    .filter((info) => info.label !== 'No platform integration')
+    .every((info) => info.disabledReason !== undefined);
+};
+
 export const ExternalPlatformDropdown = ({
   showOciOption,
-  disabledOciTooltipContent,
-  isOciDisabled,
   onChange,
+  cpuArchitecture,
+  featureSupportLevelData,
+  isSNO,
 }: ExternalPlatformDropdownProps) => {
-  const [field, { value, initialValue }, { setValue }] = useField<string>(INPUT_NAME);
+  const [field, , { setValue }] = useField<string>(INPUT_NAME);
   const [isOpen, setOpen] = React.useState(false);
+  const [externalPlatformTypes, setExternalPlatformTypes] = React.useState<
+    Partial<{ [key in PlatformType]: ExternalPlatformInfo }>
+  >({});
+
+  const tooltipDropdownDisabled = `Platform integration is not supported when ${
+    cpuArchitecture || ''
+  } is selected`;
+
   const handleClick = (event: MouseEvent<HTMLButtonElement>, href: string) => {
     event.stopPropagation(); // Stop event propagation here
     window.open(href, '_blank');
   };
+  const newFeatureSupportLevelContext = useNewFeatureSupportLevel();
+  React.useEffect(() => {
+    // Calculate updated externalPlatformTypes based on the dependencies
+    const updatedExternalPlatformTypes = getExternalPlatformTypes(
+      showOciOption,
+      isSNO,
+      newFeatureSupportLevelContext,
+      featureSupportLevelData,
+      cpuArchitecture,
+    );
 
-  const externalPlatformTypes = getExternalPlatformTypes(showOciOption);
+    // Update the state with the new externalPlatformTypes
+    setExternalPlatformTypes(updatedExternalPlatformTypes);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [featureSupportLevelData, cpuArchitecture, isSNO]);
+
+  const dropdownIsDisabled = React.useMemo(() => {
+    return areAllExternalPlatformIntegrationDisabled(externalPlatformTypes);
+  }, [externalPlatformTypes]);
+
+  React.useEffect(() => {
+    let isCurrentValueDisabled = false;
+
+    if (field.value !== 'none') {
+      isCurrentValueDisabled =
+        externalPlatformTypes[field.value as PlatformType]?.disabledReason !== undefined;
+    }
+    if (dropdownIsDisabled || isCurrentValueDisabled) {
+      setValue('none');
+      onChange('none');
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [dropdownIsDisabled, externalPlatformTypes]);
 
   const enabledItems = Object.keys(externalPlatformTypes).map((platform) => {
-    const isOracleDisabled = platform === 'oci' && isOciDisabled;
-    const { label, href, tooltip } = externalPlatformTypes[
+    const { label, href, disabledReason } = externalPlatformTypes[
       platform as PlatformType
     ] as ExternalPlatformInfo;
-
     return (
-      <DropdownItem
-        key={platform}
-        id={platform}
-        tooltip={isOracleDisabled ? disabledOciTooltipContent : tooltip}
-        isAriaDisabled={isOracleDisabled}
-        tooltipProps={{ position: 'top-start' }}
-      >
+      <DropdownItem key={platform} id={platform} isAriaDisabled={disabledReason !== undefined}>
         <Split>
-          <SplitItem>{label}</SplitItem>
+          <SplitItem>
+            <Tooltip hidden={!disabledReason} content={disabledReason} position="top">
+              <div>
+                {label}
+                {platform === 'oci' && <DeveloperPreview testId={'oci-support-level`'} />}
+              </div>
+            </Tooltip>
+          </SplitItem>
           {!!href && (
             <>
               <SplitItem isFilled />
@@ -114,12 +198,6 @@ export const ExternalPlatformDropdown = ({
     [setOpen, setValue, onChange],
   );
 
-  React.useEffect(() => {
-    if (value === 'oci' && isOciDisabled) {
-      setValue('none');
-    }
-  }, [initialValue, isOciDisabled, setValue, value]);
-
   const toggle = React.useMemo(
     () => (
       <DropdownToggle
@@ -127,11 +205,12 @@ export const ExternalPlatformDropdown = ({
         toggleIndicator={CaretDownIcon}
         isText
         className="pf-u-w-100"
+        isDisabled={dropdownIsDisabled}
       >
-        {externalPlatformTypes[value as PlatformType]?.label}
+        {externalPlatformTypes[field.value as PlatformType]?.label}
       </DropdownToggle>
     ),
-    [externalPlatformTypes, value],
+    [externalPlatformTypes, field, dropdownIsDisabled],
   );
 
   return (
@@ -140,15 +219,23 @@ export const ExternalPlatformDropdown = ({
       fieldId={fieldId}
       label={'Integrate with external partner platforms'}
     >
-      <Dropdown
-        {...field}
-        id={fieldId}
-        dropdownItems={enabledItems}
-        toggle={toggle}
-        isOpen={isOpen}
-        className="pf-u-w-100"
-        onSelect={onSelect}
-      />
+      <Tooltip
+        content={tooltipDropdownDisabled}
+        hidden={!dropdownIsDisabled}
+        position="top"
+        distance={7}
+      >
+        <Dropdown
+          {...field}
+          id={fieldId}
+          dropdownItems={enabledItems}
+          toggle={toggle}
+          isOpen={isOpen}
+          className="pf-u-w-100"
+          onSelect={onSelect}
+          disabled={dropdownIsDisabled}
+        />
+      </Tooltip>
     </FormGroup>
   );
 };

package/lib/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegrationNote.tsx

@@ -10,14 +10,16 @@ const PlatformIntegrationNote = ({ platformType }: { platformType: SupportedPlat
     <p>
       <ExclamationTriangleIcon color={warningColor.value} size="sm" /> You will need to modify your
       platform configuration after cluster installation is completed.{' '}
-      <a
-        href={integrationPlatformLink || ''}
-        target="_blank"
-        rel="noopener noreferrer"
-        data-ouia-component-id="vm-integration-kb-page"
-      >
-        Learn more <i className="fas fa-external-link-alt" />
-      </a>
+      {!!integrationPlatformLink && (
+        <a
+          href={integrationPlatformLink || ''}
+          target="_blank"
+          rel="noopener noreferrer"
+          data-ouia-component-id="vm-integration-kb-page"
+        >
+          Learn more <i className="fas fa-external-link-alt" />
+        </a>
+      )}
     </p>
   );
 };

package/lib/ocm/components/clusterConfiguration/platformIntegration/constants.tsx

@@ -5,7 +5,7 @@ export const ExternalPlatformLabels: { [key in PlatformType]: string } = {
   baremetal: 'No platform integration',
   none: 'No platform integration',
   nutanix: 'Nutanix',
-  oci: 'Oracle  (Requires a custom manifest)',
+  oci: 'Oracle Cloud Infrastructure (Requires a custom manifest)',
   vsphere: 'vSphere',
 };
 
@@ -14,6 +14,10 @@ export const ExternalPlatformLinks: Partial<{ [key in PlatformType]: string }> =
   vsphere: VSPHERE_CONFIG_LINK,
 };
 
-export const ExternalPlatformTooltips: Partial<{ [key in PlatformType]: string }> = {
-  oci: "To integrate with an external partner (for example, Oracle Cloud), you'll need to provide a custom manifest.",
+export const ExternalPlaformIds: { [key in PlatformType]: string } = {
+  baremetal: '',
+  none: '',
+  nutanix: 'NUTANIX_INTEGRATION',
+  oci: 'EXTERNAL_PLATFORM_OCI',
+  vsphere: 'VSPHERE_INTEGRATION',
 };

package/lib/ocm/components/clusterConfiguration/review/ReviewStep.tsx

@@ -4,12 +4,12 @@ import { ActionListItem, Button, ButtonVariant, Grid, GridItem } from '@patternf
 import { ClusterWizardStepHeader, useAlerts, ClusterWizardStep } from '../../../../common';
 import { useClusterWizardContext } from '../../clusterWizard/ClusterWizardContext';
 import { getApiErrorMessage, handleApiError } from '../../../api';
-import { updateCluster } from '../../../reducers/clusters';
+import { updateCluster } from '../../../store/slices/current-cluster/slice';
 import ClusterWizardFooter from '../../clusterWizard/ClusterWizardFooter';
 import ClusterWizardNavigation from '../../clusterWizard/ClusterWizardNavigation';
 import { ClustersService } from '../../../services';
 import { useStateSafely } from '../../../../common/hooks';
-import { selectCurrentClusterPermissionsState } from '../../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../../store/slices/current-cluster/selectors';
 import ReviewPreflightChecks from './ReviewPreflightChecks';
 import ReviewSummary from './ReviewSummary';
 import './ReviewCluster.css';

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

@@ -7,7 +7,7 @@ import { useAlerts, useFormikAutoSave } from '../../../../../common';
 import { useErrorMonitor } from '../../../../../common/components/ErrorHandling/ErrorMonitorContext';
 import { getApiErrorMessage } from '../../../../api';
 import { StaticIpFormProps } from './propTypes';
-import { selectCurrentClusterPermissionsState } from '../../../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
 
 const AutosaveWithParentUpdate = <StaticIpFormValues extends object>({
   onFormStateChange,

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

@@ -16,11 +16,11 @@ import { FieldArray, FieldArrayRenderProps, useField } from 'formik';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import { getFormikArrayItemFieldName, LoadingState } from '../../../../../common';
 import ConfirmationModal from '../../../../../common/components/ui/ConfirmationModal';
+import { HostStaticNetworkConfig } from '@openshift-assisted/types/assisted-installer-service';
 import {
-  selectIsCurrentClusterSNO,
   selectCurrentClusterPermissionsState,
-} from '../../../../selectors';
-import { HostStaticNetworkConfig } from '@openshift-assisted/types/assisted-installer-service';
+  selectIsCurrentClusterSNO,
+} from '../../../../store/slices/current-cluster/selectors';
 
 const fieldName = 'hosts';
 

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

@@ -5,8 +5,8 @@ import { PlusCircleIcon } from '@patternfly/react-icons';
 import { getFormikArrayItemFieldName, RemovableField } from '../../../../../../common';
 import { OcmInputField } from '../../../../ui/OcmFormFields';
 import { useSelector } from 'react-redux';
-import { selectCurrentClusterPermissionsState } from '../../../../../selectors';
 import { MacInterfaceMap } from '@openshift-assisted/types/assisted-installer-service';
+import { selectCurrentClusterPermissionsState } from '../../../../../store/slices/current-cluster/selectors';
 
 const AddMapping: React.FC<{
   onPush: ArrayHelpers['push'];

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import { Card, CardBody, CardHeader, Title } from '@patternfly/react-core';
-import { store } from '../../store';
+import { storeDay1 } from '../../store';
 import { OCM_CLUSTER_LIST_LINK } from '../../config';
 import {
   AlertsContextProvider,
@@ -49,7 +49,7 @@ const LoadingCard = () => (
   </Card>
 );
 
-const ClusterLoadFailed = ({ clusterId }: { clusterId: Cluster['id'] }) => {
+const ClusterLoadFailed = ({ clusterId, error }: { clusterId: Cluster['id']; error?: string }) => {
   const fetchCluster = useFetchCluster(clusterId);
   return (
     <Card data-testid="ai-cluster-details-card">
@@ -63,6 +63,7 @@ const ClusterLoadFailed = ({ clusterId }: { clusterId: Cluster['id'] }) => {
           title="Failed to fetch the cluster"
           fetchData={fetchCluster}
           actions={[<BackButton key={'cancel'} to={OCM_CLUSTER_LIST_LINK} />]}
+          content={error}
         />
       </CardBody>
     </Card>
@@ -106,10 +107,11 @@ const AssistedInstallerDetailCard = ({
     pullSecret,
     cluster?.openshiftVersion,
   );
+
   if (uiState === ResourceUIState.LOADING || infraEnvLoading) {
     return <LoadingCard />;
   } else if ((uiState === ResourceUIState.POLLING_ERROR && !cluster) || infraEnvError) {
-    return <ClusterLoadFailed clusterId={aiClusterId} />;
+    return <ClusterLoadFailed clusterId={aiClusterId} error={infraEnvError} />;
   }
 
   if (!cluster || !infraEnv || cluster.status === 'adding-hosts') {
@@ -158,7 +160,7 @@ const AssistedInstallerDetailCard = ({
 };
 
 const Wrapper = (props: AssistedInstallerDetailCardProps) => (
-  <Provider store={store}>
+  <Provider store={storeDay1}>
     <AlertsContextProvider>
       <AssistedInstallerDetailCard {...props} />
     </AlertsContextProvider>

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { store } from '../../store';
+import { storeDay1 } from '../../store';
 import { useSelector } from 'react-redux';
 
 import {
@@ -10,11 +10,11 @@ import {
   FeatureListType,
 } from '../../../common';
 import ClusterProperties from './ClusterProperties';
-import { selectCurrentClusterState } from '../../selectors';
 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';
 
 type AssistedInstallerExtraDetailCardProps = {
   allEnabledFeatures: FeatureListType;
@@ -58,7 +58,7 @@ const AssistedInstallerExtraDetailCard: React.FC<AssistedInstallerExtraDetailCar
 };
 
 const Wrapper: React.FC<AssistedInstallerExtraDetailCardProps> = (props) => (
-  <Provider store={store}>
+  <Provider store={storeDay1}>
     <AlertsContextProvider>
       <AssistedInstallerExtraDetailCard {...props} />
     </AlertsContextProvider>

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

@@ -9,7 +9,7 @@ import {
   TextContent,
 } from '@patternfly/react-core';
 import { getApiErrorMessage, handleApiError } from '../../api';
-import { updateCluster } from '../../reducers/clusters/currentClusterSlice';
+import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
 import { ErrorState, LoadingState } from '../../../common';
 import { ClustersAPI } from '../../services/apis';

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

@@ -28,7 +28,7 @@ import ClusterProgress from '../../../common/components/clusterDetail/ClusterPro
 import { onFetchEvents } from '../fetching/fetchEvents';
 import { getClusterProgressAlerts } from './getProgressBarAlerts';
 import { ClustersAPI } from '../../services/apis';
-import { updateCluster } from '../../reducers/clusters';
+import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { handleApiError, isInOcm } from '../../api';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import OcmClusterProgressItems from '../clusterConfiguration/OcmClusterProgressItems';

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

@@ -12,7 +12,7 @@ import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens';
 
 import { getApiErrorMessage, handleApiError } from '../../api';
-import { updateCluster } from '../../reducers/clusters/currentClusterSlice';
+import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { calculateCollectedLogsCount } from '../clusters/utils';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
 import { ErrorState, LoadingState } from '../../../common';

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

@@ -1,10 +1,10 @@
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
-import { useAlerts, LoadingState, ClusterWizardStep } from '../../../common';
+import { useAlerts, LoadingState, ClusterWizardStep, ErrorState } from '../../../common';
 import { usePullSecret } from '../../hooks';
 import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
-import { setServerUpdateError, updateCluster } from '../../reducers/clusters';
+import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { canNextClusterDetails, ClusterWizardFlowStateNew } from './wizardTransition';
 import { useOpenshiftVersions, useManagedDomains, useUsedClusterNames } from '../../hooks';
@@ -34,9 +34,6 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   const pullSecret = usePullSecret();
   const { error: errorOCPVersions, loading: loadingOCPVersions, versions } = useOpenshiftVersions();
   const { customManifests } = useClusterCustomManifests(cluster?.id || '', false);
-  React.useEffect(() => {
-    errorOCPVersions && addAlert(errorOCPVersions);
-  }, [errorOCPVersions, addAlert]);
 
   const handleClusterUpdate = React.useCallback(
     async (clusterId: Cluster['id'], params: ClusterDetailsUpdateParams) => {
@@ -92,14 +89,22 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
     [clearAlerts, addAlert, dispatch, history, handleCustomManifestsChange],
   );
 
+  const navigation = <ClusterWizardNavigation cluster={cluster} />;
   if (pullSecret === undefined || !managedDomains || loadingOCPVersions || !usedClusterNames) {
     return (
-      <ClusterWizardStep navigation={<ClusterWizardNavigation cluster={cluster} />}>
+      <ClusterWizardStep navigation={navigation}>
         <LoadingState />
       </ClusterWizardStep>
     );
   }
-  const navigation = <ClusterWizardNavigation cluster={cluster} />;
+
+  if (!cluster && errorOCPVersions) {
+    return (
+      <ClusterWizardStep navigation={navigation}>
+        <ErrorState title="Failed to retrieve OpenShift versions" />
+      </ClusterWizardStep>
+    );
+  }
 
   return (
     <ClusterDetailsForm

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

@@ -10,6 +10,7 @@ import {
   getClusterDetailsValidationSchema,
   getRichTextValidation,
   CpuArchitecture,
+  useAlerts,
 } from '../../../common';
 import { canNextClusterDetails } from './wizardTransition';
 import { OpenshiftVersionOptionType, getFormikErrorFields } from '../../../common';
@@ -22,7 +23,7 @@ import {
 } from '../../services';
 import { OcmClusterDetailsFormFields } from '../clusterConfiguration/OcmClusterDetailsFormFields';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import {
@@ -71,7 +72,7 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
   const { search } = useLocation();
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const featureSupportLevels = useNewFeatureSupportLevel();
-
+  const { clearAlerts } = useAlerts();
   const handleSubmit = React.useCallback(
     async (values: OcmClusterDetailsValues) => {
       if (cluster) {
@@ -108,6 +109,7 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
       cluster?: Cluster,
     ): (() => void) => {
       if (isViewerMode || (!dirty && !isUndefined(cluster) && canNextClusterDetails({ cluster }))) {
+        clearAlerts();
         return moveNext;
       }
 
@@ -115,7 +117,7 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
         void submitForm();
       };
     },
-    [isViewerMode, moveNext],
+    [isViewerMode, moveNext, clearAlerts],
   );
 
   const initialValues = React.useMemo(

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

@@ -7,8 +7,8 @@ import { WithErrorBoundary } from '../../../common/components/ErrorHandling/With
 import { CustomManifestsPage } from '../clusterConfiguration/manifestsConfiguration/CustomManifestsPage';
 import { CustomManifestFormState } from '../clusterConfiguration/manifestsConfiguration/components/propTypes';
 import { useSelector } from 'react-redux';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 
 const getInitialFormStateProps = () => {
   return {

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

@@ -13,11 +13,11 @@ import HostInventory from '../clusterConfiguration/HostInventory';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { canNextHostDiscovery } from './wizardTransition';
 import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
-import { setServerUpdateError, updateCluster } from '../../reducers/clusters';
+import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
 import ClusterWizardFooter from './ClusterWizardFooter';
 import ClusterWizardNavigation from './ClusterWizardNavigation';
 import { ClustersService, HostDiscoveryService } from '../../services';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import {
   Cluster,
   V2ClusterUpdateParams,

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

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

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

@@ -1,41 +1,28 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { Stack, StackItem } from '@patternfly/react-core';
-import { ClusterOperatorProps, ClusterWizardStepHeader, useFeature } from '../../../common';
-import { selectIsCurrentClusterSNO } from '../../selectors';
+import { ClusterOperatorProps, ClusterWizardStepHeader } from '../../../common';
 import CnvCheckbox from '../clusterConfiguration/operators/CnvCheckbox';
 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';
 
 export const OperatorsStep = (props: ClusterOperatorProps) => {
   const isSNO = useSelector(selectIsCurrentClusterSNO);
-  const isOpenshiftDataFoundationEnabled = useFeature('ASSISTED_INSTALLER_OCS_FEATURE') && !isSNO;
-  const isContainerNativeVirtualizationEnabled = useFeature('ASSISTED_INSTALLER_CNV_FEATURE');
 
   return (
     <Stack hasGutter data-testid={'operators-form'}>
       <StackItem>
         <ClusterWizardStepHeader>Operators</ClusterWizardStepHeader>
       </StackItem>
-      {isContainerNativeVirtualizationEnabled && (
-        <StackItem>
-          <CnvCheckbox {...props} />
-        </StackItem>
-      )}
+      <StackItem>
+        <CnvCheckbox {...props} />
+      </StackItem>
       <StackItem>
         <MceCheckbox />
       </StackItem>
-      {isOpenshiftDataFoundationEnabled && (
-        <StackItem>
-          <OdfCheckbox />
-        </StackItem>
-      )}
-      {isSNO && (
-        <StackItem>
-          <LvmCheckbox {...props} />
-        </StackItem>
-      )}
+      <StackItem>{isSNO ? <LvmCheckbox {...props} /> : <OdfCheckbox />}</StackItem>
     </Stack>
   );
 };

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

@@ -10,8 +10,8 @@ import {
 } from '../clusterConfiguration/staticIp/components/propTypes';
 import { StaticIpPage } from '../clusterConfiguration/staticIp/components/StaticIpPage';
 import { WithErrorBoundary } from '../../../common/components/ErrorHandling/WithErrorBoundary';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 
 const getInitialFormStateProps = () => {
   return {