@openshift-assisted/ui-lib 2.55.1 → 2.55.3

package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx

@@ -1,17 +1,7 @@
 import * as React from 'react';
-import ClusterWizardFooter from '../ClusterWizardFooter';
-import { useClusterWizardContext } from '../ClusterWizardContext';
-import {
-  ClusterWizardStep,
-  TechnologyPreview,
-  PULL_SECRET_INFO_LINK,
-  singleClusterOperators,
-} from '../../../../common';
-import ClusterWizardNavigation from '../ClusterWizardNavigation';
-import { WithErrorBoundary } from '../../../../common/components/ErrorHandling/WithErrorBoundary';
+import { saveAs } from 'file-saver';
+import { useNavigate } from 'react-router';
 import {
-  Split,
-  SplitItem,
   Alert,
   Grid,
   DescriptionList,
@@ -24,12 +14,20 @@ import {
   OrderType,
   Content,
 } from '@patternfly/react-core';
-import { Formik } from 'formik';
-import { saveAs } from 'file-saver';
-import { useNavigate } from 'react-router';
-
+import {
+  ClusterWizardStep,
+  ExternalLink,
+  getDisconnectedDocsLink,
+  getMajorMinorVersion,
+  PULL_SECRET_INFO_LINK,
+  singleClusterOperators,
+} from '../../../../common';
+import { WithErrorBoundary } from '../../../../common/components/ErrorHandling/WithErrorBoundary';
 import { getOperatorSpecs } from '../../../../common/components/operators/operatorSpecs';
+import { useClusterWizardContext } from '../ClusterWizardContext';
 import { DISCONNECTED_OPENSHIFT_VERSION } from './BasicStep';
+import ClusterWizardFooter from '../ClusterWizardFooter';
+import ClusterWizardNavigation from '../ClusterWizardNavigation';
 
 const ReviewStep = () => {
   const { moveBack, disconnectedInfraEnv } = useClusterWizardContext();
@@ -37,84 +35,81 @@ const ReviewStep = () => {
   const navigate = useNavigate();
 
   return (
-    <Formik
-      initialValues={{}}
-      onSubmit={() => {
-        // nothing to do
-      }}
+    <ClusterWizardStep
+      navigation={<ClusterWizardNavigation />}
+      footer={
+        <ClusterWizardFooter
+          onNext={() => {
+            saveAs(disconnectedInfraEnv?.downloadUrl ?? '');
+            void navigate('/cluster-list');
+          }}
+          onBack={moveBack}
+          nextButtonText="Download ISO"
+        />
+      }
     >
-      <ClusterWizardStep
-        navigation={<ClusterWizardNavigation />}
-        footer={
-          <ClusterWizardFooter
-            onNext={() => {
-              saveAs(disconnectedInfraEnv?.downloadUrl ?? '');
-              void navigate('/cluster-list');
-            }}
-            onBack={moveBack}
-            nextButtonText="Download ISO"
-          />
-        }
-      >
-        <WithErrorBoundary title="Failed to load Review step">
-          <Grid hasGutter>
-            <Split>
-              <SplitItem>
-                <Content component="h2">Review and download ISO</Content>
-              </SplitItem>
-              <SplitItem>
-                <TechnologyPreview />
-              </SplitItem>
-            </Split>
-            <Alert isInline variant="info" title="Discovery ISO boot instructions">
-              <List component={ListComponent.ol} type={OrderType.number}>
-                <ListItem>Download ISO</ListItem>
-                <ListItem>
-                  Download or copy your pull secret from{' '}
-                  <a href={PULL_SECRET_INFO_LINK} target="_blank" rel="noopener noreferrer">
-                    here
-                  </a>
-                </ListItem>
-                <ListItem>
-                  Boot your cluster's machines from this ISO and follow instructions
-                </ListItem>
-                <ListItem>
-                  Provide your pull secret inside the installation wizard when requested
-                </ListItem>
-              </List>
-            </Alert>
-            <Alert isInline isExpandable variant="info" title="List of available operators">
-              <List>
-                {singleClusterOperators.map((o) => {
-                  const operator = Object.values(opSpecs)
-                    .flatMap((op) => op)
-                    .find((op) => op.operatorKey === o);
-                  return <ListItem key={o}>{operator ? operator.title : o}</ListItem>;
-                })}
-              </List>
-            </Alert>
-            <DescriptionList isHorizontal>
+      <WithErrorBoundary title="Failed to load Review step">
+        <Grid hasGutter>
+          <Content component="h2">Review and download ISO</Content>
+          <Alert isInline variant="info" title="ISO boot instructions">
+            <List component={ListComponent.ol} type={OrderType.number}>
+              <ListItem>Download the ISO.</ListItem>
+              <ListItem>
+                Boot your cluster's machines from this ISO and{' '}
+                <ExternalLink
+                  href={getDisconnectedDocsLink(
+                    getMajorMinorVersion(DISCONNECTED_OPENSHIFT_VERSION),
+                  )}
+                >
+                  follow instructions
+                </ExternalLink>
+                .
+              </ListItem>
+              <ListItem>
+                Your <ExternalLink href={PULL_SECRET_INFO_LINK}>pull secret</ExternalLink> was
+                included automatically. You can change it inside the installation wizard.
+              </ListItem>
+            </List>
+          </Alert>
+          <Alert isInline isExpandable variant="info" title="List of available operators">
+            <List>
+              {singleClusterOperators.map((o) => {
+                const operator = Object.values(opSpecs)
+                  .flatMap((op) => op)
+                  .find((op) => op.operatorKey === o);
+                return <ListItem key={o}>{operator ? operator.title : o}</ListItem>;
+              })}
+            </List>
+          </Alert>
+          <DescriptionList isHorizontal>
+            <DescriptionListGroup>
+              <DescriptionListTerm>OpenShift version</DescriptionListTerm>
+              <DescriptionListDescription>
+                {disconnectedInfraEnv?.openshiftVersion ?? DISCONNECTED_OPENSHIFT_VERSION}
+              </DescriptionListDescription>
+            </DescriptionListGroup>
+            {disconnectedInfraEnv?.rendezvousIp && (
               <DescriptionListGroup>
-                <DescriptionListTerm>OpenShift version</DescriptionListTerm>
+                <DescriptionListTerm>Rendezvous IP</DescriptionListTerm>
                 <DescriptionListDescription>
-                  {disconnectedInfraEnv?.openshiftVersion ?? DISCONNECTED_OPENSHIFT_VERSION}
+                  {disconnectedInfraEnv.rendezvousIp}
                 </DescriptionListDescription>
               </DescriptionListGroup>
-              <DescriptionListGroup>
-                <DescriptionListTerm>CPU architecture</DescriptionListTerm>
-                <DescriptionListDescription>
-                  {disconnectedInfraEnv?.cpuArchitecture ?? 'x86_64'}
-                </DescriptionListDescription>
-              </DescriptionListGroup>
-              <DescriptionListGroup>
-                <DescriptionListTerm>ISO size</DescriptionListTerm>
-                <DescriptionListDescription>approx. 43.5GB</DescriptionListDescription>
-              </DescriptionListGroup>
-            </DescriptionList>
-          </Grid>
-        </WithErrorBoundary>
-      </ClusterWizardStep>
-    </Formik>
+            )}
+            <DescriptionListGroup>
+              <DescriptionListTerm>CPU architecture</DescriptionListTerm>
+              <DescriptionListDescription>
+                {disconnectedInfraEnv?.cpuArchitecture ?? 'x86_64'}
+              </DescriptionListDescription>
+            </DescriptionListGroup>
+            <DescriptionListGroup>
+              <DescriptionListTerm>ISO size</DescriptionListTerm>
+              <DescriptionListDescription>approx. 50+GB</DescriptionListDescription>
+            </DescriptionListGroup>
+          </DescriptionList>
+        </Grid>
+      </WithErrorBoundary>
+    </ClusterWizardStep>
   );
 };
 

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

@@ -0,0 +1,75 @@
+import { defaultWizardSteps, staticIpFormViewSubSteps } from './constants';
+import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
+import { ClusterWizardStepsType, disconnectedSteps } from './wizardTransition';
+
+export const addStepToClusterWizard = (
+  wizardStepIds: ClusterWizardStepsType[],
+  addAfterStep: ClusterWizardStepsType,
+  itemsToAdd: ClusterWizardStepsType[],
+): ClusterWizardStepsType[] => {
+  const stepsIds = [...wizardStepIds];
+  const referencePosition = stepsIds.findIndex((step) => step === addAfterStep);
+  const found = wizardStepIds.filter((step) => step === itemsToAdd[0]);
+  if (referencePosition !== -1 && found.length === 0) {
+    stepsIds.splice(referencePosition + 1, 0, ...itemsToAdd);
+  }
+  return stepsIds;
+};
+
+export const removeStepFromClusterWizard = (
+  wizardStepIds: ClusterWizardStepsType[],
+  itemToRemove: ClusterWizardStepsType,
+  numberItemsToRemove: number,
+): ClusterWizardStepsType[] => {
+  const stepsIds = [...wizardStepIds];
+  const position = stepsIds.findIndex((step) => step === itemToRemove);
+  if (position !== -1) {
+    stepsIds.splice(position, numberItemsToRemove);
+  }
+  return stepsIds;
+};
+
+export const getWizardStepIds = (
+  wizardStepIds: ClusterWizardStepsType[] | undefined,
+  staticIpView?: StaticIpView | 'dhcp-selected',
+  isSingleClusterFeatureEnabled?: boolean,
+): ClusterWizardStepsType[] => {
+  let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...defaultWizardSteps];
+  if (staticIpView === StaticIpView.YAML) {
+    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
+    stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', ['static-ip-yaml-view']);
+  } else if (staticIpView === StaticIpView.FORM) {
+    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
+    stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', staticIpFormViewSubSteps);
+  } else if (staticIpView === 'dhcp-selected') {
+    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
+  }
+
+  if (isSingleClusterFeatureEnabled && !stepsCopy.includes('credentials-download')) {
+    stepsCopy = addStepToClusterWizard(stepsCopy, 'custom-manifests', ['credentials-download']);
+  }
+
+  return stepsCopy;
+};
+
+export const getDisconnectedWizardStepIds = (
+  staticIpView?: StaticIpView | 'dhcp-selected',
+): ClusterWizardStepsType[] => {
+  // Always rebuild from the base disconnected steps so toggling static IP / DHCP
+  // cannot leave leftover sub-steps in the list.
+  const copy = [...disconnectedSteps];
+
+  if (staticIpView === StaticIpView.YAML) {
+    return addStepToClusterWizard(copy, 'disconnected-optional-configurations', [
+      'static-ip-yaml-view',
+    ]);
+  }
+  if (staticIpView === StaticIpView.FORM) {
+    return addStepToClusterWizard(copy, 'disconnected-optional-configurations', [
+      'static-ip-network-wide-configurations',
+      'static-ip-host-configurations',
+    ]);
+  }
+
+  return copy;
+};

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

@@ -1,25 +1,17 @@
 import React from 'react';
 import { Content, Split, SplitItem } from '@patternfly/react-core';
-import {
-  ASSISTED_INSTALLER_DOCUMENTATION_LINK,
-  TechnologyPreview,
-  ExternalLink,
-  isInOcm,
-} from '../../../common';
-import { useFeature } from '../../hooks/use-feature';
+import { ASSISTED_INSTALLER_DOCUMENTATION_LINK, ExternalLink, isInOcm } from '../../../common';
 
 type AssistedInstallerHeaderProps = {
   clusterName?: string;
 };
 
 export const AssistedInstallerHeader = ({ clusterName }: AssistedInstallerHeaderProps) => {
-  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   return (
     <>
       <Content component="h1" className="pf-v6-u-display-inline">
         {clusterName || 'Install OpenShift with the Assisted Installer'}
       </Content>
-      {isSingleClusterFeatureEnabled && <TechnologyPreview />}
       <Split hasGutter>
         <SplitItem>
           <ExternalLink href={ASSISTED_INSTALLER_DOCUMENTATION_LINK}>

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.55.1",
-    "@openshift-assisted/types": "2.55.1",
+    "@openshift-assisted/locales": "2.55.3",
+    "@openshift-assisted/types": "2.55.3",
     "@openshift-console/dynamic-plugin-sdk": "^4.22.0",
     "@patternfly/patternfly": "6.4.0",
     "@patternfly/react-code-editor": "6.4.1",
@@ -136,5 +136,5 @@
       ]
     }
   },
-  "version": "2.55.1"
+  "version": "2.55.3"
 }