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

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

@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux';
 import { useAlerts, LoadingState, ClusterWizardStep } 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';

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 {

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

@@ -0,0 +1,25 @@
+import React from 'react';
+import { TextContent, Text, Split, SplitItem } from '@patternfly/react-core';
+import { ASSISTED_INSTALLER_DOCUMENTATION_LINK, ExternalLink } from '../../../common';
+
+export const AssistedInstallerHeader = () => {
+  return (
+    <TextContent>
+      <Text component="h1" className="pf-u-display-inline">
+        Install OpenShift with the Assisted Installer
+      </Text>
+      <Split hasGutter>
+        <SplitItem>
+          <ExternalLink href={ASSISTED_INSTALLER_DOCUMENTATION_LINK}>
+            Assisted Installer documentation
+          </ExternalLink>
+        </SplitItem>
+        <SplitItem>
+          <Text component="a" data-testid="whats-new-link">
+            What's new in Assisted Installer?
+          </Text>
+        </SplitItem>
+      </Split>
+    </TextContent>
+  );
+};

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

@@ -1,21 +1,12 @@
 import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
+import { PageSection, PageSectionVariants, Text, TextContent } from '@patternfly/react-core';
 import {
-  PageSection,
-  PageSectionVariants,
-  Split,
-  SplitItem,
-  Text,
-  TextContent,
-} from '@patternfly/react-core';
-import {
-  ASSISTED_INSTALLER_DOCUMENTATION_LINK,
   AddHostsContextProvider,
   AlertsContextProvider,
   CpuArchitecture,
   ErrorState,
-  ExternalLink,
   ResourceUIState,
 } from '../../../common';
 import ClusterDetail from '../clusterDetail/ClusterDetail';
@@ -32,7 +23,7 @@ import { routeBasePath } from '../../config';
 import ClusterWizardContextProvider from '../clusterWizard/ClusterWizardContextProvider';
 import useInfraEnv from '../../hooks/useInfraEnv';
 import { SentryErrorMonitorContextProvider } from '../SentryErrorMonitorContextProvider';
-import { forceReload } from '../../reducers/clusters';
+import { forceReload } from '../../store/slices/current-cluster/slice';
 import { ClusterUiError } from './ClusterPageErrors';
 import ClusterLoading from './ClusterLoading';
 import ClusterPollingErrorModal from '../clusterDetail/ClusterPollingErrorModal';
@@ -41,6 +32,7 @@ import { BackButton } from '../ui/Buttons/BackButton';
 import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { usePullSecret } from '../../hooks';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
+import { AssistedInstallerHeader } from './AssistedInstallerHeader';
 
 type MatchParams = {
   clusterId: string;
@@ -113,23 +105,7 @@ const ClusterPageGeneric: React.FC<{ clusterId: string; showBreadcrumbs?: boolea
           {showBreadcrumbs && <ClusterBreadcrumbs clusterName={cluster.name} />}
           {showBreadcrumbs && (
             <PageSection variant={PageSectionVariants.light}>
-              <TextContent>
-                <Text component="h1" className="pf-u-display-inline">
-                  Install OpenShift with the Assisted Installer
-                </Text>
-                <Split hasGutter>
-                  <SplitItem>
-                    <ExternalLink href={ASSISTED_INSTALLER_DOCUMENTATION_LINK}>
-                      Assisted Installer documentation
-                    </ExternalLink>
-                  </SplitItem>
-                  <SplitItem>
-                    <Text component="a" data-testid="whats-new-link">
-                      What's new in Assisted Installer?
-                    </Text>
-                  </SplitItem>
-                </Split>
-              </TextContent>
+              <AssistedInstallerHeader />
             </PageSection>
           )}
 

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 import { RouteComponentProps } from 'react-router-dom';
 import {
   Button,
@@ -10,8 +9,6 @@ import {
   PageSection,
 } from '@patternfly/react-core';
 import { AddCircleOIcon } from '@patternfly/react-icons';
-
-import { selectClusterTableRows, selectClustersUIState } from '../../selectors/clusters';
 import {
   ResourceUIState,
   Alerts,
@@ -22,11 +19,7 @@ import {
   AlertsContextProvider,
 } from '../../../common';
 import ClustersTable from './ClustersTable';
-import {
-  fetchClustersAsync,
-  deleteCluster,
-  ClustersDispatch,
-} from '../../reducers/clusters/clustersSlice';
+import { fetchClustersAsync, deleteCluster } from '../../store/slices/clusters/slice';
 import { handleApiError, getApiErrorMessage } from '../../api';
 import ClusterBreadcrumbs from './ClusterBreadcrumbs';
 import { routeBasePath } from '../../config';
@@ -34,6 +27,11 @@ import { ClustersService } from '../../services';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import ClusterPollingErrorModal from '../clusterDetail/ClusterPollingErrorModal';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useSelectorDay1, useDispatchDay1 } from '../../store';
+import {
+  selectClustersUIState,
+  selectClusterTableRows,
+} from '../../store/slices/clusters/selectors';
 
 type ClustersProps = RouteComponentProps;
 
@@ -41,13 +39,13 @@ const Clusters: React.FC<ClustersProps> = ({ history }) => {
   const { LOADING, EMPTY, POLLING_ERROR, RELOADING } = ResourceUIState;
   const { addAlert } = useAlerts();
   const { t } = useTranslation();
-  const clusterRows = useSelector(selectClusterTableRows(t));
-  const clustersUIState = useSelector(selectClustersUIState);
+  const clusterRows = useSelectorDay1(selectClusterTableRows(t));
+  const clustersUIState = useSelectorDay1(selectClustersUIState);
   const uiState = React.useRef(clustersUIState);
   if (clustersUIState !== RELOADING) {
     uiState.current = clustersUIState;
   }
-  const dispatch = useDispatch<ClustersDispatch>();
+  const dispatch = useDispatchDay1();
   const deleteClusterAsync = React.useCallback(
     async (clusterId: Cluster['id']) => {
       try {

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import {
   Toolbar,
@@ -22,13 +21,14 @@ import {
 import { FilterIcon, SyncIcon } from '@patternfly/react-icons';
 import { clusterStatusLabels, isSelectEventChecked, ToolbarButton } from '../../../common';
 import { ResourceUIState } from '../../../common';
-import { selectClustersUIState } from '../../selectors';
-import { ClustersDispatch, fetchClustersAsync } from '../../reducers/clusters';
+import { fetchClustersAsync } from '../../store/slices/clusters/slice';
 import { routeBasePath } from '../../config';
 import omit from 'lodash-es/omit.js';
 import { TFunction } from 'i18next';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useDispatchDay1, useSelectorDay1 } from '../../store';
+import { selectClustersUIState } from '../../store/slices/clusters/selectors';
 
 export type ClusterFiltersType = {
   [key: string]: string[]; // value from clusterStatusLabels
@@ -52,8 +52,8 @@ const ClustersListToolbar: React.FC<ClustersListToolbarProps> = ({
 }) => {
   const [isStatusExpanded, setStatusExpanded] = React.useState(false);
   const history = useHistory();
-  const clustersUIState = useSelector(selectClustersUIState);
-  const dispatch = useDispatch<ClustersDispatch>();
+  const clustersUIState = useSelectorDay1(selectClustersUIState);
+  const dispatch = useDispatchDay1();
   const fetchClusters = React.useCallback(() => void dispatch(fetchClustersAsync()), [dispatch]);
 
   const onClearAllFilters: ToolbarProps['clearAllFilters'] = () => {

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

@@ -17,10 +17,13 @@ import {
 } from '@patternfly/react-table';
 import { ClusterTableRows } from '../../../common/types/clusters';
 import DeleteClusterModal from './DeleteClusterModal';
-import { ClusterRowDataProps, getClusterTableStatusCell } from '../../selectors/clusters';
 import { clusterStatusLabels, rowSorter, HumanizedSortable } from '../../../common';
 import ClustersListToolbar, { ClusterFiltersType } from './ClustersListToolbar';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import {
+  ClusterRowDataProps,
+  getClusterTableStatusCell,
+} from '../../store/slices/clusters/selectors';
 
 type DeleteClusterID = Pick<ClusterRowDataProps, 'id' | 'name'>;
 

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

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { PageSectionVariants, TextContent, Text, PageSection } from '@patternfly/react-core';
+import { PageSectionVariants, PageSection } from '@patternfly/react-core';
 import { AlertsContextProvider } from '../../../common';
 import ClusterBreadcrumbs from './ClusterBreadcrumbs';
 import { ClusterDefaultConfigurationProvider } from '../clusterConfiguration/ClusterDefaultConfigurationContext';
@@ -9,6 +9,7 @@ import { SentryErrorMonitorContextProvider } from '../SentryErrorMonitorContextP
 import ClusterLoading from './ClusterLoading';
 import { ClusterUiError } from './ClusterPageErrors';
 import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
+import { AssistedInstallerHeader } from './AssistedInstallerHeader';
 
 const NewClusterPageGeneric: React.FC<{ pageTitleSection?: ReactNode }> = ({
   pageTitleSection,
@@ -38,11 +39,7 @@ const NewClusterTitleSection: React.FC = () => (
   <>
     <ClusterBreadcrumbs clusterName="New cluster" />
     <PageSection variant={PageSectionVariants.light}>
-      <TextContent>
-        <Text component="h1" className="pf-u-display-inline">
-          Install OpenShift with the Assisted Installer
-        </Text>
-      </TextContent>
+      <AssistedInstallerHeader />
     </PageSection>
   </>
 );

package/lib/ocm/components/clusters/clusterPolling.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { useSelector, useDispatch } from 'react-redux';
 import { ResourceUIState, POLLING_INTERVAL } from '../../../common';
 import {
   fetchClusterAsync,
@@ -7,10 +6,10 @@ import {
   forceReload,
   cancelForceReload,
   FetchErrorType,
-  ClusterDispatch,
-} from '../../reducers/clusters';
-import { selectCurrentClusterState } from '../../selectors';
+} from '../../store/slices/current-cluster/slice';
+import { selectCurrentClusterState } from '../../store/slices/current-cluster/selectors';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useDispatchDay1, useSelectorDay1 } from '../../store';
 
 const shouldRefetch = (uiState: ResourceUIState, hasClusterData: boolean) => {
   if (uiState === ResourceUIState.POLLING_ERROR) {
@@ -24,7 +23,7 @@ const shouldRefetch = (uiState: ResourceUIState, hasClusterData: boolean) => {
 };
 
 export const useFetchCluster = (clusterId: string) => {
-  const dispatch = useDispatch<ClusterDispatch>();
+  const dispatch = useDispatchDay1();
   return React.useCallback(() => {
     if (clusterId) {
       void dispatch(fetchClusterAsync(clusterId));
@@ -39,8 +38,9 @@ export const useClusterPolling = (
   uiState: ResourceUIState;
   errorDetail: FetchErrorType | undefined;
 } => {
-  const { isReloadScheduled, uiState, data, errorDetail } = useSelector(selectCurrentClusterState);
-  const dispatch = useDispatch();
+  const { isReloadScheduled, uiState, data, errorDetail } =
+    useSelectorDay1(selectCurrentClusterState);
+  const dispatch = useDispatchDay1();
   const fetchCluster = useFetchCluster(clusterId);
   const hasClusterData = !!data;
 

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

@@ -134,6 +134,16 @@ const getNetworkTypeSelectionDisabledReason = (cluster: Cluster | undefined) =>
   return undefined;
 };
 
+const getOciDisabledReason = (cpuArchitecture: string | undefined, isSupported: boolean) => {
+  if (!isSupported) {
+    if (cpuArchitecture === CpuArchitecture.s390x || cpuArchitecture === CpuArchitecture.ppc64le) {
+      return `Integration with Oracle is not available with the selected CPU architecture.`;
+    } else {
+      return 'Integration with Oracle is available for OpenShift 4.14 and later versions.';
+    }
+  }
+};
+
 export const getNewFeatureDisabledReason = (
   featureId: FeatureId,
   cluster: Cluster | undefined,
@@ -164,17 +174,21 @@ export const getNewFeatureDisabledReason = (
       return 'Cluster-managed networking is not supported for ARM architecture with this version of OpenShift.';
     }
     case 'EXTERNAL_PLATFORM_OCI': {
-      if (cpuArchitecture === 's390x') {
-        return "Can't set Oracle platform on s390x architecture";
-      } else {
-        return 'Integration with Oracle is available for OpenShift 4.14 and later versions.';
-      }
+      return getOciDisabledReason(cpuArchitecture, isSupported);
     }
     case 'MCE': {
       if (!isSupported) {
         return 'Multicluster engine is not supported in this OpenShift version.';
-      } else {
-        return undefined;
+      }
+    }
+    case 'NUTANIX_INTEGRATION': {
+      if (!isSupported) {
+        return `Integration with Nutanix is not available with the selected CPU architecture.`;
+      }
+    }
+    case 'VSPHERE_INTEGRATION': {
+      if (!isSupported) {
+        return `Integration with vSphere is not available with the selected CPU architecture.`;
       }
     }
     default: {

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

@@ -26,7 +26,7 @@ import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { hardwareStatusColumn } from './HardwareStatus';
 import HostsTableEmptyState from '../hosts/HostsTableEmptyState';
 import { useSelector } from 'react-redux';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
 

package/lib/ocm/components/hosts/use-hosts-table.tsx

@@ -20,7 +20,7 @@ import {
   setServerUpdateError,
   updateCluster,
   updateHost,
-} from '../../reducers/clusters';
+} from '../../store/slices/current-cluster/slice';
 import { useModalDialogsContext } from './ModalDialogsContext';
 import { downloadHostInstallationLogs, onAdditionalNtpSourceAction } from './utils';
 import {
@@ -47,7 +47,6 @@ import UpdateDay2ApiVipModal from './UpdateDay2ApiVipModal';
 import { UpdateDay2ApiVipFormProps } from './UpdateDay2ApiVipForm';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { selectCurrentClusterPermissionsState, selectCurrentClusterState } from '../../selectors';
 import { hardwareStatusColumn } from './HardwareStatus';
 import { ClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 import {
@@ -57,6 +56,10 @@ import {
   Host,
   HostUpdateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
+import {
+  selectCurrentClusterPermissionsState,
+  selectCurrentClusterState,
+} from '../../store/slices/current-cluster/selectors';
 
 export const useHostsTable = (cluster: Cluster) => {
   const { addAlert } = useAlerts();

package/lib/ocm/components/hosts/utils.ts

@@ -2,7 +2,7 @@ import { saveAs } from 'file-saver';
 import type { AlertsContextType } from '../../../common';
 
 import { isInOcm, handleApiError, getApiErrorMessage } from '../../api';
-import { updateCluster } from '../../reducers/clusters';
+import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { ClustersService } from '../../services';
 import ClustersAPI from '../../../common/api/assisted-service/ClustersAPI';
 import { stringToJSON } from '../../../common/utils';

package/lib/ocm/components/index.ts

@@ -1,7 +1,7 @@
 export * from './clusterDetail';
 export * from './clusters';
 export * from './ui';
-export * from './Router';
+export * from './Routes';
 export * from './AddHosts';
 export * from './clusterWizard';
 export * from './HostsClusterDetailTab';

package/lib/ocm/components/ui/OcmFormFields.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { Checkbox, CheckboxProps, Radio, RadioProps } from '@patternfly/react-core';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import {
   CheckboxField,
   CodeField,