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

@openshift-assisted/ui-lib 2.46.3 → 2.47.1

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

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js CHANGED Viewed

@@ -33,21 +33,66 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
     const { isViewerMode } = (0, react_redux_1.useSelector)(selectors_1.selectCurrentClusterPermissionsState);
     const shouldSetSingleStack = !isViewerMode && !isDualStackSelectable && values.stackType === common_1.DUAL_STACK;
     const setSingleStack = react_1.default.useCallback(() => {
-        var _a, _b, _c;
+        var _a;
         setFieldValue('stackType', common_1.IPV4_STACK);
         if (values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2) {
-            setFieldValue('machineNetworks', values.machineNetworks.slice(0, 1));
+            // For single-stack IPv4, prefer IPv4 machine network
+            const firstNetwork = values.machineNetworks[0];
+            const isFirstIPv4 = (firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address4.isValid(firstNetwork.cidr);
+            if (isFirstIPv4) {
+                // Keep the first network if it's IPv4
+                setFieldValue('machineNetworks', [firstNetwork]);
+            }
+            else {
+                // If first is IPv6, look for IPv4 network or set empty for auto-selection
+                const ipv4Network = values.machineNetworks.find((network) => network.cidr && ip_address_1.Address4.isValid(network.cidr));
+                if (ipv4Network) {
+                    setFieldValue('machineNetworks', [ipv4Network]);
+                }
+                else {
+                    // No IPv4 network found, set empty for auto-selection
+                    setFieldValue('machineNetworks', []);
+                }
+            }
         }
-        if (values.clusterNetworks && ((_b = values.clusterNetworks) === null || _b === void 0 ? void 0 : _b.length) >= 2) {
-            setFieldValue('clusterNetworks', values.clusterNetworks.slice(0, 1));
+        // Ensure single-stack inputs are IPv4 after switching from dual-stack
+        if (values.clusterNetworks && values.clusterNetworks.length >= 1) {
+            const defaultCluster = defaultNetworkValues.clusterNetworksIpv4 && defaultNetworkValues.clusterNetworksIpv4[0];
+            const firstCluster = values.clusterNetworks[0];
+            const ipv4Cluster = defaultCluster
+                ? {
+                    cidr: defaultCluster.cidr,
+                    hostPrefix: defaultCluster.hostPrefix,
+                    clusterId: firstCluster.clusterId, // ← Preserve clusterId from original network
+                }
+                : {
+                    cidr: '',
+                    hostPrefix: '',
+                    clusterId: clusterId, // ← Use current clusterId
+                };
+            setFieldValue('clusterNetworks', [ipv4Cluster]);
         }
-        if (values.serviceNetworks && ((_c = values.serviceNetworks) === null || _c === void 0 ? void 0 : _c.length) >= 2) {
-            setFieldValue('serviceNetworks', values.serviceNetworks.slice(0, 1));
+        if (values.serviceNetworks && values.serviceNetworks.length >= 1) {
+            const defaultService = defaultNetworkValues.serviceNetworksIpv4 && defaultNetworkValues.serviceNetworksIpv4[0];
+            const firstService = values.serviceNetworks[0];
+            const ipv4Service = defaultService
+                ? {
+                    cidr: defaultService.cidr,
+                    clusterId: firstService.clusterId, // ← Preserve clusterId from original network
+                }
+                : {
+                    cidr: '',
+                    clusterId: clusterId, // ← Use current clusterId
+                };
+            setFieldValue('serviceNetworks', [ipv4Service]);
         }
         void validateForm();
     }, [
         setFieldValue,
         validateForm,
+        clusterId,
+        defaultNetworkValues.clusterNetworksIpv4,
+        defaultNetworkValues.serviceNetworksIpv4,
         values.clusterNetworks,
         values.machineNetworks,
         values.serviceNetworks,
@@ -60,7 +105,22 @@ const StackTypeControlGroup = ({ clusterId, isDualStackSelectable, hostSubnets,
             setFieldValue('networkType', common_1.NETWORK_TYPE_OVN);
         }
         if (values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) < 2) {
-            setFieldValue('machineNetworks', [...values.machineNetworks, { cidr: cidrIPv6, clusterId: clusterId }], false);
+            // Ensure IPv4 is primary when switching to dual-stack
+            const firstNetwork = values.machineNetworks[0];
+            const isFirstIPv6 = (firstNetwork === null || firstNetwork === void 0 ? void 0 : firstNetwork.cidr) && ip_address_1.Address6.isValid(firstNetwork.cidr);
+            if (isFirstIPv6) {
+                // If first network is IPv6, make IPv4 primary and IPv6 secondary
+                const IPv4Subnets = hostSubnets.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet));
+                const cidrIPv4 = IPv4Subnets.length >= 1 ? IPv4Subnets[0].subnet : common_1.NO_SUBNET_SET;
+                setFieldValue('machineNetworks', [
+                    { cidr: cidrIPv4, clusterId: clusterId },
+                    { cidr: firstNetwork.cidr, clusterId: clusterId },
+                ], false);
+            }
+            else {
+                // If first network is IPv4, add IPv6 as secondary
+                setFieldValue('machineNetworks', [...values.machineNetworks, { cidr: cidrIPv6, clusterId: clusterId }], false);
+            }
         }
         if (values.clusterNetworks && ((_b = values.clusterNetworks) === null || _b === void 0 ? void 0 : _b.length) < 2) {
             setFieldValue('clusterNetworks', [

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StackTypeControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAC1C,uDAA6F;AAC7F,mCAA0C;AAC1C,~~2CAAsC~~;~~AAEtC~~,+CAS4B;AAC5B,yDAAkF;AAClF,8FAAgF;AAChF,+EAAuG;AACvG,0DAAuD;AAcvD,MAAM,gCAAgC,GAAG,CACvC,eAAiC,EACjC,eAAiC,EACjC,QAAgC,EAChC,MAAkC,EAClC,EAAE,CACF,eAAe;IACf,eAAe;IACf,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;QACtE,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtF,CAAC,MAAM,CAAC,eAAe;YACrB,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QACzE,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,EACpC,SAAS,EACT,qBAAqB,EACrB,WAAW,GACgB,EAAE,EAAE;IAC/B,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,yBAAgB,GAA8B,CAAC;IAC/F,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,oBAAoB,GAAG,IAAA,4DAAuB,EAAC;QACnD,0BAA0B;QAC1B,qBAAqB;QACrB,0BAA0B;QAC1B,qBAAqB;KACtB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAa,CAAC;IACjF,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,yBAAW,EAAC,gDAAoC,CAAC,CAAC;IAC3E,MAAM,oBAAoB,GACxB,CAAC,YAAY,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,SAAS,KAAK,mBAAU,CAAC;IAE7E,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;;QAC5C,aAAa,CAAC,WAAW,EAAE,mBAAU,CAAC,CAAC;QAEvC,IAAI,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC,EAAE;YACjE,aAAa,CAAC,iBAAiB,EAAE,MAAM,CAAC,eAAe,CAAC,~~KAAK~~,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;~~SACtE~~;QACD,IAAI,MAAM,CAAC,eAAe,IAAI,~~CAAA~~,~~MAAA~~,MAAM,CAAC,eAAe,~~0CAAE~~,MAAM,~~KAAI~~,CAAC,EAAE;~~YACjE~~,~~aAAa~~,CAAC,~~iBAAiB~~,EAAE,~~MAAM~~,CAAC,~~eAAe~~,CAAC,~~KAAK~~,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;~~SACtE~~;QACD,IAAI,MAAM,CAAC,eAAe,IAAI,~~CAAA,MAAA,~~MAAM,CAAC,eAAe,~~0CAAE~~,MAAM,~~KAAI~~,CAAC,EAAE;~~YACjE~~,~~aAAa~~,CAAC,~~iBAAiB~~,~~EAAE~~,MAAM,CAAC,eAAe,CAAC,~~KAAK~~,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;~~SACtE~~;QAED,KAAK,YAAY,EAAE,CAAC;IACtB,CAAC,EAAE;QACD,aAAa;QACb,YAAY;QACZ,MAAM,CAAC,eAAe;QACtB,MAAM,CAAC,eAAe;QACtB,MAAM,CAAC,eAAe;KACvB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,GAAG,EAAE;;QACxB,aAAa,CAAC,WAAW,EAAE,mBAAU,CAAC,CAAC;QACvC,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;QAE1C,IAAI,MAAM,CAAC,WAAW,KAAK,yBAAgB,EAAE;YAC3C,aAAa,CAAC,aAAa,EAAE,yBAAgB,CAAC,CAAC;SAChD;QAED,IAAI,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,IAAG,CAAC,EAAE;YAChE,aAAa,CACX,iBAAiB,EACjB,CAAC,GAAG,MAAM,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EACrE,KAAK,CACN,CAAC;~~SACH~~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~~AA9KW~~,QAAA,qBAAqB,~~yBA8KhC~~"}
1	+ {"version":3,"file":"StackTypeControl.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/StackTypeControl.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js CHANGED Viewed

@@ -6,6 +6,7 @@ const react_1 = tslib_1.__importDefault(require("react"));
 const react_core_1 = require("@patternfly/react-core");
 const formik_1 = require("formik");
 const common_1 = require("../../../../common");
+const ip_address_1 = require("ip-address");
 const toFormSelectOptions = (subnets) => {
     return subnets.map((hn, index) => ({
         label: `${hn.humanized}${hn.isValid ? '' : ' (Invalid network)'}`,
@@ -31,11 +32,14 @@ const SubnetsDropdown = (_a) => {
     const [field, , { setValue }] = (0, formik_1.useField)(name);
     const [isOpen, setOpen] = react_1.default.useState(false);
     const fieldId = (0, common_1.getFieldId)(name, 'input');
-    const { itemsSubnets, currentDisplayValue } = react_1.default.useMemo(() => {
+    const { itemsSubnets, ipv4Subnets, ipv6Subnets, currentDisplayValue } = react_1.default.useMemo(() => {
         const itemsSubnets = machineSubnets.length === 0
             ? [noSubnetAvailableOption]
             : [makeNoSubnetSelectedOption(machineSubnets.length)].concat(toFormSelectOptions(machineSubnets));
-        let currentDisplayValue = itemsSubnets[0].label; // The placeholder is the fallback
+        // Separate IPv4 and IPv6 subnets
+        const ipv4Subnets = machineSubnets.filter((subnet) => ip_address_1.Address4.isValid(subnet.subnet));
+        const ipv6Subnets = machineSubnets.filter((subnet) => ip_address_1.Address6.isValid(subnet.subnet));
+        let currentDisplayValue = itemsSubnets.length > 1 ? itemsSubnets[1].label : itemsSubnets[0].label; // The placeholder is the fallback in some cases
         if (field.value) {
             const subnetItem = itemsSubnets.find((item) => item.value === field.value);
             if (subnetItem) {
@@ -46,15 +50,41 @@ const SubnetsDropdown = (_a) => {
             // When there is only one subnet, it's selected by default. We skip the placeholder at index 0.
             currentDisplayValue = itemsSubnets[1].label;
         }
-        return { itemsSubnets, currentDisplayValue: currentDisplayValue };
+        return { itemsSubnets, ipv4Subnets, ipv6Subnets, currentDisplayValue: currentDisplayValue };
     }, [machineSubnets, field.value]);
-    const dropdownItems = itemsSubnets.map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
+    const dropdownItems = react_1.default.useMemo(() => {
+        if (machineSubnets.length === 0) {
+            return [
+                react_1.default.createElement(react_core_1.DropdownItem, { key: noSubnetAvailableOption.value, id: noSubnetAvailableOption.value, isDisabled: noSubnetAvailableOption.isDisabled, value: noSubnetAvailableOption.value }, noSubnetAvailableOption.label),
+            ];
+        }
+        const hasIpv4 = ipv4Subnets.length > 0;
+        const hasIpv6 = ipv6Subnets.length > 0;
+        // If we have both IPv4 and IPv6, group them
+        if (hasIpv4 && hasIpv6) {
+            const ipv4Items = toFormSelectOptions(ipv4Subnets).map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
+            ipv4Items.push(react_1.default.createElement(react_core_1.Divider, { key: "ipv4-divider" }));
+            const ipv6Items = toFormSelectOptions(ipv6Subnets).map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
+            return [
+                react_1.default.createElement(react_core_1.DropdownItem, { key: makeNoSubnetSelectedOption(machineSubnets.length).value, id: makeNoSubnetSelectedOption(machineSubnets.length).value, isDisabled: makeNoSubnetSelectedOption(machineSubnets.length).isDisabled, value: makeNoSubnetSelectedOption(machineSubnets.length).value }, makeNoSubnetSelectedOption(machineSubnets.length).label),
+                react_1.default.createElement(react_core_1.DropdownGroup, { label: "IPv4", key: "ipv4-group" }, ipv4Items),
+                react_1.default.createElement(react_core_1.DropdownGroup, { label: "IPv6 (Technology Preview)", key: "ipv6-group" }, ipv6Items),
+            ];
+        }
+        // If only one type, don't group
+        return itemsSubnets.map(({ value, label, isDisabled }) => (react_1.default.createElement(react_core_1.DropdownItem, { key: value, id: value, isDisabled: isDisabled, value: value }, label)));
+    }, [machineSubnets, ipv4Subnets, ipv6Subnets, itemsSubnets]);
     const onSelect = (event) => {
         setValue(event === null || event === void 0 ? void 0 : event.currentTarget.id);
         setOpen(false);
     };
-    const toggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, Object.assign({ ref: toggleRef, onClick: () => setOpen(!isOpen), isExpanded: isOpen, isDisabled: isDisabled, id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '100%' } }, props), currentDisplayValue));
-    return (react_1.default.createElement(react_core_1.Dropdown, Object.assign({}, field, { id: `${fieldId}-dropdown`, onOpenChange: () => setOpen(!isOpen), onSelect: onSelect, toggle: toggle, isOpen: isOpen }), dropdownItems));
+    const currentItem = itemsSubnets.find((i) => i.label === currentDisplayValue);
+    const showBadge = Boolean(currentItem && ip_address_1.Address6.isValid(currentItem.value));
+    const toggle = (toggleRef) => (react_1.default.createElement(react_core_1.MenuToggle, Object.assign({ ref: toggleRef, onClick: () => setOpen(!isOpen), isExpanded: isOpen, isDisabled: isDisabled, id: fieldId, className: "pf-v6-u-w-100", style: { minWidth: '100%' } }, props),
+        currentDisplayValue,
+        showBadge && (react_1.default.createElement("span", { onClick: (e) => e.stopPropagation() },
+            react_1.default.createElement(common_1.TechnologyPreview, { position: common_1.PreviewBadgePosition.inlineRight })))));
+    return (react_1.default.createElement(react_core_1.Dropdown, Object.assign({}, field, { id: `${fieldId}-dropdown`, onOpenChange: (isOpen) => setOpen(isOpen), onSelect: onSelect, toggle: toggle, isOpen: isOpen }), dropdownItems));
 };
 exports.SubnetsDropdown = SubnetsDropdown;
 //# sourceMappingURL=SubnetsDropdown.js.map

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SubnetsDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,~~uDAMgC~~;AAChC,mCAAkC;AAClC,+~~CAA2E~~;~~AAQ3E~~,MAAM,mBAAmB,GAAG,CAAC,OAAqB,EAAE,EAAE;IACpD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACjC,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,EAAE;QACjE,KAAK,EAAE,EAAE,CAAC,MAAM;QAChB,UAAU,EAAE,KAAK;QACjB,EAAE,EAAE,sCAAsC,KAAK,EAAE;KAClD,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,gBAAwB,EAAE,EAAE,CAAC,CAAC;IAChE,KAAK,EAAE,4BAA4B,gBAAgB,aAAa;IAChE,KAAK,EAAE,sBAAa;IACpB,UAAU,EAAE,IAAI;IAChB,EAAE,EAAE,uDAAuD;CAC5D,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG;IAC9B,KAAK,EAAE,oCAAoC;IAC3C,KAAK,EAAE,sBAAa;IACpB,UAAU,EAAE,IAAI;IAChB,EAAE,EAAE,wDAAwD;CAC7D,CAAC;AAEK,MAAM,eAAe,GAAG,CAAC,EAKS,EAAE,EAAE;QALb,EAC9B,IAAI,EACJ,cAAc,EACd,UAAU,OAE6B,EADpC,KAAK,sBAJsB,wCAK/B,CADS;IAER,MAAM,CAAC,KAAK,EAAE,AAAD,EAAG,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;~~QAC/D~~,MAAM,YAAY,GAChB,cAAc,CAAC,MAAM,KAAK,CAAC;YACzB,CAAC,CAAC,CAAC,uBAAuB,CAAC;YAC3B,CAAC,CAAC,CAAC,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CACxD,mBAAmB,CAAC,cAAc,CAAC,CACpC,CAAC;QAER,IAAI,mBAAmB,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,~~kCAAkC~~;~~QACnF~~,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,UAAU,EAAE;gBACd,mBAAmB,GAAG,UAAU,CAAC,KAAK,CAAC;aACxC;SACF;aAAM,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YACtC,+FAA+F;YAC/F,mBAAmB,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SAC7C;QAED,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,CAAC;~~IACpE~~,CAAC,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAElC,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,~~CACvE~~,8BAAC,yBAAY,IAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,IACtE,KAAK,CACO,CAChB,CAAC,CAAC;~~IAEH~~,MAAM,QAAQ,GAAG,CAAC,KAA6C,EAAQ,EAAE;QACvE,QAAQ,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC,EAAE,CAAC,CAAC;QAClC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,SAAuC,EAAE,EAAE,CAAC,CAC1D,8BAAC,uBAAU,kBACT,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,OAAO,EACX,SAAS,EAAC,eAAe,EACzB,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IACvB,KAAK,~~GAER,~~mBAAmB,~~CACT~~,CACd,CAAC;IAEF,OAAO,CACL,8BAAC,qBAAQ,oBACH,KAAK,IACT,EAAE,EAAE,GAAG,OAAO,WAAW,EACzB,YAAY,EAAE,~~GAAG~~,EAAE,CAAC,OAAO,CAAC,~~CAAC,~~MAAM,CAAC,~~EACpC~~,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,KAEb,aAAa,CACL,CACZ,CAAC;AACJ,CAAC,CAAC;~~AAtEW~~,QAAA,eAAe,~~mBAsE1B~~"}
1	+ {"version":3,"file":"SubnetsDropdown.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js CHANGED Viewed

@@ -35,6 +35,7 @@ const VirtualIPControlGroup = ({ cluster, isVipDhcpAllocationDisabled, supportLe
     const ipPopoverContent = 'Provides an endpoint for users, both human and machine, to interact with and configure the platform.';
     const { 'api-vips-defined': apiVipFailedValidationMessage, 'ingress-vips-defined': ingressVipFailedValidationMessage, } = react_1.default.useMemo(() => (0, common_1.getVipValidationsById)(t, cluster.validationsInfo), [t, cluster.validationsInfo]);
     const enableAllocation = values.networkType === common_1.NETWORK_TYPE_SDN;
+    const isDualStack = values.stackType === common_1.DUAL_STACK;
     react_1.default.useEffect(() => {
         if (!isViewerMode && !enableAllocation) {
             setFieldValue('vipDhcpAllocation', false);
@@ -45,10 +46,16 @@ const VirtualIPControlGroup = ({ cluster, isVipDhcpAllocationDisabled, supportLe
         setFieldValue('apiVips', hasDhcp ? [] : cluster.apiVips, true);
         setFieldValue('ingressVips', hasDhcp ? [] : cluster.ingressVips, true);
     }, [cluster.apiVips, cluster.ingressVips, setFieldValue]);
-    const setVipValue = (field, e) => {
-        setFieldValue(field, [{ ip: e.target.value, clusterId: cluster.id }], true);
+    const setVipValueAtIndex = (field, index, e) => {
+        const fieldArray = field === 'apiVips' ? values.apiVips || [] : values.ingressVips || [];
+        const next = Array.isArray(fieldArray) ? [...fieldArray] : [];
+        // Ensure array has the desired length
+        while (next.length <= index) {
+            next.push({ ip: '', clusterId: cluster.id });
+        }
+        next[index] = { ip: e.target.value, clusterId: cluster.id };
+        setFieldValue(field, next, true);
     };
-    const ipFieldsSuffix = values.stackType === common_1.DUAL_STACK ? ' (IPv4)' : '';
     return (react_1.default.createElement(react_1.default.Fragment, null,
         !isVipDhcpAllocationDisabled && (react_1.default.createElement(OcmFormFields_1.OcmCheckboxField, { onChange: onChangeDhcp, label: react_1.default.createElement(react_1.default.Fragment, null,
                 react_1.default.createElement(react_core_1.Tooltip, { hidden: enableAllocation, content: "A cluster with OVN networking type cannot use 'allocate IPs via DHCP server'" },
@@ -56,34 +63,36 @@ const VirtualIPControlGroup = ({ cluster, isVipDhcpAllocationDisabled, supportLe
                 react_1.default.createElement(NewFeatureSupportLevelBadge_1.default, { featureId: "VIP_AUTO_ALLOC", supportLevel: supportLevel })), name: "vipDhcpAllocation", isDisabled: !enableAllocation })),
         values.vipDhcpAllocation ? (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement(common_1.FormikStaticField, { label: react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement("span", null,
-                        "API IP",
-                        ipFieldsSuffix),
+                    react_1.default.createElement("span", null, "API IP"),
                     " ",
                     react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "apiVip", helperText: ipHelperText, value: (0, common_1.selectApiVip)(values), isValid: !apiVipFailedValidationMessage, isRequired: true },
                 react_1.default.createElement(VipStaticValue, { id: "vip-api", vipValue: (0, common_1.selectApiVip)(cluster), cluster: cluster, validationErrorMessage: apiVipFailedValidationMessage })),
             react_1.default.createElement(common_1.FormikStaticField, { label: react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement("span", null,
-                        "Ingress IP",
-                        ipFieldsSuffix),
-                    ' ',
+                    react_1.default.createElement("span", null, "Ingress IP"),
+                    " ",
                     react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "ingressVip", helperText: ipHelperText, value: (0, common_1.selectIngressVip)(values), isValid: !ingressVipFailedValidationMessage, isRequired: true },
                 react_1.default.createElement(VipStaticValue, { id: "vip-ingress", vipValue: (0, common_1.selectIngressVip)(cluster), cluster: cluster, validationErrorMessage: ingressVipFailedValidationMessage })))) : (react_1.default.createElement(react_core_1.FormGroup, null,
             react_1.default.createElement(formik_1.FieldArray, { name: "vips" }, () => (react_1.default.createElement(react_core_1.Stack, null,
                 react_1.default.createElement(react_core_1.StackItem, null,
                     react_1.default.createElement(OcmFormFields_1.OcmInputField, { label: react_1.default.createElement(react_1.default.Fragment, null,
-                            react_1.default.createElement("span", null,
-                                "API IP",
-                                ipFieldsSuffix),
-                            ' ',
-                            react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "apiVips.0.ip", helperText: ipHelperText, isRequired: true, onChange: (e) => setVipValue('apiVips', e) })),
+                            react_1.default.createElement("span", null, "API IP"),
+                            " ",
+                            react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "apiVips.0.ip", helperText: ipHelperText, isRequired: true, labelInfo: isDualStack ? 'Primary' : undefined, onChange: (e) => setVipValueAtIndex('apiVips', 0, e) })),
+                isDualStack && (react_1.default.createElement(react_core_1.StackItem, null,
+                    react_1.default.createElement(OcmFormFields_1.OcmInputField, { label: react_1.default.createElement(react_1.default.Fragment, null,
+                            react_1.default.createElement("span", null, "API IP"),
+                            " ",
+                            react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), name: "apiVips.1.ip", helperText: ipHelperText, isRequired: true, labelInfo: 'Secondary', onChange: (e) => setVipValueAtIndex('apiVips', 1, e) }))),
                 react_1.default.createElement(react_core_1.StackItem, null,
                     react_1.default.createElement(OcmFormFields_1.OcmInputField, { name: "ingressVips.0.ip", label: react_1.default.createElement(react_1.default.Fragment, null,
-                            react_1.default.createElement("span", null,
-                                "Ingress IP",
-                                ipFieldsSuffix),
-                            ' ',
-                            react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), helperText: ipHelperText, isRequired: true, onChange: (e) => setVipValue('ingressVips', e) })))))))));
+                            react_1.default.createElement("span", null, "Ingress IP"),
+                            " ",
+                            react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), helperText: ipHelperText, isRequired: true, labelInfo: isDualStack ? 'Primary' : undefined, onChange: (e) => setVipValueAtIndex('ingressVips', 0, e) })),
+                isDualStack && (react_1.default.createElement(react_core_1.StackItem, null,
+                    react_1.default.createElement(OcmFormFields_1.OcmInputField, { name: "ingressVips.1.ip", label: react_1.default.createElement(react_1.default.Fragment, null,
+                            react_1.default.createElement("span", null, "Ingress IP"),
+                            " ",
+                            react_1.default.createElement(common_1.PopoverIcon, { bodyContent: ipPopoverContent })), helperText: ipHelperText, isRequired: true, labelInfo: 'Secondary', onChange: (e) => setVipValueAtIndex('ingressVips', 1, e) }))))))))));
 };
 exports.VirtualIPControlGroup = VirtualIPControlGroup;
 //# sourceMappingURL=VirtualIPControlGroup.js.map

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"VirtualIPControlGroup.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,6CAA0C;AAC1C,mCAAsD;AACtD,uDAQgC;AAChC,+CAU4B;AAC5B,+EAAuG;AACvG,0DAAyE;AACzE,8FAAkF;AAClF,4JAA4H;~~AAU5H~~,MAAM,cAAc,GAAG,CAAC,EACtB,QAAQ,EACR,OAAO,EACP,sBAAsB,EACtB,EAAE,GAAG,YAAY,GACG,EAAE,EAAE;IACxB,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,kBAAkB,GAAG,IAAA,iCAAwB,EAAC,OAAO,CAAC,CAAC;IAE7D,IAAI,iBAAiB,IAAI,CAAC,CAAC,QAAQ,EAAE;QACnC,OAAO,wCAAM,EAAE,EAAE,GAAG,EAAE,YAAY,IAAG,QAAQ,CAAQ,CAAC;KACvD;IACD,IAAI,iBAAiB,IAAI,sBAAsB,EAAE;QAC/C,OAAO,CACL,8BAAC,kBAAK,IACJ,EAAE,EAAE,GAAG,EAAE,0BAA0B,EACnC,OAAO,EAAE,yBAAY,CAAC,MAAM,EAC5B,KAAK,EAAC,2CAA2C,EACjD,QAAQ,UAEP,sBAAsB,CACjB,CACT,CAAC;KACH;IACD,IAAI,iBAAiB,IAAI,kBAAkB,EAAE;QAC3C,OAAO,CACL;YACE,8BAAC,oBAAO,IAAC,IAAI,EAAC,IAAI,EAAC,EAAE,EAAE,GAAG,EAAE,aAAa,iBAAe,cAAc,EAAE,gBAAgB,GAAI;YAC5F,0FAAqD,CACpD,CACJ,CAAC;KACH;IACD,OAAO,wFAAmD,CAAC;AAC7D,CAAC,CAAC;AAQK,MAAM,qBAAqB,GAAG,CAAC,EACpC,OAAO,EACP,2BAA2B,EAC3B,YAAY,GACe,EAAE,EAAE;IAC/B,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,yBAAgB,GAA8B,CAAC;IACjF,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,yBAAW,EAAC,gDAAoC,CAAC,CAAC;IAC3E,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAE/B,MAAM,YAAY,GAAG,mEAAmE,CAAC;IACzF,MAAM,gBAAgB,GACpB,sGAAsG,CAAC;IAEzG,MAAM,EACJ,kBAAkB,EAAE,6BAA6B,EACjD,sBAAsB,EAAE,iCAAiC,GAC1D,GAAG,eAAK,CAAC,OAAO,CACf,GAAG,EAAE,CAAC,IAAA,8BAAqB,EAAC,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACvD,CAAC,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAC7B,CAAC;IAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,KAAK,yBAAgB,CAAC;~~IAEjE~~,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,YAAY,IAAI,CAAC,gBAAgB,EAAE;YACtC,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;SAC3C;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;IAEpD,MAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CACpC,CAAC,OAAgB,EAAE,EAAE;QACnB,8CAA8C;QAC9C,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/D,aAAa,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC,EACD,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CACtD,CAAC;IAEF,MAAM,~~WAAW~~,GAAG,~~CAAC~~,KAAa,~~EAAE~~,CAAsC,~~EAAE~~,EAAE;~~QAC5E~~,~~aAAa~~,~~CAAC~~,KAAK,~~EAAE~~,CAAC,~~EAAE~~,~~EAAE~~,EAAE,CAAC,CAAC,MAAM,CAAC,~~KAAK~~,EAAE,~~SAAS~~,~~EAAE~~,OAAO,CAAC,~~EAAE~~,~~EAAE~~,CAAC,~~EAAE~~,~~IAAI~~,CAAC,CAAC~~;IAC9E~~,CAAC,CAAC;~~IAEF~~,~~MAAM~~,~~cAAc~~,~~GAAG~~,MAAM,CAAC,SAAS,KAAK,~~mBAAU~~,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;~~IACxE~~,OAAO,CACL;QACG,CAAC,2BAA2B,IAAI,CAC/B,8BAAC,gCAAgB,IACf,QAAQ,EAAE,YAAY,EACtB,KAAK,EACH;gBACE,8BAAC,oBAAO,IACN,MAAM,EAAE,gBAAgB,EACxB,OAAO,EACL,8EAA8E;oBAGhF,2EAAyC,CACjC;gBACV,8BAAC,qCAA2B,IAAC,SAAS,EAAC,gBAAgB,EAAC,YAAY,EAAE,YAAY,GAAI,CACrF,EAEL,IAAI,EAAC,mBAAmB,EACxB,UAAU,EAAE,CAAC,gBAAgB,GAC7B,CACH;QACA,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAC1B;YACE,8BAAC,0BAAiB,IAChB,KAAK,EACH;oBACE~~;;wBAAa~~,~~cAAc,CAAQ~~;;oBAAC,8BAAC,oBAAW,IAAC,WAAW,EAAE,gBAAgB,GAAI,~~CACjF~~,EAEL,IAAI,EAAC,QAAQ,EACb,UAAU,EAAE,YAAY,EACxB,KAAK,EAAE,IAAA,qBAAY,EAAC,MAAM,CAAC,EAC3B,OAAO,EAAE,CAAC,6BAA6B,EACvC,UAAU;gBAEV,8BAAC,cAAc,IACb,EAAE,EAAC,SAAS,EACZ,QAAQ,EAAE,IAAA,qBAAY,EAAC,OAAO,CAAC,EAC/B,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,6BAA6B,GACrD,CACgB;YACpB,8BAAC,0BAAiB,IAChB,KAAK,EACH;oBACE;;~~wBAAiB,cAAc,CAAQ;~~oBAAC,~~GAAG;oBAC3C,~~8BAAC,oBAAW,IAAC,WAAW,EAAE,gBAAgB,GAAI,~~CAC7C~~,EAEL,IAAI,EAAC,YAAY,EACjB,UAAU,EAAE,YAAY,EACxB,KAAK,EAAE,IAAA,yBAAgB,EAAC,MAAM,CAAC,EAC/B,OAAO,EAAE,CAAC,iCAAiC,EAC3C,UAAU;gBAEV,8BAAC,cAAc,IACb,EAAE,EAAC,aAAa,EAChB,QAAQ,EAAE,IAAA,yBAAgB,EAAC,OAAO,CAAC,EACnC,OAAO,EAAE,OAAO,EAChB,sBAAsB,EAAE,iCAAiC,GACzD,CACgB,CACnB,CACJ,CAAC,CAAC,CAAC,CACF,8BAAC,sBAAS;YACR,8BAAC,mBAAU,IAAC,IAAI,EAAC,MAAM,IACpB,GAAG,EAAE,CAAC,CACL,8BAAC,kBAAK;gBACJ,8BAAC,sBAAS;oBACR,8BAAC,6BAAa,IACZ,KAAK,EACH;4BACE;;~~gCAAa~~,cAAc,~~CAAQ~~;~~4BAAC~~,~~GAAG~~;~~4BACvC~~,8BAAC,oBAAW,IAAC,WAAW,EAAE,gBAAgB,GAAI,~~CAC7C~~,EAEL,IAAI,EAAC,cAAc,EACnB,UAAU,EAAE,YAAY,EACxB,UAAU,QACV,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CACd,~~WAAW~~,CAAC,SAAS,EAAE,CAAwC,CAAC,~~GAElE~~,CACQ;~~gBACZ~~,8BAAC,sBAAS;oBACR,8BAAC,6BAAa,IACZ,IAAI,EAAC,kBAAkB,EACvB,KAAK,EACH;4BACE;;~~gCAAiB~~,~~cAAc~~,~~CAAQ~~;~~4BAAC~~,~~GAAG~~;~~4BAC3C~~,8BAAC,oBAAW,IAAC,WAAW,EAAE,gBAAgB,GAAI,~~CAC7C~~,EAEL,UAAU,EAAE,YAAY,EACxB,UAAU,QACV,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CACd,~~WAAW~~,~~CAAC~~,aAAa,~~EAAE~~,CAAwC,~~CAAC~~,~~GAEtE~~,CACQ,~~CACN~~,CACT,CACU,CACH,CACb,CACA,CACJ,CAAC;AACJ,CAAC,CAAC;~~AAvJW~~,QAAA,qBAAqB,~~yBAuJhC~~"}
1	+ {"version":3,"file":"VirtualIPControlGroup.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js CHANGED Viewed

@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
 const Yup = tslib_1.__importStar(require("yup"));
 const common_1 = require("../../../../common");
 const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported) => {
-    var _a;
+    var _a, _b, _c;
     const isSNOCluster = (0, common_1.isSNO)(cluster);
-    const isDualStackType = (0, common_1.isDualStack)(cluster);
+    const isDualStackType = (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion }));
     return {
         apiVips: cluster.apiVips,
         ingressVips: cluster.ingressVips,
@@ -24,50 +24,55 @@ const getNetworkInitialValues = (cluster, defaultNetworkValues, isClusterManaged
         clusterNetworks: cluster.clusterNetworks ||
             (isDualStackType
                 ? defaultNetworkValues.clusterNetworksDualstack
-                : defaultNetworkValues.clusterNetworksIpv4),
+                : (_b = defaultNetworkValues.clusterNetworksIpv4) === null || _b === void 0 ? void 0 : _b.map((network) => (Object.assign(Object.assign({}, network), { clusterId: cluster.id })))),
         serviceNetworks: cluster.serviceNetworks ||
             (isDualStackType
                 ? defaultNetworkValues.serviceNetworksDualstack
-                : defaultNetworkValues.serviceNetworksIpv4),
+                : (_c = defaultNetworkValues.serviceNetworksIpv4) === null || _c === void 0 ? void 0 : _c.map((network) => (Object.assign(Object.assign({}, network), { clusterId: cluster.id })))),
     };
 };
 exports.getNetworkInitialValues = getNetworkInitialValues;
-const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets) => Yup.lazy((values) => Yup.object().shape({
-    apiVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips),
-    ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.ingressVips),
-    sshPublicKey: common_1.sshPublicKeyListValidationSchema,
-    machineNetworks: values.managedNetworkingType === 'userManaged'
-        ? Yup.array()
-        : common_1.machineNetworksValidationSchema.when('stackType', {
+const getNetworkConfigurationValidationSchema = (initialValues, hostSubnets, openshiftVersion) => Yup.lazy((values) => {
+    const apiVipSchema = values.stackType === common_1.DUAL_STACK
+        ? (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips).min(2, 'Provide both Primary and Secondary API IPs.')
+        : (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.apiVips);
+    return Yup.object().shape({
+        apiVips: apiVipSchema,
+        ingressVips: (0, common_1.vipArrayValidationSchema)(hostSubnets, values, initialValues.ingressVips),
+        sshPublicKey: common_1.sshPublicKeyListValidationSchema,
+        machineNetworks: values.managedNetworkingType === 'userManaged'
+            ? Yup.array()
+            : common_1.machineNetworksValidationSchema.when('stackType', {
+                is: (stackType) => stackType === common_1.IPV4_STACK,
+                then: () => common_1.machineNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
+                otherwise: () => {
+                    var _a;
+                    return values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
+                        ? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks', openshiftVersion))
+                        : Yup.array();
+                },
+            }),
+        clusterNetworks: common_1.clusterNetworksValidationSchema.when('stackType', {
             is: (stackType) => stackType === common_1.IPV4_STACK,
-            then: () => common_1.machineNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
+            then: () => common_1.clusterNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
             otherwise: () => {
                 var _a;
-                return values.machineNetworks && ((_a = values.machineNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
-                    ? common_1.machineNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('machine networks'))
+                return values.clusterNetworks && ((_a = values.clusterNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
+                    ? common_1.clusterNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('cluster network', openshiftVersion))
                     : Yup.array();
             },
         }),
-    clusterNetworks: common_1.clusterNetworksValidationSchema.when('stackType', {
-        is: (stackType) => stackType === common_1.IPV4_STACK,
-        then: () => common_1.clusterNetworksValidationSchema.concat(common_1.IPv4ValidationSchema),
-        otherwise: () => {
-            var _a;
-            return values.clusterNetworks && ((_a = values.clusterNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
-                ? common_1.clusterNetworksValidationSchema.concat((0, common_1.dualStackValidationSchema)('cluster network'))
-                : Yup.array();
-        },
-    }),
-    serviceNetworks: common_1.serviceNetworkValidationSchema.when('stackType', {
-        is: (stackType) => stackType === common_1.IPV4_STACK,
-        then: () => common_1.serviceNetworkValidationSchema.concat(common_1.IPv4ValidationSchema),
-        otherwise: () => {
-            var _a;
-            return values.serviceNetworks && ((_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
-                ? common_1.serviceNetworkValidationSchema.concat((0, common_1.dualStackValidationSchema)('service network'))
-                : Yup.array();
-        },
-    }),
-}));
+        serviceNetworks: common_1.serviceNetworkValidationSchema.when('stackType', {
+            is: (stackType) => stackType === common_1.IPV4_STACK,
+            then: () => common_1.serviceNetworkValidationSchema.concat(common_1.IPv4ValidationSchema),
+            otherwise: () => {
+                var _a;
+                return values.serviceNetworks && ((_a = values.serviceNetworks) === null || _a === void 0 ? void 0 : _a.length) >= 2
+                    ? common_1.serviceNetworkValidationSchema.concat((0, common_1.dualStackValidationSchema)('service network', openshiftVersion))
+                    : Yup.array();
+            },
+        }),
+    });
+});
 exports.getNetworkConfigurationValidationSchema = getNetworkConfigurationValidationSchema;
 //# sourceMappingURL=networkConfigurationValidation.js.map

package/build/cjs/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAC3B,+CAe4B;AAQrB,MAAM,uBAAuB,GAAG,CACrC,OAAgB,EAChB,oBAMC,EACD,qCAA8C,EAClB,EAAE;;IAC9B,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;IACpC,MAAM,eAAe,GAAG,IAAA,oBAAW,~~EAAC~~,OAAO,CAAC,CAAC;~~IAE7C~~,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;QACxC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,qBAAqB,EACnB,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAE,IAAI,MAAK,MAAM;YACjC,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,qCAAqC,CAAC;YAC1F,YAAY;YACV,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,gBAAgB;QACtB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,yBAAgB;QACpD,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,EAAE;QAC9C,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,mBAAU,CAAC,CAAC,CAAC,mBAAU;QACpD,eAAe,EACb,OAAO,CAAC,eAAe;YACvB,CAAC,eAAe;gBACd,CAAC,CAAC,oBAAoB,CAAC,wBAAwB;gBAC/C,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;~~QAC/C~~,eAAe,EACb,OAAO,CAAC,eAAe;YACvB,CAAC,eAAe;gBACd,CAAC,CAAC,oBAAoB,CAAC,wBAAwB;gBAC/C,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;~~KAChD~~,CAAC;AACJ,CAAC,CAAC;~~AAvCW~~,QAAA,uBAAuB,~~2BAuClC~~;AAEK,MAAM,uCAAuC,GAAG,CACrD,aAAyC,EACzC,WAAwB,EACxB,EAAE,CACF,GAAG,CAAC,IAAI,CAAC,CAAC,MAAkC,EAAE,EAAE,~~CAC9C~~,~~GAAG~~,CAAC,MAAM,~~EAA8B~~,CAAC,~~KAAK~~,CAAC;~~IAC7C~~,~~OAAO~~,~~EAAE~~,IAAA,iCAAwB,EAAS,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;~~IACrF~~,WAAW,EAAE,IAAA,iCAAwB,EACnC,WAAW,EACX,MAAM,EACN,aAAa,CAAC,WAAW,CAC1B;~~IACD~~,YAAY,EAAE,yCAAgC;~~IAC9C~~,eAAe,EACb,MAAM,CAAC,qBAAqB,KAAK,aAAa;~~QAC5C~~,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE;~~QACb~~,CAAC,CAAC,wCAA+B,CAAC,IAAI,CAAC,WAAW,EAAE;~~YAChD~~,EAAE,EAAE,CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;~~YACpF~~,IAAI,EAAE,GAAG,EAAE,CAAC,wCAA+B,CAAC,MAAM,CAAC,6BAAoB,CAAC;~~YACxE~~,SAAS,EAAE,GAAG,EAAE;;~~gBACd~~,OAAA,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC;~~oBAC3D~~,CAAC,CAAC,wCAA+B,CAAC,MAAM,CACpC,IAAA,kCAAyB,EAAC,kBAAkB,CAAC,~~CAC9C~~;~~oBACH~~,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;~~aAAA~~;~~SAClB~~,CAAC;~~IACR~~,eAAe,EAAE,wCAA+B,CAAC,IAAI,CAAC,WAAW,EAAE;~~QACjE~~,EAAE,EAAE,CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;~~QACpF~~,IAAI,EAAE,GAAG,EAAE,CAAC,wCAA+B,CAAC,MAAM,CAAC,6BAAoB,CAAC;~~QACxE~~,SAAS,EAAE,GAAG,EAAE;;~~YACd~~,OAAA,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC;~~gBAC3D~~,CAAC,CAAC,wCAA+B,CAAC,MAAM,~~CAAC~~,IAAA,kCAAyB,EAAC,iBAAiB,CAAC,~~CAAC~~;~~gBACtF~~,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;~~SAAA~~;~~KAClB~~,CAAC;~~IACF~~,eAAe,EAAE,uCAA8B,CAAC,IAAI,CAAC,WAAW,EAAE;~~QAChE~~,EAAE,EAAE,CAAC,SAAkD,EAAE,EAAE,CAAC,SAAS,KAAK,mBAAU;~~QACpF~~,IAAI,EAAE,GAAG,EAAE,CAAC,uCAA8B,CAAC,MAAM,CAAC,6BAAoB,CAAC;~~QACvE~~,SAAS,EAAE,GAAG,EAAE;;~~YACd~~,OAAA,MAAM,CAAC,eAAe,IAAI,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,MAAM,KAAI,CAAC;~~gBAC3D~~,CAAC,CAAC,uCAA8B,CAAC,MAAM,~~CAAC~~,IAAA,kCAAyB,EAAC,iBAAiB,CAAC,~~CAAC~~;~~gBACrF~~,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;~~SAAA~~;~~KAClB~~,CAAC;~~CACH~~,CAAC,~~CACH~~,CAAC;~~AA3CS~~,QAAA,uCAAuC,~~2CA2ChD~~"}
1	+ {"version":3,"file":"networkConfigurationValidation.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js CHANGED Viewed

@@ -9,7 +9,7 @@ const common_1 = require("../../../../common");
 const ClusterProperties_1 = require("../../clusterDetail/ClusterProperties");
 const ReviewNetworkingTable = ({ cluster }) => {
     const rows = react_1.default.useMemo(() => {
-        var _a, _b;
+        var _a, _b, _c;
         const networkRows = [
             {
                 rowId: 'network-management',
@@ -43,7 +43,13 @@ const ReviewNetworkingTable = ({ cluster }) => {
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'machine-networks' },
                     },
-                    (0, common_1.isDualStack)(cluster) ? { title: 'Primary' } : { title: '' },
+                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion }))
+                        ? {
+                            title: (_c = cluster.machineNetworks) === null || _c === void 0 ? void 0 : _c.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
+                                index === 0 ? 'Primary' : 'Secondary',
+                                react_1.default.createElement("br", null)))),
+                        }
+                        : { title: '' },
                 ],
             });
         cluster.apiVips &&
@@ -73,7 +79,7 @@ const ReviewNetworkingTable = ({ cluster }) => {
         return networkRows;
     }, [cluster]);
     const rowsAdvanced = react_1.default.useMemo(() => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         return [
             {
                 rowId: 'cluster-network-cidr',
@@ -85,7 +91,11 @@ const ReviewNetworkingTable = ({ cluster }) => {
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'cluster-network-cidr' },
                     },
-                    (0, common_1.isDualStack)(cluster) && { title: 'Primary' },
+                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion })) && {
+                        title: (_b = cluster.clusterNetworks) === null || _b === void 0 ? void 0 : _b.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
+                            index === 0 ? 'Primary' : 'Secondary',
+                            react_1.default.createElement("br", null)))),
+                    },
                 ].filter(Boolean),
             },
             {
@@ -93,12 +103,16 @@ const ReviewNetworkingTable = ({ cluster }) => {
                 cells: [
                     { title: 'Cluster network host prefix' },
                     {
-                        title: (_b = cluster.clusterNetworks) === null || _b === void 0 ? void 0 : _b.map((network) => (react_1.default.createElement("span", { key: network.hostPrefix },
+                        title: (_c = cluster.clusterNetworks) === null || _c === void 0 ? void 0 : _c.map((network) => (react_1.default.createElement("span", { key: network.hostPrefix },
                             network.hostPrefix,
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'cluster-network-prefix' },
                     },
-                    (0, common_1.isDualStack)(cluster) && { title: 'Primary' },
+                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion })) && {
+                        title: (_d = cluster.clusterNetworks) === null || _d === void 0 ? void 0 : _d.map((network, index) => (react_1.default.createElement("span", { key: network.hostPrefix },
+                            index === 0 ? 'Primary' : 'Secondary',
+                            react_1.default.createElement("br", null)))),
+                    },
                 ].filter(Boolean),
             },
             {
@@ -106,12 +120,16 @@ const ReviewNetworkingTable = ({ cluster }) => {
                 cells: [
                     { title: 'Service network CIDR' },
                     {
-                        title: (_c = cluster.serviceNetworks) === null || _c === void 0 ? void 0 : _c.map((network) => (react_1.default.createElement("span", { key: network.cidr },
+                        title: (_e = cluster.serviceNetworks) === null || _e === void 0 ? void 0 : _e.map((network) => (react_1.default.createElement("span", { key: network.cidr },
                             network.cidr,
                             react_1.default.createElement("br", null)))),
                         props: { 'data-testid': 'service-network-cidr' },
                     },
-                    (0, common_1.isDualStack)(cluster) && { title: 'Primary' },
+                    (0, common_1.isDualStack)(Object.assign(Object.assign({}, cluster), { openshiftVersion: cluster.openshiftVersion })) && {
+                        title: (_f = cluster.serviceNetworks) === null || _f === void 0 ? void 0 : _f.map((network, index) => (react_1.default.createElement("span", { key: network.cidr },
+                            index === 0 ? 'Primary' : 'Secondary',
+                            react_1.default.createElement("br", null)))),
+                    },
                 ].filter(Boolean),
             },
             {

package/build/cjs/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ReviewNetworkingTable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx"],"names":[],"mappings":";;;;AAAA,uDAA+C;AAC/C,yDAA6E;AAC7E,0DAA0B;AAC1B,+CAK4B;AAC5B,6EAI+C;AAQxC,MAAM,qBAAqB,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;IACzE,MAAM,IAAI,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;;QAC9B,MAAM,WAAW,GAAG;YAClB;gBACE,KAAK,EAAE,oBAAoB;gBAC3B,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,4BAA4B,EAAE;oBACvC;wBACE,KAAK,EAAE,IAAA,qCAAiB,EAAC,OAAO,CAAC;wBACjC,KAAK,EAAE,EAAE,aAAa,EAAE,4BAA4B,EAAE,OAAO,EAAE,CAAC,EAAE;qBACnE;iBACF;aACF;YACD;gBACE,KAAK,EAAE,YAAY;gBACnB,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE;oBACnC;wBACE,KAAK,EAAE,IAAA,qCAAiB,EAAC,OAAO,CAAC;wBACjC,KAAK,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE;qBACnD;iBACF;aACF;SACqB,CAAC;QAEzB,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,0CAAE,MAAM,CAAA;YAC/B,WAAW,CAAC,IAAI,CAAC;gBACf,KAAK,EAAE,uBAAuB;gBAC9B,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,uBAAuB,EAAE;oBAClC;wBACE,KAAK,EAAE,MAAA,OAAO,CAAC,eAAe,0CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAC/C,wCAAM,GAAG,EAAE,OAAO,CAAC,IAAI;4BACpB,OAAO,CAAC,IAAI;4BACb,yCAAM,CACD,CACR,CAAC;wBACF,KAAK,EAAE,EAAE,aAAa,EAAE,kBAAkB,EAAE;qBAC7C;oBACD,IAAA,oBAAW,~~EAAC~~,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,~~SAAS~~,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;~~iBAC5D~~;aACF,CAAC,CAAC;QAEL,OAAO,CAAC,OAAO;YACb,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAC1B,WAAW,CAAC,IAAI,CAAC;gBACf,KAAK,EAAE,QAAQ;gBACf,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,QAAQ,EAAE;oBACnB;wBACE,KAAK,EAAE,IAAA,qBAAY,EAAC,OAAO,CAAC;wBAC5B,KAAK,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;qBAChD;iBACF;aACF,CAAC,CAAC;QAEL,OAAO,CAAC,WAAW;YACjB,OAAO,CAAC,WAAW,CAAC,MAAM;YAC1B,WAAW,CAAC,IAAI,CAAC;gBACf,KAAK,EAAE,YAAY;gBACnB,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,YAAY,EAAE;oBACvB;wBACE,KAAK,EAAE,IAAA,yBAAgB,EAAC,OAAO,CAAC;wBAChC,KAAK,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,EAAE;qBACpD;iBACF;aACF,CAAC,CAAC;QAEL,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,YAAY,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;;QACtC,OAAO;YACL;gBACE,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,sBAAsB,EAAE;oBACjC;wBACE,KAAK,EAAE,MAAA,OAAO,CAAC,eAAe,0CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAC/C,wCAAM,GAAG,EAAE,OAAO,CAAC,IAAI;4BACpB,OAAO,CAAC,IAAI;4BACb,yCAAM,CACD,CACR,CAAC;wBACF,KAAK,EAAE,EAAE,aAAa,EAAE,sBAAsB,EAAE;qBACjD;oBACD,IAAA,oBAAW,~~EAAC~~,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,~~SAAS~~,EAAE;~~iBAC7C~~,CAAC,MAAM,CAAC,OAAO,CAAC;aAClB;YACD;gBACE,KAAK,EAAE,6BAA6B;gBACpC,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,6BAA6B,EAAE;oBACxC;wBACE,KAAK,EAAE,MAAA,OAAO,CAAC,eAAe,0CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAC/C,wCAAM,GAAG,EAAE,OAAO,CAAC,UAAU;4BAC1B,OAAO,CAAC,UAAU;4BACnB,yCAAM,CACD,CACR,CAAC;wBACF,KAAK,EAAE,EAAE,aAAa,EAAE,wBAAwB,EAAE;qBACnD;oBACD,IAAA,oBAAW,~~EAAC~~,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,~~SAAS~~,EAAE;~~iBAC7C~~,CAAC,MAAM,CAAC,OAAO,CAAC;aAClB;YACD;gBACE,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,sBAAsB,EAAE;oBACjC;wBACE,KAAK,EAAE,MAAA,OAAO,CAAC,eAAe,0CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAC/C,wCAAM,GAAG,EAAE,OAAO,CAAC,IAAI;4BACpB,OAAO,CAAC,IAAI;4BACb,yCAAM,CACD,CACR,CAAC;wBACF,KAAK,EAAE,EAAE,aAAa,EAAE,sBAAsB,EAAE;qBACjD;oBACD,IAAA,oBAAW,~~EAAC~~,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,~~SAAS~~,EAAE;~~iBAC7C~~,CAAC,MAAM,CAAC,OAAO,CAAC;aAClB;YACD;gBACE,KAAK,EAAE,iBAAiB;gBACxB,KAAK,EAAE;oBACL,EAAE,KAAK,EAAE,iBAAiB,EAAE;oBAC5B;wBACE,KAAK,EAAE,IAAA,kCAAc,EAAC,OAAO,CAAC,WAAW,CAAC;wBAC1C,KAAK,EAAE,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC,EAAE;qBACxD;iBACF;aACF;SACqB,CAAC;IAC3B,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO,CACL;QACE,8BAAC,mBAAK,IACJ,OAAO,EAAE,0BAAY,CAAC,OAAO,EAC7B,OAAO,EAAE,KAAK,EACd,SAAS,EAAE,cAAc,gBACb,yBAAyB;YAErC,8BAAC,mBAAK,QACH,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CACpB,8BAAC,gBAAE,IAAC,GAAG,EAAE,IAAA,2BAAkB,EAAC,GAAG,CAAC,KAAK,CAAC,IACnC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAC1B,8BAAC,gBAAE,kBAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAM,IAAI,CAAC,KAAK,GACtC,IAAI,CAAC,KAAK,CACR,CACN,CAAC,CACC,CACN,CAAC,CACI,CACF;QAER,yCAAM;QACN,8BAAC,kBAAK,IAAC,SAAS,EAAC,mBAAmB,EAAC,YAAY,EAAC,IAAI,mCAE9C;QAER,8BAAC,mBAAK,IACJ,OAAO,EAAE,0BAAY,CAAC,OAAO,EAC7B,OAAO,EAAE,KAAK,EACd,SAAS,EAAE,cAAc,gBACb,kCAAkC;YAE9C,8BAAC,mBAAK,QACH,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAC5B,8BAAC,gBAAE,IAAC,GAAG,EAAE,IAAA,2BAAkB,EAAC,GAAG,CAAC,KAAK,CAAC,IACnC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAC1B,8BAAC,gBAAE,kBAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAM,IAAI,CAAC,KAAK,GACtC,IAAI,CAAC,KAAK,CACR,CACN,CAAC,CACC,CACN,CAAC,CACI,CACF,CACP,CACJ,CAAC;AACJ,CAAC,CAAC;~~AArLW~~,QAAA,qBAAqB,~~yBAqLhC~~"}
1	+ {"version":3,"file":"ReviewNetworkingTable.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.js CHANGED Viewed

@@ -28,10 +28,10 @@ const PreflightChecksDetailExpanded = ({ cluster }) => {
 };
 const PreflightCheckInfo = ({ title, icon, span = 3, offset, className, }) => {
     return (react_1.default.createElement(react_core_1.GridItem, { span: span, offset: offset, className: className },
-        react_1.default.createElement(react_core_1.Flex, { spaceItems: { default: 'spaceItemsSm' }, alignItems: { default: 'alignItemsCenter' } },
-            react_1.default.createElement(react_core_1.FlexItem, { style: { display: 'flex', alignItems: 'center' } }, icon),
-            react_1.default.createElement(react_core_1.FlexItem, { style: { display: 'flex', alignItems: 'center' } },
-                react_1.default.createElement("b", null, title)))));
+        react_1.default.createElement(react_core_1.Content, { className: "pf-v6-u-text-wrap pf-v6-u-font-weight-bold" },
+            icon,
+            " ",
+            title)));
 };
 const getCheckIcon = (validationStatuses) => {
     if (validationStatuses.includes('failure') || validationStatuses.includes('error')) {
@@ -75,7 +75,7 @@ const ReviewPreflightChecks = ({ cluster }) => {
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(react_core_1.Divider, null),
         react_1.default.createElement(react_core_1.ExpandableSection, { toggleContent: react_1.default.createElement(react_core_1.Grid, null,
-                react_1.default.createElement(react_core_1.GridItem, { span: 2 }, "Preflight checks"),
+                react_1.default.createElement(react_core_1.GridItem, { span: 2, className: "pf-v6-u-text-wrap" }, "Preflight checks"),
                 !isChecksExpanded && react_1.default.createElement(PreflightChecksDetailCollapsed, { cluster: cluster })), isIndented: true, isExpanded: isChecksExpanded, onToggle: () => setChecksExpanded(!isChecksExpanded), className: 'review-expandable', "data-testid": "review-preflight-checks-main" },
             react_1.default.createElement(PreflightChecksDetailExpanded, { cluster: cluster })),
         react_1.default.createElement(react_core_1.Divider, null)));