@openshift-assisted/ui-lib 2.55.2 → 2.56.1

package/lib/common/components/ui/index.ts

@@ -11,9 +11,13 @@ export * from './eventsModal';
 export * from './PreviewBadge';
 export * from './TechnologyPreview';
 export * from './DeveloperPreview';
+export * from './CustomToolbarFilter';
 
 export * from './OpenShiftVersionDropdown';
 export * from './OpenShiftVersionModal';
+export * from './ConfirmationModal';
+export * from './SectionTitle';
+export * from './ViewClusterEventsButton';
 
 export * from './utils';
 
@@ -26,5 +30,4 @@ export { default as GridGap } from './GridGap';
 export { default as EventsList } from './EventsList';
 export { default as ClusterEventsToolbar } from './ClusterEventsToolbar';
 export { default as ModalProgress } from './ModalProgress';
-export { default as ConfirmationModal } from './ConfirmationModal';
 export { default as NoPermissionsError } from './NoPermissionsError';

package/lib/common/components/ui/uiState/EmptyState.tsx

@@ -6,17 +6,16 @@ import {
   EmptyStateActions,
 } from '@patternfly/react-core';
 import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon';
-import { ComponentType } from 'react';
 
 type Props = {
   title?: string;
   content?: React.ReactNode;
-  icon?: ComponentType;
+  icon?: React.ComponentType;
   primaryAction?: React.ReactNode;
   secondaryActions?: React.ReactNode[];
 };
 
-const EmptyState: React.FC<Props> = ({
+export const EmptyState: React.FC<Props> = ({
   title = 'No results found',
   content,
   icon = SearchIcon,
@@ -31,5 +30,3 @@ const EmptyState: React.FC<Props> = ({
     </PFEmptyState>
   </Bullseye>
 );
-
-export default EmptyState;

package/lib/common/components/ui/uiState/index.ts

@@ -1,3 +1,3 @@
-export { default as EmptyState } from './EmptyState';
+export * from './EmptyState';
 export { default as ErrorState } from './ErrorState';
 export { default as LoadingState } from './LoadingState';

package/lib/common/config/constants.ts

@@ -157,81 +157,6 @@ export const hostValidationLabels = (t: TFunction): { [key in HostValidationId]:
   'metallb-requirements-satisfied': t('ai:MetalLB requirements'),
 });
 
-export const hostValidationFailureHints = (
-  t: TFunction,
-): { [key in HostValidationId]: string } => ({
-  'compatible-with-cluster-platform': '',
-  'has-default-route': '',
-  'sufficient-network-latency-requirement-for-role': '',
-  'sufficient-packet-loss-requirement-for-role': '',
-  'has-inventory': '',
-  'inventory-not-partially-truncated': '',
-  'inventory-not-fully-truncated': '',
-  'has-min-cpu-cores': '',
-  'has-min-memory': '',
-  'has-min-valid-disks': '',
-  'has-cpu-cores-for-role': '',
-  'has-memory-for-role': '',
-  'hostname-unique': '',
-  'hostname-valid': '',
-  connected: '',
-  'media-connected': '',
-  'machine-cidr-defined': '',
-  'belongs-to-machine-cidr': '',
-  'ignition-downloadable': '',
-  'belongs-to-majority-group': '',
-  'valid-platform-network-settings': '',
-  'ntp-synced': t(
-    "ai:Manually fix the host's NTP configuration or provide additional NTP sources.",
-  ),
-  'time-synced-between-host-and-service': '',
-  'container-images-available': '',
-  'lso-requirements-satisfied': '',
-  'ocs-requirements-satisfied': '',
-  'odf-requirements-satisfied': '',
-  'lvm-requirements-satisfied': '',
-  'cnv-requirements-satisfied': '',
-  'disk-encryption-requirements-satisfied': '',
-  'sufficient-installation-disk-speed': '',
-  'api-domain-name-resolved-correctly': '',
-  'api-int-domain-name-resolved-correctly': '',
-  'apps-domain-name-resolved-correctly': '',
-  'release-domain-name-resolved-correctly': '',
-  'dns-wildcard-not-configured': '',
-  'non-overlapping-subnets': '',
-  'vsphere-disk-uuid-enabled': '',
-  'compatible-agent': '',
-  'no-skip-installation-disk': '',
-  'no-skip-missing-disk': '',
-  'no-ip-collisions-in-network': '',
-  'mce-requirements-satisfied': '',
-  'mtv-requirements-satisfied': '',
-  'no-iscsi-nic-belongs-to-machine-cidr': '',
-  'node-feature-discovery-requirements-satisfied': '',
-  'nvidia-gpu-requirements-satisfied': '',
-  'pipelines-requirements-satisfied': '',
-  'serverless-requirements-satisfied': '',
-  'servicemesh-requirements-satisfied': '',
-  'openshift-ai-requirements-satisfied': '',
-  'osc-requirements-satisfied': '',
-  'authorino-requirements-satisfied': '',
-  'mtu-valid': '',
-  'nmstate-requirements-satisfied': '',
-  'amd-gpu-requirements-satisfied': '',
-  'kmm-requirements-satisfied': '',
-  'node-healthcheck-requirements-satisfied': '',
-  'self-node-remediation-requirements-satisfied': '',
-  'fence-agents-remediation-requirements-satisfied': '',
-  'node-maintenance-requirements-satisfied': '',
-  'kube-descheduler-requirements-satisfied': '',
-  'cluster-observability-requirements-satisfied': '',
-  'loki-requirements-satisfied': '',
-  'openshift-logging-requirements-satisfied': '',
-  'numa-resources-requirements-satisfied': '',
-  'oadp-requirements-satisfied': '',
-  'metallb-requirements-satisfied': '',
-});
-
 export const clusterValidationLabels = (
   t: TFunction,
 ): { [key in ClusterValidationId]?: string } => ({

package/lib/common/hooks/index.ts

@@ -1,3 +1,6 @@
 export { default as useStateSafely } from './useStateSafely';
 export { default as useDeepCompareMemoize } from './useDeepCompareMemoize';
 export { useTranslation } from './use-translation-wrapper';
+
+export * from './useFieldErrorMsg';
+export * from './useFormikHelpers';

package/lib/common/index.ts

@@ -2,6 +2,7 @@ export * from './components';
 export * from './api';
 export * from './types';
 export * from './config';
+export * from './configurations';
 export * from './features';
 export * from './reducers';
 export * from './selectors';

package/lib/common/types/generateIsoFields.ts

@@ -11,3 +11,8 @@ export type TrustedCertificateFieldsType = {
   enableCertificate: boolean;
   trustBundle?: InfraEnv['additionalTrustBundle'];
 };
+
+export type NtpSourcesFieldsType = {
+  enableNtpSources: boolean;
+  ntpSourcesList: string;
+};

package/lib/common/utils.ts

@@ -4,6 +4,7 @@ import isString from 'lodash-es/isString.js';
 import { loadAll } from 'js-yaml';
 import { TFunction } from 'i18next';
 import { MAX_FILE_SIZE_BYTES, MAX_FILE_SIZE_OFFSET_FACTOR } from './configurations';
+import { MS_PER_DAY, TIME_ZERO } from './config';
 
 export const FILENAME_REGEX = /^[^\/]*\.(json|ya?ml(\.patch_?[a-zA-Z0-9_]*)?)$/;
 
@@ -142,3 +143,17 @@ export const isMajorMinorVersionEqualOrGreater = (checkVersion = '', toVersion:
 
   return checkVersionNum >= toVersionNum;
 };
+
+function diffInDaysBetweenDates(inputDate: string) {
+  const dateObject = new Date(inputDate);
+  const today = new Date();
+  return Math.floor(Math.abs(today.valueOf() - dateObject.valueOf()) / MS_PER_DAY);
+}
+
+export function calculateClusterDateDiff(inactiveDeletionDays: number, completedAt?: string) {
+  if (completedAt && completedAt !== TIME_ZERO) {
+    return inactiveDeletionDays - diffInDaysBetweenDates(completedAt);
+  } else {
+    return inactiveDeletionDays;
+  }
+}

package/lib/common/validationSchemas/proxyValidation.tsx

@@ -5,26 +5,32 @@ import { trimCommaSeparatedList } from '../components/ui/formik/utils';
 import { PROXY_DNS_REGEX } from './regexes';
 import { isIPorDN } from './utils';
 
-export const httpProxyValidationSchema = ({
-  values,
-  pairValueName,
-  allowEmpty,
-  t,
-}: {
+type ProxyUrlValidationParams = {
   values: ProxyFieldsType;
   pairValueName: 'httpProxy' | 'httpsProxy';
   allowEmpty?: boolean;
   t: TFunction;
-}) => {
+  allowedProtocols: string[];
+  formatErrorMessage: string;
+};
+
+const proxyUrlValidationSchema = ({
+  values,
+  pairValueName,
+  allowEmpty,
+  t,
+  allowedProtocols,
+  formatErrorMessage,
+}: ProxyUrlValidationParams) => {
   const validation = Yup.string().test(
     'http-proxy-validation',
-    t('ai:Provide a valid HTTP URL.'),
+    formatErrorMessage,
     (value?: string) => {
       if (!value) {
         return true;
       }
 
-      if (!value.startsWith('http://')) {
+      if (!allowedProtocols.some((protocol) => value.startsWith(protocol))) {
         return false;
       }
 
@@ -48,6 +54,24 @@ export const httpProxyValidationSchema = ({
   );
 };
 
+export const httpProxyValidationSchema = (
+  params: Omit<ProxyUrlValidationParams, 'allowedProtocols' | 'formatErrorMessage'>,
+) =>
+  proxyUrlValidationSchema({
+    ...params,
+    allowedProtocols: ['http://'],
+    formatErrorMessage: params.t('ai:Provide a valid HTTP URL.'),
+  });
+
+export const httpsProxyValidationSchema = (
+  params: Omit<ProxyUrlValidationParams, 'allowedProtocols' | 'formatErrorMessage'>,
+) =>
+  proxyUrlValidationSchema({
+    ...params,
+    allowedProtocols: ['http://', 'https://'],
+    formatErrorMessage: params.t('ai:Provide a valid HTTP or HTTPS URL.'),
+  });
+
 export const noProxyValidationSchema = (t: TFunction) =>
   Yup.string().test(
     'no-proxy-validation',

package/lib/ocm/components/AddHosts/AddHosts.tsx

@@ -12,9 +12,6 @@ import {
   Toolbar,
   ToolbarContent,
 } from '@patternfly/react-core';
-import { getApiErrorMessage, handleApiError } from '../../../common/api';
-import { DiscoveryImageModal } from '../clusterConfiguration/DiscoveryImageModal';
-import { ModalDialogsContextProvider } from '../hosts/ModalDialogsContext';
 import {
   ToolbarButton,
   getReadyHostCount,
@@ -22,14 +19,16 @@ import {
   AddHostsContext,
   alertsSlice,
   canInstallHost,
+  getApiErrorMessage,
+  handleApiError,
+  ViewClusterEventsButton,
 } from '../../../common';
-import InventoryAddHosts from './InventoryAddHost';
-import { onFetchEvents } from '../fetching/fetchEvents';
 import { HostsService } from '../../services';
-import ClusterDetailStatusVarieties, {
-  useClusterStatusVarieties,
-} from '../clusterDetail/ClusterDetailStatusVarieties';
-import ViewClusterEventsButton from '../../../common/components/ui/ViewClusterEventsButton';
+import { DiscoveryImageModal } from '../discoveryImage';
+import { ModalDialogsContextProvider } from '../hostsTable/modals/ModalDialogsContext';
+import { ClusterDetailStatusVarieties, useClusterStatusVarieties } from '../clusterDetail';
+import { onFetchEvents } from '../fetching/fetchEvents';
+import { InventoryAddHosts } from './InventoryAddHost';
 
 const { addAlert } = alertsSlice.actions;
 

package/lib/ocm/components/AddHosts/InventoryAddHost.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
 import { Content, Alert, AlertVariant, Stack, StackItem } from '@patternfly/react-core';
-import ClusterHostsTable from '../hosts/ClusterHostsTable';
-import InformationAndAlerts from '../clusterConfiguration/InformationAndAlerts';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { CpuArchitecture } from '../../../common';
+import { ClusterHostsTable } from '../hostsTable/ClusterHostsTable';
+import { InformationAndAlerts } from '../information';
 import Day2WizardContextProvider from './day2Wizard/Day2WizardContextProvider';
 import Day2DiscoveryImageModalButton from './day2Wizard/Day2DiscoveryImageModalButton';
 import Day2Wizard from './day2Wizard/Day2Wizard';
-import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
-const InventoryAddHosts = ({ cluster }: { cluster?: Cluster }) => {
+export const InventoryAddHosts = ({ cluster }: { cluster?: Cluster }) => {
   if (!cluster) {
     return null;
   }
@@ -43,5 +43,3 @@ const InventoryAddHosts = ({ cluster }: { cluster?: Cluster }) => {
     </Stack>
   );
 };
-
-export default InventoryAddHosts;

package/lib/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.tsx

@@ -1,6 +1,11 @@
-import { Alert, Grid, GridItem } from '@patternfly/react-core';
-import { Form, Formik } from 'formik';
 import React from 'react';
+import { Form, Formik } from 'formik';
+import { Alert, Grid, GridItem } from '@patternfly/react-core';
+import {
+  Cluster,
+  InfraEnv,
+  InfraEnvCreateParams,
+} from '@openshift-assisted/types/assisted-installer-service';
 import {
   ClusterCpuArchitecture,
   ClusterWizardStep,
@@ -12,25 +17,23 @@ import {
   HOW_TO_KNOW_IF_CLUSTER_SUPPORTS_MULTIPLE_CPU_ARCHS,
   LoadingState,
   SupportedCpuArchitecture,
+  handleApiError,
 } from '../../../../common';
-import { HostsNetworkConfigurationType, InfraEnvsService } from '../../../services';
-import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
-import { handleApiError } from '../../../../common/api';
+import {
+  HostsNetworkConfigurationType,
+  InfraEnvsService,
+  mapClusterCpuArchToInfraEnvCpuArch,
+} from '../../../services';
+import { usePullSecret } from '../../../hooks';
+import { useOpenShiftVersionsContext } from '../../../contexts';
+import { isOciPlatformType } from '../../utils';
+import { useModalDialogsContext } from '../../hostsTable/modals/ModalDialogsContext';
+import { CpuArchitectureDropdown } from '../../wizard/wizardFields/CpuArchitectureDropdown';
 import { Day2ClusterDetailValues } from '../types';
 import { useDay2WizardContext } from './Day2WizardContext';
-import Day2WizardNav from './Day2WizardNav';
-import Day2WizardFooter from './Day2WizardFooter';
+import { Day2WizardNav } from './Day2WizardNav';
+import { Day2WizardFooter } from './Day2WizardFooter';
 import Day2HostStaticIpConfigurations from './Day2StaticIpHostConfigurations';
-import { mapClusterCpuArchToInfraEnvCpuArch } from '../../../services/CpuArchitectureService';
-import CpuArchitectureDropdown from '../../clusterConfiguration/CpuArchitectureDropdown';
-import { usePullSecret } from '../../../hooks';
-import { useOpenShiftVersionsContext } from '../../clusterWizard/OpenShiftVersionsContext';
-import {
-  Cluster,
-  InfraEnv,
-  InfraEnvCreateParams,
-} from '@openshift-assisted/types/assisted-installer-service';
-import { isOciPlatformType } from '../../utils';
 
 const getDay2ClusterDetailInitialValues = async (
   clusterId: Cluster['id'],

package/lib/ocm/components/AddHosts/day2Wizard/Day2DiscoveryImageModalButton.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Button, ButtonVariant } from '@patternfly/react-core';
 import { AddHostsContext } from '../../../../common';
-import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
+import { useModalDialogsContext } from '../../hostsTable/modals/ModalDialogsContext';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 const Day2DiscoveryImageModalButton = ({ cluster }: { cluster: Cluster }) => {

package/lib/ocm/components/AddHosts/day2Wizard/Day2DownloadISO.tsx

@@ -1,10 +1,15 @@
 import React from 'react';
 import { Stack, StackItem } from '@patternfly/react-core';
-import { ClusterWizardStep, ClusterWizardStepHeader, DownloadIso, isSNO } from '../../../../common';
-import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
+import {
+  ClusterWizardStep,
+  ClusterWizardStepHeader,
+  DownloadIso,
+  isSNO,
+  DownloadIpxeScript,
+} from '../../../../common';
+import { useModalDialogsContext } from '../../hostsTable/modals/ModalDialogsContext';
 import { useDay2WizardContext } from './Day2WizardContext';
-import Day2WizardNav from './Day2WizardNav';
-import DownloadIpxeScript from '../../../../common/components/clusterConfiguration/DownloadIpxeScript';
+import { Day2WizardNav } from './Day2WizardNav';
 
 const Day2DownloadISO = () => {
   const { day2DiscoveryImageDialog } = useModalDialogsContext();

package/lib/ocm/components/AddHosts/day2Wizard/Day2GenerateISO.tsx

@@ -1,12 +1,11 @@
 import React from 'react';
 import { Stack, StackItem } from '@patternfly/react-core';
 import { ClusterWizardStep, ClusterWizardStepHeader } from '../../../../common';
-import DiscoveryImageForm from '../../clusterConfiguration/DiscoveryImageForm';
-import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
+import { useInfraEnvImageUrl, useInfraEnvIpxeImageUrl } from '../../../hooks';
+import { useModalDialogsContext } from '../../hostsTable/modals/ModalDialogsContext';
+import { DiscoveryImageForm } from '../../discoveryImage';
 import { useDay2WizardContext } from './Day2WizardContext';
-import Day2WizardNav from './Day2WizardNav';
-import useInfraEnvImageUrl from '../../../hooks/useInfraEnvImageUrl';
-import useInfraEnvIpxeImageUrl from '../../../hooks/useInfraEnvIpxeImageUrl';
+import { Day2WizardNav } from './Day2WizardNav';
 
 const Day2GenerateISO = () => {
   const { day2DiscoveryImageDialog } = useModalDialogsContext();

package/lib/ocm/components/AddHosts/day2Wizard/Day2StaticIP.tsx

@@ -7,6 +7,10 @@ import {
   Button,
   ButtonVariant,
 } from '@patternfly/react-core';
+import {
+  InfraEnv,
+  InfraEnvUpdateParams,
+} from '@openshift-assisted/types/assisted-installer-service';
 import {
   ClusterWizardStep,
   ClusterWizardStepHeader,
@@ -14,25 +18,23 @@ import {
   LoadingState,
 } from '../../../../common';
 import { HostsNetworkConfigurationType, InfraEnvsService } from '../../../services';
-import { FormViewHosts } from '../../clusterConfiguration/staticIp/components/FormViewHosts/FormViewHosts';
-import { FormViewNetworkWide } from '../../clusterConfiguration/staticIp/components/FormViewNetworkWide/FormViewNetworkWide';
+import { useModalDialogsContext } from '../../hostsTable/modals/ModalDialogsContext';
 import {
+  StaticIpInfo,
+  getDummyStaticIpInfo,
+  YamlView,
+  StaticIpViewRadioGroup,
+  FormViewNetworkWide,
+  FormViewHosts,
   StaticIpFormState,
+  getStaticIpInfo,
+  StaticIpView,
   StaticIpViewProps,
-} from '../../clusterConfiguration/staticIp/components/propTypes';
-import StaticIpViewRadioGroup from '../../clusterConfiguration/staticIp/components/StaticIpViewRadioGroup';
-import { YamlView } from '../../clusterConfiguration/staticIp/components/YamlView/YamlView';
-import { StaticIpInfo, StaticIpView } from '../../clusterConfiguration/staticIp/data/dataTypes';
-import { getStaticIpInfo } from '../../clusterConfiguration/staticIp/data/fromInfraEnv';
-import { getDummyStaticIpInfo } from '../../clusterConfiguration/staticIp/data/dummyData';
-import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
+} from '../../wizard/steps/staticIp';
+
 import { useDay2WizardContext } from './Day2WizardContext';
-import Day2WizardNav from './Day2WizardNav';
-import Day2WizardFooter from './Day2WizardFooter';
-import {
-  InfraEnv,
-  InfraEnvUpdateParams,
-} from '@openshift-assisted/types/assisted-installer-service';
+import { Day2WizardNav } from './Day2WizardNav';
+import { Day2WizardFooter } from './Day2WizardFooter';
 
 const Day2StaticIP = () => {
   const { day2DiscoveryImageDialog } = useModalDialogsContext();

package/lib/ocm/components/AddHosts/day2Wizard/Day2Wizard.tsx

@@ -2,12 +2,12 @@ import React from 'react';
 import { Modal, ModalVariant, WizardHeader } from '@patternfly/react-core';
 import classNames from 'classnames';
 import { ClusterWizardStep } from '../../../../common';
-import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
+import { useModalDialogsContext } from '../../hostsTable/modals/ModalDialogsContext';
 import Day2ClusterDetails from './Day2ClusterDetails';
 import Day2DownloadISO from './Day2DownloadISO';
 import Day2GenerateISO from './Day2GenerateISO';
 import Day2StaticIP from './Day2StaticIP';
-import Day2WizardNav from './Day2WizardNav';
+import { Day2WizardNav } from './Day2WizardNav';
 import { useDay2WizardContext } from './Day2WizardContext';
 
 const Day2WizardStep = () => {

package/lib/ocm/components/AddHosts/day2Wizard/Day2WizardContext.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { HostsNetworkConfigurationType } from '../../../services';
-import { StaticIpView } from '../../clusterConfiguration/staticIp/data/dataTypes';
-import { Day2WizardStepsType } from './constants';
 import { CpuArchitecture } from '../../../../common';
+import { StaticIpView } from '../../wizard/steps/staticIp';
+import { Day2WizardStepsType } from './constants';
 
 export type Day2WizardContextType = {
   currentStepId: Day2WizardStepsType;

package/lib/ocm/components/AddHosts/day2Wizard/Day2WizardContextProvider.tsx

@@ -1,14 +1,14 @@
 import React, { PropsWithChildren } from 'react';
 import Day2WizardContext, { Day2WizardContextType } from './Day2WizardContext';
+import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 import {
   AssistedInstallerOCMPermissionTypesListType,
   CpuArchitecture,
   getDefaultCpuArchitecture,
 } from '../../../../common';
-import { Day2WizardStepsType, defaultWizardSteps, staticIpFormViewSubSteps } from './constants';
 import { HostsNetworkConfigurationType } from '../../../services';
-import { StaticIpView } from '../../clusterConfiguration/staticIp/data/dataTypes';
-import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
+import { StaticIpView } from '../../wizard/steps/staticIp';
+import { Day2WizardStepsType, defaultWizardSteps, staticIpFormViewSubSteps } from './constants';
 
 const getWizardStepIds = (staticIpView?: string): Day2WizardStepsType[] => {
   const stepIds: Day2WizardStepsType[] = [...defaultWizardSteps];

package/lib/ocm/components/AddHosts/day2Wizard/Day2WizardFooter.tsx

@@ -10,7 +10,7 @@ type Day2WizardFooterProps = {
   onNext?: () => void;
 };
 
-const Day2WizardFooter = ({
+export const Day2WizardFooter = ({
   isSubmitting,
   isNextDisabled,
   onNext,
@@ -45,5 +45,3 @@ const Day2WizardFooter = ({
     />
   );
 };
-
-export default Day2WizardFooter;

package/lib/ocm/components/AddHosts/day2Wizard/Day2WizardNav.tsx

@@ -2,9 +2,9 @@ import React from 'react';
 import { WizardNav, WizardNavItem } from '@patternfly/react-core';
 import { Day2WizardStepsType, day2WizardStepNames, staticIpFormViewSubSteps } from './constants';
 import { useDay2WizardContext } from './Day2WizardContext';
-import { isStaticIpStep } from '../../clusterWizard/wizardTransition';
+import { isStaticIpStep } from '../../wizard/utils/wizardTransition';
 
-const Day2WizardNav = () => {
+export const Day2WizardNav = () => {
   const wizardContext = useDay2WizardContext();
 
   const isStepIdxAfterCurrent = (idx: number) => {
@@ -71,5 +71,3 @@ const Day2WizardNav = () => {
 
   return <WizardNav data-testid="day2-wizard-nav">{getWizardNavItems()}</WizardNav>;
 };
-
-export default Day2WizardNav;

package/lib/ocm/components/AddHosts/types.ts

@@ -1,6 +1,9 @@
-import { OcmCpuArchitecture, SupportedCpuArchitecture } from '../../../common';
+import {
+  NewFeatureSupportLevelMap,
+  OcmCpuArchitecture,
+  SupportedCpuArchitecture,
+} from '../../../common';
 import { HostsNetworkConfigurationType } from '../../services';
-import { FeaturesSupportsLevel } from '../../../common/components/featureSupportLevels/types';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 /* The type is reverse engineered.
@@ -50,7 +53,7 @@ export type OcmClusterType = {
   };
 
   aiCluster?: Cluster;
-  aiSupportLevels?: FeaturesSupportsLevel;
+  aiSupportLevels?: { features: NewFeatureSupportLevelMap };
 };
 
 export type Day2ClusterDetailValues = {

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

@@ -1,32 +1,40 @@
 import React from 'react';
 import { useNavigate } from 'react-router';
 import { Stack, StackItem, Content, ButtonVariant, GridItem, Grid } from '@patternfly/react-core';
-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';
+import {
+  ToolbarButton,
+  Alerts,
+  getEnabledHosts,
+  selectOlmOperators,
+  isSNO,
+  handleApiError,
+  isInOcm,
+  useNewFeatureSupportLevel,
+  ClusterProgress,
+} from '../../../common';
 import { routeBasePath } from '../../config';
-import ClusterDetailStatusVarieties, {
-  useClusterStatusVarieties,
-} from './ClusterDetailStatusVarieties';
-import ClusterProgress from '../../../common/components/clusterDetail/ClusterProgress';
-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 '../../../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';
+import { updateCluster } from '../../store/slices/current-cluster/slice';
+import { onFetchEvents } from '../fetching/fetchEvents';
+import {
+  ClusterToolbar,
+  ClusterDetailsButtonGroup,
+  OcmClusterProgressItems,
+  ClusterSummaryExpandable,
+  HostInventoryExpandable,
+  getProgressAlerts,
+  ClusterDetailStatusVarieties,
+  useClusterStatusVarieties,
+} from './components';
+import { getClusterDetailId } from './utils';
 
 type ClusterDetailProps = {
   cluster: Cluster;
 };
 
-const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
+export const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
   const clusterVarieties = useClusterStatusVarieties(cluster);
   const featureSupportLevelContext = useNewFeatureSupportLevel();
   const isSNOExpansionAllowed =
@@ -67,7 +75,7 @@ const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
             <OcmClusterProgressItems cluster={cluster} onFetchEvents={onFetchEvents} />
           </GridItem>
           <GridItem span={6}>
-            {getClusterProgressAlerts(
+            {getProgressAlerts(
               getEnabledHosts(cluster.hosts),
               cluster,
               selectOlmOperators(cluster),
@@ -113,5 +121,3 @@ const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
     </Stack>
   );
 };
-
-export default ClusterDetail;