npm - @openshift-assisted/ui-lib - Versions diffs - 2.46.3 → 2.47.0 - Mend

@openshift-assisted/ui-lib 2.46.3 → 2.47.0

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 (126) hide show

package/build/cjs/cim/components/ClusterDeployment/ClusterDetailsFormFields.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ClusterDetailsFormFields.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx"],"names":[],"mappings":";;;;AAAA,qDAA+B;AAC/B,~~uDAA6E~~;~~AAC7E~~,mCAA0C;AAE1C,~~4CAAkF~~;~~AAClF~~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~~uBAAuB~~,~~GAC3B~~,MAAM,CAAC,~~6BAA6B~~,IAAI,MAAM,CAAC,~~6BAA6B~~,CAAC;~~IAE~~/E,OAAO,CACL,oBAAC,iBAAI,IAAC,EAAE,EAAC,8BAA8B;QACpC,UAAU,CAAC,CAAC,CAAC,CACZ,oBAAC,iCAAe,IAAC,IAAI,EAAC,MAAM,EAAC,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE,UAAU,UACjE,IAAI,CACW,CACnB,CAAC,CAAC,CAAC,CACF,oBAAC,uBAAc,IACb,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAC3B,IAAI,EAAC,MAAM,EACX,WAAW,EAAE,CAAC,CAAC,uBAAuB,CAAC,EACvC,sBAAsB,EAAE,IAAA,yCAAgC,EAAC,CAAC,CAAC,EAC3D,UAAU,SACV,CACH;QACA,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,MAAM,CAAC,KAAI,cAAc,CAAC,MAAM,CAAC;QAClD,UAAU,CAAC,CAAC,CAAC,CACZ,oBAAC,iCAAe,IACd,IAAI,EAAC,eAAe,EACpB,KAAK,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAC1B,UAAU,EAAE,oBAAC,yBAAiB,IAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,GAAI,EAC3E,UAAU,UAET,aAAa,CACE,CACnB,CAAC,CAAC,CAAC,CACF,oBAAC,mBAAU,IACT,KAAK,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAC1B,IAAI,EAAC,eAAe,EACpB,UAAU,EAAE,oBAAC,yBAAiB,IAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,GAAI,EAC3E,WAAW,EAAC,aAAa,EACzB,UAAU,SACV,CACH;QACA,qBAAqB,CAAC,CAAC,CAAC,CACvB,oBAAC,iCAAe,IAAC,IAAI,EAAC,kBAAkB,EAAC,KAAK,EAAC,mBAAmB,EAAC,UAAU;YAC1E,CAAC,CAAC,cAAc,CAAC;;YAAG,qBAAqB,CAC1B,CACnB,CAAC,CAAC,CAAC,CACF;YACE,oBAAC,iCAAwB,IACvB,IAAI,EAAC,kBAAkB,EACvB,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,KAAK,EACvB,yBAAyB,EAAE,GAAG,EAAE,CAAC,4BAA4B,CAAC,IAAI,CAAC,EACnE,WAAW,EAAE,uBAAuB,GACpC;YACD,yBAAyB,IAAI,CAC5B,oBAAC,8BAAqB,IACpB,WAAW,EAAE,WAAW,EACxB,4BAA4B,EAAE,4BAA4B,GAC1D,CACH,CACA,CACJ;QACD,oBAAC,mCAAyB,IACxB,UAAU,EAAE,UAAU,EACtB,oBAAoB,EAAE,oBAAoB,~~GAC1C~~;QACD,CAAC,SAAS,IAAI,CACb,oBAAC,iCAAuB,IAAC,gBAAgB,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,GAAI,CACxF;~~QACA~~,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,kBAAkB,CAAC,KAAI,cAAc,CAAC,kBAAkB,CAAC;~~QAC1E~~,CAAC,UAAU,IAAI,oBAAC,qBAAU,OAAG;~~QAC7B~~,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,YAAY,CAAC,KAAI,cAAc,CAAC,YAAY,CAAC~~;QAM9D~~,~~uBAAuB~~,IAAI,MAAM,CAAC,kBAAkB,KAAK,OAAO,IAAI,CACnE,oBAAC,kBAAK,IACJ,OAAO,EAAE,yBAAY,CAAC,OAAO,EAC7B,QAAQ,QACR,KAAK,EACH,oBAAC,qBAAQ,QACN,CAAC,CACA,8FAA8F,CAC/F,CACQ,GAEb,CACH;QACA,uBAAuB,IAAI,MAAM,CAAC,kBAAkB,KAAK,MAAM,IAAI,CAClE,oBAAC,kBAAK,IACJ,OAAO,EAAE,yBAAY,CAAC,OAAO,EAC7B,QAAQ,QACR,KAAK,EACH,oBAAC,qBAAQ,QACN,CAAC,CACA,wJAAwJ,CACzJ,CACQ,GAEb,CACH,CACI,CACR,CAAC;AACJ,CAAC,CAAC;~~AA7JW~~,QAAA,wBAAwB,~~4BA6JnC~~"}
1	+ {"version":3,"file":"ClusterDetailsFormFields.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx"],"names":[],"mappings":"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"}

package/build/cjs/common/components/clusterConfiguration/ControlPlaneNodesDropdown.js CHANGED Viewed

@@ -7,13 +7,28 @@ const use_translation_wrapper_1 = require("../../hooks/use-translation-wrapper")
 const __1 = require("../..");
 const formik_1 = require("formik");
 const toNumber_1 = tslib_1.__importDefault(require("lodash-es/toNumber"));
-const ControlPlaneNodesDropdown = ({ isDisabled = false, allowHighlyAvailable, }) => {
+const OcmTNADisclaimer_1 = tslib_1.__importDefault(require("./OcmTNADisclaimer"));
+const isItemEnabled = (value, allowHighlyAvailable, allowTNA) => {
+    switch (value) {
+        case 1:
+        case 3:
+            return true;
+        case 2:
+            return !!allowTNA;
+        case 4:
+        case 5:
+            return !!allowHighlyAvailable;
+    }
+    return false;
+};
+const ControlPlaneNodesDropdown = ({ isDisabled = false, allowHighlyAvailable, allowTNA, }) => {
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
     const [{ name, value: selectedValue }, , { setValue }] = (0, formik_1.useField)('controlPlaneCount');
     const [controlPlanelOpen, setControlPlanelOpen] = React.useState(false);
     const fieldId = (0, __1.getFieldId)(name, 'input');
     const options = [
         { value: 1, label: t('ai:1 (Single Node OpenShift - not highly available cluster)') },
+        { value: 2, label: t('ai:2 (Two-Nodes Arbiter)') },
         { value: 3, label: t('ai:3 (highly available cluster)') },
         { value: 4, label: t('ai:4 (highly available cluster+)') },
         { value: 5, label: t('ai:5 (highly available cluster++)') },
@@ -24,19 +39,21 @@ const ControlPlaneNodesDropdown = ({ isDisabled = false, allowHighlyAvailable, }
         }
     }, [allowHighlyAvailable, selectedValue, setValue]);
     const dropdownItems = options.map(({ value, label }) => {
-        const isItemEnabled = [1, 3].includes(value) || allowHighlyAvailable;
+        const isEnabled = isItemEnabled(value, allowHighlyAvailable, allowTNA);
         const disabledReason = t('ai:This option is not available with the selected OpenShift version');
         return (React.createElement(react_core_1.DropdownItem, { key: value, id: value.toString(), isAriaDisabled: !isItemEnabled, isDisabled: !isItemEnabled, selected: selectedValue === value, value: value },
-            React.createElement(react_core_1.Tooltip, { hidden: isItemEnabled, content: disabledReason, position: "top" },
+            React.createElement(react_core_1.Tooltip, { hidden: isEnabled, content: disabledReason, position: "top" },
                 React.createElement("div", null, label))));
     });
     const onControlPlaneSelect = (e, value) => {
         setValue((0, toNumber_1.default)(value));
         setControlPlanelOpen(false);
     };
-    return !isDisabled ? (React.createElement(react_core_1.FormGroup, { isInline: true, fieldId: fieldId, label: t('ai:Number of control plane nodes'), isRequired: true },
-        React.createElement(react_core_1.Dropdown, { isOpen: controlPlanelOpen, onSelect: onControlPlaneSelect, onOpenChange: () => setControlPlanelOpen(!controlPlanelOpen), toggle: (toggleRef) => (React.createElement(react_core_1.MenuToggle, { className: "pf-v6-u-w-100", ref: toggleRef, isFullWidth: true, onClick: () => setControlPlanelOpen(!controlPlanelOpen), isExpanded: controlPlanelOpen }, selectedValue ? selectedValue : '3')), shouldFocusToggleOnSelect: true },
-            React.createElement(react_core_1.DropdownList, null, dropdownItems)))) : (React.createElement(__1.StaticField, { name: 'controlPlaneCount', label: t('ai:Number of control plane nodes'), isRequired: true }, selectedValue));
+    return (React.createElement(React.Fragment, null,
+        !isDisabled ? (React.createElement(react_core_1.FormGroup, { isInline: true, fieldId: fieldId, label: t('ai:Number of control plane nodes'), isRequired: true },
+            React.createElement(react_core_1.Dropdown, { isOpen: controlPlanelOpen, onSelect: onControlPlaneSelect, onOpenChange: () => setControlPlanelOpen(!controlPlanelOpen), toggle: (toggleRef) => (React.createElement(react_core_1.MenuToggle, { className: "pf-v5-u-w-100", ref: toggleRef, isFullWidth: true, onClick: () => setControlPlanelOpen(!controlPlanelOpen), isExpanded: controlPlanelOpen }, selectedValue ? selectedValue : '3')), shouldFocusToggleOnSelect: true },
+                React.createElement(react_core_1.DropdownList, null, dropdownItems)))) : (React.createElement(__1.StaticField, { name: 'controlPlaneCount', label: t('ai:Number of control plane nodes'), isRequired: true }, selectedValue)),
+        selectedValue === 2 && React.createElement(OcmTNADisclaimer_1.default, null)));
 };
 exports.default = ControlPlaneNodesDropdown;
 //# sourceMappingURL=ControlPlaneNodesDropdown.js.map

package/build/cjs/common/components/clusterConfiguration/ControlPlaneNodesDropdown.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ControlPlaneNodesDropdown.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,uDAQgC;AAChC,iFAAqE;AACrE,6BAAgD;AAChD,mCAAkC;AAClC,0EAA0C;~~AAO1C~~,MAAM,yBAAyB,GAAG,CAAC,EACjC,UAAU,GAAG,KAAK,EAClB,oBAAoB,~~GAIrB~~,EAAE,EAAE;IACH,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,AAAD,EAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAS,mBAAmB,CAAC,CAAC;IAC/F,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,IAAA,cAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,OAAO,GAA8B;QACzC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,6DAA6D,CAAC,EAAE;QACrF,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,iCAAiC,CAAC,EAAE;QACzD,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,kCAAkC,CAAC,EAAE;QAC1D,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,mCAAmC,CAAC,EAAE;KAC5D,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC3D,QAAQ,CAAC,CAAC,CAAC,CAAC;SACb;IACH,CAAC,EAAE,CAAC,oBAAoB,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;QACrD,MAAM,~~aAAa~~,GAAG,~~CAAC~~,CAAC,EAAE,~~CAAC~~,~~CAAC~~,~~CAAC,~~QAAQ,CAAC,~~KAAK,~~CAAC~~,IAAI,oBAAoB,CAAC~~;~~QACrE~~,MAAM,cAAc,GAAG,CAAC,CAAC,qEAAqE,CAAC,CAAC;QAChG,OAAO,CACL,oBAAC,yBAAY,IACX,GAAG,EAAE,KAAK,EACV,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,EACpB,cAAc,EAAE,CAAC,aAAa,EAC9B,UAAU,EAAE,CAAC,aAAa,EAC1B,QAAQ,EAAE,aAAa,KAAK,KAAK,EACjC,KAAK,EAAE,KAAK;YAEZ,oBAAC,oBAAO,IAAC,MAAM,EAAE,~~aAAa~~,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAC,KAAK;~~gBACrE~~,iCAAM,KAAK,CAAO,CACV,CACG,CAChB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,oBAAoB,GAAG,CAC3B,CAAyC,EACzC,KAAuB,EACvB,EAAE;QACF,QAAQ,CAAC,IAAA,kBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,~~CACnB~~,oBAAC,sBAAS,~~IAAC~~,QAAQ,~~QAAC~~,OAAO,EAAE,OAAO,~~EAAE~~,KAAK,EAAE,CAAC,CAAC,kCAAkC,CAAC,~~EAAE~~,UAAU;~~QAC5F~~,oBAAC,qBAAQ,IACP,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,oBAAoB,EAC9B,YAAY,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC,iBAAiB,CAAC,EAC5D,MAAM,EAAE,CAAC,SAAuC,EAAE,EAAE,CAAC,CACnD,oBAAC,uBAAU,IACT,SAAS,EAAC,eAAe,EACzB,GAAG,EAAE,SAAS,EACd,WAAW,QACX,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC,iBAAiB,CAAC,EACvD,UAAU,EAAE,iBAAiB,IAE5B,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CACzB,CACd,EACD,yBAAyB;~~YAEzB~~,oBAAC,yBAAY,QAAE,aAAa,CAAgB,CACnC,CACD,CACb,CAAC,CAAC,CAAC,CACF,oBAAC,eAAW,IACV,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,CAAC,CAAC,kCAAkC,CAAC,EAC5C,UAAU,UAET,aAAa,CACF,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,yBAAyB,CAAC"}
1	+ {"version":3,"file":"ControlPlaneNodesDropdown.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx"],"names":[],"mappings":"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"}

package/build/cjs/common/components/clusterConfiguration/DownloadIso.js CHANGED Viewed

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
-const file_saver_1 = require("file-saver");
 const react_core_1 = require("@patternfly/react-core");
 const ui_1 = require("../ui");
 const DiscoveryInstructions_1 = tslib_1.__importDefault(require("./DiscoveryInstructions"));
@@ -36,7 +35,7 @@ const DownloadIso = ({ fileName = 'discovery.iso', downloadUrl, onClose, onReset
                 react_1.default.createElement(react_core_1.StackItem, null,
                     react_1.default.createElement(react_core_1.Alert, { variant: "info", isInline: true, title: `${t('ai:Never share your downloaded ISO with anyone else.')} ${t('ai:Forwarding it could put your credentials and personal data at risk.')}` })))),
         react_1.default.createElement(react_core_1.ModalFooter, null,
-            react_1.default.createElement(react_core_1.Button, { variant: react_core_1.ButtonVariant.primary, onClick: () => downloadUrl && (0, file_saver_1.saveAs)(downloadUrl), "data-testid": "download-iso-btn", isDisabled: !downloadUrl }, t('ai:Download Discovery ISO')),
+            react_1.default.createElement(react_core_1.Button, { variant: react_core_1.ButtonVariant.primary, "data-testid": "download-iso-btn", isDisabled: !downloadUrl, component: 'a', target: "_blank", href: downloadUrl, download: true, rel: "noopener noreferrer" }, t('ai:Download Discovery ISO')),
             react_1.default.createElement(react_core_1.Button, { variant: react_core_1.ButtonVariant.secondary, onClick: onClose, "data-testid": "close-iso-btn" }, t('ai:Close')),
             onReset && (react_1.default.createElement(react_core_1.Button, { variant: react_core_1.ButtonVariant.link, onClick: onReset, "data-testid": "edit-iso-btn" }, t('ai:Edit ISO configuration'))))));
 };

package/build/cjs/common/components/clusterConfiguration/DownloadIso.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DownloadIso.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/DownloadIso.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,~~2CAAoC;AACpC,~~uDAUgC;AAChC,8BAA+C;AAC/C,4FAA4D;AAC5D,yEAA0D;AAC1D,iFAAqE;AACrE,yGAAmG;AACnG,yCAAsD;AAatD,MAAM,WAAW,GAAG,CAAC,EACnB,QAAQ,GAAG,eAAe,EAC1B,WAAW,EACX,OAAO,EACP,OAAO,EACP,OAAO,EACP,KAAK,GAAG,KAAK,EACb,UAAU,EACV,4BAA4B,GACX,EAAE,EAAE;IACrB,MAAM,WAAW,GAAG,WAAW,QAAQ,KAAK,WAAW,IAAI,EAAE,GAAG,CAAC;IACjE,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,MAAM,4BAA4B,GAAG,CAAC,WAAmB,EAAE,EAAE;QAC3D,4BAA4B,CAAC,CAAC,CAAC,4BAA4B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,CAAC,IAAI,CAAC,IAAA,+BAAsB,EAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACzE,CAAC,CAAC;IAEF,OAAO,CACL;QACE,8BAAC,sBAAS;YACR,8BAAC,kBAAK,IAAC,SAAS;gBACd,8BAAC,sBAAS;oBACR,8BAAC,kBAAK,IACJ,QAAQ,QACR,OAAO,EAAC,SAAS,EACjB,KAAK,EAAE,CAAC,CAAC,4CAA4C,CAAC;wBAEtD;;4BAEE,8BAAC,+BAAqB,IAAC,KAAK,EAAE,KAAK,GAAI,CACtC,CACG,CACE;gBACX,OAAO,KAAK,KAAK,IAAI,CACpB,8BAAC,sBAAS;oBACR,8BAAC,uCAAY,IAAC,UAAU,EAAE,UAAU,GAAI,CAC9B,CACb;gBACD,8BAAC,sBAAS;oBACR,8BAAC,mBAAM,IACL,OAAO,EAAC,MAAM,EACd,IAAI,EAAE,8BAAC,4CAAmB,OAAG,EAC7B,YAAY,EAAC,OAAO,EACpB,QAAQ,QACR,OAAO,EAAE,GAAG,EAAE,CAAC,4BAA4B,CAAC,WAAW,CAAC,IAEvD,CAAC,CAAC,oCAAoC,CAAC,CACjC,CACC;gBACZ,8BAAC,sBAAS;oBACR,8BAAC,eAAU;wBACT,8BAAC,eAAU,IACT,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAChC,KAAK,EACH,8BAAC,0BAAa,IACZ,UAAU,QACV,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,8BAAiB,EAAC,KAAK,EAAE,WAAW,CAAC,IAEvD,WAAW,CACE,GAElB;wBACF,8BAAC,eAAU,IACT,KAAK,EAAE,CAAC,CAAC,iCAAiC,CAAC,EAC3C,KAAK,EACH,8BAAC,0BAAa,IACZ,UAAU,QACV,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,8BAAiB,EAAC,KAAK,EAAE,WAAW,CAAC,IAEvD,WAAW,CACE,GAElB,CACS,CACH;gBACZ,8BAAC,sBAAS;oBACR,8BAAC,kBAAK,IACJ,OAAO,EAAC,MAAM,EACd,QAAQ,QACR,KAAK,EAAE,GAAG,CAAC,CAAC,sDAAsD,CAAC,IAAI,CAAC,CACtE,wEAAwE,CACzE,EAAE,GACH,CACQ,CACN,CACE;QACZ,8BAAC,wBAAW;YACV,8BAAC,mBAAM,IACL,OAAO,EAAE,0BAAa,CAAC,OAAO,~~EAC9B~~,~~OAAO~~,~~EAAE~~,~~GAAG~~,EAAE,CAAC,WAAW,~~IAAI~~,~~IAAA~~,~~mBAAM~~,~~EAAC~~,~~WAAW~~,~~CAAC~~,~~iBACrC~~,~~kBAAkB~~,~~EAC9B~~,~~UAAU~~,EAAE,~~CAAC,~~WAAW,~~IAEvB~~,CAAC,CAAC,2BAA2B,CAAC,CACxB;YACT,8BAAC,mBAAM,IAAC,OAAO,EAAE,0BAAa,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,iBAAc,eAAe,IACpF,CAAC,CAAC,UAAU,CAAC,CACP;YACR,OAAO,IAAI,CACV,8BAAC,mBAAM,IAAC,OAAO,EAAE,0BAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,iBAAc,cAAc,IAC9E,CAAC,CAAC,2BAA2B,CAAC,CACxB,CACV,CACW,CACb,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,WAAW,CAAC"}
1	+ {"version":3,"file":"DownloadIso.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/DownloadIso.tsx"],"names":[],"mappings":"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"}

package/build/cjs/{ocm → common}/components/clusterConfiguration/OcmTNADisclaimer.js RENAMED Viewed

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const react_core_1 = require("@patternfly/react-core");
-const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
+const use_translation_wrapper_1 = require("../../hooks/use-translation-wrapper");
 const OcmTNADisclaimer = () => {
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
     return (react_1.default.createElement(react_core_1.Alert, { variant: react_core_1.AlertVariant.info, title: t('ai:Requirements for Two Node control plane OpenShift'), isInline: true },

package/build/cjs/common/components/clusterConfiguration/OcmTNADisclaimer.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"OcmTNADisclaimer.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/OcmTNADisclaimer.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAA6E;AAC7E,iFAAqE;AAErE,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,OAAO,CACL,8BAAC,kBAAK,IACJ,OAAO,EAAE,yBAAY,CAAC,IAAI,EAC1B,KAAK,EAAE,CAAC,CAAC,sDAAsD,CAAC,EAChE,QAAQ;QAER,8BAAC,iBAAI;YACH,8BAAC,qBAAQ,QACN,CAAC,CAAC,+EAA+E,CAAC,CAC1E,CACN,CACD,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}

package/build/cjs/common/components/clusterConfiguration/utils.js CHANGED Viewed

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVipValidationsById = exports.filterValidationsInfoByStatus = exports.filterValidationsInfoByGroup = exports.getStorageInitialValues = exports.getHostDiscoveryInitialValues = exports.isSubnetInIPv6 = exports.isDualStack = exports.canBeDualStack = exports.canSelectNetworkTypeSDN = exports.isAdvNetworkConf = exports.clusterNetworksEqual = exports.serviceNetworksEqual = exports.getSubnetFromMachineNetworkCidr = exports.getHostSubnets = exports.getHumanizedSubnet = exports.getHumanizedSubnetRange = exports.getSubnet = exports.getOpenshiftVersionText = void 0;
 const ip_address_1 = require("ip-address");
 const config_1 = require("../../config");
+const utils_1 = require("../../utils");
 const selectors_1 = require("../../selectors");
 const types_1 = require("../../types");
-const utils_1 = require("../hosts/utils");
-const utils_2 = require("../../utils");
+const utils_2 = require("../hosts/utils");
+const utils_3 = require("../../utils");
 const getBetaVersionText = (openshiftVersion, versions) => {
     const versionSelected = versions.find((version) => version.version === openshiftVersion);
     return (versionSelected === null || versionSelected === void 0 ? void 0 : versionSelected.supportLevel) === 'beta' ? '- Developer preview release' : '';
@@ -53,8 +54,8 @@ const getHumanizedSubnet = (subnet) => {
 exports.getHumanizedSubnet = getHumanizedSubnet;
 const buildHostnameMap = (hosts) => {
     return hosts.reduce((acc, host) => {
-        const inventory = (0, utils_2.stringToJSON)(host.inventory) || {};
-        acc = Object.assign(Object.assign({}, acc), { [host.id]: (0, utils_1.getHostname)(host, inventory) });
+        const inventory = (0, utils_3.stringToJSON)(host.inventory) || {};
+        acc = Object.assign(Object.assign({}, acc), { [host.id]: (0, utils_2.getHostname)(host, inventory) });
         return acc;
     }, {});
 };
@@ -118,13 +119,23 @@ exports.canSelectNetworkTypeSDN = canSelectNetworkTypeSDN;
 const canBeDualStack = (subnets) => subnets.some((subnet) => ip_address_1.Address4.isValid(subnet.subnet)) &&
     subnets.some((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
 exports.canBeDualStack = canBeDualStack;
-const areNetworksDualStack = (networks) => networks &&
-    networks.length > 1 &&
-    ip_address_1.Address4.isValid(networks[0].cidr || '') &&
-    ip_address_1.Address6.isValid(networks[1].cidr || '');
-const isDualStack = ({ machineNetworks, clusterNetworks, serviceNetworks, }) => areNetworksDualStack(machineNetworks) &&
-    areNetworksDualStack(clusterNetworks) &&
-    areNetworksDualStack(serviceNetworks);
+const areNetworksDualStack = (networks, openshiftVersion) => {
+    if (!networks || networks.length < 2) {
+        return false;
+    }
+    const firstCidr = networks[0].cidr || '';
+    const secondCidr = networks[1].cidr || '';
+    // For OCP >= 4.12, allow either IPv4 or IPv6 as primary, with opposite as secondary
+    if (openshiftVersion && (0, utils_1.isMajorMinorVersionEqualOrGreater)(openshiftVersion, '4.12')) {
+        return ((ip_address_1.Address4.isValid(firstCidr) && ip_address_1.Address6.isValid(secondCidr)) ||
+            (ip_address_1.Address6.isValid(firstCidr) && ip_address_1.Address4.isValid(secondCidr)));
+    }
+    // For older versions, require IPv4 as primary and IPv6 as secondary
+    return ip_address_1.Address4.isValid(firstCidr) && ip_address_1.Address6.isValid(secondCidr);
+};
+const isDualStack = ({ machineNetworks, clusterNetworks, serviceNetworks, openshiftVersion, }) => areNetworksDualStack(machineNetworks, openshiftVersion) &&
+    areNetworksDualStack(clusterNetworks, openshiftVersion) &&
+    areNetworksDualStack(serviceNetworks, openshiftVersion);
 exports.isDualStack = isDualStack;
 const isSubnetInIPv6 = ({ clusterNetworkCidr, machineNetworkCidr, serviceNetworkCidr, }) => ip_address_1.Address6.isValid(clusterNetworkCidr || '') ||
     ip_address_1.Address6.isValid(machineNetworkCidr || '') ||
@@ -168,7 +179,7 @@ function filterValidationsInfoByStatus(validationsInfo, selectedStatuses = ['fai
 }
 exports.filterValidationsInfoByStatus = filterValidationsInfoByStatus;
 const getVipValidationsById = (t, validationsInfoString) => {
-    const validationsInfo = (0, utils_2.stringToJSON)(validationsInfoString) || {};
+    const validationsInfo = (0, utils_3.stringToJSON)(validationsInfoString) || {};
     const failedDhcpAllocationMessageStubs = [
         t('ai:VIP IP allocation from DHCP server has been timed out'),
         t('ai:IP allocation from the DHCP server timed out.'),

package/build/cjs/common/components/clusterConfiguration/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":"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~~CACF~~,QAAQ~~;IACR~~,QAAQ,CAAC,MAAM,GAAG,CAAC;~~IACnB~~,~~qBAAQ~~,CAAC,~~OAAO~~,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;~~IACxC~~,qBAAQ,CAAC,OAAO,CAAC,~~QAAQ~~,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,~~EAAE~~,CAAC,CAAC;~~AAEpC~~,MAAM,WAAW,GAAG,CAAC,EAC1B,eAAe,EACf,eAAe,EACf,eAAe,~~GAC0D~~,EAAE,EAAE,~~CAC7E~~,oBAAoB,CAAC,eAAe,CAAC;~~IACrC~~,oBAAoB,CAAC,eAAe,CAAC;~~IACrC~~,oBAAoB,CAAC,eAAe,CAAC,CAAC;~~AAP3B~~,QAAA,WAAW,~~eAOgB~~;~~AAEjC~~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"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/utils.ts"],"names":[],"mappings":"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"}

package/build/cjs/common/components/clusterConfiguration/utils.test.js ADDED Viewed

@@ -0,0 +1,242 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const utils_1 = require("./utils");
+(0, vitest_1.describe)('isDualStack', () => {
+    const createMachineNetwork = (cidr) => ({ cidr, clusterId: 'test' });
+    const createClusterNetwork = (cidr, hostPrefix) => ({
+        cidr,
+        hostPrefix,
+        clusterId: 'test',
+    });
+    const createServiceNetwork = (cidr) => ({ cidr, clusterId: 'test' });
+    (0, vitest_1.describe)('OCP < 4.12 (legacy behavior)', () => {
+        (0, vitest_1.test)('returns true for valid dual stack with IPv4 primary', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('2001:db8::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('fd01::/48', 64),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('fd02::/112'),
+                ],
+                openshiftVersion: '4.11',
+            });
+            (0, vitest_1.expect)(result).toBe(true);
+        });
+        (0, vitest_1.test)('returns false for IPv6 primary in OCP < 4.12', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('2001:db8::/64'),
+                    createMachineNetwork('192.168.1.0/24'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('fd01::/48', 64),
+                    createClusterNetwork('10.128.0.0/14', 23),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('fd02::/112'),
+                    createServiceNetwork('172.30.0.0/16'),
+                ],
+                openshiftVersion: '4.11',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.test)('returns false for single stack', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [createMachineNetwork('192.168.1.0/24')],
+                clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
+                serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
+                openshiftVersion: '4.11',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.test)('returns false for empty networks', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [],
+                clusterNetworks: [],
+                serviceNetworks: [],
+                openshiftVersion: '4.11',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+    });
+    (0, vitest_1.describe)('OCP >= 4.12 (new behavior)', () => {
+        (0, vitest_1.test)('returns true for IPv4 primary and IPv6 secondary', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('2001:db8::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('fd01::/48', 64),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('fd02::/112'),
+                ],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(true);
+        });
+        (0, vitest_1.test)('returns true for IPv6 primary and IPv4 secondary', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('2001:db8::/64'),
+                    createMachineNetwork('192.168.1.0/24'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('fd01::/48', 64),
+                    createClusterNetwork('10.128.0.0/14', 23),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('fd02::/112'),
+                    createServiceNetwork('172.30.0.0/16'),
+                ],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(true);
+        });
+        (0, vitest_1.test)('returns false for IPv6 primary and IPv6 secondary (not dual-stack)', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('2001:db8::/64'),
+                    createMachineNetwork('2001:db9::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('fd01::/48', 64),
+                    createClusterNetwork('fd02::/48', 64),
+                ],
+                serviceNetworks: [createServiceNetwork('fd03::/112'), createServiceNetwork('fd04::/112')],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.test)('returns false for IPv4 primary and IPv4 secondary (not dual-stack)', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('10.0.0.0/24'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('172.16.0.0/14', 23),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('172.31.0.0/16'),
+                ],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.test)('returns false for single stack', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [createMachineNetwork('192.168.1.0/24')],
+                clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
+                serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.test)('returns false if any network type is not dual stack', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('2001:db8::/64'),
+                ],
+                clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('fd02::/112'),
+                ],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+    });
+    (0, vitest_1.describe)('no version specified (defaults to legacy behavior)', () => {
+        (0, vitest_1.test)('returns true for IPv4 primary and IPv6 secondary', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('2001:db8::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('fd01::/48', 64),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('fd02::/112'),
+                ],
+            });
+            (0, vitest_1.expect)(result).toBe(true);
+        });
+        (0, vitest_1.test)('returns false for IPv6 primary when no version specified', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    createMachineNetwork('2001:db8::/64'),
+                    createMachineNetwork('192.168.1.0/24'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('fd01::/48', 64),
+                    createClusterNetwork('10.128.0.0/14', 23),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('fd02::/112'),
+                    createServiceNetwork('172.30.0.0/16'),
+                ],
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+    });
+    (0, vitest_1.describe)('edge cases', () => {
+        (0, vitest_1.test)('handles undefined networks', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: undefined,
+                clusterNetworks: undefined,
+                serviceNetworks: undefined,
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.test)('handles networks with empty CIDRs', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [
+                    { cidr: '', clusterId: 'test' },
+                    { cidr: '', clusterId: 'test' },
+                ],
+                clusterNetworks: [
+                    { cidr: '', hostPrefix: 23, clusterId: 'test' },
+                    { cidr: '', hostPrefix: 64, clusterId: 'test' },
+                ],
+                serviceNetworks: [
+                    { cidr: '', clusterId: 'test' },
+                    { cidr: '', clusterId: 'test' },
+                ],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.test)('handles invalid CIDRs', () => {
+            const result = (0, utils_1.isDualStack)({
+                machineNetworks: [createMachineNetwork('invalid'), createMachineNetwork('also-invalid')],
+                clusterNetworks: [
+                    createClusterNetwork('invalid', 23),
+                    createClusterNetwork('also-invalid', 64),
+                ],
+                serviceNetworks: [createServiceNetwork('invalid'), createServiceNetwork('also-invalid')],
+                openshiftVersion: '4.12',
+            });
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+    });
+});
+//# sourceMappingURL=utils.test.js.map

package/build/cjs/common/components/clusterConfiguration/utils.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterConfiguration/utils.test.ts"],"names":[],"mappings":"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"}

package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js CHANGED Viewed

@@ -42,7 +42,7 @@ const getClusterDetailsInitialValues = ({ cluster, pullSecret, managedDomains, o
         diskEncryptionTangServers: (0, exports.parseTangServers)((_g = cluster === null || cluster === void 0 ? void 0 : cluster.diskEncryption) === null || _g === void 0 ? void 0 : _g.tangServers),
         diskEncryption: (_h = cluster === null || cluster === void 0 ? void 0 : cluster.diskEncryption) !== null && _h !== void 0 ? _h : {},
         cpuArchitecture: (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture) || (0, types_1.getDefaultCpuArchitecture)(),
-        platform: ((_j = cluster === null || cluster === void 0 ? void 0 : cluster.platform) === null || _j === void 0 ? void 0 : _j.type) || 'none',
+        platform: ((_j = cluster === null || cluster === void 0 ? void 0 : cluster.platform) === null || _j === void 0 ? void 0 : _j.type) || 'baremetal',
         customOpenshiftSelect: null,
         userManagedNetworking: (cluster === null || cluster === void 0 ? void 0 : cluster.userManagedNetworking) || false,
         enableDiskEncryptionOnArbiters: ['all', 'arbiters'].includes((_l = (_k = cluster === null || cluster === void 0 ? void 0 : cluster.diskEncryption) === null || _k === void 0 ? void 0 : _k.enableOn) !== null && _l !== void 0 ? _l : 'none'),

package/build/cjs/common/components/clusterWizard/clusterDetailsValidation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"clusterDetailsValidation.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterWizard/clusterDetailsValidation.ts"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAO3B,uCAAoF;AAEpF,8BAMe;AAGf,MAAM,gBAAgB,GAAG,GAAiB,EAAE;IAC1C,OAAO;QACL;YACE,GAAG,EAAE,EAAE;YACP,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,iBAA0B,EAAgB,EAAE;IAC3E,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,gBAAgB,EAAE,CAAC;KAC3B;IAED,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAiB,CAAC;KACtD;IAAC,OAAO,CAAC,EAAE;QACV,kDAAkD;KACnD;IACD,OAAO,gBAAgB,EAAE,CAAC;AAC5B,CAAC,CAAC;AAXW,QAAA,gBAAgB,oBAW3B;AAEK,MAAM,8BAA8B,GAAG,CAAC,EAC7C,OAAO,EACP,UAAU,EACV,cAAc,EACd,WAAW,EACX,UAAU,GAOX,EAAwB,EAAE;;IACzB,MAAM,EACJ,IAAI,GAAG,EAAE,EACT,aAAa,GAAG,UAAU,IAAI,EAAE,EAChC,gBAAgB,GAAG,IAAA,+BAA0B,EAAC,WAAW,CAAC,EAC1D,iBAAiB,GAAG,CAAC,GACtB,GAAG,OAAO,IAAI,EAAE,CAAC;IAClB,OAAO;QACL,IAAI;QACJ,gBAAgB;QAChB,UAAU,EAAE,UAAU,IAAI,EAAE;QAC5B,aAAa;QACb,iBAAiB;QACjB,mBAAmB,EACjB,CAAC,CAAC,aAAa,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;QAChF,6BAA6B,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,QAAQ,CACxD,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,0CAAE,QAAQ,mCAAI,MAAM,CAC5C;QACD,6BAA6B,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,QAAQ,CACxD,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,0CAAE,QAAQ,mCAAI,MAAM,CAC5C;QACD,kBAAkB,EAAE,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,0CAAE,IAAI,mCAAI,OAAO;QAC5D,yBAAyB,EAAE,IAAA,wBAAgB,EAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,0CAAE,WAAW,CAAC;QACjF,cAAc,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,mCAAI,EAAE;QAC7C,eAAe,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,KAAI,IAAA,iCAAyB,GAAE;QACxE,QAAQ,EAAE,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI,KAAI,~~MAAM~~;~~QAC3C~~,qBAAqB,EAAE,IAAI;QAC3B,qBAAqB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,qBAAqB,KAAI,KAAK;QAC9D,8BAA8B,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,QAAQ,CAC1D,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,0CAAE,QAAQ,mCAAI,MAAM,CAC5C;KACF,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,8BAA8B,kCA4CzC;AAEK,MAAM,iCAAiC,GAAG,CAAC,EAChD,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,KAAK,EACL,CAAC,GAOF,EAAE,EAAE,CACH,GAAG,CAAC,IAAI,CAAC,CAAC,MAA2D,EAAE,EAAE;IACvE,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,IAAA,yBAAoB,EAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,aAAa,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;IAC7F,IAAI,aAAa,EAAE;QACjB,OAAO,GAAG,CAAC,MAAM,CAAC;YAChB,IAAI,EAAE,YAAY,EAAE;YACpB,aAAa,EAAE,KAAK;gBAClB,CAAC,CAAC,+BAA0B,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACjD,CAAC,CAAC,4BAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC;SACjD,CAAC,CAAC;KACJ;IACD,OAAO,GAAG,CAAC,MAAM,CAAC;QAChB,IAAI,EAAE,YAAY,EAAE;QACpB,aAAa,EAAE,KAAK;YAClB,CAAC,CAAC,+BAA0B,CAAC,QAAQ,CAAC,UAAU,CAAC;YACjD,CAAC,CAAC,4BAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC;QAChD,UAAU,EAAE,+BAA0B,CAAC,QAAQ,CAAC,WAAW,CAAC;QAC5D,yBAAyB,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAChE,EAAE,EAAE,CAAC,kBAA0C,EAAE,EAAE;gBACjD,OAAO,kBAAkB,KAAK,MAAM,CAAC;YACvC,CAAC;YACD,IAAI,EAAE,GAAG,EAAE,CACT,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,CACZ,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;gBACjB,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE;qBACd,GAAG,CACF,CAAC,CAAC,8EAA8E,CAAC,CAClF;qBACA,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;gBAC9B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;aACrD,CAAC,CACH;SACJ,CAAC;KACH,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AA/CQ,QAAA,iCAAiC,qCA+CzC"}
1	+ {"version":3,"file":"clusterDetailsValidation.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusterWizard/clusterDetailsValidation.ts"],"names":[],"mappings":"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"}

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

@@ -13,6 +13,7 @@ const constants_1 = require("../../../config/constants");
 const utils_1 = require("../../clusterConfiguration/utils");
 const constants_2 = require("./constants");
 const utils_2 = require("./utils");
+const utils_3 = require("../../../utils");
 const selectors_1 = require("../../../selectors");
 const ALPHANUMERIC_REGEX = /^[a-zA-Z0-9]+$/;
 const NAME_START_END_REGEX = /^[a-z0-9](.*[a-z0-9])?$/;
@@ -452,10 +453,19 @@ exports.serviceNetworkValidationSchema = Yup.array().of(Yup.object({
     cidr: (0, exports.ipBlockValidationSchema)(undefined /* So far used in OCM only and so validated by backend */),
     clusterId: Yup.string(),
 }));
-const dualStackValidationSchema = (field) => Yup.array()
+const dualStackValidationSchema = (field, openshiftVersion) => Yup.array()
     .max(2, `Maximum number of ${field} subnets in dual stack is 2.`)
-    .test('dual-stack-ipv4', 'First network has to be IPv4 subnet.', (values) => !!(values === null || values === void 0 ? void 0 : values[0].cidr) && ip_address_1.Address4.isValid(values[0].cidr))
-    .test('dual-stack-ipv6', 'Second network has to be IPv6 subnet.', (values) => !!(values === null || values === void 0 ? void 0 : values[1].cidr) && ip_address_1.Address6.isValid(values[1].cidr));
+    .test('dual-stack-ipv4', openshiftVersion && (0, utils_3.isMajorMinorVersionEqualOrGreater)(openshiftVersion, '4.12')
+    ? 'First network has to be a valid IPv4 or IPv6 subnet.'
+    : 'First network has to be IPv4 subnet.', (values) => {
+    // For OCP versions > 4.11, allow IPv6 as primary network
+    if (openshiftVersion && (0, utils_3.isMajorMinorVersionEqualOrGreater)(openshiftVersion, '4.12')) {
+        return (!!(values === null || values === void 0 ? void 0 : values[0].cidr) &&
+            (ip_address_1.Address4.isValid(values[0].cidr) || ip_address_1.Address6.isValid(values[0].cidr)));
+    }
+    // For older versions, require IPv4 as primary network
+    return !!(values === null || values === void 0 ? void 0 : values[0].cidr) && ip_address_1.Address4.isValid(values[0].cidr);
+});
 exports.dualStackValidationSchema = dualStackValidationSchema;
 exports.IPv4ValidationSchema = Yup.array().test('single-stack', `All network subnets must be IPv4.`, (values) => (0, utils_2.allSubnetsIPv4)(values));
 //# sourceMappingURL=validationSchemas.js.map