@openshift-assisted/ui-lib 2.53.1 → 2.54.0

package/build/cjs/ocm/components/clusterWizard/wizardTransition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStaticIpStep = exports.canNextNetwork = exports.canNextOperators = exports.canNextStorage = exports.canNextHostDiscovery = exports.canNextClusterDetails = exports.allClusterWizardSoftValidationIds = exports.wizardStepsValidationsMap = exports.getClusterWizardFirstStep = exports.isStepAfter = exports.getLastStepForWizard = exports.ClusterWizardFlowStateNew = exports.disconnectedSteps = void 0;
+exports.isStaticIpStep = exports.canNextNetwork = exports.canNextOperators = exports.canNextStorage = exports.canNextHostDiscovery = exports.canNextClusterDetails = exports.allClusterWizardSoftValidationIds = exports.wizardStepsValidationsMap = exports.getClusterWizardFirstStep = exports.isStepAfter = exports.ClusterWizardFlowStateNew = exports.disconnectedSteps = void 0;
 const validationsInfoUtils_1 = require("../../../common/components/clusterWizard/validationsInfoUtils");
 const dataTypes_1 = require("../clusterConfiguration/staticIp/data/dataTypes");
 const utils_1 = require("../../../common/utils");
@@ -22,15 +22,6 @@ exports.disconnectedSteps = [
     'disconnected-review',
 ];
 exports.ClusterWizardFlowStateNew = 'new';
-const getLastStepForWizard = (customManifestsStepNeedsToBeFilled) => {
-    if (customManifestsStepNeedsToBeFilled) {
-        return 'custom-manifests';
-    }
-    else {
-        return 'review';
-    }
-};
-exports.getLastStepForWizard = getLastStepForWizard;
 const isStepAfter = (stepA, stepB) => {
     const indexA = wizardStepsOrder.findIndex((step) => step === stepA);
     const indexB = wizardStepsOrder.findIndex((step) => step === stepB);
@@ -40,7 +31,7 @@ const isStepAfter = (stepA, stepB) => {
     return indexA > indexB;
 };
 exports.isStepAfter = isStepAfter;
-const getClusterWizardFirstStep = (locationState, staticIpInfo, state, hosts, customManifestsStepNeedsToBeFilled) => {
+const getClusterWizardFirstStep = (locationState, staticIpInfo, state, cluster) => {
     // Just for the first time when the cluster is created
     if (locationState === exports.ClusterWizardFlowStateNew && !staticIpInfo) {
         return 'operators';
@@ -53,39 +44,40 @@ const getClusterWizardFirstStep = (locationState, staticIpInfo, state, hosts, cu
     }
     switch (state) {
         case 'ready':
-            return (0, exports.getLastStepForWizard)(customManifestsStepNeedsToBeFilled || false);
+            return 'review';
         case 'pending-for-input':
         case 'adding-hosts':
         case 'insufficient':
-            if (customManifestsStepNeedsToBeFilled) {
-                return 'custom-manifests';
-            }
-            return getStepForFailingHostValidations(hosts);
+            return getStepForFailingValidations(cluster);
         default:
             return 'cluster-details';
     }
 };
 exports.getClusterWizardFirstStep = getClusterWizardFirstStep;
-const getStepForFailingHostValidations = (hosts) => {
-    const failingValidations = getHostFailingValidationIds(hosts);
-    const minimumStep = 'host-discovery';
+const MINIMUM_STEP = 'host-discovery';
+const getStepForFailingValidations = (cluster) => {
+    // test host validations first, then cluster validations
+    const failingValidations = new Set([
+        ...getHostFailingValidationIds(cluster === null || cluster === void 0 ? void 0 : cluster.hosts),
+        ...getClusterFailingValidationIds(cluster),
+    ]);
     let step;
     for (const failingValidationId of failingValidations) {
-        step = (0, validationsInfoUtils_1.findValidationStep)(failingValidationId, exports.wizardStepsValidationsMap, minimumStep);
+        step = findValidationStep(failingValidationId, exports.wizardStepsValidationsMap);
         if (step !== undefined) {
             break;
         }
     }
-    return (step || minimumStep);
+    return step || MINIMUM_STEP;
 };
 const getHostFailingValidationIds = (hosts) => {
-    const failingValidations = [];
+    const failingValidations = new Set();
     hosts === null || hosts === void 0 ? void 0 : hosts.forEach((host) => {
         const validationsInfo = (0, utils_1.stringToJSON)(host.validationsInfo) || {};
         (0, utils_1.getKeys)(validationsInfo).forEach((group) => {
             const f = (validation) => {
                 if (validation.status === 'failure') {
-                    failingValidations.push(validation.id);
+                    failingValidations.add(validation.id);
                 }
             };
             const validationGroup = validationsInfo[group];
@@ -94,6 +86,35 @@ const getHostFailingValidationIds = (hosts) => {
     });
     return failingValidations;
 };
+const getClusterFailingValidationIds = (cluster) => {
+    const failingValidations = new Set();
+    const validationsInfo = (0, utils_1.stringToJSON)(cluster === null || cluster === void 0 ? void 0 : cluster.validationsInfo) || {};
+    (0, utils_1.getKeys)(validationsInfo).forEach((group) => {
+        const f = (validation) => {
+            if (validation.status === 'failure') {
+                failingValidations.add(validation.id);
+            }
+        };
+        const validationGroup = validationsInfo[group];
+        validationGroup.forEach(f);
+    });
+    return failingValidations;
+};
+const findValidationStep = (validationId, wizardStepsValidationsMap) => {
+    let isBeforeMinimumStep = true;
+    return wizardStepsOrder.find((wizardStepId) => {
+        if (wizardStepId === MINIMUM_STEP) {
+            isBeforeMinimumStep = false;
+        }
+        if (isBeforeMinimumStep) {
+            return false;
+        }
+        // find first matching validation-map name, ignoring steps before minimumStep
+        const { host: hostValidationMap, cluster: clusterValidationMap } = wizardStepsValidationsMap[wizardStepId];
+        return (hostValidationMap.validationIds.includes(validationId) ||
+            clusterValidationMap.validationIds.includes(validationId));
+    });
+};
 const buildEmptyValidationsMap = () => ({
     cluster: {
         groups: [],
@@ -140,6 +161,7 @@ const hostDiscoveryStepValidationsMap = {
         groups: ['hardware'],
         validationIds: [
             'connected',
+            'hostname-valid',
             'media-connected',
             'lso-requirements-satisfied',
             'odf-requirements-satisfied',
@@ -178,12 +200,18 @@ const storageStepValidationsMap = {
 const networkingStepValidationsMap = {
     cluster: {
         groups: ['network'],
-        validationIds: [],
+        validationIds: [
+            'api-vips-defined',
+            'machine-cidr-defined',
+            'cluster-cidr-defined',
+            'service-cidr-defined',
+            'all-hosts-are-ready-to-install',
+        ],
     },
     host: {
         allowedStatuses: ['known', 'disabled'],
         groups: ['network'],
-        validationIds: [],
+        validationIds: ['apps-domain-name-resolved-correctly'],
     },
     // TODO(jtomasek): container-images-available validation is currently not running on the backend, it stays in pending.
     // marking it as soft validation is the easy way to prevent it from blocking the progress.
@@ -197,6 +225,18 @@ const networkingStepValidationsMap = {
         'custom-manifests-requirements-satisfied',
     ],
 };
+const customManifestsValidationsMap = {
+    cluster: {
+        groups: ['network'],
+        validationIds: ['platform-requirements-satisfied', 'custom-manifests-requirements-satisfied'],
+    },
+    host: {
+        allowedStatuses: ['known', 'disabled'],
+        groups: ['network'],
+        validationIds: [],
+    },
+    softValidationIds: ['ntp-synced', 'container-images-available', 'mtu-valid'],
+};
 const reviewStepValidationsMap = {
     cluster: {
         groups: [],
@@ -210,7 +250,6 @@ const reviewStepValidationsMap = {
     softValidationIds: [],
 };
 const credentialsValidationMap = buildEmptyValidationsMap();
-const customManifestsValidationsMap = buildEmptyValidationsMap();
 const disconnectedReviewValidationsMap = buildEmptyValidationsMap();
 const disconnectedBasicValidationsMap = buildEmptyValidationsMap();
 exports.wizardStepsValidationsMap = {
@@ -218,13 +257,13 @@ exports.wizardStepsValidationsMap = {
     'static-ip-yaml-view': staticIpValidationsMap,
     'static-ip-network-wide-configurations': staticIpValidationsMap,
     'static-ip-host-configurations': staticIpValidationsMap,
-    'custom-manifests': customManifestsValidationsMap,
     operators: operatorsStepValidationsMap,
     'host-discovery': hostDiscoveryStepValidationsMap,
     storage: storageStepValidationsMap,
     networking: networkingStepValidationsMap,
-    review: reviewStepValidationsMap,
+    'custom-manifests': customManifestsValidationsMap,
     'credentials-download': credentialsValidationMap,
+    review: reviewStepValidationsMap,
     'disconnected-review': disconnectedReviewValidationsMap,
     'disconnected-basic': disconnectedBasicValidationsMap,
 };

package/build/cjs/ocm/components/clusterWizard/wizardTransition.js.map

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

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

@@ -42,13 +42,13 @@ function useInfraEnvId(clusterId, cpuArchitecture, clusterName, pullSecret, open
         openshiftVersion,
     ]);
     react_1.default.useEffect(() => {
-        if (!clusterId) {
+        if (!clusterId && !isSingleClusterFeatureEnabled) {
             setError('Missing clusterId to load infrastructure environment');
         }
         else if (!infraEnvId) {
             void findInfraEnvId();
         }
-    }, [clusterId, findInfraEnvId, infraEnvId]);
+    }, [clusterId, findInfraEnvId, infraEnvId, isSingleClusterFeatureEnabled]);
     return { infraEnvId, error };
 }
 //# sourceMappingURL=useInfraEnvId.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useInfraEnvId.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvId.ts"],"names":[],"mappings":";;AAWA,gCAsDC;;AAjED,0DAA0B;AAE1B,8CAAqD;AACrD,0CAA+C;AAM/C,+CAA2C;AAE3C,SAAwB,aAAa,CACnC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAEzB,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAkB,CAAC;IACnE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAClD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,2BAAgB,CAAC,aAAa,CACrD,SAAS,EACT,eAAe,EACf,6BAA6B,CAC9B,CAAC;YACF,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,YAAY,KAAK,CAAC,EAAE,CAAC;gBACjD,WAAW,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,4CAA4C;gBAC5C,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,MAAM,CAAC;wBAC7C,IAAI,EAAE,2BAAgB,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;wBACrE,UAAU;wBACV,SAAS;wBACT,gBAAgB;wBAChB,eAAe,EAAE,eAA0D;qBAC5E,CAAC,CAAC;oBACH,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAA,EAAE;QACD,SAAS;QACT,eAAe;QACf,6BAA6B;QAC7B,UAAU;QACV,WAAW;QACX,gBAAgB;KACjB,CAAC,CAAC;IAEH,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,QAAQ,CAAC,sDAAsD,CAAC,CAAC;QACnE,CAAC;aAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACvB,KAAK,cAAc,EAAE,CAAC;QACxB,CAAC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"useInfraEnvId.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvId.ts"],"names":[],"mappings":";;AAWA,gCAsDC;;AAjED,0DAA0B;AAE1B,8CAAqD;AACrD,0CAA+C;AAM/C,+CAA2C;AAE3C,SAAwB,aAAa,CACnC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAEzB,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAkB,CAAC;IACnE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAClD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,2BAAgB,CAAC,aAAa,CACrD,SAAS,EACT,eAAe,EACf,6BAA6B,CAC9B,CAAC;YACF,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,YAAY,KAAK,CAAC,EAAE,CAAC;gBACjD,WAAW,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,4CAA4C;gBAC5C,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,MAAM,CAAC;wBAC7C,IAAI,EAAE,2BAAgB,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;wBACrE,UAAU;wBACV,SAAS;wBACT,gBAAgB;wBAChB,eAAe,EAAE,eAA0D;qBAC5E,CAAC,CAAC;oBACH,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAA,EAAE;QACD,SAAS;QACT,eAAe;QACf,6BAA6B;QAC7B,UAAU;QACV,WAAW;QACX,gBAAgB;KACjB,CAAC,CAAC;IAEH,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,SAAS,IAAI,CAAC,6BAA6B,EAAE,CAAC;YACjD,QAAQ,CAAC,sDAAsD,CAAC,CAAC;QACnE,CAAC;aAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACvB,KAAK,cAAc,EAAE,CAAC;QACxB,CAAC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,6BAA6B,CAAC,CAAC,CAAC;IAE3E,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC"}

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/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/common/CpuArchitectureDropdown.tsx

@@ -86,7 +86,7 @@ const CpuArchitectureDropdown = ({
             id={fieldId}
             ref={toggleRef}
             onClick={() => setCpuArchOpen(!cpuArchOpen)}
-            className="pf-v6-u-w-100"
+            isFullWidth
           >
             {value ? architectureData[value].label : t('ai:CPU architecture')}
           </MenuToggle>
@@ -94,6 +94,7 @@ const CpuArchitectureDropdown = ({
         isOpen={cpuArchOpen}
         onSelect={onCpuArchSelect}
         onOpenChange={() => setCpuArchOpen(!cpuArchOpen)}
+        shouldFocusToggleOnSelect
       >
         {dropdownItems}
       </Dropdown>

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.tsx

@@ -29,6 +29,7 @@ const hasFilledTangServers = (tangServers: TangServer[]): boolean => {
 export interface DiskEncryptionControlGroupProps {
   values: DiskEncryptionValues;
   isSNO: boolean;
+  isArbiterEncryptionAvailable?: boolean;
   isDisabled?: boolean;
   docVersion?: string;
 }
@@ -36,6 +37,7 @@ export interface DiskEncryptionControlGroupProps {
 const DiskEncryptionControlGroup = ({
   values,
   isSNO = false,
+  isArbiterEncryptionAvailable = true,
   isDisabled = false,
   docVersion,
 }: DiskEncryptionControlGroupProps) => {
@@ -77,6 +79,12 @@ const DiskEncryptionControlGroup = ({
       setFieldValue('enableDiskEncryptionOnWorkers', false);
     }
   }, [isSNO, setFieldValue]);
+
+  React.useEffect(() => {
+    if (!isArbiterEncryptionAvailable) {
+      setFieldValue('enableDiskEncryptionOnArbiters', false);
+    }
+  }, [isArbiterEncryptionAvailable, setFieldValue]);
   const { t } = useTranslation();
   const disableMessage = t('ai:This option is not editable after the draft cluster is created');
   const tooltipProps = {
@@ -105,14 +113,16 @@ const DiskEncryptionControlGroup = ({
             />
           </StackItem>
         </RenderIf>
-        <StackItem>
-          <SwitchField
-            tooltipProps={tooltipProps}
-            name="enableDiskEncryptionOnArbiters"
-            label={t('ai:Arbiter')}
-            isDisabled={isDisabled}
-          />
-        </StackItem>
+        <RenderIf condition={isArbiterEncryptionAvailable}>
+          <StackItem>
+            <SwitchField
+              tooltipProps={tooltipProps}
+              name="enableDiskEncryptionOnArbiters"
+              label={t('ai:Arbiter')}
+              isDisabled={isDisabled}
+            />
+          </StackItem>
+        </RenderIf>
         <RenderIf
           condition={
             enableDiskEncryptionOnMasters ||

package/lib/common/components/clusterConfiguration/ExternalPlatformsDropdown.tsx

@@ -75,11 +75,13 @@ export const ExternalPlatformsDropdown = ({ isDisabled }: { isDisabled: boolean
       <Dropdown
         isOpen={isOpen}
         toggle={(toggleRef) => (
-          <MenuToggle ref={toggleRef} className="pf-v5-u-w-100" onClick={() => setIsOpen(!isOpen)}>
+          <MenuToggle ref={toggleRef} onClick={() => setIsOpen(!isOpen)} isFullWidth>
             {value ? platforms[value] : t('ai:Integrate with external partner platforms')}
           </MenuToggle>
         )}
         onSelect={onSelect}
+        onOpenChange={() => setIsOpen(!isOpen)}
+        shouldFocusToggleOnSelect
       >
         {options}
       </Dropdown>