Merge branch 'master' into Add-download-kubeconfig-wizard-page

Author: ElayAharoni

Diff for: .github/workflows/push-to-master-disconnected.yaml

@@ -1,11 +1,16 @@
 approvers:
+  - ammont82
   - batzionb
   - celdrake
+  - jgyselov
   - jkilzi
   - rawagner
 options: {}
 reviewers:
+  - ammont82
   - batzionb
   - celdrake
+  - ElayAharoni
+  - jgyselov
   - jkilzi
   - rawagner

Diff for: OWNERS

@@ -1,10 +1,27 @@
 import * as React from 'react';
 import { BrowserRouter, Routes, Route } from 'react-router-dom-v5-compat';
 import { Brand, Masthead, MastheadBrand, MastheadMain, Page } from '@patternfly/react-core';
-import '../i18n';
-import { CreateClusterWizard, EditClusterWizard } from './Wizard';
 import { Provider } from 'react-redux';
-import { Store } from '@openshift-assisted/ui-lib/ocm';
+import { Store, useFeatureDetection } from '@openshift-assisted/ui-lib/ocm';
+import { FeatureListType } from '@openshift-assisted/ui-lib/lib/common';
+
+import CreateClusterWizard from './CreateClusterWizard';
+import ClusterPage from './ClusterPage';
+import '../i18n';
+
+const features: FeatureListType = {
+  ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE: true,
+};
+
+const AppRouter = () => {
+  useFeatureDetection(features);
+  return (
+    <Routes>
+      <Route path="/" element={<CreateClusterWizard />} />
+      <Route path="/:clusterId" element={<ClusterPage />} />
+    </Routes>
+  );
+};
 
 export const App: React.FC = () => {
   const header = (
@@ -27,10 +44,7 @@ export const App: React.FC = () => {
     <BrowserRouter>
       <Provider store={Store.storeDay1}>
         <Page header={header} isManagedSidebar defaultManagedSidebarIsOpen={false}>
-          <Routes>
-            <Route path="/" element={<CreateClusterWizard />} />
-            <Route path="/:clusterId" element={<EditClusterWizard />} />
-          </Routes>
+          <AppRouter />
         </Page>
       </Provider>
     </BrowserRouter>

Diff for: apps/assisted-disconnected-ui/src/components/App.tsx

@@ -0,0 +1,9 @@
+import { SingleClusterPage } from '@openshift-assisted/ui-lib/ocm';
+import { useParams } from 'react-router-dom-v5-compat';
+
+const ClusterPage = () => {
+  const { clusterId } = useParams() as { clusterId: string };
+  return <SingleClusterPage clusterId={clusterId} />;
+};
+
+export default ClusterPage;

Diff for: apps/assisted-disconnected-ui/src/components/ClusterPage.tsx

@@ -0,0 +1,45 @@
+import { useCluster } from '../hooks/useCluster';
+import { AlertsContextProvider } from '@openshift-assisted/ui-lib/common';
+import {
+  ClusterLoading,
+  ClusterWizardContextProvider,
+  OpenshiftVersionsContextProvider,
+  NewFeatureSupportLevelProvider,
+  NewClusterWizard,
+} from '@openshift-assisted/ui-lib/ocm';
+import { Alert, PageSection, PageSectionVariants } from '@patternfly/react-core';
+import { useNavigate } from 'react-router-dom-v5-compat';
+
+const CreateClusterWizard = () => {
+  const [clusterId, isLoading, error] = useCluster();
+  const navigate = useNavigate();
+  if (isLoading) {
+    return <ClusterLoading />;
+  }
+
+  if (error) {
+    return (
+      <PageSection variant={PageSectionVariants.light} isFilled>
+        <Alert isInline variant="danger" title="Failed to fetch clusters" />
+      </PageSection>
+    );
+  }
+
+  if (clusterId) {
+    navigate(`/${clusterId}`);
+  }
+
+  return (
+    <AlertsContextProvider>
+      <ClusterWizardContextProvider>
+        <OpenshiftVersionsContextProvider>
+          <NewFeatureSupportLevelProvider loadingUi={<ClusterLoading />}>
+            <NewClusterWizard />
+          </NewFeatureSupportLevelProvider>
+        </OpenshiftVersionsContextProvider>
+      </ClusterWizardContextProvider>
+    </AlertsContextProvider>
+  );
+};
+
+export default CreateClusterWizard;

Diff for: apps/assisted-disconnected-ui/src/components/CreateClusterWizard.tsx

@@ -24,14 +24,12 @@ import { OcmSwitchField } from '../ui/OcmFormFields';
 import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { useFeature } from '../../hooks/use-feature';
-import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 
 const schedulableMastersTooltip =
   'Workloads must be run on control plane nodes when less than 5 hosts are discovered';
 
 const HostInventory = ({ cluster }: { cluster: Cluster }) => {
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-  const { isDisconnectedMode } = useClusterWizardContext();
   const mastersMustRunWorkloads = selectMastersMustRunWorkloads(cluster);
   const { setFieldValue } = useFormikContext<HostDiscoveryValues>();
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
@@ -46,7 +44,7 @@ const HostInventory = ({ cluster }: { cluster: Cluster }) => {
         <ClusterWizardStepHeader>Host discovery</ClusterWizardStepHeader>
       </StackItem>
       <StackItem>
-        {!isViewerMode && !isSingleClusterFeatureEnabled && !isDisconnectedMode && (
+        {!isViewerMode && !isSingleClusterFeatureEnabled && (
           <TextContent>
             <Text component="p">
               <DiscoveryImageModalButton

Diff for: apps/assisted-disconnected-ui/src/components/Wizard.tsx

@@ -133,7 +133,6 @@ export const OcmClusterDetailsFormFields = ({
 
       <OcmBaseDomainField managedDomains={managedDomains} clusterExists={clusterExists} />
 
-      {/* TODO(mlibra): For single-cluster: We will probably change this to just a static text */}
       {forceOpenshiftVersion ? (
         <OcmOpenShiftVersion
           versions={versions}
@@ -184,15 +183,12 @@ export const OcmClusterDetailsFormFields = ({
       )}
       <CustomManifestCheckbox clusterId={clusterId || ''} isDisabled={platform === 'external'} />
 
-      {
-        // Reason: In the single-cluster flow, the Host discovery phase is replaced by a single one-fits-all ISO download
-        !isSingleClusterFeatureEnabled && (
-          <HostsNetworkConfigurationControlGroup
-            clusterExists={clusterExists}
-            isDisabled={platform === 'external'}
-          />
-        )
-      }
+      {!isSingleClusterFeatureEnabled && (
+        <HostsNetworkConfigurationControlGroup
+          clusterExists={clusterExists}
+          isDisabled={platform === 'external'}
+        />
+      )}
 
       <DiskEncryptionControlGroup
         values={values}

Diff for: libs/ui-lib/lib/ocm/components/clusterConfiguration/HostInventory.tsx

@@ -18,7 +18,6 @@ export type ClusterWizardContextType = {
   setWizardPerPage: (perPage: number) => void;
   updateUISettings: (data: UISettingsValues) => Promise<void>;
   uiSettings?: UISettingsValues;
-  isDisconnectedMode: boolean;
 };
 
 export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);