@openshift-assisted/ui-lib 2.38.5 → 2.39.0

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/BondsSelect.tsx

@@ -11,7 +11,7 @@ const bondsList = [
   { value: 'balance-rr', label: 'Balance-rr (0)', default: false },
   { value: 'active-backup', label: 'Active-Backup (1)', default: true },
   { value: 'balance-xor', label: 'Balance-xor (2)', default: false },
-  { value: 'broadcast', label: 'Broadcast (3)', default: false },
+  { value: 'broadcase', label: 'Broadcase (3)', default: false },
   { value: '802.3ad', label: '802.3ad (4)', default: false },
   { value: 'balance-tlb', label: 'Balance-tlb (5)', default: false },
   { value: 'balance-alb', label: 'Balance-alb (6)', default: false },

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

@@ -18,11 +18,22 @@ const AutosaveWithParentUpdate = <StaticIpFormValues extends object>({
 }) => {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const emptyValues = React.useMemo(() => getEmptyValues(), []);
-  const { isSubmitting, isValid, touched, errors, values } = useFormikContext<StaticIpFormValues>();
+  const { isSubmitting, isValid, touched, errors, values, initialValues, submitForm } =
+    useFormikContext<StaticIpFormValues>();
+
   const isEmpty = React.useMemo<boolean>(() => {
     return isEqual(values, emptyValues);
   }, [values, emptyValues]);
+
   const isAutoSaveRunning = useFormikAutoSave();
+
+  React.useEffect(() => {
+    if (!isEqual(emptyValues, initialValues)) {
+      void submitForm();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   React.useEffect(() => {
     onFormStateChange({ isSubmitting, isAutoSaveRunning, isValid, touched, errors, isEmpty });
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -89,13 +100,7 @@ export const StaticIpForm = <StaticIpFormValues extends object>({
 
   const onSubmit = isViewerMode ? () => Promise.resolve() : handleSubmit;
   return (
-    <Formik
-      initialValues={initialValues}
-      onSubmit={onSubmit}
-      validate={validate}
-      validateOnMount
-      enableReinitialize
-    >
+    <Formik initialValues={initialValues} onSubmit={onSubmit} validate={validate} validateOnMount>
       <Form>
         {children}
         <AutosaveWithParentUpdate<StaticIpFormValues>

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

@@ -28,7 +28,7 @@ import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { usePullSecret } from '../../hooks';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { useFeatureDetection } from '../../hooks/use-feature-detection';
-import { OpenshiftVersionsContextProvider } from '../clusterWizard/OpenshiftVersionsContext';
+import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVersionsContext';
 import {
   unstable_HistoryRouter as HistoryRouter,
   HistoryRouterProps,
@@ -147,7 +147,7 @@ const AssistedInstallerDetailCard = ({
 
   const clusterDetailCard = (
     <AlertsContextProvider>
-      <OpenshiftVersionsContextProvider>
+      <OpenShiftVersionsContextProvider>
         <SentryErrorMonitorContextProvider>
           <ModalDialogsContextProvider>
             <ClusterDefaultConfigurationProvider
@@ -170,7 +170,7 @@ const AssistedInstallerDetailCard = ({
             </ClusterDefaultConfigurationProvider>
           </ModalDialogsContextProvider>
         </SentryErrorMonitorContextProvider>
-      </OpenshiftVersionsContextProvider>
+      </OpenShiftVersionsContextProvider>
     </AlertsContextProvider>
   );
 

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

@@ -11,7 +11,7 @@ import useInfraEnv from '../../hooks/useInfraEnv';
 import { usePullSecret } from '../../hooks';
 import { selectCurrentClusterState } from '../../store/slices/current-cluster/selectors';
 import { useFeatureDetection } from '../../hooks/use-feature-detection';
-import { OpenshiftVersionsContextProvider } from '../clusterWizard/OpenshiftVersionsContext';
+import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVersionsContext';
 
 type AssistedInstallerExtraDetailCardProps = {
   allEnabledFeatures: FeatureListType;
@@ -58,9 +58,9 @@ const Wrapper: React.FC<AssistedInstallerExtraDetailCardProps> = (props) => {
   return (
     <Provider store={storeDay1}>
       <AlertsContextProvider>
-        <OpenshiftVersionsContextProvider>
+        <OpenShiftVersionsContextProvider>
           <AssistedInstallerExtraDetailCard {...props} />
-        </OpenshiftVersionsContextProvider>
+        </OpenShiftVersionsContextProvider>
       </AlertsContextProvider>
     </Provider>
   );

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { UiIcon, getOpenshiftVersionText } from '../../../common';
-import { useOpenshiftVersionsContext } from '../clusterWizard/OpenshiftVersionsContext';
+import { useOpenShiftVersionsContext } from '../clusterWizard/OpenShiftVersionsContext';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { Popover, Text, TextContent, TextVariants } from '@patternfly/react-core';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
@@ -28,7 +28,7 @@ const UnsupportedVersion = ({ version }: { version: string }) => {
 
 const OpenShiftVersionDetail = ({ cluster }: { cluster: Cluster }) => {
   const { openshiftVersion } = cluster;
-  const { isSupportedOpenShiftVersion, latestVersions: versions } = useOpenshiftVersionsContext();
+  const { isSupportedOpenShiftVersion, latestVersions: versions } = useOpenShiftVersionsContext();
   const isSupported = isSupportedOpenShiftVersion(openshiftVersion);
 
   const version = React.useMemo(() => {

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

@@ -8,7 +8,7 @@ import { setServerUpdateError, updateCluster } from '../../store/slices/current-
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { canNextClusterDetails, ClusterWizardFlowStateNew } from './wizardTransition';
 import { useManagedDomains, useUsedClusterNames } from '../../hooks';
-import { useOpenshiftVersionsContext } from './OpenshiftVersionsContext';
+import { useOpenShiftVersionsContext } from './OpenShiftVersionsContext';
 import ClusterDetailsForm from './ClusterDetailsForm';
 import ClusterWizardNavigation from './ClusterWizardNavigation';
 import {
@@ -36,7 +36,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
     error: errorOCPVersions,
     loading: loadingOCPVersions,
     latestVersions: versions,
-  } = useOpenshiftVersionsContext();
+  } = useOpenShiftVersionsContext();
   const location = useLocation();
 
   const handleClusterUpdate = React.useCallback(

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

@@ -31,6 +31,7 @@ import {
   InfraEnv,
   ManagedDomain,
 } from '@openshift-assisted/types/assisted-installer-service';
+import { useFeature } from '../../hooks/use-feature';
 
 type ClusterDetailsFormProps = {
   cluster?: Cluster;
@@ -67,6 +68,7 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
   const { search } = useLocation();
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const { clearAlerts } = useAlerts();
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
 
   const handleSubmit = React.useCallback(
     async (values: OcmClusterDetailsValues) => {
@@ -175,7 +177,11 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
               <GridItem span={12} lg={10} xl={9} xl2={7}>
                 <OcmClusterDetailsFormFields
                   versions={ocpVersions}
-                  forceOpenshiftVersion={cluster?.openshiftVersion}
+                  forceOpenshiftVersion={
+                    isSingleClusterFeatureEnabled
+                      ? ocpVersions[0].version
+                      : cluster?.openshiftVersion
+                  }
                   isPullSecretSet={!!cluster?.pullSecretSet}
                   defaultPullSecret={pullSecret}
                   isOcm={isInOcm}

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

@@ -16,6 +16,7 @@ import {
   InfraEnv,
   InfraEnvUpdateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
+import KubeconfigDownload from './KubeconfigDownload';
 
 type ClusterWizardProps = {
   cluster: Cluster;
@@ -44,6 +45,8 @@ const ClusterWizard = ({ cluster, infraEnv, updateInfraEnv }: ClusterWizardProps
       case 'static-ip-network-wide-configurations':
       case 'static-ip-yaml-view':
         return <StaticIp cluster={cluster} infraEnv={infraEnv} updateInfraEnv={updateInfraEnv} />;
+      case 'kubeconfig-download':
+        return <KubeconfigDownload cluster={cluster} />;
       case 'cluster-details':
       default:
         return <ClusterDetails cluster={cluster} infraEnv={infraEnv} />;

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

@@ -69,8 +69,7 @@ const getWizardStepIds = (
     stepsCopy = removeStepFromClusterWizard(stepsCopy, 'custom-manifests', 1);
   }
   if (isSingleClusterFeatureEnabled) {
-    // tentatively removed, proper waiting on support by backend
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'operators', 1);
+    stepsCopy = addStepToClusterWizard(stepsCopy, 'networking', ['kubeconfig-download']);
   }
 
   return stepsCopy;

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

@@ -15,6 +15,8 @@ import ClusterWizardStepValidationsAlert from '../../../common/components/cluste
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { onFetchEvents } from '../fetching/fetchEvents';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useFeature } from '../../hooks/use-feature';
+import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
 
 type ClusterValidationSectionProps = {
   cluster?: Cluster;
@@ -82,9 +84,16 @@ const ClusterWizardFooter = ({
 }: ClusterWizardFooterProps) => {
   const { alerts } = useAlerts();
   const navigate = useNavigate();
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
+  const { currentStepId } = useClusterWizardContext();
+  const { resetSingleClusterDialog } = useModalDialogsContext();
 
   const handleCancel = React.useCallback(() => navigate('/cluster-list'), [navigate]);
 
+  const handleReset = React.useCallback(() => {
+    resetSingleClusterDialog.open({ cluster });
+  }, [resetSingleClusterDialog, cluster]);
+
   const alertsSection = alerts.length ? <Alerts /> : undefined;
 
   const errorsSection = (
@@ -100,7 +109,12 @@ const ClusterWizardFooter = ({
     <WizardFooter
       alerts={alertsSection}
       errors={errorsSection}
-      onCancel={onCancel || handleCancel}
+      onCancel={isSingleClusterFeatureEnabled ? undefined : onCancel || handleCancel}
+      onReset={
+        isSingleClusterFeatureEnabled && currentStepId !== 'cluster-details'
+          ? handleReset
+          : undefined
+      }
       leftExtraActions={additionalActions}
       cluster={cluster}
       onFetchEvents={onFetchEvents}

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

@@ -0,0 +1,39 @@
+import React from 'react';
+import { ClusterWizardStep, ClusterWizardStepHeader } from '../../../common';
+import { useClusterWizardContext } from './ClusterWizardContext';
+import ClusterWizardFooter from './ClusterWizardFooter';
+import ClusterWizardNavigation from './ClusterWizardNavigation';
+import { WithErrorBoundary } from '../../../common/components/ErrorHandling/WithErrorBoundary';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { Checkbox } from '@patternfly/react-core';
+
+const KubeconfigDownload: React.FC<{ cluster: Cluster }> = ({ cluster }) => {
+  const [isChecked, setIsChecked] = React.useState<boolean>(false);
+  const clusterWizardContext = useClusterWizardContext();
+
+  const footer = (
+    <ClusterWizardFooter
+      cluster={cluster}
+      onNext={() => clusterWizardContext.moveNext()}
+      onBack={() => clusterWizardContext.moveBack()}
+      isNextDisabled={!isChecked}
+      nextButtonText="Download Kubeconfig"
+    />
+  );
+
+  return (
+    <ClusterWizardStep navigation={<ClusterWizardNavigation cluster={cluster} />} footer={footer}>
+      <WithErrorBoundary title="Failed to load Kubeconfig Download step">
+        <ClusterWizardStepHeader>Download Kubeconfig</ClusterWizardStepHeader>
+        <Checkbox
+          id="Kubeconfig-download-agreement"
+          isChecked={isChecked}
+          onChange={() => setIsChecked(!isChecked)}
+          label="I understand that I need to download Kubeconfig file prior of proceeding with the cluster installation."
+        />
+      </WithErrorBoundary>
+    </ClusterWizardStep>
+  );
+};
+
+export default KubeconfigDownload;

package/lib/ocm/components/clusterWizard/{OpenshiftVersionsContext.tsx → OpenShiftVersionsContext.tsx}

@@ -8,7 +8,7 @@ import { getKeys } from '../../../common/utils';
 const supportedVersionLevels = ['production', 'maintenance'];
 
 type OpenShiftVersion = Cluster['openshiftVersion'];
-type OpenshiftVersionsContextType = {
+type OpenShiftVersionsContextType = {
   allVersions: OpenshiftVersionOptionType[];
   latestVersions: OpenshiftVersionOptionType[];
   isSupportedOpenShiftVersion: (version: OpenShiftVersion) => boolean;
@@ -17,9 +17,9 @@ type OpenshiftVersionsContextType = {
   loading: boolean;
 };
 
-const OpenshiftVersionsContext = createContext<OpenshiftVersionsContextType | null>(null);
+const OpenShiftVersionsContext = createContext<OpenShiftVersionsContextType | null>(null);
 
-export const OpenshiftVersionsContextProvider = ({ children }: { children: React.ReactNode }) => {
+export const OpenShiftVersionsContextProvider = ({ children }: { children: React.ReactNode }) => {
   const [allVersions, setAllVersions] = React.useState<OpenshiftVersionOptionType[]>([]);
   const [latestVersions, setLatestVersions] = React.useState<OpenshiftVersionOptionType[]>([]);
   const [error, setError] = React.useState<{ title: string; message: string }>();
@@ -107,7 +107,7 @@ export const OpenshiftVersionsContextProvider = ({ children }: { children: React
   );
 
   return (
-    <OpenshiftVersionsContext.Provider
+    <OpenShiftVersionsContext.Provider
       value={{
         allVersions,
         latestVersions,
@@ -118,14 +118,14 @@ export const OpenshiftVersionsContextProvider = ({ children }: { children: React
       }}
     >
       {children}
-    </OpenshiftVersionsContext.Provider>
+    </OpenShiftVersionsContext.Provider>
   );
 };
 
-export const useOpenshiftVersionsContext = () => {
-  const context = React.useContext(OpenshiftVersionsContext);
+export const useOpenShiftVersionsContext = () => {
+  const context = React.useContext(OpenShiftVersionsContext);
   if (!context) {
-    throw new Error('useOpenshiftVersionsContext must be used within OpenshiftVersionsContext');
+    throw new Error('useOpenShiftVersionsContext must be used within OpenShiftVersionsContext');
   }
   return context;
 };

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

@@ -22,6 +22,11 @@ import {
   OPERATOR_NAME_PIPELINES,
   OPERATOR_NAME_SERVERLESS,
   OPERATOR_NAME_SERVICEMESH,
+  OPERATOR_NAME_NODE_HEALTHCHECK,
+  OPERATOR_NAME_SELF_NODE_REMEDIATION,
+  OPERATOR_NAME_FENCE_AGENTS_REMEDIATION,
+  OPERATOR_NAME_NODE_MAINTENANCE,
+  OPERATOR_NAME_KUBE_DESCHEDULER,
   OperatorsValues,
   selectMonitoredOperators,
   useAlerts,
@@ -60,6 +65,11 @@ export const getOperatorsInitialValues = (
     useNvidiaGpu: isOperatorEnabled([OPERATOR_NAME_NVIDIA_GPU]),
     useAmdGpu: isOperatorEnabled([OPERATOR_NAME_AMD_GPU]),
     useKmm: isOperatorEnabled([OPERATOR_NAME_KMM]),
+    useNodeHealthcheck: isOperatorEnabled([OPERATOR_NAME_NODE_HEALTHCHECK]),
+    useSelfNodeRemediation: isOperatorEnabled([OPERATOR_NAME_SELF_NODE_REMEDIATION]),
+    useFenceAgentsRemediation: isOperatorEnabled([OPERATOR_NAME_FENCE_AGENTS_REMEDIATION]),
+    useNodeMaintenance: isOperatorEnabled([OPERATOR_NAME_NODE_MAINTENANCE]),
+    useKubeDescheduler: isOperatorEnabled([OPERATOR_NAME_KUBE_DESCHEDULER]),
   };
 };
 

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

@@ -48,8 +48,8 @@ import {
   getOpenShiftAIIncompatibleWithLvmsReason,
 } from '../featureSupportLevels/featureStateUtils';
 import OpenshiftAINvidiaRequirements from '../clusterConfiguration/operators/OpenshiftAINvidiaRequirements';
-import OpenshiftAIAmdRequirements from '../clusterConfiguration/operators/OpenshiftAIAmdRequirements';
 import VirtualizationRequirements from '../clusterConfiguration/operators/VirtualizationRequirements';
+import OpenshiftAIAmdRequirements from '../clusterConfiguration/operators/OpenshiftAIAmdRequirements';
 
 const operatorsThatCanNotBeInstalledAlone = [
   'nvdia-gpu',
@@ -58,6 +58,13 @@ const operatorsThatCanNotBeInstalledAlone = [
   'serverless',
   'authorino',
   'lso',
+  'amd-gpu',
+  'nvidia-gpu',
+  'node-healthcheck',
+  'self-node-remediation',
+  'fence-agents-remediation',
+  'node-maintenance',
+  'kube-descheduler',
 ];
 
 export const OperatorsStep = (props: ClusterOperatorProps) => {
@@ -68,7 +75,7 @@ export const OperatorsStep = (props: ClusterOperatorProps) => {
   );
 
   const [bundles, setBundles] = useState<Bundle[]>([]);
-  const [isExpanded, setIsExpanded] = useState(true);
+  const [isExpanded, setIsExpanded] = useState(false);
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [supportedOperators, setSupportedOperators] = useState<string[]>([]);
   const [searchTerm, setSearchTerm] = useState('');
@@ -335,7 +342,7 @@ export const OperatorsStep = (props: ClusterOperatorProps) => {
             : hasIncompatibleOperators
             ? 'Some operators in this bundle can not be installed with some single operators selected.'
             : hasAnotherAIBundleSelected
-            ? 'This bundle cannot be selected because you already have another Openshift AI bundle selected.'
+            ? 'This bundle cannot be selected because you already have another OpenShift AI bundle selected.'
             : '';
           return (
             <GalleryItem key={bundle.id}>
@@ -420,11 +427,12 @@ export const OperatorsStep = (props: ClusterOperatorProps) => {
         } selected)`}
         onToggle={() => setIsExpanded(!isExpanded)}
         isExpanded={isExpanded}
+        data-testid="single-operators-section"
       >
         <Stack hasGutter data-testid={'operators-form'}>
           {supportedOperators.map((operatorKey) => {
             const isOperatorSelected = bundleOperators.includes(operatorKey);
-            const isOperatorPartOfAIBundle =
+            const isOperatorNotAllowedAlone =
               operatorsThatCanNotBeInstalledAlone.includes(operatorKey);
             const disabledReason = getDisabledReasonForOperator(operatorKey, values);
             const featureSupportLevel = featureSupportLevelData.getFeatureSupportLevel(
@@ -444,7 +452,7 @@ export const OperatorsStep = (props: ClusterOperatorProps) => {
                   disabledReason={
                     isOperatorSelected
                       ? 'This operator is part of a bundle and cannot be deselected.'
-                      : isOperatorPartOfAIBundle
+                      : isOperatorNotAllowedAlone
                       ? 'This operator cannot be installed as a standalone'
                       : disabledReason
                   }

package/lib/ocm/components/clusterWizard/constants.ts

@@ -11,6 +11,7 @@ export const wizardStepNames: { [key in ClusterWizardStepsType]: string } = {
   networking: 'Networking',
   'custom-manifests': 'Custom manifests',
   review: 'Review and create',
+  'kubeconfig-download': 'Download Kubeconfig',
 };
 
 export const defaultWizardSteps: ClusterWizardStepsType[] = [

package/lib/ocm/components/clusterWizard/index.ts

@@ -1,3 +1,5 @@
 export { default as ClusterDetailsForm } from './ClusterDetailsForm';
 export { default as NewClusterWizard } from './NewClusterWizard';
+export { default as ClusterWizard } from './ClusterWizard';
 export { default as ClusterWizardContextProvider } from './ClusterWizardContextProvider';
+export { OpenShiftVersionsContextProvider } from './OpenShiftVersionsContext';

package/lib/ocm/components/clusterWizard/wizardTransition.ts

@@ -28,7 +28,8 @@ export type ClusterWizardStepsType =
   | 'storage'
   | 'networking'
   | 'review'
-  | 'custom-manifests';
+  | 'custom-manifests'
+  | 'kubeconfig-download';
 
 const wizardStepsOrder: ClusterWizardStepsType[] = [
   'cluster-details',
@@ -40,6 +41,7 @@ const wizardStepsOrder: ClusterWizardStepsType[] = [
   'storage',
   'networking',
   'custom-manifests',
+  'kubeconfig-download',
   'review',
 ];
 
@@ -245,6 +247,8 @@ const reviewStepValidationsMap: WizardStepValidationMap = {
   softValidationIds: [],
 };
 
+const kubeconfigValidationMap = buildEmptyValidationsMap();
+
 const customManifestsValidationsMap = buildEmptyValidationsMap();
 
 export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardStepsType> = {
@@ -258,6 +262,7 @@ export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardSt
   storage: storageStepValidationsMap,
   networking: networkingStepValidationsMap,
   review: reviewStepValidationsMap,
+  'kubeconfig-download': kubeconfigValidationMap,
 };
 
 export const allClusterWizardSoftValidationIds =

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

@@ -33,18 +33,17 @@ import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { usePullSecret } from '../../hooks';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 import { AssistedInstallerHeader } from './AssistedInstallerHeader';
-import { OpenshiftVersionsContextProvider } from '../clusterWizard/OpenshiftVersionsContext';
+import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVersionsContext';
 
 const ClusterPageGeneric = ({
   clusterId,
   showBreadcrumbs = false,
+  resetModal,
 }: {
   clusterId: string;
   showBreadcrumbs?: boolean;
+  resetModal?: React.ReactNode;
 }) => {
-  if (!clusterId) {
-    // console.error('ClusterPageGeneric: missing clusterId');
-  }
   const fetchCluster = useFetchCluster(clusterId);
   const dispatch = useDispatch();
   const { cluster, uiState, errorDetail } = useClusterPolling(clusterId);
@@ -72,9 +71,9 @@ const ClusterPageGeneric = ({
       };
       return (
         <AddHostsContextProvider cluster={cluster} resetCluster={onReset}>
-          <OpenshiftVersionsContextProvider>
+          <OpenShiftVersionsContextProvider>
             <AddHosts />
-          </OpenshiftVersionsContextProvider>
+          </OpenShiftVersionsContextProvider>
         </AddHostsContextProvider>
       );
     } else if (
@@ -170,7 +169,7 @@ const ClusterPageGeneric = ({
                 loadingUI={<ClusterLoading />}
                 errorUI={<ClusterUiError />}
               >
-                <OpenshiftVersionsContextProvider>
+                <OpenShiftVersionsContextProvider>
                   <NewFeatureSupportLevelProvider
                     loadingUi={<ClusterLoading />}
                     cluster={cluster}
@@ -178,17 +177,15 @@ const ClusterPageGeneric = ({
                     openshiftVersion={cluster.openshiftVersion}
                     platformType={cluster.platform?.type}
                   >
-                    {/* TODO(mlibra): Will be reworked within https://issues.redhat.com/browse/AGENT-522
-                    <RebootNodeZeroModal cluster={cluster} />
-                    */}
                     {getContent(cluster, infraEnv)}
                     {uiState === ResourceUIState.POLLING_ERROR && <ClusterPollingErrorModal />}
                     {uiState === ResourceUIState.UPDATE_ERROR && <ClusterUpdateErrorModal />}
                     <CancelInstallationModal />
                     <ResetClusterModal />
+                    {resetModal}
                     <DiscoveryImageModal />
                   </NewFeatureSupportLevelProvider>
-                </OpenshiftVersionsContextProvider>
+                </OpenShiftVersionsContextProvider>
               </ClusterDefaultConfigurationProvider>
             </ModalDialogsContextProvider>
           </SentryErrorMonitorContextProvider>
@@ -200,9 +197,15 @@ const ClusterPageGeneric = ({
   return <Navigate to="/clusters" />;
 };
 
-export const SingleClusterPage = ({ clusterId }: { clusterId: string }) => (
+export const SingleClusterPage = ({
+  clusterId,
+  resetModal,
+}: {
+  clusterId: string;
+  resetModal: React.ReactNode;
+}) => (
   <AlertsContextProvider>
-    <ClusterPageGeneric clusterId={clusterId} />
+    <ClusterPageGeneric clusterId={clusterId} resetModal={resetModal} />
   </AlertsContextProvider>
 );
 

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

@@ -11,7 +11,7 @@ import { ClusterUiError } from './ClusterPageErrors';
 import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { AssistedInstallerHeader } from './AssistedInstallerHeader';
 import { ModalDialogsContextProvider } from '../hosts/ModalDialogsContext';
-import { OpenshiftVersionsContextProvider } from '../clusterWizard/OpenshiftVersionsContext';
+import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVersionsContext';
 
 const NewClusterPageGeneric = ({ pageTitleSection }: { pageTitleSection?: ReactNode }) => {
   return (
@@ -22,7 +22,7 @@ const NewClusterPageGeneric = ({ pageTitleSection }: { pageTitleSection?: ReactN
             loadingUI={<ClusterLoading />}
             errorUI={<ClusterUiError />}
           >
-            <OpenshiftVersionsContextProvider>
+            <OpenShiftVersionsContextProvider>
               <NewFeatureSupportLevelProvider loadingUi={<ClusterLoading />}>
                 {pageTitleSection}
                 <PageSection variant={PageSectionVariants.light} isFilled>
@@ -31,7 +31,7 @@ const NewClusterPageGeneric = ({ pageTitleSection }: { pageTitleSection?: ReactN
                   </ClusterWizardContextProvider>
                 </PageSection>
               </NewFeatureSupportLevelProvider>
-            </OpenshiftVersionsContextProvider>
+            </OpenShiftVersionsContextProvider>
           </ClusterDefaultConfigurationProvider>
         </ModalDialogsContextProvider>
       </SentryErrorMonitorContextProvider>

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

@@ -1,6 +1,9 @@
 export { default as Clusters } from './Clusters';
+export { default as ClusterLoading } from './ClusterLoading';
 export { default as ClusterToolbar } from './ClusterToolbar';
+export { ClusterUiError } from './ClusterPageErrors';
 export { default as ClusterStatus, ClusterStatusIcon } from './ClusterStatus';
 
 export * from './NewClusterPage';
 export * from './ClusterPage';
+export { useClusterPolling } from './clusterPolling';

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

@@ -21,7 +21,7 @@ import {
   SupportLevel,
   SupportLevels,
 } from '@openshift-assisted/types/assisted-installer-service';
-import { useOpenshiftVersionsContext } from '../clusterWizard/OpenshiftVersionsContext';
+import { useOpenShiftVersionsContext } from '../clusterWizard/OpenShiftVersionsContext';
 
 export type NewSupportLevelProviderProps = PropsWithChildren<{
   clusterFeatureUsage?: string;
@@ -44,7 +44,7 @@ export const NewFeatureSupportLevelProvider: React.FC<NewSupportLevelProviderPro
   openshiftVersion,
   platformType,
 }) => {
-  const { loading: loadingOCPVersions } = useOpenshiftVersionsContext();
+  const { loading: loadingOCPVersions } = useOpenShiftVersionsContext();
   const pullSecret = usePullSecret();
   const { infraEnv, isLoading: isInfraEnvLoading } = useInfraEnv(
     cluster?.id || '',

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

@@ -16,7 +16,7 @@ import { DetailItem, UiIcon } from '../../../common';
 import { getLimitedFeatureSupportLevels } from '../../../common/components/newFeatureSupportLevels/utils';
 import { WithErrorBoundary } from '../../../common/components/ErrorHandling/WithErrorBoundary';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { useOpenshiftVersionsContext } from '../clusterWizard/OpenshiftVersionsContext';
+import { useOpenShiftVersionsContext } from '../clusterWizard/OpenShiftVersionsContext';
 import { TFunction } from 'i18next';
 import {
   NewFeatureSupportLevelData,
@@ -141,7 +141,7 @@ export const getSupportLevelInfo = (
 const SupportLevel = ({ cluster }: SupportLevelProps) => {
   const { t } = useTranslation();
   const featureSupportLevelData = useNewFeatureSupportLevel();
-  const { isSupportedOpenShiftVersion } = useOpenshiftVersionsContext();
+  const { isSupportedOpenShiftVersion } = useOpenShiftVersionsContext();
 
   const { limitedClusterFeatures, hasSupportedVersion, isFullySupported } =
     React.useMemo<SupportLevelMemo>(

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

@@ -14,7 +14,7 @@ import {
 } from '@openshift-assisted/types/assisted-installer-service';
 import { ExternalPlatformLabels } from '../clusterConfiguration/platformIntegration/constants';
 
-const CNV_OPERATOR_LABEL = 'Openshift Virtualization';
+const CNV_OPERATOR_LABEL = 'OpenShift Virtualization';
 const LVMS_OPERATOR_LABEL = 'Logical Volume Manager Storage';
 const LVM_OPERATOR_LABEL = 'Logical Volume Manager';
 const ODF_OPERATOR_LABEL = 'OpenShift Data Foundation';