@openshift-assisted/ui-lib 2.38.5 → 2.39.1

package/build/cjs/ocm/hooks/useInfraEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"useInfraEnv.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnv.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,wBAAkC;AAClC,yCAA+C;AAC/C,8CAAqD;AACrD,2CAAgD;AAChD,0GAA0E;AAO1E,SAAwB,WAAW,CACjC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAOzB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAY,CAAC;IAC3D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,IAAA,gBAAa,EAC1D,SAAS,EACT,eAAe,EACf,WAAW,EACX,UAAU,EACV,gBAAgB,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAC/C,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,mBAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC9D,WAAW,CAAC,QAAQ,CAAC,CAAC;aACvB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACxC,iCAAuB,CAAC,gBAAgB,CAAC,SAAS,EAAE,wBAAe,CAAC,qBAAqB,CAAC,CAAC;YAC3F,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAE5B,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CACtC,CAAO,oBAA0C,EAAE,EAAE;QACnD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,iEAAiE,CAAC;SACzE;QACD,mBAAY,CAAC,mBAAmB,EAAE,CAAC;QACnC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAY,CAAC,MAAM,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAC7E,WAAW,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC,CAAA,EACD,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,eAAe,EAAE;YACnB,QAAQ,CAAC,eAAe,CAAC,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,QAAQ,EAAE;gBACb,KAAK,WAAW,EAAE,CAAC;aACpB;SACF;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAEzD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;AAC7E,CAAC;AA3DD,8BA2DC"}
+{"version":3,"file":"useInfraEnv.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnv.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,4EAA4C;AAC5C,yCAA+C;AAC/C,8CAAqD;AACrD,2CAAgD;AAChD,0GAA0E;AAO1E,SAAwB,WAAW,CACjC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAOzB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAY,CAAC;IAC3D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,IAAA,uBAAa,EAC1D,SAAS,EACT,eAAe,EACf,WAAW,EACX,UAAU,EACV,gBAAgB,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAC/C,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,mBAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC9D,WAAW,CAAC,QAAQ,CAAC,CAAC;aACvB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACxC,iCAAuB,CAAC,gBAAgB,CAAC,SAAS,EAAE,wBAAe,CAAC,qBAAqB,CAAC,CAAC;YAC3F,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAE5B,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CACtC,CAAO,oBAA0C,EAAE,EAAE;QACnD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,iEAAiE,CAAC;SACzE;QACD,mBAAY,CAAC,mBAAmB,EAAE,CAAC;QACnC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAY,CAAC,MAAM,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAC7E,WAAW,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC,CAAA,EACD,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,eAAe,EAAE;YACnB,QAAQ,CAAC,eAAe,CAAC,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,QAAQ,EAAE;gBACb,KAAK,WAAW,EAAE,CAAC;aACpB;SACF;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAEzD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC;AAC7E,CAAC;AA3DD,8BA2DC"}

package/build/cjs/ocm/index.js

@@ -9,6 +9,7 @@ exports.Services = tslib_1.__importStar(require("./services"));
 // without namespace
 tslib_1.__exportStar(require("./components"), exports);
 tslib_1.__exportStar(require("./services"), exports);
+tslib_1.__exportStar(require("./hooks"), exports);
 // re-export selected from common
 exports.Features = tslib_1.__importStar(require("../common/features"));
 exports.Constants = tslib_1.__importStar(require("../common/config"));

package/build/cjs/ocm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/ocm/index.ts"],"names":[],"mappings":";;;;AAAA,6DAAqC;AACrC,yDAAiC;AACjC,2DAAmC;AACnC,+DAAuC;AAEvC,oBAAoB;AACpB,uDAA6B;AAC7B,qDAA2B;AAE3B,iCAAiC;AACjC,uEAA+C;AAC/C,sEAA8C;AAC9C,uEAA+C;AAE/C,+DAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/ocm/index.ts"],"names":[],"mappings":";;;;AAAA,6DAAqC;AACrC,yDAAiC;AACjC,2DAAmC;AACnC,+DAAuC;AAEvC,oBAAoB;AACpB,uDAA6B;AAC7B,qDAA2B;AAC3B,kDAAwB;AAExB,iCAAiC;AACjC,uEAA+C;AAC/C,sEAA8C;AAC9C,uEAA+C;AAE/C,+DAAqC"}

package/build/cjs/ocm/services/OperatorsService.js

@@ -33,16 +33,21 @@ const OperatorsService = {
         setOperator(common_1.OPERATOR_NAME_NVIDIA_GPU, values.useNvidiaGpu);
         setOperator(common_1.OPERATOR_NAME_AMD_GPU, values.useAmdGpu);
         setOperator(common_1.OPERATOR_NAME_KMM, values.useKmm);
+        setOperator(common_1.OPERATOR_NAME_NODE_HEALTHCHECK, values.useNodeHealthcheck);
+        setOperator(common_1.OPERATOR_NAME_SELF_NODE_REMEDIATION, values.useNodeMaintenance);
+        setOperator(common_1.OPERATOR_NAME_FENCE_AGENTS_REMEDIATION, values.useFenceAgentsRemediation);
+        setOperator(common_1.OPERATOR_NAME_NODE_MAINTENANCE, values.useNodeMaintenance);
+        setOperator(common_1.OPERATOR_NAME_KUBE_DESCHEDULER, values.useKubeDescheduler);
         return Object.values(enabledOlmOperatorsByName);
     },
     /**
-     * Depending on the Openshift version and certain selected operators, the
+     * Depending on the OpenShift version and certain selected operators, the
      * Backend can activate some other operators.
      * We need to synchronise them back to the form
      */
     syncOperators(uiOperators, updatedOperators) {
         const updates = {};
-        // LVM operator can be automatically selected depending on Openshift version + other operators
+        // LVM operator can be automatically selected depending on OpenShift version + other operators
         const lvmPrevInactive = (uiOperators === null || uiOperators === void 0 ? void 0 : uiOperators.find((op) => op.name === common_1.OPERATOR_NAME_LVM)) === undefined;
         const lvmNowActive = (updatedOperators === null || updatedOperators === void 0 ? void 0 : updatedOperators.find((op) => op.name === common_1.OPERATOR_NAME_LVM)) !== undefined;
         if (lvmPrevInactive && lvmNowActive) {

package/build/cjs/ocm/services/OperatorsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"OperatorsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/OperatorsService.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"OperatorsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/OperatorsService.tsx"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,7 @@
+import React from 'react';
 import { Formik, FormikProps, useFormikContext } from 'formik';
+import { Stack } from '@patternfly/react-core';
 import noop from 'lodash-es/noop.js';
-import * as React from 'react';
-import { Ref } from 'react';
 import { ClusterDetailsValues, getRichTextValidation } from '../../../common';
 import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
 import ClusterDeploymentDetailsForm from './ClusterDeploymentDetailsForm';
@@ -33,18 +33,20 @@ const DetailsFormBody: React.FC<DetailsFormBodyProps> = ({
   }, []);
 
   return (
-    <ClusterDeploymentDetailsForm
-      clusterImages={clusterImages}
-      extensionAfter={extensionAfter}
-      isNutanix={isNutanix}
-      osImages={osImages}
-    />
+    <Stack hasGutter>
+      <ClusterDeploymentDetailsForm
+        clusterImages={clusterImages}
+        extensionAfter={extensionAfter}
+        isNutanix={isNutanix}
+        osImages={osImages}
+      />
+    </Stack>
   );
 };
 
 type ACMClusterDeploymentDetailsStepProps = DetailsFormBodyProps & {
   usedClusterNames: string[];
-  formRef: Ref<FormikProps<ClusterDetailsValues>>;
+  formRef: React.Ref<FormikProps<ClusterDetailsValues>>;
 };
 
 const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepProps> = ({

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

@@ -1,5 +1,13 @@
 import * as React from 'react';
-import { Alert, Stack, StackItem } from '@patternfly/react-core';
+import {
+  Alert,
+  AlertVariant,
+  Stack,
+  StackItem,
+  useWizardContext,
+  useWizardFooter,
+  WizardFooter,
+} from '@patternfly/react-core';
 import { AgentClusterInstallK8sResource, ClusterDeploymentK8sResource, OsImage } from '../../types';
 import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
 import { getOCPVersions, getSelectedVersion } from '../helpers';
@@ -10,6 +18,9 @@ import {
 } from './ClusterDetailsFormFields';
 import { useFormikContext } from 'formik';
 import { ClusterDetailsValues, CpuArchitecture, SupportedCpuArchitecture } from '../../../common';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
+import { ValidationSection } from './components/ValidationSection';
+import { toNumber } from 'lodash-es';
 
 type ClusterDeploymentDetailsFormProps = {
   clusterImages: ClusterImageSetK8sResource[];
@@ -20,6 +31,59 @@ type ClusterDeploymentDetailsFormProps = {
   osImages?: OsImage[];
 };
 
+export const ClusterDeploymentDetailsFormWrapper = ({
+  children,
+}: {
+  children: React.ReactNode;
+}) => {
+  const { activeStep, goToPrevStep, goToNextStep, close } = useWizardContext();
+  const { syncError } = React.useContext(ClusterDeploymentWizardContext);
+  const { submitForm, isSubmitting, isValid, isValidating, dirty } =
+    useFormikContext<ClusterDetailsValues>();
+  const { t } = useTranslation();
+
+  const handleOnNext = React.useCallback(() => {
+    if (dirty) {
+      void submitForm();
+    } else {
+      void goToNextStep();
+    }
+  }, [dirty, goToNextStep, submitForm]);
+
+  const footer = React.useMemo(
+    () => (
+      <WizardFooter
+        activeStep={activeStep}
+        onNext={handleOnNext}
+        isNextDisabled={!isValid || isValidating || isSubmitting}
+        nextButtonProps={{ isLoading: isSubmitting }}
+        nextButtonText={t('ai:Next')}
+        onBack={goToPrevStep}
+        onClose={close}
+        isBackHidden
+      />
+    ),
+    [activeStep, close, goToPrevStep, handleOnNext, isSubmitting, isValid, isValidating, t],
+  );
+
+  useWizardFooter(footer);
+
+  return (
+    <Stack hasGutter>
+      {children}
+      {syncError && (
+        <StackItem>
+          <ValidationSection currentStepId={'networking'} hosts={[]}>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+              {syncError}
+            </Alert>
+          </ValidationSection>
+        </StackItem>
+      )}
+    </Stack>
+  );
+};
+
 const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
   agentClusterInstall,
   clusterDeployment,
@@ -29,11 +93,16 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
   osImages,
 }) => {
   const { t } = useTranslation();
-  const ocpVersions = React.useMemo(
+  const versions = React.useMemo(
     () => getOCPVersions(clusterImages, isNutanix, osImages),
     [clusterImages, isNutanix, osImages],
   );
 
+  const allVersions = React.useMemo(
+    () => getOCPVersions(clusterImages, isNutanix, osImages, true),
+    [clusterImages, isNutanix, osImages],
+  );
+
   const forceOpenshiftVersion = agentClusterInstall
     ? getSelectedVersion(clusterImages, agentClusterInstall)
     : undefined;
@@ -41,25 +110,20 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
 
   const { values } = useFormikContext<ClusterDetailsValues>();
 
-  const cpuArchitectures = React.useMemo(() => {
+  const [cpuArchitectures, allowHighlyAvailable] = React.useMemo(() => {
     const cpuArchitectures = [CpuArchitecture.x86, CpuArchitecture.ARM, CpuArchitecture.s390x];
-    if (!osImages) {
-      return cpuArchitectures;
-    }
+    const version = allVersions.find((ver) => ver.value === values.openshiftVersion);
+    const isMulti = version?.cpuArchitectures?.[0] === CpuArchitecture.MULTI;
 
-    const openshiftVersion = ocpVersions
-      .find((ver) => ver.value === values.openshiftVersion)
-      ?.version.split('.')
-      .slice(0, 2)
-      .join('.');
-
-    return osImages
-      .filter((osImage) => osImage.openshiftVersion === openshiftVersion)
-      .map((osImage) => osImage.cpuArchitecture as SupportedCpuArchitecture);
-  }, [osImages, ocpVersions, values.openshiftVersion]);
+    const highlyAvailableSupported = toNumber(version?.version?.split('.')?.[1]) >= 18;
+    return [
+      (isMulti ? cpuArchitectures : version?.cpuArchitectures) as SupportedCpuArchitecture[],
+      highlyAvailableSupported && !isMulti,
+    ];
+  }, [allVersions, values.openshiftVersion]);
 
   return (
-    <Stack hasGutter>
+    <>
       {isEditFlow && (
         <StackItem>
           <Alert
@@ -71,15 +135,17 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
       )}
       <StackItem>
         <ClusterDetailsFormFields
-          versions={ocpVersions}
+          versions={versions}
+          allVersions={allVersions}
           isEditFlow={isEditFlow}
           forceOpenshiftVersion={forceOpenshiftVersion}
           extensionAfter={extensionAfter}
           isNutanix={isNutanix}
           cpuArchitectures={cpuArchitectures}
+          allowHighlyAvailable={allowHighlyAvailable}
         />
       </StackItem>
-    </Stack>
+    </>
   );
 };
 

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Formik } from 'formik';
 import { Lazy } from 'yup';
-import { Grid, GridItem } from '@patternfly/react-core';
+import { Grid, GridItem, useWizardContext } from '@patternfly/react-core';
 
 import {
   useAlerts,
@@ -15,9 +15,6 @@ import {
 } from '../../../common';
 
 import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from './types';
-import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
-import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
-import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
 import { getAICluster, getNetworkType, getOCPVersions } from '../helpers';
 import {
   AgentClusterInstallK8sResource,
@@ -25,8 +22,10 @@ import {
   ClusterDeploymentK8sResource,
   InfraEnvK8sResource,
 } from '../../types';
-import ClusterDeploymentDetailsForm from './ClusterDeploymentDetailsForm';
-import { isCIMFlow, getGridSpans } from './helpers';
+import ClusterDeploymentDetailsForm, {
+  ClusterDeploymentDetailsFormWrapper,
+} from './ClusterDeploymentDetailsForm';
+import { getGridSpans } from './helpers';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type UseDetailsFormikArgs = {
@@ -108,15 +107,16 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
   agents,
   usedClusterNames,
   onSaveDetails,
-  onClose,
   isPreviewOpen,
   infraEnv,
   isNutanix,
 }) => {
-  const { addAlert } = useAlerts();
-  const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
   const { t } = useTranslation();
+  const { addAlert } = useAlerts();
+  const { goToNextStep } = useWizardContext();
+
   const ocpVersions = getOCPVersions(clusterImages, isNutanix);
+  const gridSpans = getGridSpans(isPreviewOpen);
 
   const [initialValues, validationSchema] = useDetailsFormik({
     clusterDeployment,
@@ -126,15 +126,11 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
     usedClusterNames,
     infraEnv,
   });
-  const next = () =>
-    isCIMFlow(clusterDeployment)
-      ? setCurrentStepId('hosts-selection')
-      : setCurrentStepId('hosts-discovery');
 
   const handleSubmit = async (values: ClusterDeploymentDetailsValues) => {
     try {
       await onSaveDetails(values);
-      next();
+      await goToNextStep();
     } catch (error) {
       addAlert({
         title: t('ai:Failed to save ClusterDeployment'),
@@ -149,45 +145,21 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
       validate={getRichTextValidation(validationSchema)}
       onSubmit={handleSubmit}
     >
-      {({ submitForm, isSubmitting, isValid, isValidating, dirty }) => {
-        const handleOnNext = () => {
-          if (dirty) {
-            void submitForm();
-          } else {
-            next();
-          }
-        };
-
-        const footer = (
-          <ClusterDeploymentWizardFooter
-            agentClusterInstall={agentClusterInstall}
-            isSubmitting={isSubmitting}
-            isNextDisabled={!isValid || isValidating || isSubmitting}
-            onNext={handleOnNext}
-            onCancel={onClose}
-          />
-        );
-
-        const gridSpans = getGridSpans(isPreviewOpen);
-
-        return (
-          <ClusterDeploymentWizardStep footer={footer}>
-            <Grid hasGutter>
-              <GridItem>
-                <ClusterWizardStepHeader>Cluster Details</ClusterWizardStepHeader>
-              </GridItem>
-              <GridItem {...gridSpans}>
-                <ClusterDeploymentDetailsForm
-                  agentClusterInstall={agentClusterInstall}
-                  clusterDeployment={clusterDeployment}
-                  clusterImages={clusterImages}
-                  isNutanix={isNutanix}
-                />
-              </GridItem>
-            </Grid>
-          </ClusterDeploymentWizardStep>
-        );
-      }}
+      <Grid hasGutter>
+        <GridItem>
+          <ClusterWizardStepHeader>Cluster Details</ClusterWizardStepHeader>
+        </GridItem>
+        <GridItem {...gridSpans}>
+          <ClusterDeploymentDetailsFormWrapper>
+            <ClusterDeploymentDetailsForm
+              agentClusterInstall={agentClusterInstall}
+              clusterDeployment={clusterDeployment}
+              clusterImages={clusterImages}
+              isNutanix={isNutanix}
+            />
+          </ClusterDeploymentDetailsFormWrapper>
+        </GridItem>
+      </Grid>
     </Formik>
   );
 };

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

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import noop from 'lodash-es/noop.js';
 import { Stack, StackItem } from '@patternfly/react-core';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import {
@@ -28,13 +27,13 @@ import {
 } from '../../../common';
 import { ClusterDeploymentHostDiscoveryTableProps } from '../ClusterDeployment/types';
 import MassApproveAgentModal from '../modals/MassApproveAgentModal';
-import { MassChangeHostnameModalProps } from '../../../common/components/hosts/MassChangeHostnameModal';
 import MassApproveAction from '../modals/MassApproveAction';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { ExpandComponent } from '../Agent/AgentsSelectionTable';
 import { HostsTableDetailContextProvider } from '../../../common/components/hosts/HostsTableDetailContext';
 import { agentStatus, bmhStatus } from '../helpers/agentStatus';
+import { onAgentChangeHostname } from '../helpers';
 
 const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscoveryTableProps> = ({
   agents,
@@ -126,19 +125,6 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
     />,
   ];
 
-  const onAgentChangeHostname: MassChangeHostnameModalProps['onChangeHostname'] = async (
-    host,
-    hostname,
-  ) => {
-    const agent = agents.find((a) => a.metadata?.uid === host.id);
-    if (agent) {
-      return onChangeHostname(agent, hostname);
-    } else {
-      const bmh = bareMetalHosts.find((bmh) => bmh.metadata?.uid === host.id);
-      return bmh ? onChangeBMHHostname(bmh, hostname) : noop;
-    }
-  };
-
   const paginationProps = usePagination(hosts.length);
   const itemIDs = hosts.map((h) => h.id);
 
@@ -185,7 +171,12 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
           isOpen={isMassChangeHostOpen}
           hosts={hosts}
           selectedHostIDs={selectedHostIDs}
-          onChangeHostname={onAgentChangeHostname}
+          onChangeHostname={onAgentChangeHostname(
+            agents,
+            bareMetalHosts,
+            onChangeHostname,
+            onChangeBMHHostname,
+          )}
           onClose={() => setMassChangeHostOpen(false)}
           canChangeHostname={canChangeHostname(agents, agentStatuses, bareMetalHosts, t)}
         />

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

@@ -1,16 +1,21 @@
 import React from 'react';
 import * as Yup from 'yup';
 import { Formik, FormikConfig, useFormikContext } from 'formik';
-import { Alert, AlertVariant, Grid, GridItem } from '@patternfly/react-core';
-import { ClusterWizardStepHeader, useAlerts } from '../../../common';
+import {
+  Alert,
+  AlertVariant,
+  Grid,
+  GridItem,
+  useWizardContext,
+  useWizardFooter,
+  WizardFooter,
+} from '@patternfly/react-core';
+import { Alerts, ClusterWizardStepHeader, useAlerts } from '../../../common';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
 } from '../../types';
-import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
-import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
-import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
 import ClusterDeploymentHostsSelection from './ClusterDeploymentHostsSelection';
 import {
   ClusterDeploymentHostSelectionStepProps,
@@ -25,6 +30,8 @@ import {
 import { canNextFromHostSelectionStep } from './wizardTransition';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';
+import { ValidationSection } from './components/ValidationSection';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 
 const getInitialValues = ({
   agents,
@@ -138,14 +145,15 @@ type HostSelectionFormProps = Omit<ClusterDeploymentHostSelectionStepProps, 'onS
 const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   agents,
   agentClusterInstall,
-  onClose,
   clusterDeployment,
   aiConfigMap,
   onEditRole: onEditRoleInit,
   onSetInstallationDiskId,
   isNutanix,
 }) => {
-  const { setCurrentStepId } = React.useContext(ClusterDeploymentWizardContext);
+  const { activeStep, goToNextStep, goToPrevStep, close } = useWizardContext();
+  const { syncError } = React.useContext(ClusterDeploymentWizardContext);
+  const { alerts } = useAlerts();
   const [showClusterErrors, setShowClusterErrors] = React.useState(false);
   const {
     values,
@@ -186,7 +194,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
     setShowClusterErrors(false);
   }, []);
 
-  const onNext = async () => {
+  const onNext = React.useCallback(async () => {
     if (!showFormErrors) {
       setShowFormErrors(true);
       const errors = await validateForm();
@@ -202,7 +210,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
     }
     void submitForm();
     setNextRequested(true);
-  };
+  }, [setTouched, showFormErrors, submitForm, validateForm]);
 
   React.useEffect(() => {
     if (nextRequested && !isSubmitting) {
@@ -223,71 +231,106 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
       ) {
         setShowClusterErrors(true);
         if (canNextFromHostSelectionStep(agentClusterInstall, selectedAgents)) {
-          setCurrentStepId('networking');
+          void goToNextStep();
         }
       }
     }
-  }, [nextRequested, selectedAgents, agentClusterInstall, setCurrentStepId, isSubmitting, t]);
-
-  let submittingText: string | undefined = undefined;
+  }, [nextRequested, selectedAgents, agentClusterInstall, isSubmitting, t, goToNextStep]);
 
-  if (isSubmitting) {
-    submittingText = t('ai:Saving changes...');
-  } else if (nextRequested && !showClusterErrors) {
-    submittingText = t('ai:Binding hosts...');
-  }
+  const submittingText = React.useMemo(() => {
+    if (isSubmitting) {
+      return t('ai:Saving changes...');
+    } else if (nextRequested && !showClusterErrors) {
+      return t('ai:Binding hosts...');
+    }
+    return undefined;
+  }, [isSubmitting, nextRequested, showClusterErrors, t]);
 
-  const onSyncError = React.useCallback(() => setNextRequested(false), []);
+  React.useEffect(() => {
+    if (syncError) {
+      setNextRequested(false);
+    }
+  }, [syncError]);
 
-  const footer = (
-    <ClusterDeploymentWizardFooter
-      agentClusterInstall={agentClusterInstall}
-      agents={selectedAgents}
-      isSubmitting={!!submittingText}
-      submittingText={submittingText}
-      isNextDisabled={
-        nextRequested || isSubmitting || (showFormErrors ? !isValid || isValidating : false)
-      }
-      // eslint-disable-next-line @typescript-eslint/no-misused-promises
-      onNext={onNext}
-      onBack={() => setCurrentStepId('cluster-details')}
-      onCancel={onClose}
-      showClusterErrors={showClusterErrors}
-      onSyncError={onSyncError}
-    >
-      {showFormErrors && errors.selectedHostIds && touched.selectedHostIds && (
-        <Alert
-          variant={AlertVariant.danger}
-          title={t('ai:Provided cluster configuration is not valid')}
-          isInline
-        >
-          {errors.selectedHostIds}
+  const errorsSection = (
+    <ValidationSection currentStepId={'cluster-details'} hosts={[]}>
+      {syncError && (
+        <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+          {syncError}
         </Alert>
       )}
-    </ClusterDeploymentWizardFooter>
+    </ValidationSection>
   );
 
+  const footer = React.useMemo(
+    () => (
+      <WizardFooter
+        activeStep={activeStep}
+        onNext={onNext}
+        isNextDisabled={
+          nextRequested || isSubmitting || (showFormErrors ? !isValid || isValidating : false) // ||
+          // !!syncError
+        }
+        nextButtonText={submittingText || t('ai:Next')}
+        nextButtonProps={{ isLoading: !!submittingText }}
+        onBack={goToPrevStep}
+        onClose={close}
+      />
+    ),
+    [
+      activeStep,
+      onNext,
+      nextRequested,
+      isSubmitting,
+      showFormErrors,
+      isValid,
+      isValidating,
+      submittingText,
+      t,
+      goToPrevStep,
+      close,
+    ],
+  );
+
+  useWizardFooter(footer);
+
   return (
-    <ClusterDeploymentWizardStep footer={footer}>
-      <Grid hasGutter>
+    <Grid hasGutter>
+      <GridItem>
+        <ClusterWizardStepHeader>{t('ai:Cluster hosts')}</ClusterWizardStepHeader>
+      </GridItem>
+      <GridItem>
+        <ClusterDeploymentHostsSelection
+          agentClusterInstall={agentClusterInstall}
+          agents={agents}
+          clusterDeployment={clusterDeployment}
+          aiConfigMap={aiConfigMap}
+          onEditRole={onEditRole}
+          onSetInstallationDiskId={onSetInstallationDiskId}
+          onAutoSelectChange={onAutoSelectChange}
+          onHostSelect={onHostSelect}
+          isNutanix={isNutanix}
+        />
+      </GridItem>
+      {(showClusterErrors || showFormErrors) && !!alerts.length && (
         <GridItem>
-          <ClusterWizardStepHeader>{t('ai:Cluster hosts')}</ClusterWizardStepHeader>
+          <Alerts />
         </GridItem>
+      )}
+
+      {syncError && <GridItem>{errorsSection}</GridItem>}
+      {showFormErrors && errors.selectedHostIds && touched.selectedHostIds && (
         <GridItem>
-          <ClusterDeploymentHostsSelection
-            agentClusterInstall={agentClusterInstall}
-            agents={agents}
-            clusterDeployment={clusterDeployment}
-            aiConfigMap={aiConfigMap}
-            onEditRole={onEditRole}
-            onSetInstallationDiskId={onSetInstallationDiskId}
-            onAutoSelectChange={onAutoSelectChange}
-            onHostSelect={onHostSelect}
-            isNutanix={isNutanix}
-          />
+          <Alert
+            variant={AlertVariant.danger}
+            title={t('ai:Provided cluster configuration is not valid')}
+            isInline
+          >
+            {errors.selectedHostIds}
+          </Alert>
         </GridItem>
-      </Grid>
-    </ClusterDeploymentWizardStep>
+      )}
+    </Grid>
   );
 };