@openshift-assisted/ui-lib 5.0.0-cim → 5.0.1-cim

package/build/cjs/ocm/hooks/useLateBinding.js

@@ -7,48 +7,63 @@ const useInfraEnvHosts_1 = tslib_1.__importDefault(require("./useInfraEnvHosts")
 const HostsService_1 = tslib_1.__importDefault(require("../services/HostsService"));
 const utils_1 = require("../../common/utils");
 const use_feature_1 = require("./use-feature");
+const MAX_BIND_RETRY_ATTEMPTS = 3;
 const useLateBinding = (cluster) => {
     const [isBinding, setIsBinding] = (0, react_1.useState)(false);
     const { addAlert, removeAlert, alerts } = (0, common_1.useAlerts)();
     const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
+    const bindFailureCounts = (0, react_1.useRef)(new Map());
+    const alertsRef = (0, react_1.useRef)(alerts);
+    alertsRef.current = alerts;
     const { hosts: infraEnvHosts, error: infraEnvError, isLoading: infraEnvLoading, } = (0, useInfraEnvHosts_1.default)(isSingleClusterFeatureEnabled ? cluster.id : '', cluster.cpuArchitecture
         ? cluster.cpuArchitecture
         : common_1.CpuArchitecture.USE_DAY1_ARCHITECTURE, cluster.name, undefined, cluster.openshiftVersion);
+    const bindSingleHost = (0, react_1.useCallback)((host) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
+        setIsBinding(true);
+        try {
+            yield HostsService_1.default.bind(host, cluster.id);
+            // Binding succeeded: reset the failure counter and clear any alert that
+            // was shown after previous exhausted retries.
+            bindFailureCounts.current.delete(host.id);
+            const alertKey = (_a = alertsRef.current.find((alert) => alert.key === host.id)) === null || _a === void 0 ? void 0 : _a.key;
+            if (alertKey) {
+                removeAlert(alertKey);
+            }
+        }
+        catch (error) {
+            const failureCount = ((_b = bindFailureCounts.current.get(host.id)) !== null && _b !== void 0 ? _b : 0) + 1;
+            bindFailureCounts.current.set(host.id, failureCount);
+            // Suppress transient errors (e.g. 5xx during self-healing) and only
+            // surface the alert once silent retries have been exhausted.
+            if (failureCount >= MAX_BIND_RETRY_ATTEMPTS) {
+                addAlert({
+                    title: `Failed to bind host ${host.requestedHostname || ''}`,
+                    message: (0, utils_1.getErrorMessage)(error),
+                    key: host.id,
+                });
+            }
+        }
+        finally {
+            setIsBinding(false);
+        }
+    }), [cluster.id, addAlert, removeAlert]);
     const bindHosts = (0, react_1.useCallback)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        if (infraEnvHosts && !infraEnvError && !infraEnvLoading && isSingleClusterFeatureEnabled) {
-            for (const host of infraEnvHosts) {
-                if (host.clusterId !== cluster.id) {
-                    setIsBinding(true);
-                    try {
-                        const alertKey = (_a = alerts.find((alert) => alert.key === host.id)) === null || _a === void 0 ? void 0 : _a.key;
-                        if (alertKey) {
-                            removeAlert(alertKey);
-                        }
-                        yield HostsService_1.default.bind(host, cluster.id);
-                    }
-                    catch (error) {
-                        addAlert({
-                            title: `Failed to bind host ${host.requestedHostname || ''}`,
-                            message: (0, utils_1.getErrorMessage)(error),
-                            key: host.id,
-                        });
-                    }
-                    finally {
-                        setIsBinding(false);
-                    }
-                }
+        if (!infraEnvHosts || infraEnvError || infraEnvLoading || !isSingleClusterFeatureEnabled) {
+            return;
+        }
+        for (const host of infraEnvHosts) {
+            if (host.clusterId !== cluster.id) {
+                yield bindSingleHost(host);
             }
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }), [
         infraEnvHosts,
         infraEnvError,
         infraEnvLoading,
         isSingleClusterFeatureEnabled,
         cluster.id,
-        addAlert,
-        removeAlert,
+        bindSingleHost,
     ]);
     (0, react_1.useEffect)(() => {
         if (isSingleClusterFeatureEnabled) {

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

@@ -1 +1 @@
-{"version":3,"file":"useLateBinding.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useLateBinding.ts"],"names":[],"mappings":";;;AAAA,iCAAyD;AAEzD,yCAA0D;AAC1D,kFAAkD;AAClD,oFAAoD;AACpD,8CAAqD;AACrD,+CAA2C;AAE3C,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAW,EAAE;IACnD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IACtD,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,EACJ,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,eAAe,GAC3B,GAAG,IAAA,0BAAgB,EAClB,6BAA6B,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAC/C,OAAO,CAAC,eAAe;QACrB,CAAC,CAAE,OAAO,CAAC,eAAmC;QAC9C,CAAC,CAAC,wBAAe,CAAC,qBAAqB,EACzC,OAAO,CAAC,IAAI,EACZ,SAAS,EACT,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,GAAS,EAAE;;QACvC,IAAI,aAAa,IAAI,CAAC,aAAa,IAAI,CAAC,eAAe,IAAI,6BAA6B,EAAE,CAAC;YACzF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,EAAE,EAAE,CAAC;oBAClC,YAAY,CAAC,IAAI,CAAC,CAAC;oBACnB,IAAI,CAAC;wBACH,MAAM,QAAQ,GAAG,MAAA,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,0CAAE,GAAG,CAAC;wBACpE,IAAI,QAAQ,EAAE,CAAC;4BACb,WAAW,CAAC,QAAQ,CAAC,CAAC;wBACxB,CAAC;wBACD,MAAM,sBAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC5C,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,QAAQ,CAAC;4BACP,KAAK,EAAE,uBAAuB,IAAI,CAAC,iBAAiB,IAAI,EAAE,EAAE;4BAC5D,OAAO,EAAE,IAAA,uBAAe,EAAC,KAAK,CAAC;4BAC/B,GAAG,EAAE,IAAI,CAAC,EAAE;yBACb,CAAC,CAAC;oBACL,CAAC;4BAAS,CAAC;wBACT,YAAY,CAAC,KAAK,CAAC,CAAC;oBACtB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,uDAAuD;IACzD,CAAC,CAAA,EAAE;QACD,aAAa;QACb,aAAa;QACb,eAAe;QACf,6BAA6B;QAC7B,OAAO,CAAC,EAAE;QACV,QAAQ;QACR,WAAW;KACZ,CAAC,CAAC;IAEH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,6BAA6B,EAAE,CAAC;YAClC,KAAK,SAAS,EAAE,CAAC;QACnB,CAAC;IACH,CAAC,EAAE,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/C,OAAO,eAAe,IAAI,SAAS,CAAC;AACtC,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"useLateBinding.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useLateBinding.ts"],"names":[],"mappings":"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"}

package/build/cjs/ocm/hooks/usePullSecret.js

@@ -7,8 +7,8 @@ const api_1 = require("../../common/api");
 const common_1 = require("../../common");
 const access_token_api_1 = require("../../common/api/accounts-management-service/access-token-api");
 /**
- * Standalone / disconnected UI: bridge serves GET /pull-secret from a mounted manifest
- * (see assisted-disconnected-ui proxy).
+ * Standalone / disconnected UI: proxy serves GET /api/pull-secret with pull-secret JSON
+ * `{ "auths": … }` extracted from the mounted Secret manifest (see assisted-disconnected-ui proxy).
  */
 function fetchPullSecretFromBridge() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {

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

@@ -10,7 +10,10 @@ const InfraEnvsService = {
             let infraEnvId = InfraEnvIdsCacheService_1.default.getInfraEnvId(clusterId, cpuArchitecture);
             if (infraEnvId instanceof Error) {
                 const { data: infraEnvs } = yield apis_1.InfraEnvsAPI.list(!isSingleClusterFeatureEnabled ? clusterId : '');
-                if (infraEnvs.length > 0) {
+                if (isSingleClusterFeatureEnabled) {
+                    return infraEnvs[0].id;
+                }
+                if (infraEnvs.length > 0 && clusterId) {
                     InfraEnvIdsCacheService_1.default.updateInfraEnvs(clusterId, infraEnvs);
                     infraEnvId = InfraEnvIdsCacheService_1.default.getInfraEnvId(clusterId, cpuArchitecture);
                 }

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

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

package/build/cjs/ocm/store/slices/clusters/selectors.js

@@ -4,7 +4,7 @@ exports.selectClusterNames = exports.selectClusterTableRows = exports.getCluster
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const toolkit_1 = require("@reduxjs/toolkit");
-const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
+const react_router_1 = require("react-router");
 const common_1 = require("../../../../common");
 const ClusterStatus_1 = tslib_1.__importStar(require("../../../components/clusters/ClusterStatus"));
 const selectClusters = (state) => state.clusters.data.filter((c) => c.kind !== 'DisconnectedCluster');
@@ -29,7 +29,7 @@ const clusterToClusterTableRow = (cluster, t) => {
     return {
         cells: [
             {
-                title: (react_1.default.createElement(react_router_dom_v5_compat_1.Link, { key: name, to: id, id: `cluster-link-${id}` }, name)),
+                title: (react_1.default.createElement(react_router_1.Link, { key: name, to: id, id: `cluster-link-${id}` }, name)),
                 props: { 'data-testid': `cluster-name-${name}` },
                 sortableValue: name,
             },

package/build/cjs/ocm/store/slices/clusters/selectors.js.map

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

package/build/cjs/ocm/store/slices/feature-flags/selectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/feature-flags/selectors.ts"],"names":[],"mappings":";;;AAEA,8CAAkD;AAE3C,MAAM,uBAAuB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC;AAAvE,QAAA,uBAAuB,2BAAgD;AAE7E,MAAM,gBAAgB,GAAG,CAAC,SAAgC,EAAE,EAAE,CACnE,IAAA,wBAAc,EACZ,+BAAuB,EACvB,CAAC,YAAwD,EAAE,EAAE,WAC3D,OAAA,MAAA,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,mCAAI,KAAK,CAAA,EAAA,CACxC,CAAC;AALS,QAAA,gBAAgB,oBAKzB"}
+{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/feature-flags/selectors.ts"],"names":[],"mappings":";;;AAEA,8CAAkD;AAG3C,MAAM,uBAAuB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC;AAAvE,QAAA,uBAAuB,2BAAgD;AAE7E,MAAM,gBAAgB,GAAG,CAC9B,SAAgC,EACE,EAAE,CACpC,IAAA,wBAAc,EACZ,+BAAuB,EACvB,CAAC,YAAwD,EAAW,EAAE,WACpE,OAAA,MAAA,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,mCAAI,KAAK,CAAA,EAAA,CACxC,CAAC;AAPS,QAAA,gBAAgB,oBAOzB"}

package/build/cjs/ocm/store/slices/infra-envs/selectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/infra-envs/selectors.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAI3C,MAAM,oBAAoB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;AAAjE,QAAA,oBAAoB,wBAA6C;AACjE,QAAA,+BAA+B,GAAG,IAAA,wBAAc,EAC3D,CAAC,4BAAoB,EAAE,CAAC,CAAgB,EAAE,eAAgC,EAAE,EAAE,CAAC,eAAe,CAAC,EAC/F,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,CAC7B,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,eAAe,KAAK,eAAe,CAAC,CAC7E,CAAC"}
+{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/infra-envs/selectors.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAM3C,MAAM,oBAAoB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;AAAjE,QAAA,oBAAoB,wBAA6C;AACjE,QAAA,+BAA+B,GAAG,IAAA,wBAAc,EAC3D,CAAC,4BAAoB,EAAE,CAAC,CAAgB,EAAE,eAAgC,EAAE,EAAE,CAAC,eAAe,CAAC,EAC/F,CAAC,SAAS,EAAE,eAAe,EAAwB,EAAE,CACnD,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,eAAe,KAAK,eAAe,CAAC,CACT,CAAC"}

package/lib/cim/components/Agent/NoAgentsAlert.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Alert, AlertVariant, List, ListComponent, ListItem } from '@patternfly/react-core';
-import { Link } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Trans } from 'react-i18next';
 import { architectureData, CpuArchitecture, SupportedCpuArchitecture } from '../../../common';

package/lib/cim/components/Agent/tableColumns.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { TFunction } from 'i18next';
-import { Link } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import { HostsTableActions, getInventory, getHostname, Hostname } from '../../../common';
 import { TableRow } from '../../../common/components/hosts/AITable';

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Grid, GridItem, Wizard, WizardStep } from '@patternfly/react-core';
-import { AlertsContextProvider, LoadingState } from '../../../common';
+import { AlertsContextProvider, ErrorState, LoadingState } from '../../../common';
 import { ClusterDeploymentWizardProps } from './types';
 import { ACMFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { YamlPreview, useYamlPreview } from '../YamlPreview';
@@ -14,6 +14,7 @@ import { ClusterDeploymentHostsDiscoveryStep } from './hostDiscovery';
 import { ClusterDeploymentNetworkingStep } from './networking';
 import { ClusterDeploymentReviewStep } from './review';
 import { ClusterDeploymentCustomManifestsStep } from './customManifests';
+import { useAgents } from '../../hooks';
 
 export const ClusterDeploymentWizard = ({
   className,
@@ -27,7 +28,6 @@ export const ClusterDeploymentWizard = ({
   fetchSecret,
   clusterDeployment,
   agentClusterInstall,
-  agents,
   bareMetalHosts,
   clusterImages,
   aiConfigMap,
@@ -54,12 +54,20 @@ export const ClusterDeploymentWizard = ({
     fetchKlusterletAddonConfig,
   });
 
+  const [agents, loaded, error] = useAgents({ isList: true });
+
   // if initialStep is set, it is either 'host-selection' or 'host-discovery', both at index 4
   // if initialStep is not set, start at 'cluster-details' which is at index 2
   const startIndex = initialStep ? 4 : 2;
   const stepNames = wizardStepNames(t);
   const isAIFlow = !!infraEnv;
 
+  if (!loaded) {
+    return <LoadingState />;
+  } else if (error) {
+    return <ErrorState />;
+  }
+
   return (
     <Grid style={{ height: '100%' }}>
       <GridItem span={isPreviewOpen ? 7 : 12}>

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

@@ -4,7 +4,7 @@ import { Stack } from '@patternfly/react-core';
 import noop from 'lodash-es/noop.js';
 import { ClusterDetailsValues, getRichTextValidation } from '../../../../common';
 import { ClusterImageSetK8sResource } from '../../../types/k8s/cluster-image-set';
-import { useDetailsFormik } from './ClusterDeploymentDetailsStep';
+import { useDetailsFormik } from './useDetailsFormik';
 import { ClusterDetailsFormFieldsProps } from './ClusterDetailsFormFields';
 import { OsImage } from '../../../types';
 import { getOCPVersions } from '../../helpers';
@@ -58,9 +58,11 @@ export const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetai
   ...rest
 }) => {
   const ocpVersions = getOCPVersions(clusterImages, !!isNutanix, osImages);
+  const allOcpVersions = getOCPVersions(clusterImages, !!isNutanix, osImages, true);
 
   const [initialValues, validationSchema] = useDetailsFormik({
     ocpVersions,
+    allOcpVersions,
     usedClusterNames,
   });
 

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

@@ -1,101 +1,18 @@
 import React from 'react';
 import { Formik } from 'formik';
-import { Lazy } from 'yup';
 import { Grid, GridItem, useWizardContext } from '@patternfly/react-core';
 
-import {
-  useAlerts,
-  getClusterDetailsInitialValues,
-  getClusterDetailsValidationSchema,
-  ClusterWizardStepHeader,
-  ClusterDetailsValues,
-  getRichTextValidation,
-  OpenshiftVersionOptionType,
-} from '../../../../common';
+import { useAlerts, ClusterWizardStepHeader, getRichTextValidation } from '../../../../common';
 
 import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from '../types';
-import { getAICluster, getNetworkType, getOCPVersions } from '../../helpers';
-import {
-  AgentClusterInstallK8sResource,
-  AgentK8sResource,
-  ClusterDeploymentK8sResource,
-  InfraEnvK8sResource,
-} from '../../../types';
+import { getOCPVersions } from '../../helpers';
 import {
   ClusterDeploymentDetailsForm,
   ClusterDeploymentDetailsFormWrapper,
 } from './ClusterDeploymentDetailsForm';
 import { getGridSpans } from '../helpers';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-
-type UseDetailsFormikArgs = {
-  usedClusterNames: string[];
-  ocpVersions: OpenshiftVersionOptionType[];
-  clusterDeployment?: ClusterDeploymentK8sResource;
-  agentClusterInstall?: AgentClusterInstallK8sResource;
-  agents?: AgentK8sResource[];
-  infraEnv?: InfraEnvK8sResource;
-};
-
-export const useDetailsFormik = ({
-  clusterDeployment,
-  agentClusterInstall,
-  agents,
-  usedClusterNames,
-  infraEnv,
-  ocpVersions,
-}: UseDetailsFormikArgs): [
-  ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
-  Lazy<{ baseDnsDomain: string }>,
-] => {
-  const { t } = useTranslation();
-  const isEdit = !!clusterDeployment || !!agentClusterInstall;
-
-  const cluster = React.useMemo(
-    () =>
-      clusterDeployment && agentClusterInstall
-        ? getAICluster({
-            clusterDeployment,
-            agentClusterInstall,
-            agents,
-            infraEnv,
-          })
-        : undefined,
-    [agentClusterInstall, clusterDeployment, agents, infraEnv],
-  );
-
-  const initialValues = React.useMemo(
-    () => {
-      const initValues = getClusterDetailsInitialValues({
-        managedDomains: [], // not supported
-        cluster,
-        ocpVersions,
-      });
-
-      const ocpVersion = ocpVersions.find(
-        (ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
-      );
-      return {
-        ...initValues,
-        networkType: getNetworkType(ocpVersion),
-      };
-    },
-    [], // eslint-disable-line react-hooks/exhaustive-deps
-  );
-
-  const validationSchema = React.useMemo(
-    () =>
-      getClusterDetailsValidationSchema({
-        usedClusterNames,
-        pullSecretSet: isEdit,
-        validateUniqueName: true,
-        t,
-      }),
-    [usedClusterNames, isEdit, t],
-  );
-
-  return [initialValues, validationSchema];
-};
+import { useDetailsFormik } from './useDetailsFormik';
 
 export const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps> = ({
   clusterImages,
@@ -113,11 +30,13 @@ export const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStep
   const { goToNextStep } = useWizardContext();
 
   const ocpVersions = getOCPVersions(clusterImages, isNutanix);
+  const allOcpVersions = getOCPVersions(clusterImages, isNutanix, undefined, true);
   const gridSpans = getGridSpans(isPreviewOpen);
 
   const [initialValues, validationSchema] = useDetailsFormik({
     clusterDeployment,
     ocpVersions,
+    allOcpVersions,
     agentClusterInstall,
     agents,
     usedClusterNames,

package/lib/cim/components/ClusterDeployment/clusterDetails/ClusterDetailsFormFields.tsx

@@ -17,7 +17,6 @@ import { ClusterDetailsValues } from '../../../../common/components/clusterWizar
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import CpuArchitectureDropdown from '../../common/CpuArchitectureDropdown';
 import ControlPlaneNodesDropdown from '../../../../common/components/clusterConfiguration/ControlPlaneNodesDropdown';
-import { getNetworkType } from '../../helpers';
 
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
@@ -59,19 +58,9 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   const { t } = useTranslation();
   const nameInputRef = React.useRef<HTMLInputElement>();
   const [openshiftVersionModalOpen, setOpenshiftVersionModalOpen] = React.useState(false);
-  const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
+  const { values } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain } = values;
 
-  React.useEffect(() => {
-    if (!versions.length && !values.openshiftVersion && !isEditFlow) {
-      const fallbackOpenShiftVersion = allVersions.find((version) => version.default);
-      setFieldValue('customOpenshiftSelect', fallbackOpenShiftVersion?.value);
-      setFieldValue('openshiftVersion', fallbackOpenShiftVersion?.value);
-      setFieldValue('networkType', getNetworkType(fallbackOpenShiftVersion));
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   React.useEffect(() => {
     nameInputRef.current?.focus();
   }, []);

package/lib/cim/components/ClusterDeployment/clusterDetails/useDetailsFormik.tsx

@@ -0,0 +1,97 @@
+import React from 'react';
+import { Lazy } from 'yup';
+import {
+  ClusterDetailsValues,
+  getClusterDetailsInitialValues,
+  getClusterDetailsValidationSchema,
+  OpenshiftVersionOptionType,
+  useTranslation,
+} from '../../../../common';
+import {
+  AgentClusterInstallK8sResource,
+  AgentK8sResource,
+  ClusterDeploymentK8sResource,
+  InfraEnvK8sResource,
+} from '../../../types';
+import { getAICluster, getNetworkType } from '../../helpers';
+
+type UseDetailsFormikArgs = {
+  usedClusterNames: string[];
+  ocpVersions: OpenshiftVersionOptionType[];
+  allOcpVersions: OpenshiftVersionOptionType[];
+  clusterDeployment?: ClusterDeploymentK8sResource;
+  agentClusterInstall?: AgentClusterInstallK8sResource;
+  agents?: AgentK8sResource[];
+  infraEnv?: InfraEnvK8sResource;
+};
+
+export const useDetailsFormik = ({
+  clusterDeployment,
+  agentClusterInstall,
+  agents,
+  usedClusterNames,
+  infraEnv,
+  ocpVersions,
+  allOcpVersions,
+}: UseDetailsFormikArgs): [
+  ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
+  Lazy<{ baseDnsDomain: string }>,
+] => {
+  const { t } = useTranslation();
+  const isEdit = !!clusterDeployment || !!agentClusterInstall;
+
+  const cluster = React.useMemo(
+    () =>
+      clusterDeployment && agentClusterInstall
+        ? getAICluster({
+            clusterDeployment,
+            agentClusterInstall,
+            agents,
+            infraEnv,
+          })
+        : undefined,
+    [agentClusterInstall, clusterDeployment, agents, infraEnv],
+  );
+
+  const initialValues = React.useMemo(
+    () => {
+      let initValues = getClusterDetailsInitialValues({
+        managedDomains: [], // not supported
+        cluster,
+        ocpVersions,
+      });
+
+      let ocpVersion = ocpVersions.find(
+        (ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
+      );
+
+      if (!ocpVersion) {
+        ocpVersion = allOcpVersions.find((version) => version.default);
+        initValues = {
+          ...initValues,
+          openshiftVersion: ocpVersion?.value || '',
+          customOpenshiftSelect: ocpVersion?.value || '',
+        };
+      }
+
+      return {
+        ...initValues,
+        networkType: getNetworkType(ocpVersion),
+      };
+    },
+    [], // eslint-disable-line react-hooks/exhaustive-deps
+  );
+
+  const validationSchema = React.useMemo(
+    () =>
+      getClusterDetailsValidationSchema({
+        usedClusterNames,
+        pullSecretSet: isEdit,
+        validateUniqueName: true,
+        t,
+      }),
+    [usedClusterNames, isEdit, t],
+  );
+
+  return [initialValues, validationSchema];
+};

package/lib/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.tsx

@@ -1,3 +1,4 @@
+import * as React from 'react';
 import {
   Alert,
   AlertVariant,
@@ -7,7 +8,7 @@ import {
   useWizardFooter,
   WizardFooter,
 } from '@patternfly/react-core';
-import * as React from 'react';
+import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 import { canNextFromReviewStep } from '../wizardTransition';
 import {
   AgentClusterInstallK8sResource,
@@ -42,7 +43,6 @@ import { useTranslation } from '../../../../common/hooks/use-translation-wrapper
 import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
 import { ReviewConfigMapsTable } from './ReviewConfigMapsTable';
 import { ValidationSection } from '../components/ValidationSection';
-import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 
 type ClusterDeploymentReviewStepProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -77,7 +77,8 @@ export const ClusterDeploymentReviewStep = ({
 
   const canContinue = canNextFromReviewStep(agentClusterInstall, clusterAgents);
   const { t } = useTranslation();
-  const onNext = async () => {
+
+  const onNext = React.useCallback(async () => {
     clearAlerts();
     setSubmitting(true);
     try {
@@ -88,18 +89,21 @@ export const ClusterDeploymentReviewStep = ({
     } finally {
       setSubmitting(false);
     }
-  };
+  }, [addAlert, clearAlerts, onFinish, t]);
 
-  const footer = (
-    <WizardFooter
-      activeStep={activeStep}
-      onNext={onNext}
-      isNextDisabled={isSubmitting || !canContinue || !!syncError}
-      nextButtonText={t('ai:Install cluster')}
-      nextButtonProps={{ isLoading: isSubmitting }}
-      onBack={goToPrevStep}
-      onClose={close}
-    />
+  const footer = React.useMemo(
+    () => (
+      <WizardFooter
+        activeStep={activeStep}
+        onNext={onNext}
+        isNextDisabled={isSubmitting || !canContinue || !!syncError}
+        nextButtonText={t('ai:Install cluster')}
+        nextButtonProps={{ isLoading: isSubmitting }}
+        onBack={goToPrevStep}
+        onClose={close}
+      />
+    ),
+    [activeStep, canContinue, close, goToPrevStep, isSubmitting, onNext, syncError, t],
   );
   useWizardFooter(footer);
 

package/lib/cim/components/ClusterDeployment/types.ts

@@ -141,7 +141,6 @@ export type ClusterDeploymentWizardProps = {
 
   clusterDeployment: ClusterDeploymentK8sResource;
   agentClusterInstall: AgentClusterInstallK8sResource;
-  agents: AgentK8sResource[];
   bareMetalHosts: BareMetalHostK8sResource[];
   aiConfigMap?: ConfigMapK8sResource;
   infraEnv?: InfraEnvK8sResource;

package/lib/cim/components/ClusterDeployment/wizardTransition.ts

@@ -69,7 +69,11 @@ const networkingStepValidationsMap: WizardStepValidationMap = {
   // Alternatively we would have to whitelist network validations instead of using group
   // TODO(mlibra): remove that container-images-available from soft validations and let backend drive it via disabling it.
   //   Depends on: https://issues.redhat.com/browse/MGMT-5265
-  softValidationIds: ['ntp-synced', 'container-images-available'],
+  softValidationIds: [
+    'ntp-synced',
+    'container-images-available',
+    'custom-manifests-requirements-satisfied',
+  ],
   getPageURL: (host: Host, validationID: string) => {
     if (validationID === 'ntp-synced') {
       return {

package/lib/cim/components/Hypershift/DetailsPage/NodePoolsTable.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Link } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router';
 import { Button, Label, Popover, Stack, StackItem } from '@patternfly/react-core';
 import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';

package/lib/cim/components/InfraEnv/AddHostDropdown.tsx

@@ -18,7 +18,7 @@ import { AddBmcHostModal, AddBmcHostYamlModal, AddHostModal } from '../modals';
 import { AddHostDropdownProps } from './types';
 import './AddHostDropdown.css';
 import { Trans } from 'react-i18next';
-import { Link } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/js/icons/outlined-question-circle-icon';
 
 type ModalType = 'iso' | 'bmc' | 'yaml' | 'ipxe' | undefined;