@openshift-assisted/ui-lib 2.38.5 → 2.39.1

package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscovery.tsx

@@ -15,7 +15,7 @@ import {
   HostsNotShowingLink,
   VMRebootConfigurationInfo,
 } from '../../../common';
-import { getIsSNOCluster } from '../helpers';
+import { getIsSNOCluster, onAgentChangeHostname } from '../helpers';
 import MinimalHWRequirements from '../Agent/MinimalHWRequirements';
 import { ClusterDeploymentHostsDiscoveryProps } from './types';
 import { EditBMHModal, EditAgentModal } from '../modals';
@@ -57,7 +57,7 @@ const ClusterDeploymentHostsDiscovery: React.FC<ClusterDeploymentHostsDiscoveryP
   infraEnv,
   infraNMStates,
   usedHostnames,
-  onSaveAgent,
+  onChangeHostname,
   onEditRole,
   onSetInstallationDiskId,
   onSaveBMH,
@@ -119,7 +119,7 @@ const ClusterDeploymentHostsDiscovery: React.FC<ClusterDeploymentHostsDiscoveryP
                 onEditRole={onEditRole}
                 onSetInstallationDiskId={onSetInstallationDiskId}
                 onEditBMH={setEditBMH}
-                onChangeHostname={onSaveAgent}
+                onChangeHostname={onChangeHostname}
                 onChangeBMHHostname={onChangeBMHHostname}
                 onApprove={onApproveAgent}
                 width={contentRect.bounds?.width}
@@ -138,13 +138,19 @@ const ClusterDeploymentHostsDiscovery: React.FC<ClusterDeploymentHostsDiscoveryP
           fetchSecret={fetchSecret}
           usedHostnames={usedHostnames || []}
         />
-        <EditAgentModal
-          isOpen={!!editAgent}
-          onClose={() => setEditAgent(undefined)}
-          usedHostnames={usedHostnames}
-          agent={editAgent}
-          onSave={onSaveAgent}
-        />
+        {editAgent && (
+          <EditAgentModal
+            onClose={() => setEditAgent(undefined)}
+            usedHostnames={usedHostnames}
+            agent={editAgent}
+            onSave={onAgentChangeHostname(
+              agents,
+              bareMetalHosts,
+              onChangeHostname,
+              onChangeBMHHostname,
+            )}
+          />
+        )}
       </GridItem>
       <DiscoveryTroubleshootingModal
         isOpen={isDiscoveryHintModalOpen}

package/lib/cim/components/ClusterDeployment/ClusterDeploymentHostsDiscoveryStep.tsx

@@ -1,28 +1,37 @@
 import React from 'react';
 import uniq from 'lodash-es/uniq.js';
-import { Grid, GridItem, Alert, AlertVariant, List, ListItem } from '@patternfly/react-core';
+import {
+  Grid,
+  GridItem,
+  Alert,
+  AlertVariant,
+  List,
+  ListItem,
+  useWizardFooter,
+  WizardFooter,
+  useWizardContext,
+} from '@patternfly/react-core';
 
-import { ClusterWizardStepHeader } from '../../../common';
-import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
-import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
-import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
+import { Alerts, ClusterWizardStepHeader } from '../../../common';
 import { ClusterDeploymentHostsDiscoveryStepProps } from './types';
 import ClusterDeploymentHostsDiscovery from './ClusterDeploymentHostsDiscovery';
 import { getAgentsHostsNames, isAgentOfInfraEnv } from './helpers';
 import { getIsSNOCluster, getWizardStepAgentStatus } from '../helpers';
 import { canNextFromHostDiscoveryStep } from './wizardTransition';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ValidationSection } from './components/ValidationSection';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 
-const ClusterDeploymentHostsDiscoveryStep: React.FC<ClusterDeploymentHostsDiscoveryStepProps> = ({
+const ClusterDeploymentHostsDiscoveryStep = ({
   agentClusterInstall,
   agents: allAgents,
   infraEnv,
   onSaveHostsDiscovery,
-  onClose,
   ...rest
-}) => {
+}: ClusterDeploymentHostsDiscoveryStepProps) => {
   const { t } = useTranslation();
-  const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
+  const { syncError } = React.useContext(ClusterDeploymentWizardContext);
+  const { activeStep, goToNextStep, goToPrevStep, close } = useWizardContext();
   const [showClusterErrors, setShowClusterErrors] = React.useState(false);
   const [nextRequested, setNextRequested] = React.useState(false);
   const [showFormErrors, setShowFormErrors] = React.useState(false);
@@ -61,7 +70,7 @@ const ClusterDeploymentHostsDiscoveryStep: React.FC<ClusterDeploymentHostsDiscov
     errors.push(t('ai:Some hosts are not ready.'));
   }
 
-  const onNext = async () => {
+  const onNext = React.useCallback(async () => {
     if (!showFormErrors) {
       setShowFormErrors(true);
       if (errors.length) {
@@ -70,7 +79,7 @@ const ClusterDeploymentHostsDiscoveryStep: React.FC<ClusterDeploymentHostsDiscov
     }
     await onSaveHostsDiscovery();
     setNextRequested(true);
-  };
+  }, [errors.length, onSaveHostsDiscovery, showFormErrors]);
 
   React.useEffect(() => {
     setNextRequested(false);
@@ -86,31 +95,68 @@ const ClusterDeploymentHostsDiscoveryStep: React.FC<ClusterDeploymentHostsDiscov
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         if (canNextFromHostDiscoveryStep(agentClusterInstall, infraEnvAgents)) {
-          setCurrentStepId('networking');
+          void goToNextStep();
         }
       }
     }
-  }, [nextRequested, infraEnvAgents, agentClusterInstall, setCurrentStepId, agentsNotHealthy]);
+  }, [nextRequested, infraEnvAgents, agentClusterInstall, agentsNotHealthy, goToNextStep]);
 
-  const submittingText =
-    nextRequested && !showClusterErrors ? t('ai:Saving changes...') : undefined;
+  const submittingText = React.useMemo(
+    () => (nextRequested && !showClusterErrors ? t('ai:Saving changes...') : undefined),
+    [nextRequested, showClusterErrors, t],
+  );
+
+  React.useEffect(() => {
+    if (syncError) {
+      setNextRequested(false);
+    }
+  }, [syncError]);
 
-  const onSyncError = React.useCallback(() => setNextRequested(false), []);
+  const footer = React.useMemo(
+    () => (
+      <WizardFooter
+        activeStep={activeStep}
+        onNext={onNext}
+        isNextDisabled={nextRequested || (showFormErrors ? !!errors.length : false)}
+        nextButtonText={submittingText || t('ai:Next')}
+        nextButtonProps={{ isLoading: !!submittingText }}
+        onBack={goToPrevStep}
+        onClose={close}
+      />
+    ),
+    [
+      activeStep,
+      close,
+      errors.length,
+      goToPrevStep,
+      nextRequested,
+      onNext,
+      showFormErrors,
+      submittingText,
+      t,
+    ],
+  );
+  useWizardFooter(footer);
 
-  const footer = (
-    <ClusterDeploymentWizardFooter
-      agentClusterInstall={agentClusterInstall}
-      agents={infraEnvAgents}
-      isSubmitting={!!submittingText}
-      submittingText={submittingText}
-      isNextDisabled={nextRequested || (showFormErrors ? !!errors.length : false)}
-      // eslint-disable-next-line @typescript-eslint/no-misused-promises
-      onNext={onNext}
-      onBack={() => setCurrentStepId('cluster-details')}
-      showClusterErrors={showClusterErrors}
-      onSyncError={onSyncError}
-      onCancel={onClose}
-    >
+  return (
+    <Grid hasGutter>
+      <GridItem>
+        <ClusterWizardStepHeader>{t('ai:Cluster hosts')}</ClusterWizardStepHeader>
+      </GridItem>
+      <GridItem>
+        <ClusterDeploymentHostsDiscovery
+          agentClusterInstall={agentClusterInstall}
+          agents={infraEnvAgents}
+          infraEnv={infraEnv}
+          usedHostnames={usedHostnames}
+          {...rest}
+        />
+      </GridItem>
+      {showClusterErrors && !!errors.length && (
+        <GridItem>
+          <Alerts />
+        </GridItem>
+      )}
       {showFormErrors && !!errors.length && (
         <Alert
           variant={AlertVariant.danger}
@@ -124,27 +170,17 @@ const ClusterDeploymentHostsDiscoveryStep: React.FC<ClusterDeploymentHostsDiscov
           </List>
         </Alert>
       )}
-    </ClusterDeploymentWizardFooter>
-  );
 
-  return (
-    <ClusterDeploymentWizardStep footer={footer}>
-      <Grid hasGutter>
+      {!!syncError && (
         <GridItem>
-          <ClusterWizardStepHeader>{t('ai:Cluster hosts')}</ClusterWizardStepHeader>
+          <ValidationSection currentStepId={'hosts-selection'} hosts={[]}>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+              {syncError}
+            </Alert>
+          </ValidationSection>
         </GridItem>
-        <GridItem>
-          <ClusterDeploymentHostsDiscovery
-            agentClusterInstall={agentClusterInstall}
-            agents={infraEnvAgents}
-            infraEnv={infraEnv}
-            usedHostnames={usedHostnames}
-            {...rest}
-          />
-        </GridItem>
-      </Grid>
-    </ClusterDeploymentWizardStep>
+      )}
+    </Grid>
   );
 };
-
 export default ClusterDeploymentHostsDiscoveryStep;

package/lib/cim/components/ClusterDeployment/ClusterDeploymentNetworkingStep.tsx

@@ -1,6 +1,14 @@
 import React from 'react';
 import { Formik, useFormikContext } from 'formik';
-import { Alert, AlertVariant, Grid, GridItem } from '@patternfly/react-core';
+import {
+  Alert,
+  AlertVariant,
+  Grid,
+  GridItem,
+  useWizardContext,
+  useWizardFooter,
+  WizardFooter,
+} from '@patternfly/react-core';
 
 import {
   useAlerts,
@@ -8,6 +16,7 @@ import {
   FormikAutoSave,
   getFormikErrorFields,
   clusterFieldLabels,
+  Alerts,
 } from '../../../common';
 
 import {
@@ -15,20 +24,18 @@ import {
   AgentTableActions,
   ClusterDeploymentNetworkingValues,
 } from './types';
-import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
-import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
-import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
 import ClusterDeploymentNetworkingForm from './ClusterDeploymentNetworkingForm';
-import { isAgentOfCluster, isCIMFlow } from './helpers';
+import { isAgentOfCluster } from './helpers';
 import { useInfraEnvProxies, useNetworkingFormik } from './use-networking-formik';
 import { canNextFromNetworkingStep } from './wizardTransition';
 import { AgentK8sResource } from '../../types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ValidationSection } from './components/ValidationSection';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 
 type NetworkingFormProps = {
   clusterDeployment: ClusterDeploymentDetailsNetworkingProps['clusterDeployment'];
   agentClusterInstall: ClusterDeploymentDetailsNetworkingProps['agentClusterInstall'];
-  onClose: ClusterDeploymentDetailsNetworkingProps['onClose'];
   agents: AgentK8sResource[];
   fetchInfraEnv: ClusterDeploymentDetailsNetworkingProps['fetchInfraEnv'];
   onEditHost: AgentTableActions['onEditHost'];
@@ -38,18 +45,21 @@ type NetworkingFormProps = {
   isNutanix: ClusterDeploymentDetailsNetworkingProps['isNutanix'];
 };
 
-const NetworkingForm: React.FC<NetworkingFormProps> = ({
+export const NetworkingForm = ({
   clusterDeployment,
   agentClusterInstall,
   agents,
-  onClose,
   fetchInfraEnv,
   onEditHost,
   onEditRole,
   isPreviewOpen,
   onSetInstallationDiskId,
   isNutanix,
-}) => {
+}: NetworkingFormProps) => {
+  const { t } = useTranslation();
+  const { activeStep, goToPrevStep, goToNextStep, close } = useWizardContext();
+  const { syncError } = React.useContext(ClusterDeploymentWizardContext);
+  const { alerts } = useAlerts();
   const [showFormErrors, setShowFormErrors] = React.useState(false);
   const [showClusterErrors, setShowClusterErrors] = React.useState(false);
   const [nextRequested, setNextRequested] = React.useState(false);
@@ -59,16 +69,13 @@ const NetworkingForm: React.FC<NetworkingFormProps> = ({
   });
   const { isValid, isValidating, isSubmitting, validateForm, setTouched, errors, touched, values } =
     useFormikContext<ClusterDeploymentNetworkingValues>();
-  const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
-
-  const canContinue = canNextFromNetworkingStep(agentClusterInstall, agents);
 
-  const onBack = () =>
-    isCIMFlow(clusterDeployment)
-      ? setCurrentStepId('hosts-selection')
-      : setCurrentStepId('hosts-discovery');
+  const canContinue = React.useMemo(
+    () => canNextFromNetworkingStep(agentClusterInstall, agents),
+    [agentClusterInstall, agents],
+  );
 
-  const onNext = async () => {
+  const onNext = React.useCallback(async () => {
     if (!showFormErrors) {
       const errors = await validateForm();
       setTouched(
@@ -83,57 +90,72 @@ const NetworkingForm: React.FC<NetworkingFormProps> = ({
       }
     }
     setNextRequested(true);
-  };
+  }, [setTouched, showFormErrors, validateForm]);
 
   React.useEffect(() => {
     setNextRequested(false);
     setShowClusterErrors(false);
-  }, [values.apiVip, values.ingressVip]);
+  }, [values.apiVips, values.ingressVips]);
 
   React.useEffect(() => {
     if (nextRequested) {
       setShowClusterErrors(true);
       if (canContinue) {
-        setCurrentStepId('review');
+        void goToNextStep();
       }
     }
-  }, [nextRequested, canContinue, setCurrentStepId]);
+  }, [nextRequested, canContinue, goToNextStep]);
 
-  const onSyncError = React.useCallback(() => setNextRequested(false), []);
+  React.useEffect(() => {
+    if (syncError) {
+      setNextRequested(false);
+    }
+  }, [syncError]);
 
   const errorFields = getFormikErrorFields(errors, touched);
-  const { t } = useTranslation();
-  const footer = (
-    <ClusterDeploymentWizardFooter
-      agentClusterInstall={agentClusterInstall}
-      agents={agents}
-      isSubmitting={isSubmitting}
-      isNextDisabled={
-        nextRequested || isSubmitting || (showFormErrors ? !isValid || isValidating : false)
-      }
-      showClusterErrors={!errorFields.length && showClusterErrors}
-      onBack={onBack}
-      // eslint-disable-next-line @typescript-eslint/no-misused-promises
-      onNext={onNext}
-      onCancel={onClose}
-      nextButtonText="Next"
-      onSyncError={onSyncError}
-    >
-      {showFormErrors && !!errorFields.length && (
-        <Alert
-          variant={AlertVariant.danger}
-          title={t('ai:Provided cluster configuration is not valid')}
-          isInline
-        >
-          {t('ai:The following fields are invalid or missing')}:{' '}
-          {errorFields.map((field: string) => clusterFieldLabels(t)[field] || field).join(', ')}.
-        </Alert>
-      )}
-    </ClusterDeploymentWizardFooter>
+
+  const submittingText = React.useMemo(() => {
+    if (isSubmitting) {
+      return t('ai:Saving changes...');
+    } else if (isValidating || nextRequested) {
+      return t('ai:Validating...');
+    }
+    return undefined;
+  }, [isSubmitting, isValidating, nextRequested, t]);
+
+  const footer = React.useMemo(
+    () => (
+      <WizardFooter
+        activeStep={activeStep}
+        onNext={onNext}
+        isNextDisabled={
+          nextRequested || isSubmitting || (showFormErrors ? !isValid || isValidating : false)
+        }
+        nextButtonProps={{ isLoading: !!submittingText }}
+        nextButtonText={submittingText || t('ai:Next')}
+        onBack={goToPrevStep}
+        onClose={close}
+      />
+    ),
+    [
+      activeStep,
+      onNext,
+      nextRequested,
+      isSubmitting,
+      showFormErrors,
+      isValid,
+      isValidating,
+      submittingText,
+      goToPrevStep,
+      close,
+      t,
+    ],
   );
 
+  useWizardFooter(footer);
+
   return (
-    <ClusterDeploymentWizardStep footer={footer}>
+    <>
       <Grid hasGutter>
         <GridItem>
           <ClusterWizardStepHeader>{t('ai:Networking')}</ClusterWizardStepHeader>
@@ -154,19 +176,49 @@ const NetworkingForm: React.FC<NetworkingFormProps> = ({
             isNutanix={isNutanix}
           />
         </GridItem>
+
+        {showFormErrors && !!errorFields.length && (
+          <GridItem>
+            <Alert
+              variant={AlertVariant.danger}
+              title={t('ai:Provided cluster configuration is not valid')}
+              isInline
+            >
+              {t('ai:The following fields are invalid or missing')}:{' '}
+              {errorFields.map((field: string) => clusterFieldLabels(t)[field] || field).join(', ')}
+              .
+            </Alert>
+          </GridItem>
+        )}
+
+        {(showClusterErrors || showFormErrors) && !!alerts.length && (
+          <GridItem>
+            <Alerts />
+          </GridItem>
+        )}
+
+        {syncError && (
+          <GridItem>
+            <ValidationSection currentStepId={'networking'} hosts={[]}>
+              <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+                {syncError}
+              </Alert>
+            </ValidationSection>
+          </GridItem>
+        )}
       </Grid>
       <FormikAutoSave />
-    </ClusterDeploymentWizardStep>
+    </>
   );
 };
 
-const ClusterDeploymentNetworkingStep: React.FC<ClusterDeploymentDetailsNetworkingProps> = ({
+const ClusterDeploymentNetworkingStep = ({
   clusterDeployment,
   agentClusterInstall,
   agents,
   onSaveNetworking,
   ...rest
-}) => {
+}: ClusterDeploymentDetailsNetworkingProps) => {
   const { addAlert } = useAlerts();
 
   const cdName = clusterDeployment?.metadata?.name;