npm - @openshift-assisted/ui-lib - Versions diffs - 2.15.3-cim → 2.15.5-cim - Mend

@openshift-assisted/ui-lib 2.15.3-cim → 2.15.5-cim

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

package/build/cjs/cim/components/Hypershift/HostedClusterWizard/HostsStep/NodePoolForm.js CHANGED Viewed

@@ -10,15 +10,11 @@ const ClusterDeployment_1 = require("../../../ClusterDeployment");
 const formik_1 = require("formik");
 const helpers_1 = require("../../../helpers");
 const use_translation_wrapper_1 = require("../../../../../common/hooks/use-translation-wrapper");
-const useFormikHelpers_1 = require("../../../../../common/hooks/useFormikHelpers");
 require("./NodePoolForm.css");
 const NodePoolAgentsForm_1 = tslib_1.__importDefault(require("../../forms/NodePoolAgentsForm"));
 const NodePoolForm = ({ infraEnvs, agents, index, onRemove }) => {
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
     const { values } = (0, formik_1.useFormikContext)();
-    const { setValue: setCountValue } = (0, useFormikHelpers_1.useFormikHelpers)(`nodePools[${index}].count`);
-    const { setValue: setMinAutoscalingValue } = (0, useFormikHelpers_1.useFormikHelpers)(`nodePools[${index}].autoscaling.minReplicas`);
-    const { setValue: setMaxAutoscalingValue } = (0, useFormikHelpers_1.useFormikHelpers)(`nodePools[${index}].autoscaling.maxReplicas`);
     const [isExpanded, setExpanded] = React.useState(true);
     const infraEnvAgents = React.useMemo(() => {
         const infraEnv = infraEnvs.find((ie) => { var _a; return ((_a = ie.metadata) === null || _a === void 0 ? void 0 : _a.namespace) === values.agentNamespace; });
@@ -43,30 +39,6 @@ const NodePoolForm = ({ infraEnvs, agents, index, onRemove }) => {
             : values.nodePools[i].count;
     }
     const maxAgents = Math.max(0, Math.min(matchingAgents.length, availableAgents.length - previousNodePoolsCount));
-    const currentCount = values.nodePools[index].useAutoscaling
-        ? values.nodePools[index].autoscaling.maxReplicas
-        : values.nodePools[index].count;
-    React.useEffect(() => {
-        if (currentCount > maxAgents) {
-            if (values.nodePools[index].useAutoscaling) {
-                if (maxAgents === 0) {
-                    void setMinAutoscalingValue(maxAgents);
-                }
-                void setMaxAutoscalingValue(maxAgents);
-            }
-            else {
-                void setCountValue(maxAgents);
-            }
-        }
-    }, [
-        maxAgents,
-        currentCount,
-        values.nodePools,
-        index,
-        setCountValue,
-        setMinAutoscalingValue,
-        setMaxAutoscalingValue,
-    ]);
     return (React.createElement(react_core_1.Stack, { hasGutter: true },
         React.createElement(react_core_1.StackItem, null,
             React.createElement(react_core_1.Level, { hasGutter: true },

package/build/cjs/cim/components/Hypershift/HostedClusterWizard/HostsStep/NodePoolForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"NodePoolForm.js","sourceRoot":"","sources":["../../../../../../../lib/cim/components/Hypershift/HostedClusterWizard/HostsStep/NodePoolForm.tsx"],"names":[],"mappings":";;;AAAA,uDAagC;AAChC,qDAA+B;AAC/B,iFAA6E;AAC7E,8EAA2C;AAC3C,kDAAwD;AAExD,kEAA+D;AAE/D,mCAA0C;AAC1C,8CAAyD;AACzD,iGAAqF;~~AACrF~~,~~mFAAgF;AAEhF,~~8BAA4B;AAC5B,gGAAgE;AAShE,MAAM,YAAY,GAAgC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC3F,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAgB,GAAmB,CAAC;IACvD,MAAM,~~EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAA,mCAAgB,EAAC,aAAa,KAAK,SAAS,~~CAAC,~~CAAC;IAClF,MAAM,EAAE,QAAQ,EAAE,sBAAsB,EAAE,GAAG,IAAA,mCAAgB,EAC3D,aAAa,KAAK,2BAA2B,CAC9C,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,sBAAsB,EAAE,GAAG,IAAA,mCAAgB,EAC3D,aAAa,KAAK,2BAA2B,CAC9C,CAAC;IACF,MAAM,CAAC,~~UAAU,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;~~IACvD~~,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,EAAE,CAAC,QAAQ,0CAAE,SAAS,MAAK,MAAM,CAAC,cAAc,CAAA,EAAA,CAAC,CAAC;QAC1F,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,qCAAiB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IACtE,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IAE/C,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,eAAe,GAAG,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;;QACtD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAA4B,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;YACnF,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACjB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,OAAO,CACL,IAAA,oBAAO,EAAC,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,KAAI,EAAE,EAAE,MAAM,CAAC;YAC7C,CAAC,CAAA,MAAA,KAAK,CAAC,IAAI,CAAC,qBAAqB,0CAAE,IAAI,CAAA;YACvC,CAAC,CAAA,MAAA,KAAK,CAAC,IAAI,CAAC,qBAAqB,0CAAE,SAAS,CAAA,CAC7C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,sBAAsB,GAAG,CAAC,CAAC;IAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9B,sBAAsB,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,cAAc;YAC1D,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW;YAC7C,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;KAC/B;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CACxB,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,GAAG,sBAAsB,CAAC,CACjF,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,cAAc;QACzD,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,WAAW;QACjD,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;IAElC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,YAAY,GAAG,SAAS,EAAE;YAC5B,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,cAAc,EAAE;gBAC1C,IAAI,SAAS,KAAK,CAAC,EAAE;oBACnB,KAAK,sBAAsB,CAAC,SAAS,CAAC,CAAC;iBACxC;gBACD,KAAK,sBAAsB,CAAC,SAAS,CAAC,CAAC;aACxC;iBAAM;gBACL,KAAK,aAAa,CAAC,SAAS,CAAC,CAAC;aAC/B;SACF;IACH,CAAC,EAAE;QACD,SAAS;QACT,YAAY;QACZ,MAAM,CAAC,SAAS;QAChB,KAAK;QACL,aAAa;QACb,sBAAsB;QACtB,sBAAsB;KACvB,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,kBAAK,IAAC,SAAS;QACd,oBAAC,sBAAS;YACR,oBAAC,kBAAK,IAAC,SAAS;gBACd,oBAAC,sBAAS;oBACR,oBAAC,iBAAI,IACH,UAAU,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAC3C,UAAU,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EACvC,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;wBAE7B,oBAAC,qBAAQ;4BACP,oBAAC,kBAAK,IAAC,SAAS,EAAC,sBAAsB;gCACrC,oBAAC,sBAAS;oCACR,oBAAC,oCAAuB,IACtB,SAAS,EAAC,iCAAiC,EAC3C,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,WAAW,GACrB,CACQ;gCACZ,oBAAC,sBAAS;oCACR,oBAAC,wBAAe,IACd,IAAI,EAAE,aAAa,KAAK,eAAe,EACvC,UAAU,QACV,gBAAgB,EAAE,KAAK,GACvB,CACQ,CACN,CACC;wBACV,CAAC,UAAU,IAAI,CACd;4BACE,oBAAC,qBAAQ;gCACP,oBAAC,oBAAO,IAAC,WAAW,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,GAAI,CACxC;4BACX,oBAAC,qBAAQ;gCACP,oBAAC,kBAAK,IAAC,OAAO,EAAC,SAAS,IACrB,CAAC,CAAC,8BAA8B,EAAE;oCACjC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM;iCAClD,CAAC,CACI,CACC,CACV,CACJ,CACI,CACG;gBACX,KAAK,KAAK,CAAC,IAAI,CACd,oBAAC,sBAAS;oBACR,oBAAC,mBAAM,IAAC,OAAO,EAAC,MAAM,EAAC,IAAI,EAAE,oBAAC,sBAAS,OAAG,EAAE,OAAO,EAAE,QAAQ,GAAI,CACvD,CACb,CACK,CACE;QACX,UAAU,IAAI,CACb,oBAAC,sBAAS,IAAC,SAAS,EAAC,uBAAuB;YAC1C,oBAAC,4BAAkB,IACjB,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,aAAa,KAAK,QAAQ,EACrC,SAAS,EAAE,aAAa,KAAK,cAAc,EAC3C,eAAe,EAAE,aAAa,KAAK,cAAc,EACjD,kBAAkB,EAAE,aAAa,KAAK,iBAAiB,EACvD,SAAS,EAAE,SAAS,GACpB,CACQ,CACb,CACK,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}
1	+ {"version":3,"file":"NodePoolForm.js","sourceRoot":"","sources":["../../../../../../../lib/cim/components/Hypershift/HostedClusterWizard/HostsStep/NodePoolForm.tsx"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/Hypershift/forms/NodePoolAgentsForm.js CHANGED Viewed

@@ -9,6 +9,7 @@ const LabelsSelector_1 = require("../../ClusterDeployment/LabelsSelector");
 const formik_1 = require("formik");
 const NodePoolAgentsForm = ({ agents, labelName, countName, autoscalingName, maxAgents, useAutoscalingName, isEdit = false, }) => {
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
+    const [{ value: count }] = (0, formik_1.useField)(countName);
     const [{ value: minValue }] = (0, formik_1.useField)(`${autoscalingName}.minReplicas`);
     const [{ value: maxValue }] = (0, formik_1.useField)(`${autoscalingName}.maxReplicas`);
     const [{ value: useAutoscalingValue }] = (0, formik_1.useField)(useAutoscalingName);
@@ -23,10 +24,14 @@ const NodePoolAgentsForm = ({ agents, labelName, countName, autoscalingName, max
             React.createElement(common_1.CheckboxField, { name: useAutoscalingName, label: t('ai:Use autoscaling') })),
         useAutoscalingValue ? (React.createElement(React.Fragment, null,
             React.createElement(react_core_1.GridItem, null,
-                React.createElement(common_1.NumberInputField, { name: `${autoscalingName}.minReplicas`, label: t('ai:Minimum number of hosts'), isRequired: true, minValue: 1, maxValue: maxValue || maxAgents })),
+                React.createElement(common_1.NumberInputField, { name: `${autoscalingName}.minReplicas`, label: t('ai:Minimum number of hosts'), isRequired: true, minValue: 1, maxValue: maxValue })),
             React.createElement(react_core_1.GridItem, null,
-                React.createElement(common_1.NumberInputField, { name: `${autoscalingName}.maxReplicas`, label: t('ai:Maximum number of hosts'), isRequired: true, minValue: minValue || 1, maxValue: maxAgents, helperText: helperText })))) : (React.createElement(react_core_1.GridItem, null,
-            React.createElement(common_1.NumberInputField, { label: t('ai:Number of hosts'), idPostfix: "count", name: countName, isRequired: true, minValue: 0, maxValue: maxAgents, helperText: helperText })))));
+                React.createElement(common_1.NumberInputField, { name: `${autoscalingName}.maxReplicas`, label: t('ai:Maximum number of hosts'), isRequired: true, minValue: minValue || 1, helperText: helperText })))) : (React.createElement(React.Fragment, null,
+            React.createElement(react_core_1.GridItem, null,
+                React.createElement(common_1.NumberInputField, { label: t('ai:Number of hosts'), idPostfix: "count", name: countName, isRequired: true, minValue: 0, helperText: helperText })))),
+        (useAutoscalingValue ? maxValue : count) > maxAgents && (React.createElement(react_core_1.GridItem, null,
+            React.createElement(react_core_1.Alert, { isInline: true, variant: react_core_1.AlertVariant.warning, title: t('ai:Host count exceeds the current number of available hosts.') },
+                React.createElement(react_core_1.Text, null, t('ai:Scale down the nodepool or make more hosts available.')))))));
 };
 exports.default = NodePoolAgentsForm;
 //# sourceMappingURL=NodePoolAgentsForm.js.map

package/build/cjs/cim/components/Hypershift/forms/NodePoolAgentsForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"NodePoolAgentsForm.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/forms/NodePoolAgentsForm.tsx"],"names":[],"mappings":";;;AAAA,~~uDAAwD~~;~~AACxD~~,qDAA+B;AAC/B,+CAAkF;AAClF,8FAAkF;AAElF,2EAA4E;AAC5E,mCAAkC;AAYlC,MAAM,kBAAkB,GAAG,CAAC,EAC1B,MAAM,EACN,SAAS,EACT,SAAS,EACT,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,MAAM,GAAG,KAAK,GACU,EAAE,EAAE;IAC5B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,GAAG,eAAe,cAAc,CAAC,CAAC;IACjF,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,GAAG,eAAe,cAAc,CAAC,CAAC;IACjF,MAAM,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAU,kBAAkB,CAAC,CAAC;IAE/E,MAAM,UAAU,GAAG,CACjB;QACG,CAAC,CAAC,uCAAuC,EAAE,EAAE,SAAS,EAAE,CAAC;QAAE,GAAG;QAC/D,oBAAC,oBAAW,IACV,WAAW,EAAE,CAAC,CACZ,uKAAuK,CACxK,GACD,CACD,CACJ,CAAC;IAEF,OAAO,CACL,oBAAC,iBAAI,IAAC,SAAS;QACZ,CAAC,MAAM,IAAI,CACV,oBAAC,qBAAQ;YACP,oBAAC,mCAAkB,IAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAI,CAC9C,CACZ;QACD,oBAAC,qBAAQ;YACP,oBAAC,sBAAa,IAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAAI,CAClE;QACV,mBAAmB,CAAC,CAAC,CAAC,CACrB;YACE,oBAAC,qBAAQ;gBACP,oBAAC,yBAAgB,IACf,IAAI,EAAE,GAAG,eAAe,cAAc,EACtC,KAAK,EAAE,CAAC,CAAC,4BAA4B,CAAC,EACtC,UAAU,QACV,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAE,QAAQ,~~IAAI~~,~~SAAS,GAC/B,~~CACO;YACX,oBAAC,qBAAQ;gBACP,oBAAC,yBAAgB,IACf,IAAI,EAAE,GAAG,eAAe,cAAc,EACtC,KAAK,EAAE,CAAC,CAAC,4BAA4B,CAAC,EACtC,UAAU,QACV,QAAQ,EAAE,QAAQ,IAAI,CAAC,EACvB,~~QAAQ,EAAE,SAAS,EACnB,~~UAAU,EAAE,UAAU,GACtB,CACO,CACV,CACJ,CAAC,CAAC,CAAC,CACF,oBAAC,qBAAQ;~~YACP~~,oBAAC,yBAAgB,IACf,KAAK,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAC9B,SAAS,EAAC,OAAO,EACjB,IAAI,EAAE,SAAS,EACf,UAAU,QACV,QAAQ,EAAE,CAAC,EACX,~~QAAQ~~,EAAE,SAAS,~~EACnB~~,~~UAAU~~,EAAE,~~UAAU~~,~~GACtB~~,~~CACO~~,CACZ,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,kBAAkB,CAAC"}
1	+ {"version":3,"file":"NodePoolAgentsForm.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/forms/NodePoolAgentsForm.tsx"],"names":[],"mappings":";;;AAAA,uDAAmF;AACnF,qDAA+B;AAC/B,+CAAkF;AAClF,8FAAkF;AAElF,2EAA4E;AAC5E,mCAAkC;AAYlC,MAAM,kBAAkB,GAAG,CAAC,EAC1B,MAAM,EACN,SAAS,EACT,SAAS,EACT,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,MAAM,GAAG,KAAK,GACU,EAAE,EAAE;IAC5B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,SAAS,CAAC,CAAC;IACvD,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,GAAG,eAAe,cAAc,CAAC,CAAC;IACjF,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,GAAG,eAAe,cAAc,CAAC,CAAC;IACjF,MAAM,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAU,kBAAkB,CAAC,CAAC;IAE/E,MAAM,UAAU,GAAG,CACjB;QACG,CAAC,CAAC,uCAAuC,EAAE,EAAE,SAAS,EAAE,CAAC;QAAE,GAAG;QAC/D,oBAAC,oBAAW,IACV,WAAW,EAAE,CAAC,CACZ,uKAAuK,CACxK,GACD,CACD,CACJ,CAAC;IAEF,OAAO,CACL,oBAAC,iBAAI,IAAC,SAAS;QACZ,CAAC,MAAM,IAAI,CACV,oBAAC,qBAAQ;YACP,oBAAC,mCAAkB,IAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAI,CAC9C,CACZ;QACD,oBAAC,qBAAQ;YACP,oBAAC,sBAAa,IAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAAI,CAClE;QACV,mBAAmB,CAAC,CAAC,CAAC,CACrB;YACE,oBAAC,qBAAQ;gBACP,oBAAC,yBAAgB,IACf,IAAI,EAAE,GAAG,eAAe,cAAc,EACtC,KAAK,EAAE,CAAC,CAAC,4BAA4B,CAAC,EACtC,UAAU,QACV,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAE,QAAQ,GAClB,CACO;YACX,oBAAC,qBAAQ;gBACP,oBAAC,yBAAgB,IACf,IAAI,EAAE,GAAG,eAAe,cAAc,EACtC,KAAK,EAAE,CAAC,CAAC,4BAA4B,CAAC,EACtC,UAAU,QACV,QAAQ,EAAE,QAAQ,IAAI,CAAC,EACvB,UAAU,EAAE,UAAU,GACtB,CACO,CACV,CACJ,CAAC,CAAC,CAAC,CACF;YACE,oBAAC,qBAAQ;gBACP,oBAAC,yBAAgB,IACf,KAAK,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAC9B,SAAS,EAAC,OAAO,EACjB,IAAI,EAAE,SAAS,EACf,UAAU,QACV,QAAQ,EAAE,CAAC,EACX,UAAU,EAAE,UAAU,GACtB,CACO,CACV,CACJ;QACA,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,SAAS,IAAI,CACvD,oBAAC,qBAAQ;YACP,oBAAC,kBAAK,IACJ,QAAQ,QACR,OAAO,EAAE,yBAAY,CAAC,OAAO,EAC7B,KAAK,EAAE,CAAC,CAAC,8DAA8D,CAAC;gBAExE,oBAAC,iBAAI,QAAE,CAAC,CAAC,0DAA0D,CAAC,CAAQ,CACtE,CACC,CACZ,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,kBAAkB,CAAC"}

package/build/cjs/cim/components/Hypershift/modals/AddNodePoolModal.js CHANGED Viewed

@@ -17,7 +17,7 @@ const AddNodePoolModal = ({ onSubmit, onClose, agents, hostedCluster, agentsName
         var _b, _c;
         setError(undefined);
         const nodePool = {
-            apiVersion: 'hypershift.openshift.io/v1alpha1',
+            apiVersion: 'hypershift.openshift.io/v1beta1',
             kind: 'NodePool',
             metadata: {
                 name: values.nodePoolName,

package/build/cjs/cim/components/Hypershift/modals/AddNodePoolModal.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AddNodePoolModal.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/AddNodePoolModal.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAUgC;AAChC,mCAAgC;AAEhC,8FAAkF;AAClF,oDAA2D;AAG3D,oCAAgD;AAChD,0EAA0C;AAW1C,MAAM,gBAAgB,GAAG,CAAC,EACxB,QAAQ,EACR,OAAO,EACP,MAAM,EACN,aAAa,EACb,eAAe,GACO,EAAE,EAAE;;IAC1B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAU,CAAC;IACnD,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,SAAS,MAAK,eAAe,CAAA,EAAA,CAAC,CAAC;IACxF,MAAM,YAAY,GAAG,CAAO,MAA0B,EAAE,EAAE;;QACxD,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpB,MAAM,QAAQ,GAAwB;YACpC,UAAU,EAAE,~~kCAAkC~~;~~YAC9C~~,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE;gBACR,IAAI,EAAE,MAAM,CAAC,YAAY;gBACzB,SAAS,EAAE,MAAA,aAAa,CAAC,QAAQ,0CAAE,SAAS;aAC7C;YACD,IAAI,EAAE;gBACJ,WAAW,EAAE,CAAA,MAAA,aAAa,CAAC,QAAQ,0CAAE,IAAI,KAAI,EAAE;gBAC/C,QAAQ,EAAE,MAAM,CAAC,KAAK;gBACtB,UAAU,EAAE;oBACV,UAAU,EAAE,KAAK;oBACjB,WAAW,EAAE,SAAS;iBACvB;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,kBAAkB,EAAE;4BAClB,WAAW,EAAE,IAAA,4BAAoB,EAAC,MAAM,CAAC,WAAW,CAAC;yBACtD;qBACF;iBACF;gBACD,OAAO,EAAE;oBACP,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK;iBACxC;aACF;SACF,CAAC;QACF,IAAI;YACF,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACzB,OAAO,EAAE,CAAC;SACX;QAAC,OAAO,GAAG,EAAE;YACZ,QAAQ,CAAC,IAAA,uBAAe,EAAC,GAAG,CAAC,CAAC,CAAC;SAChC;IACH,CAAC,CAAA,CAAC;IAEF,OAAO,CACL,oBAAC,kBAAK,kBACO,sBAAsB,EACjC,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAC3B,MAAM,QACN,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,yBAAY,CAAC,MAAM,EAC5B,gBAAgB;QAEhB,oBAAC,eAAM,IACL,aAAa,EAAE;gBACb,YAAY,EAAE,YAAY,CAAA,MAAA,aAAa,CAAC,QAAQ,0CAAE,IAAI,KAAI,EAAE,IAAI,IAAI,CAAC,KAAK,CACxE,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CACpB,EAAE;gBACH,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,CAAC;gBACR,cAAc,EAAE,KAAK;gBACrB,WAAW,EAAE;oBACX,WAAW,EAAE,CAAC;oBACd,WAAW,EAAE,CAAC;iBACf;aACF,EACD,QAAQ,EAAE,YAAY,IAErB,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAC1C;YACE,oBAAC,yBAAY;gBACX,oBAAC,kBAAK,IAAC,SAAS;oBACd,oBAAC,sBAAS;wBACR,oBAAC,sBAAY,IAAC,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,GAAI,CAC7D;oBACX,KAAK,IAAI,CACR,oBAAC,sBAAS;wBACR,oBAAC,kBAAK,IAAC,OAAO,EAAC,QAAQ,EAAC,QAAQ,QAAC,KAAK,EAAE,KAAK,GAAI,CACvC,CACb,CACK,CACK;YACf,oBAAC,2BAAc;gBACb,oBAAC,mBAAM;gBACL,kEAAkE;;oBAAlE,kEAAkE;oBAClE,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,CAAC,OAAO,IAAI,YAAY,EACpC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,oBAAC,oBAAO,IAAC,IAAI,EAAC,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,IAErD,CAAC,CAAC,WAAW,CAAC,CACR;gBACT,oBAAC,mBAAM,IAAC,OAAO,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,IACpC,CAAC,CAAC,WAAW,CAAC,CACR,CACM,CAChB,CACJ,CACM,CACH,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
1	+ {"version":3,"file":"AddNodePoolModal.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/AddNodePoolModal.tsx"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/Hypershift/modals/ManageHostsModal.js CHANGED Viewed

@@ -33,7 +33,7 @@ const getPatches = (values, nodePool) => {
         }
     }
     else {
-        if (!!nodePool.spec.replicas) {
+        if (nodePool.spec.replicas !== undefined) {
             patches.push({
                 op: 'replace',
                 value: values.count,
@@ -70,7 +70,7 @@ const ManageHostsModal = ({ onClose, nodePool, hostedCluster, agents, onSubmit,
         React.createElement(formik_1.Formik, { initialValues: {
                 nodePoolName: ((_a = nodePool.metadata) === null || _a === void 0 ? void 0 : _a.name) || '',
                 agentLabels: (0, utils_1.labelsToFormikValue)(((_d = (_c = (_b = nodePool.spec.platform) === null || _b === void 0 ? void 0 : _b.agent) === null || _c === void 0 ? void 0 : _c.agentLabelSelector) === null || _d === void 0 ? void 0 : _d.matchLabels) || {}),
-                count: nodePool.spec.replicas || 1,
+                count: nodePool.spec.replicas || 0,
                 useAutoscaling: !!nodePool.spec.autoScaling,
                 autoscaling: {
                     minReplicas: ((_e = nodePool.spec.autoScaling) === null || _e === void 0 ? void 0 : _e.min) || 1,

package/build/cjs/cim/components/Hypershift/modals/ManageHostsModal.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ManageHostsModal.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/ManageHostsModal.tsx"],"names":[],"mappings":";;;AAAA,uDAUgC;AAChC,mCAA8C;AAC9C,qDAA+B;AAQ/B,0EAA0C;AAC1C,oCAA+C;AAC/C,8FAAkF;AAClF,oDAA2D;AAkB3D,MAAM,UAAU,GAAG,CAAC,MAA0B,EAAE,QAA6B,EAAE,EAAE;IAC/E,MAAM,OAAO,GAAG,EAAE,CAAC;IAEnB,IAAI,MAAM,CAAC,cAAc,EAAE;QACzB,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE;YAC/B,OAAO,CAAC,IAAI,CAAC;gBACX,EAAE,EAAE,SAAS;gBACb,KAAK,EAAE;oBACL,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW;oBACnC,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW;iBACpC;gBACD,IAAI,EAAE,mBAAmB;aAC1B,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,IAAI,CACV,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,gBAAgB,EAAE,EACxC;gBACE,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE;oBACL,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW;oBACnC,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW;iBACpC;gBACD,IAAI,EAAE,mBAAmB;aAC1B,CACF,CAAC;SACH;KACF;SAAM;QACL,IAAI,~~CAAC,CAAC,~~QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;~~YAC5B~~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"}
1	+ {"version":3,"file":"ManageHostsModal.js","sourceRoot":"","sources":["../../../../../../lib/cim/components/Hypershift/modals/ManageHostsModal.tsx"],"names":[],"mappings":"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"}

package/build/cjs/cim/components/helpers/versions.js CHANGED Viewed

@@ -42,35 +42,50 @@ const isValidImageSet = (cis, architectures, extended) => {
     return architectures.some((arch) => { var _a, _b, _c; return ((_a = cis.spec) === null || _a === void 0 ? void 0 : _a.releaseImage.endsWith(arch)) || ((_c = (_b = cis.metadata) === null || _b === void 0 ? void 0 : _b.labels) === null || _c === void 0 ? void 0 : _c.architecture) === arch; });
 };
 exports.isValidImageSet = isValidImageSet;
+// Extracts major.minor version, strips any non-numeric prefix (e.g., "img4.18.55" → "4.18")
+const extractMajorMinor = (version) => {
+    const versionWithoutPrefix = version.replace(/^[^\d]*/, '');
+    return versionWithoutPrefix.split('.').slice(0, 2).join('.');
+};
+// Converts a ClusterImageSet to an OpenshiftVersionOptionType
+const toVersionOption = (clusterImageSet) => {
+    var _a, _b, _c, _d;
+    const version = (0, exports.getVersionFromReleaseImage)((_a = clusterImageSet.spec) === null || _a === void 0 ? void 0 : _a.releaseImage) ||
+        ((_b = clusterImageSet.metadata) === null || _b === void 0 ? void 0 : _b.name) ||
+        '';
+    const cpuArch = getCPUArchFromReleaseImage((_c = clusterImageSet.spec) === null || _c === void 0 ? void 0 : _c.releaseImage);
+    return {
+        label: `OpenShift ${version}`,
+        version,
+        value: (_d = clusterImageSet.metadata) === null || _d === void 0 ? void 0 : _d.name,
+        default: false,
+        // (rawagner) ACM does not have the warning so changing to 'production'
+        // supportLevel : getSupportLevelFromChannel(clusterImageSet.metadata?.labels?.channel)
+        supportLevel: 'production',
+        cpuArchitectures: cpuArch ? [cpuArch] : undefined,
+    };
+};
+/**
+ * In case there are osImages specified on the AgentServiceConfig, we want to limit
+ * the availability in the dropdown to only versions that are listed there.
+ * Otherwise the installation fails.
+ */
+const hasMatchingOsImage = (version, osImageVersions) => {
+    if (!osImageVersions.length)
+        return true;
+    return osImageVersions.includes(extractMajorMinor(version.version));
+};
 const getOCPVersions = (clusterImageSets, isNutanix, osImages, extended) => {
-    const ocpImageVersions = Array.from(new Set(osImages === null || osImages === void 0 ? void 0 : osImages.map((osImage) => osImage.openshiftVersion)));
+    const architectures = isNutanix ? exports.supportedNutanixPlatforms : undefined;
+    const osImageVersions = [...new Set(osImages === null || osImages === void 0 ? void 0 : osImages.map((img) => img.openshiftVersion))];
     const versions = clusterImageSets
-        .filter((clusterImageSet) => (0, exports.isValidImageSet)(clusterImageSet, isNutanix ? exports.supportedNutanixPlatforms : undefined, extended))
-        .map((clusterImageSet) => {
-        var _a, _b, _c, _d, _e;
-        const version = (0, exports.getVersionFromReleaseImage)((_a = clusterImageSet.spec) === null || _a === void 0 ? void 0 : _a.releaseImage);
-        const cpuArch = getCPUArchFromReleaseImage((_b = clusterImageSet.spec) === null || _b === void 0 ? void 0 : _b.releaseImage);
-        return {
-            label: `OpenShift ${version ? version : (_c = clusterImageSet.metadata) === null || _c === void 0 ? void 0 : _c.name}`,
-            version: version || ((_d = clusterImageSet.metadata) === null || _d === void 0 ? void 0 : _d.name) || '',
-            value: (_e = clusterImageSet.metadata) === null || _e === void 0 ? void 0 : _e.name,
-            default: false,
-            // (rawagner) ACM does not have the warning so changing to 'production'
-            supportLevel: 'production',
-            cpuArchitectures: cpuArch ? [cpuArch] : undefined,
-        };
-    })
-        .filter((ocpVersion) => {
-        const ver = ocpVersion.version.split('.').slice(0, 2).join('.');
-        return !!ocpImageVersions.length ? ocpImageVersions.includes(ver) : true;
-    })
-        .sort((versionA, versionB) => /* descending */ -1 * versionA.label.localeCompare(versionB.label));
-    if (versions.length) {
-        // make sure that the pre-selected one is the first-one after sorting
-        versions[0].default = true;
-    }
-    const deduped = (0, uniqBy_js_1.default)(versions, (v) => v.version);
-    return deduped;
+        .filter((clusterImageSet) => (0, exports.isValidImageSet)(clusterImageSet, architectures, extended))
+        .map(toVersionOption)
+        .filter((v) => hasMatchingOsImage(v, osImageVersions))
+        .sort((a, b) => b.label.localeCompare(a.label));
+    // Mark first version as the default selection
+    versions[0] && (versions[0].default = true);
+    return (0, uniqBy_js_1.default)(versions, (v) => v.version);
 };
 exports.getOCPVersions = getOCPVersions;
 const getSelectedVersion = (clusterImages, agentClusterInstall) => {

package/build/cjs/cim/components/helpers/versions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":";;;;AAAA,4EAAyC;AAUzC,iDAA6D;AAEtD,MAAM,0BAA0B,GAAG,CAAC,YAAY,GAAG,EAAE,EAAE,EAAE;IAC9D,MAAM,KAAK,GAAG,oCAAoC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtE,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;QACzC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC;AALW,QAAA,0BAA0B,8BAKrC;AAEF,MAAM,0BAA0B,GAAG,CAAC,YAAY,GAAG,EAAE,EAAE,EAAE;IACvD,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAChD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;QACzC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC;AAEF,2BAA2B;AAC3B,MAAM,0BAA0B,GAAG,CACjC,OAAgB,EAC6B,EAAE;IAC/C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,aAAa,CAAC;KACtB;IAED,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC9B,OAAO,MAAM,CAAC,CAAC,iCAAiC;KACjD;IAED,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAChC,OAAO,YAAY,CAAC;KACrB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEW,QAAA,yBAAyB,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAEvD,MAAM,eAAe,GAAG,CAC7B,GAA+B,EAC/B,aAAwB,EACxB,QAAkB,EAClB,EAAE;;IACF,IAAI,CAAC,QAAQ,IAAI,CAAA,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,MAAM,0CAAE,OAAO,MAAK,MAAM,EAAE;QACzD,OAAO,KAAK,CAAC;KACd;IACD,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,aAAa,CAAC,IAAI,CACvB,CAAC,IAAI,EAAE,EAAE,mBAAC,OAAA,CAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAI,CAAA,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,MAAM,0CAAE,YAAY,MAAK,IAAI,CAAA,EAAA,CAC/F,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B;~~AAEK~~,MAAM,~~cAAc~~,GAAG,~~CAC5B~~,~~gBAA8C~~,~~EAC9C~~,~~SAA+B,EAC/B,QAAoB,EACpB,QAAkB,EACY,~~EAAE;~~IAChC~~,MAAM,~~gBAAgB~~,GAAG,~~KAAK~~,CAAC,~~IAAI~~,~~CACjC,IAAI,GAAG,~~CAAC,~~QAAQ~~,~~aAAR~~,~~QAAQ~~,~~uBAAR,QAAQ,CAAE,GAAG,~~CAAC,CAAC,OAAO,~~EAAE~~,~~EAAE,~~CAAC,~~OAAO~~,CAAC,~~gBAAgB~~,CAAC,CAAC,~~CAC9D~~,CAAC~~;IAEF~~,~~MAAM~~,~~QAAQ~~,~~GAAG~~,~~gBAAgB;SAC9B,MAAM,~~CAAC,CAAC,~~eAAe~~,~~EAAE,EAAE,CAC1B,IAAA,uBAAe,EAAC,eAAe,EAAE,SAAS,~~CAAC,~~CAAC~~,CAAC,~~iCAAyB,~~CAAC,CAAC,CAAC,~~SAAS~~,~~EAAE~~,~~QAAQ~~,~~CAAC,CAC9F;SACA,~~GAAG,~~CAAC~~,~~CAAC~~,~~eAAe~~,~~EAA8B,~~EAAE;;~~QACnD~~,MAAM,OAAO,~~GAAG~~,IAAA,kCAA0B,EAAC,MAAA,eAAe,CAAC,IAAI,0CAAE,YAAY,CAAC,CAAC;~~QAC/E~~,MAAM,OAAO,GAAG,0BAA0B,CAAC,MAAA,eAAe,CAAC,IAAI,0CAAE,YAAY,CAAC,CAAC;~~QAC~~/E,OAAO;~~YACL~~,KAAK,EAAE,aAAa,OAAO,~~CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAE,MAAA,eAAe,CAAC,QAAQ,0CAAE,IAAe,~~EAAE;~~YACpF~~,OAAO~~,EAAE,OAAO,KAAI,MAAA,eAAe,CAAC,QAAQ,0CAAE,IAAI,CAAA,IAAI,EAAE~~;~~YACxD~~,KAAK,EAAE,MAAA,eAAe,CAAC,QAAQ,0CAAE,IAAc;~~YAC~~/C,OAAO,EAAE,KAAK;~~YACd~~,uEAAuE;~~YACvE~~,YAAY,EAAE,YAAY;~~YAC1B~~,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAA0B,CAAC,CAAC,CAAC,CAAC,SAAS;~~SACrE~~,CAAC;~~IACJ~~,CAAC,CAAC;~~SACD~~,MAAM,~~CAAC~~,~~CAAC~~,~~UAAU~~,~~EAAE~~,EAAE;~~QACrB~~,MAAM,~~GAAG~~,~~GAAG~~,~~UAAU,~~CAAC,OAAO,CAAC,~~KAAK~~,CAAC,~~GAAG~~,CAAC,CAAC,~~KAAK~~,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,~~IAAI~~,CAAC,~~GAAG~~,CAAC,CAAC;~~QAChE~~,~~OAAO~~,~~CAAC~~,CAAC,~~gBAAgB~~,CAAC,~~MAAM~~,CAAC,CAAC,CAAC,gBAAgB,CAAC,~~QAAQ~~,CAAC,GAAG,~~CAAC~~,CAAC,CAAC,CAAC,~~IAAI~~,CAAC;~~IAC3E~~,CAAC,CAAC;~~SACD~~,~~IAAI~~,~~CACH~~,CAAC,~~QAAQ~~,EAAE,~~QAAQ,~~EAAE,EAAE,CAAC,~~gBAAgB~~,CAAC,CAAC,CAAC,~~GAAG~~,~~QAAQ~~,CAAC,KAAK,CAAC,aAAa,CAAC,~~QAAQ~~,CAAC,KAAK,CAAC,~~CAC3F~~,CAAC;~~IAEJ~~,~~IAAI~~,QAAQ,CAAC,~~MAAM~~,~~EAAE;QACnB~~,~~qEAAqE;QACrE~~,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;~~KAC5B;IAED~~,~~MAAM,~~OAAO,~~GAAG,~~IAAA,mBAAM,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;~~IACnD~~,~~OAAO,OAAO,~~CAAC~~;AACjB~~,CAAC~~,CAAC~~;~~AA1CW~~,QAAA,cAAc,~~kBA0CzB~~;AAEK,MAAM,kBAAkB,GAAG,CAChC,aAA2C,EAC3C,mBAAmD,EACnD,EAAE;;IACF,MAAM,oBAAoB,GAAG,aAAa,CAAC,IAAI,CAC7C,CAAC,EAAE,EAAE,EAAE,mBAAC,OAAA,CAAA,MAAA,EAAE,CAAC,QAAQ,0CAAE,IAAI,OAAK,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,WAAW,0CAAE,IAAI,CAAA,CAAA,EAAA,CAC3E,CAAC;IAEF,OAAO,oBAAoB;QACzB,CAAC,CAAC,MAAA,MAAA,IAAA,sBAAc,EAAC,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,0CAAG,CAAC,CAAC,0CAAE,OAAO;QAClF,CAAC,CAAC,MAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,0CAAE,WAAW,0CAAE,IAAI,CAAC;AACnD,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B;AAEK,MAAM,wBAAwB,GAAG,CAAC,EAA8B,EAAsB,EAAE,2BAC7F,OAAA,CAAA,MAAA,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,MAAM,0CAAE,OAAO,0CAAG,CAAC,CAAC,0CAAE,OAAO,MAAI,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,0CAAE,aAAa,0CAAE,OAAO,CAAA,CAAA,EAAA,CAAC;AAD3D,QAAA,wBAAwB,4BACmC;AAEjE,MAAM,cAAc,GAAG,CAC5B,UAAkD,EAChB,EAAE,CACpC,UAAU,CAAC,IAAA,4BAAoB,EAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;AAHtF,QAAA,cAAc,kBAGwE"}
1	+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../lib/cim/components/helpers/versions.ts"],"names":[],"mappings":"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"}

package/build/cjs/common/components/ui/formik/TextAreaField.js CHANGED Viewed

@@ -24,7 +24,8 @@ const TextAreaField = (_a) => {
         React.createElement(react_core_1.TextArea, Object.assign({}, field, restProps, { id: fieldId, style: { resize: 'vertical' }, validated: isValid ? 'default' : 'error', isRequired: isRequired, "aria-describedby": `${fieldId}-helper`, onChange: (event) => field.onChange(event), disabled: isDisabled })),
         (errorMessage || helperText) && (React.createElement(react_core_1.FormHelperText, null,
             React.createElement(react_core_1.HelperText, null,
-                React.createElement(react_core_1.HelperTextItem, { icon: errorMessage && React.createElement(exclamation_circle_icon_1.ExclamationCircleIcon, null), variant: errorMessage ? 'error' : 'default', id: errorMessage ? `${fieldId}-helper-error` : `${fieldId}-helper` }, errorMessage ? errorMessage : helperText))))));
+                errorMessage && (React.createElement(react_core_1.HelperTextItem, { icon: React.createElement(exclamation_circle_icon_1.ExclamationCircleIcon, null), variant: 'error', id: `${fieldId}-helper-error` }, errorMessage)),
+                helperText && (React.createElement(react_core_1.HelperTextItem, { variant: 'default', id: `${fieldId}-helper` }, helperText)))))));
 };
 exports.default = TextAreaField;
 //# sourceMappingURL=TextAreaField.js.map

package/build/cjs/common/components/ui/formik/TextAreaField.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TextAreaField.js","sourceRoot":"","sources":["../../../../../../lib/common/components/ui/formik/TextAreaField.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,mCAAkC;AAClC,uDAMgC;AAEhC,mCAAqC;AACrC,2GAAsG;AAEtG,MAAM,aAAa,GAAiC,CAAC,EAUpD,EAAE,EAAE;QAVgD,EACnD,KAAK,EACL,UAAU,EACV,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,SAAS,EACT,SAAS,EACT,cAAc,OAEf,EADI,KAAK,sBAT2C,6GAUpD,CADS;IAER,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;IAEpC,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE;YACrB,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SACnD;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,EAAE,UAAU,KAAmB,KAAK,EAAnB,SAAS,kBAAK,KAAK,EAApC,cAA4B,CAAQ,CAAC;IAE3C,OAAO,CACL,oBAAC,sBAAS,IACR,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,cAAc,EACzB,EAAE,EAAE,iBAAiB,OAAO,EAAE;QAE7B,QAAQ;QACT,oBAAC,qBAAQ,oBACH,KAAK,EACL,SAAS,IACb,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAC7B,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EACxC,UAAU,EAAE,UAAU,sBACJ,GAAG,OAAO,SAAS,EACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC1C,QAAQ,EAAE,UAAU,IACpB;QACD,CAAC,YAAY,IAAI,UAAU,CAAC,IAAI,CAC/B,oBAAC,2BAAc;YACb,oBAAC,uBAAU;~~gBACT~~,oBAAC,2BAAc,IACb,IAAI,EAAE,~~YAAY,IAAI,~~oBAAC,+CAAqB,OAAG,EAC/C,OAAO,EAAE,~~YAAY~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,OAAO,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~SAAS~~,~~EAC3C~~,~~EAAE~~,~~EAAE~~,~~YAAY~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~GAAG,~~OAAO,~~eAAe~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,GAAG,OAAO,SAAS,~~IAEjE~~,~~YAAY~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~YAAY,CAAC,CAAC,CAAC,UAAU,CAC1B,CACN,~~CACE,CAClB,CACS,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
1	+ {"version":3,"file":"TextAreaField.js","sourceRoot":"","sources":["../../../../../../lib/common/components/ui/formik/TextAreaField.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,mCAAkC;AAClC,uDAMgC;AAEhC,mCAAqC;AACrC,2GAAsG;AAEtG,MAAM,aAAa,GAAiC,CAAC,EAUpD,EAAE,EAAE;QAVgD,EACnD,KAAK,EACL,UAAU,EACV,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,SAAS,EACT,SAAS,EACT,cAAc,OAEf,EADI,KAAK,sBAT2C,6GAUpD,CADS;IAER,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;IAEpC,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE;YACrB,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SACnD;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,EAAE,UAAU,KAAmB,KAAK,EAAnB,SAAS,kBAAK,KAAK,EAApC,cAA4B,CAAQ,CAAC;IAE3C,OAAO,CACL,oBAAC,sBAAS,IACR,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,cAAc,EACzB,EAAE,EAAE,iBAAiB,OAAO,EAAE;QAE7B,QAAQ;QACT,oBAAC,qBAAQ,oBACH,KAAK,EACL,SAAS,IACb,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAC7B,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EACxC,UAAU,EAAE,UAAU,sBACJ,GAAG,OAAO,SAAS,EACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC1C,QAAQ,EAAE,UAAU,IACpB;QACD,CAAC,YAAY,IAAI,UAAU,CAAC,IAAI,CAC/B,oBAAC,2BAAc;YACb,oBAAC,uBAAU;gBACR,YAAY,IAAI,CACf,oBAAC,2BAAc,IACb,IAAI,EAAE,oBAAC,+CAAqB,OAAG,EAC/B,OAAO,EAAE,OAAO,EAChB,EAAE,EAAE,GAAG,OAAO,eAAe,IAE5B,YAAY,CACE,CAClB;gBACA,UAAU,IAAI,CACb,oBAAC,2BAAc,IAAC,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,SAAS,IACxD,UAAU,CACI,CAClB,CACU,CACE,CAClB,CACS,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}

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

@@ -10,7 +10,7 @@ import {
 } from '@patternfly/react-core';
 import { AgentClusterInstallK8sResource, ClusterDeploymentK8sResource, OsImage } from '../../types';
 import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
-import { getOCPVersions, getSelectedVersion } from '../helpers';
+import { getOCPVersions } from '../helpers';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import {
   ClusterDetailsFormFields,
@@ -38,17 +38,14 @@ export const ClusterDeploymentDetailsFormWrapper = ({
 }) => {
   const { activeStep, goToPrevStep, goToNextStep, close } = useWizardContext();
   const { syncError } = React.useContext(ClusterDeploymentWizardContext);
-  const { submitForm, isSubmitting, isValid, isValidating, dirty } =
-    useFormikContext<ClusterDetailsValues>();
+  const { isSubmitting, isValid, isValidating } = useFormikContext<ClusterDetailsValues>();
   const { t } = useTranslation();
+  // ClusterDeploymentDetailsFormWrapper is exclusively used by ClusterDeploymentWizard (edit flow).
+  // No form submission needed here—just navigate to the next step.
   const handleOnNext = React.useCallback(() => {
-    if (dirty) {
-      void submitForm();
-    } else {
-      void goToNextStep();
-    }
-  }, [dirty, goToNextStep, submitForm]);
+    void goToNextStep();
+  }, [goToNextStep]);
   const footer = React.useMemo(
     () => (
@@ -84,8 +81,7 @@ export const ClusterDeploymentDetailsFormWrapper = ({
   );
 };
-const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
-  agentClusterInstall,
+export const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
   clusterDeployment,
   clusterImages,
   extensionAfter,
@@ -103,18 +99,13 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
     [clusterImages, isNutanix, osImages],
   );
-  const forceOpenshiftVersion = agentClusterInstall
-    ? getSelectedVersion(clusterImages, agentClusterInstall)
-    : undefined;
   const isEditFlow = !!clusterDeployment;
   const { values } = useFormikContext<ClusterDetailsValues>();
   const [cpuArchitectures, allowHighlyAvailable] = React.useMemo(() => {
     const cpuArchitectures = [CpuArchitecture.x86, CpuArchitecture.ARM, CpuArchitecture.s390x];
-    const version = allVersions.find(
-      (ver) => ver.value === values.openshiftVersion || ver.version === forceOpenshiftVersion,
-    );
+    const version = allVersions.find((ver) => ver.value === values.openshiftVersion);
     const isMulti = version?.cpuArchitectures?.[0] === CpuArchitecture.MULTI;
     const highlyAvailableSupported = toNumber(version?.version?.split('.')?.[1]) >= 18;
@@ -122,7 +113,7 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
       (isMulti ? cpuArchitectures : version?.cpuArchitectures) as SupportedCpuArchitecture[],
       highlyAvailableSupported && !isMulti,
     ];
-  }, [allVersions, forceOpenshiftVersion, values.openshiftVersion]);
+  }, [allVersions, values.openshiftVersion]);
   return (
     <>
@@ -140,7 +131,6 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
           versions={versions}
           allVersions={allVersions}
           isEditFlow={isEditFlow}
-          forceOpenshiftVersion={forceOpenshiftVersion}
           extensionAfter={extensionAfter}
           isNutanix={isNutanix}
           cpuArchitectures={cpuArchitectures}

package/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx CHANGED Viewed

@@ -19,7 +19,6 @@ import { getNetworkType } from '../helpers';
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
-  forceOpenshiftVersion?: string;
   extensionAfter?: { [key: string]: React.ReactElement };
   versions: OpenshiftVersionOptionType[];
   allVersions: OpenshiftVersionOptionType[];
@@ -50,7 +49,6 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   isEditFlow,
   versions,
   allVersions,
-  forceOpenshiftVersion,
   extensionAfter,
   isNutanix,
   cpuArchitectures,
@@ -63,7 +61,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   const { name, baseDnsDomain } = values;
   React.useEffect(() => {
-    if (!versions.length && !values.openshiftVersion) {
+    if (!versions.length && !values.openshiftVersion && !isEditFlow) {
       const fallbackOpenShiftVersion = allVersions.find((version) => version.default);
       setFieldValue('customOpenshiftSelect', fallbackOpenShiftVersion);
       setFieldValue('openshiftVersion', fallbackOpenShiftVersion?.value);
@@ -138,9 +136,11 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
           isRequired
         />
       )}
-      {forceOpenshiftVersion ? (
+      {isEditFlow ? (
         <StaticTextField name="openshiftVersion" label="OpenShift version" isRequired>
-          {t('ai:OpenShift')} {forceOpenshiftVersion}
+          {t('ai:OpenShift')}{' '}
+          {allVersions.find((v) => v.value === values.openshiftVersion)?.version ||
+            values.openshiftVersion}
         </StaticTextField>
       ) : (
         <>

package/lib/cim/components/Hypershift/HostedClusterWizard/HostsStep/HostsStep.tsx CHANGED Viewed

@@ -6,8 +6,6 @@ import { Stack, StackItem } from '@patternfly/react-core';
 import HostsForm from './HostsForm';
 import { HostsStepProps, HostsFormValues, NodePoolFormValue } from './types';
 import { useTranslation } from '../../../../../common/hooks/use-translation-wrapper';
-import { getAgentsForSelection } from '../../../helpers';
-import { INFRAENV_AGENTINSTALL_LABEL_KEY } from '../../../common';
 import { TFunction } from 'i18next';
 import { NodePoolK8sResource } from '../../types';
@@ -61,16 +59,7 @@ const HostsStep: React.FC<HostsStepProps> = ({
   olmCatalogPlacement,
 }) => {
   const { t } = useTranslation();
-  const availableAgents = getAgentsForSelection(agents);
-  const infraEnvsWithAgents = infraEnvs.filter((ie) =>
-    availableAgents.some(
-      (a) =>
-        a.metadata?.labels?.[INFRAENV_AGENTINSTALL_LABEL_KEY] === ie.metadata?.name &&
-        a.metadata?.namespace === ie.metadata?.namespace &&
-        !a.spec.clusterDeploymentName,
-    ),
-  );
   return (
     <Stack hasGutter>
       <StackItem>
@@ -84,7 +73,7 @@ const HostsStep: React.FC<HostsStepProps> = ({
             controllerAvailabilityPolicy: controllerAvailabilityPolicy || 'HighlyAvailable',
             infrastructureAvailabilityPolicy: infrastructureAvailabilityPolicy || 'HighlyAvailable',
             olmCatalogPlacement: olmCatalogPlacement || 'management',
-            agentNamespace: initInfraEnv || infraEnvsWithAgents[0]?.metadata?.namespace || '',
+            agentNamespace: initInfraEnv || infraEnvs[0]?.metadata?.namespace || '',
             nodePools: initNodePools || [
               {
                 nodePoolName: `nodepool-${clusterName}-1`,
@@ -106,7 +95,7 @@ const HostsStep: React.FC<HostsStepProps> = ({
         >
           <HostsForm
             onValuesChanged={onValuesChanged}
-            infraEnvs={infraEnvsWithAgents}
+            infraEnvs={infraEnvs}
             agents={agents}
             clusterName={clusterName}
             initReleaseImage={initReleaseImage}

package/lib/cim/components/Hypershift/HostedClusterWizard/HostsStep/NodePoolForm.tsx CHANGED Viewed

@@ -22,7 +22,6 @@ import { HostsFormValues } from './types';
 import { useFormikContext } from 'formik';
 import { getAgentsForSelection } from '../../../helpers';
 import { useTranslation } from '../../../../../common/hooks/use-translation-wrapper';
-import { useFormikHelpers } from '../../../../../common/hooks/useFormikHelpers';
 import './NodePoolForm.css';
 import NodePoolAgentsForm from '../../forms/NodePoolAgentsForm';
@@ -37,14 +36,8 @@ type NodePoolFormProps = {
 const NodePoolForm: React.FC<NodePoolFormProps> = ({ infraEnvs, agents, index, onRemove }) => {
   const { t } = useTranslation();
   const { values } = useFormikContext<HostsFormValues>();
-  const { setValue: setCountValue } = useFormikHelpers(`nodePools[${index}].count`);
-  const { setValue: setMinAutoscalingValue } = useFormikHelpers(
-    `nodePools[${index}].autoscaling.minReplicas`,
-  );
-  const { setValue: setMaxAutoscalingValue } = useFormikHelpers(
-    `nodePools[${index}].autoscaling.maxReplicas`,
-  );
   const [isExpanded, setExpanded] = React.useState(true);
   const infraEnvAgents = React.useMemo(() => {
     const infraEnv = infraEnvs.find((ie) => ie.metadata?.namespace === values.agentNamespace);
     return agents.filter((agent) => isAgentOfInfraEnv(infraEnv, agent));
@@ -79,31 +72,6 @@ const NodePoolForm: React.FC<NodePoolFormProps> = ({ infraEnvs, agents, index, o
     Math.min(matchingAgents.length, availableAgents.length - previousNodePoolsCount),
   );
-  const currentCount = values.nodePools[index].useAutoscaling
-    ? values.nodePools[index].autoscaling.maxReplicas
-    : values.nodePools[index].count;
-  React.useEffect(() => {
-    if (currentCount > maxAgents) {
-      if (values.nodePools[index].useAutoscaling) {
-        if (maxAgents === 0) {
-          void setMinAutoscalingValue(maxAgents);
-        }
-        void setMaxAutoscalingValue(maxAgents);
-      } else {
-        void setCountValue(maxAgents);
-      }
-    }
-  }, [
-    maxAgents,
-    currentCount,
-    values.nodePools,
-    index,
-    setCountValue,
-    setMinAutoscalingValue,
-    setMaxAutoscalingValue,
-  ]);
   return (
     <Stack hasGutter>
       <StackItem>

package/lib/cim/components/Hypershift/forms/NodePoolAgentsForm.tsx CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Grid, GridItem } from '@patternfly/react-core';
+import { Alert, AlertVariant, Grid, GridItem, Text } from '@patternfly/react-core';
 import * as React from 'react';
 import { CheckboxField, NumberInputField, PopoverIcon } from '../../../../common';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
@@ -27,6 +27,7 @@ const NodePoolAgentsForm = ({
 }: NodePoolAgentsFormProps) => {
   const { t } = useTranslation();
+  const [{ value: count }] = useField<number>(countName);
   const [{ value: minValue }] = useField<number>(`${autoscalingName}.minReplicas`);
   const [{ value: maxValue }] = useField<number>(`${autoscalingName}.maxReplicas`);
   const [{ value: useAutoscalingValue }] = useField<boolean>(useAutoscalingName);
@@ -60,7 +61,7 @@ const NodePoolAgentsForm = ({
               label={t('ai:Minimum number of hosts')}
               isRequired
               minValue={1}
-              maxValue={maxValue || maxAgents}
+              maxValue={maxValue}
             />
           </GridItem>
           <GridItem>
@@ -69,22 +70,33 @@ const NodePoolAgentsForm = ({
               label={t('ai:Maximum number of hosts')}
               isRequired
               minValue={minValue || 1}
-              maxValue={maxAgents}
               helperText={helperText}
             />
           </GridItem>
         </>
       ) : (
+        <>
+          <GridItem>
+            <NumberInputField
+              label={t('ai:Number of hosts')}
+              idPostfix="count"
+              name={countName}
+              isRequired
+              minValue={0}
+              helperText={helperText}
+            />
+          </GridItem>
+        </>
+      )}
+      {(useAutoscalingValue ? maxValue : count) > maxAgents && (
         <GridItem>
-          <NumberInputField
-            label={t('ai:Number of hosts')}
-            idPostfix="count"
-            name={countName}
-            isRequired
-            minValue={0}
-            maxValue={maxAgents}
-            helperText={helperText}
-          />
+          <Alert
+            isInline
+            variant={AlertVariant.warning}
+            title={t('ai:Host count exceeds the current number of available hosts.')}
+          >
+            <Text>{t('ai:Scale down the nodepool or make more hosts available.')}</Text>
+          </Alert>
         </GridItem>
       )}
     </Grid>

package/lib/cim/components/Hypershift/modals/AddNodePoolModal.tsx CHANGED Viewed

@@ -41,7 +41,7 @@ const AddNodePoolModal = ({
   const handleSubmit = async (values: NodePoolFormValues) => {
     setError(undefined);
     const nodePool: NodePoolK8sResource = {
-      apiVersion: 'hypershift.openshift.io/v1alpha1',
+      apiVersion: 'hypershift.openshift.io/v1beta1',
       kind: 'NodePool',
       metadata: {
         name: values.nodePoolName,

package/lib/cim/components/Hypershift/modals/ManageHostsModal.tsx CHANGED Viewed

@@ -66,7 +66,7 @@ const getPatches = (values: NodePoolFormValues, nodePool: NodePoolK8sResource) =
       );
     }
   } else {
-    if (!!nodePool.spec.replicas) {
+    if (nodePool.spec.replicas !== undefined) {
       patches.push({
         op: 'replace',
         value: values.count,
@@ -127,7 +127,7 @@ const ManageHostsModal = ({
           agentLabels: labelsToFormikValue(
             nodePool.spec.platform?.agent?.agentLabelSelector?.matchLabels || {},
           ),
-          count: nodePool.spec.replicas || 1,
+          count: nodePool.spec.replicas || 0,
           useAutoscaling: !!nodePool.spec.autoScaling,
           autoscaling: {
             minReplicas: nodePool.spec.autoScaling?.min || 1,