npm - @openshift-assisted/ui-lib - Versions diffs - 2.53.1 → 2.54.0 - Mend

@openshift-assisted/ui-lib 2.53.1 → 2.54.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 (163) hide show

package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js CHANGED Viewed

@@ -46,8 +46,8 @@ const getWizardStepIds = (wizardStepIds, staticIpView, isSingleClusterFeatureEna
     else if (staticIpView === 'dhcp-selected') {
         stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
     }
-    if (isSingleClusterFeatureEnabled) {
-        stepsCopy = addStepToClusterWizard(stepsCopy, 'networking', ['credentials-download']);
+    if (isSingleClusterFeatureEnabled && !stepsCopy.includes('credentials-download')) {
+        stepsCopy = addStepToClusterWizard(stepsCopy, 'custom-manifests', ['credentials-download']);
     }
     return stepsCopy;
 };
@@ -72,7 +72,7 @@ const ClusterWizardContextProvider = ({ children, cluster, infraEnv, permissions
                     (0, networkType_1.isThirdPartyCNI)(cluster.networkType) || (0, utils_1.isOciPlatformType)(cluster);
             }
             const customManifestsStepNeedsToBeFilled = customManifestsRequired && !(uiSettings === null || uiSettings === void 0 ? void 0 : uiSettings.customManifestsAdded);
-            const requiredStepId = (0, wizardTransition_1.getClusterWizardFirstStep)(locationState, staticIpInfo, cluster === null || cluster === void 0 ? void 0 : cluster.status, cluster === null || cluster === void 0 ? void 0 : cluster.hosts, customManifestsStepNeedsToBeFilled);
+            const requiredStepId = (0, wizardTransition_1.getClusterWizardFirstStep)(locationState, staticIpInfo, cluster === null || cluster === void 0 ? void 0 : cluster.status, cluster);
             const firstStepIds = getWizardStepIds(wizardStepIds, staticIpInfo === null || staticIpInfo === void 0 ? void 0 : staticIpInfo.view, isSingleClusterFeatureEnabled);
             // Only move step if there is still none, or the user is at a forbidden step
             if (!currentStepId ||
@@ -91,7 +91,7 @@ const ClusterWizardContextProvider = ({ children, cluster, infraEnv, permissions
             });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [uiSettings, UISettingsLoading, UISettingsError]);
+    }, [uiSettings, UISettingsLoading, UISettingsError, isSingleClusterFeatureEnabled]);
     const contextValue = react_1.default.useMemo(() => {
         if (!wizardStepIds || !currentStepId) {
             return null;

package/build/cjs/ocm/components/clusterWizard/ClusterWizardContextProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ClusterWizardContextProvider.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx"],"names":[],"mappings":";;;AAAA,0DAAiD;AACjD,2EAAyD;AACzD,iEAAwF;AACxF,yDAO4B;AAC5B,6CAA+D;AAC/D,2CAA2E;AAC3E,+EAA+E;AAC/E,qFAAqF;AACrF,4CAAyF;AACzF,4GAA4E;AAE5E,uCAA4C;AAC5C,uDAAsD;AACtD,yDAAqD;AACrD,mEAAoE;AACpE,oCAA6C;AAE7C,MAAM,sBAAsB,GAAG,CAC7B,aAAuC,EACvC,YAAoC,EACpC,UAAoC,EACpC,EAAE;IACF,MAAM,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;IACpC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,iBAAiB,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,QAAQ,CAAC,MAAM,CAAC,iBAAiB,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAClC,aAAuC,EACvC,YAAoC,EACpC,mBAA2B,EAC3B,EAAE;IACF,MAAM,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IACrE,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,aAAmD,EACnD,YAA6C,EAE7C,6BAAuC,EACb,EAAE;IAC5B,IAAI,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,8BAAkB,CAAC,CAAC;IAC7E,IAAI,YAAY,KAAK,wBAAY,CAAC,IAAI,EAAE,CAAC;QACvC,SAAS,GAAG,2BAA2B,CAAC,SAAS,EAAE,uCAAuC,EAAE,CAAC,CAAC,CAAC;QAC/F,SAAS,GAAG,sBAAsB,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC5F,CAAC;SAAM,IAAI,YAAY,KAAK,wBAAY,CAAC,IAAI,EAAE,CAAC;QAC9C,SAAS,GAAG,2BAA2B,CAAC,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;QAC7E,SAAS,GAAG,sBAAsB,CAAC,SAAS,EAAE,iBAAiB,EAAE,oCAAwB,CAAC,CAAC;IAC7F,CAAC;SAAM,IAAI,YAAY,KAAK,eAAe,EAAE,CAAC;QAC5C,SAAS,GAAG,2BAA2B,CAAC,SAAS,EAAE,uCAAuC,EAAE,CAAC,CAAC,CAAC;IACjG,CAAC;IAED,IAAI,6BAA6B,EAAE,CAAC;~~QAClC~~,SAAS,GAAG,sBAAsB,CAAC,SAAS,EAAE,~~YAAY~~,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;~~IACxF~~,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,CAAC,EACpC,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,WAAW,GAKX,EAAE,EAAE;IACJ,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAC9F,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,EAA0B,CAAC;IACnF,MAAM,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,EAA4B,CAAC;IAC9F,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAA,wCAAW,GAAE,CAAC;IAC/B,MAAM,aAAa,GAAG,QAAQ,CAAC,KAA+C,CAAC;IAC/E,MAAM,EACJ,UAAU,EACV,gBAAgB,EAChB,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,eAAe,GACvB,GAAG,IAAA,qBAAa,EAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,CAAC;IAC/B,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IACtD,MAAM,qBAAqB,GAAG,IAAA,kCAAwB,GAAE,CAAC;IAEzD,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,CAAC,oCAAiB,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAEvF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,8BAAe,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,IAAI,uBAAuB,GAAG,KAAK,CAAC;YACpC,IAAI,OAAO,EAAE,CAAC;gBACZ,uBAAuB;oBACrB,IAAA,6BAAe,EAAC,OAAO,CAAC,WAAW,CAAC,IAAI,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;YACvE,CAAC;YACD,MAAM,kCAAkC,GACtC,uBAAuB,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,oBAAoB,CAAA,CAAC;YAE/D,MAAM,cAAc,GAAG,IAAA,4CAAyB,EAC9C,aAAa,EACb,YAAY,EACZ,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EACf,OAAO,~~aAAP~~,~~OAAO,uBAAP,OAAO,CAAE,KAAK,EACd,kCAAkC,CACnC,~~CAAC;YACF,MAAM,YAAY,GAAG,gBAAgB,CACnC,aAAa,EACb,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,~~EAElB~~,6BAA6B,CAC9B,CAAC;YAEF,4EAA4E;YAC5E,IACE,CAAC,aAAa;gBACd,CAAC,kCAAkC,IAAI,IAAA,8BAAW,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC,EAClF,CAAC;gBACD,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACnC,CAAC;YAED,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC9C,CAAC;QAED,IACE,CAAC,CAAC,eAAe;YACjB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,+BAA+B,CAAC,EACxE,CAAC;YACD,QAAQ,CAAC;gBACP,KAAK,EAAE,+BAA+B;gBACtC,OAAO,EAAE,eAAe;gBACxB,OAAO,EAAE,yBAAY,CAAC,OAAO;aAC9B,CAAC,CAAC;QACL,CAAC;QAED,uDAAuD;IACzD,CAAC,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC,CAAC;~~IAErD~~,MAAM,YAAY,GAAG,eAAK,CAAC,OAAO,CAAkC,GAAG,EAAE;QACvE,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAClC,yIAAyI;YACzI,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,8BAAe,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,4BAA4B,aAAa,oCAAoC,CAAC;YACtF,CAAC;YAED,MAAM,UAAU,GAAG,gBAAgB,CACjC,aAAa,EACb,YAAY,CAAC,IAAI,~~EAEjB~~,6BAA6B,CAC9B,CAAC;YACF,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,MAAM,kBAAkB,GAAG,CAAC,MAA8B,EAAE,EAAE;YAC5D,WAAW,EAAE,CAAC;YACd,IAAI,IAAA,iCAAc,EAAC,aAAa,CAAC,IAAI,CAAC,IAAA,iCAAc,EAAC,MAAM,CAAC,EAAE,CAAC;gBAC7D,sBAAsB,EAAE,CAAC;YAC3B,CAAC;YACD,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,OAAO;YACL,QAAQ;gBACN,WAAW,EAAE,CAAC;gBACd,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC5D,IAAI,UAAU,GAAG,aAAa,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;gBACnD,IAAI,UAAU,KAAK,+BAA+B,EAAE,CAAC;oBACnD,sFAAsF;oBACtF,UAAU,GAAG,uCAAuC,CAAC;gBACvD,CAAC;gBACD,kBAAkB,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC;YACD,QAAQ;gBACN,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC5D,kBAAkB,CAAC,aAAa,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC;YACD,oBAAoB,CAAC,IAAkB;gBACrC,IAAI,IAAI,KAAK,wBAAY,CAAC,IAAI,EAAE,CAAC;oBAC/B,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,uCAAuC,CAAC,CAAC;gBAC5D,CAAC;gBACD,gBAAgB,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,EAAE,6BAA6B,CAAC,CAAC,CAAC;YACzF,CAAC;YACD,6BAA6B,CAAC,IAAmC;gBAC/D,IAAI,IAAI,KAAK,wCAA6B,CAAC,MAAM,EAAE,CAAC;oBAClD,gBAAgB,CACd,gBAAgB,~~CACd~~,aAAa,~~EACb~~,wBAAY,CAAC,IAAI,~~EAEjB~~,6BAA6B,~~CAC9B~~,~~CACF~~,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CACd,gBAAgB,CAAC,aAAa,EAAE,eAAe,EAAE,6BAA6B,CAAC,CAChF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,aAAa,EAAE,aAAa;YAC5B,aAAa;YACb,gBAAgB,EAAE,kBAAkB;YACpC,aAAa;YACb,gBAAgB;YAChB,UAAU;YACV,gBAAgB;YAChB,mBAAmB;YACnB,sBAAsB,EAAE,CAAC,OAAgB,EAAE,EAAE;gBAC3C,sBAAsB,CAAC,OAAO,CAAC,CAAC;gBAChC,IAAI,OAAO,EAAE,CAAC;oBACZ,kBAAkB,CAAC,oCAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3C,CAAC;qBAAM,CAAC;oBACN,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,MAAM,KAAI,kBAAkB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClF,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC,EAAE;QACD,aAAa;QACb,aAAa;QACb,QAAQ;QACR,aAAa;QACb,6BAA6B;QAC7B,WAAW;QACX,UAAU;QACV,gBAAgB;QAChB,mBAAmB;QACnB,sBAAsB;KACvB,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL;QACE,8BAAC,2CAAoB,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY,IAAG,QAAQ,CAAiC,CAC7F,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,4BAA4B,CAAC"}
1	+ {"version":3,"file":"ClusterWizardContextProvider.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js CHANGED Viewed

@@ -7,19 +7,22 @@ const ClusterDetails_1 = tslib_1.__importDefault(require("./ClusterDetails"));
 const ClusterWizardContext_1 = require("./ClusterWizardContext");
 const ReviewStep_1 = tslib_1.__importDefault(require("./disconnected/ReviewStep"));
 const BasicStep_1 = tslib_1.__importDefault(require("./disconnected/BasicStep"));
-const getCurrentStep = (currentStepId) => {
+const hooks_1 = require("../../hooks");
+const types_1 = require("../../../common/types");
+const getCurrentStep = (currentStepId, infraEnv) => {
     switch (currentStepId) {
         case 'disconnected-review':
             return react_1.default.createElement(ReviewStep_1.default, null);
         case 'disconnected-basic':
             return react_1.default.createElement(BasicStep_1.default, null);
         default:
-            return react_1.default.createElement(ClusterDetails_1.default, null);
+            return react_1.default.createElement(ClusterDetails_1.default, { infraEnv: infraEnv });
     }
 };
 const NewClusterWizard = () => {
+    const { infraEnv } = (0, hooks_1.useInfraEnv)('', types_1.CpuArchitecture.USE_DAY1_ARCHITECTURE);
     const { currentStepId } = (0, ClusterWizardContext_1.useClusterWizardContext)();
-    return (react_1.default.createElement("div", { className: (0, classnames_1.default)('pf-v6-c-wizard', 'cluster-wizard') }, getCurrentStep(currentStepId)));
+    return (react_1.default.createElement("div", { className: (0, classnames_1.default)('pf-v6-c-wizard', 'cluster-wizard') }, getCurrentStep(currentStepId, infraEnv)));
 };
 exports.default = NewClusterWizard;
 //# sourceMappingURL=NewClusterWizard.js.map

package/build/cjs/ocm/components/clusterWizard/NewClusterWizard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"NewClusterWizard.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/NewClusterWizard.tsx"],"names":[],"mappings":";;;AAAA,oEAAoC;AACpC,0DAA0B;AAC1B,8EAA8C;AAC9C,iEAAiE;AACjE,mFAAmD;AACnD,iFAAiD;~~AAGjD~~,MAAM,cAAc,GAAG,CAAC,aAAqC,EAAE,EAAE;~~IAC/D~~,QAAQ,aAAa,EAAE,CAAC;QACtB,KAAK,qBAAqB;YACxB,OAAO,8BAAC,oBAAU,OAAG,CAAC;QACxB,KAAK,oBAAoB;YACvB,OAAO,8BAAC,mBAAS,OAAG,CAAC;QACvB;YACE,OAAO,8BAAC,wBAAc,~~OAAG~~,CAAC;~~IAC9B~~,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAa,GAAG,EAAE;IACtC,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAEpD,OAAO,CACL,uCAAK,SAAS,EAAE,IAAA,oBAAU,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,IAC3D,cAAc,CAAC,aAAa,CAAC,~~CAC1B~~,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
1	+ {"version":3,"file":"NewClusterWizard.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/NewClusterWizard.tsx"],"names":[],"mappings":";;;AAAA,oEAAoC;AACpC,0DAA0B;AAC1B,8EAA8C;AAC9C,iEAAiE;AACjE,mFAAmD;AACnD,iFAAiD;AAEjD,uCAA0C;AAC1C,iDAAwD;AAGxD,MAAM,cAAc,GAAG,CAAC,aAAqC,EAAE,QAAmB,EAAE,EAAE;IACpF,QAAQ,aAAa,EAAE,CAAC;QACtB,KAAK,qBAAqB;YACxB,OAAO,8BAAC,oBAAU,OAAG,CAAC;QACxB,KAAK,oBAAoB;YACvB,OAAO,8BAAC,mBAAS,OAAG,CAAC;QACvB;YACE,OAAO,8BAAC,wBAAc,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAAC;IAClD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAa,GAAG,EAAE;IACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,mBAAW,EAAC,EAAE,EAAE,uBAAe,CAAC,qBAAqB,CAAC,CAAC;IAC5E,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAEpD,OAAO,CACL,uCAAK,SAAS,EAAE,IAAA,oBAAU,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,IAC3D,cAAc,CAAC,aAAa,EAAE,QAAQ,CAAC,CACpC,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}

package/build/cjs/ocm/components/clusterWizard/Operators.js CHANGED Viewed

@@ -18,9 +18,26 @@ const wizardTransition_1 = require("./wizardTransition");
 // but making it shorter will allow us to disable navigation buttons while changes are pending
 const operatorsAutoSaveDebounce = 500;
 const getOperatorsInitialValues = (uiSettings, cluster) => {
+    var _a;
+    const olmOperators = (0, common_1.selectOlmOperators)(cluster);
+    const selectedOperators = olmOperators
+        .filter((operator) => { var _a; return operator.name && !((_a = operator.sourceBundles) === null || _a === void 0 ? void 0 : _a.length); })
+        .map(({ name }) => name);
+    const selectedBundlesFromOperatorBundles = (cluster.operatorBundles || []).map(({ id, optionalOperators }) => ({
+        id,
+        optionalOperators: optionalOperators || [],
+    }));
+    // Backward compatibility: old clusters can miss `operatorBundles`.
+    const selectedBundlesFromUiSettings = ((uiSettings === null || uiSettings === void 0 ? void 0 : uiSettings.bundlesSelected) || []).map((id) => ({
+        id,
+        optionalOperators: [],
+    }));
+    const selectedBundles = !!((_a = cluster.operatorBundles) === null || _a === void 0 ? void 0 : _a.length)
+        ? selectedBundlesFromOperatorBundles
+        : selectedBundlesFromUiSettings;
     return {
-        selectedBundles: (uiSettings === null || uiSettings === void 0 ? void 0 : uiSettings.bundlesSelected) || [],
-        selectedOperators: (0, common_1.selectOlmOperators)(cluster).map((o) => o.name || ''),
+        selectedBundles,
+        selectedOperators,
     };
 };
 const OperatorsForm = ({ cluster }) => {
@@ -48,17 +65,28 @@ const Operators = ({ cluster }) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const { updateUISettings, uiSettings } = (0, ClusterWizardContext_1.useClusterWizardContext)();
     const { addAlert, clearAlerts } = (0, common_1.useAlerts)();
+    const initialValues = react_1.default.useMemo(() => getOperatorsInitialValues(uiSettings, cluster), [cluster, uiSettings]);
     const handleSubmit = (values) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         clearAlerts();
-        const enabledOperators = values.selectedOperators.map((so) => ({
-            name: so,
-        }));
         try {
             const { data: updatedCluster } = yield services_1.ClustersService.update(cluster.id, cluster.tags, {
-                olmOperators: enabledOperators,
+                operatorBundles: values.selectedBundles,
+                olmOperators: values.selectedOperators.map((name) => ({ name })),
             });
-            yield updateUISettings({ bundlesSelected: values.selectedBundles });
             dispatch((0, slice_1.updateCluster)(updatedCluster));
+            // Backward compatibility: old clusters used uiSettings.bundlesSelected, keep operatorBundles as source of truth.
+            if ((_a = uiSettings === null || uiSettings === void 0 ? void 0 : uiSettings.bundlesSelected) === null || _a === void 0 ? void 0 : _a.length) {
+                try {
+                    yield updateUISettings({ bundlesSelected: undefined });
+                }
+                catch (uiSettingsError) {
+                    (0, api_1.handleApiError)(uiSettingsError, () => addAlert({
+                        title: 'Failed to update UI settings',
+                        message: (0, api_1.getApiErrorMessage)(uiSettingsError),
+                    }));
+                }
+            }
         }
         catch (e) {
             (0, api_1.handleApiError)(e, () => addAlert({ title: 'Failed to update the cluster', message: (0, api_1.getApiErrorMessage)(e) }));
@@ -67,7 +95,7 @@ const Operators = ({ cluster }) => {
             }
         }
     });
-    return (react_1.default.createElement(formik_1.Formik, { initialValues: getOperatorsInitialValues(uiSettings, cluster), onSubmit: handleSubmit },
+    return (react_1.default.createElement(formik_1.Formik, { initialValues: initialValues, onSubmit: handleSubmit },
         react_1.default.createElement(OperatorsForm, { cluster: cluster })));
 };
 exports.default = Operators;

package/build/cjs/ocm/components/clusterWizard/Operators.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Operators.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/Operators.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,6CAA0C;AAC1C,2EAAsE;AACtE,mCAAgE;AAEhE,4CAQyB;AACzB,iEAAiE;AACjE,uGAAuE;AACvE,+GAA+E;AAC/E,mDAAgD;AAChD,6CAAiD;AACjD,oEAA+F;AAC/F,6CAA+F;AAC/F,yDAAsD;AAEtD,uEAAuE;AACvE,8FAA8F;AAC9F,MAAM,yBAAyB,GAAG,GAAG,CAAC;AAEtC,MAAM,yBAAyB,GAAG,CAChC,UAAwC,EACxC,OAAgB,EACC,EAAE;IACnB,OAAO;~~QACL~~,eAAe,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,eAAe,KAAI,EAAE~~;QAClD~~,~~iBAAiB~~,EAAE,~~IAAA~~,~~2BAAkB~~,~~EAAC~~,~~OAAO~~,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,~~EAAE~~,~~EAAE~~,CAAC,CAAC,CAAC,~~IAAI~~,~~IAAI~~,~~EAAE,~~CAAC;~~KACxE~~,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;IAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC/B,MAAM,oBAAoB,GAAG,IAAA,8CAAuB,GAAE,CAAC;IACvD,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EAAC,yBAAyB,CAAC,CAAC;IACvE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAgB,GAAmB,CAAC;IACvF,MAAM,QAAQ,GAAG,IAAA,wCAAW,GAAE,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wCAAW,GAAE,CAAC;IAEnC,MAAM,cAAc,GAClB,iBAAiB;QACjB,CAAC,OAAO;QACR,CAAC,CAAC,MAAM,CAAC,MAAM;QACf,YAAY;QACZ,CAAC,IAAA,mCAAgB,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEjC,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAChE,QAAQ,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,oBAAoB,CAAC,QAAQ,EAAE,CAAC;IAClC,CAAC,CAAC;IAEF,OAAO,CACL,8BAAC,0BAAiB,IAChB,UAAU,EAAE,8BAAC,iCAAuB,IAAC,OAAO,EAAE,OAAO,GAAI,EACzD,MAAM,EACJ,8BAAC,6BAAmB,IAClB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,IAAA,6BAAoB,EAAC,MAAM,EAAE,OAAO,CAAC,EAClD,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAC7C,cAAc,EAAE,YAAY,IAAI,iBAAiB,GACjD;QAGJ,8BAAC,6BAAa,IAAC,OAAO,EAAE,OAAO,GAAI,CACjB,CACrB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;IACtD,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;IAC/B,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IACnE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;~~IAE9C~~,MAAM,~~YAAY~~,~~GAA8C~~,~~CAAO~~,~~MAAM~~,~~EAAE~~,~~EAAE;QAC/E~~,~~WAAW~~,EAAE,CAAC~~;QAEd~~,~~MAAM~~,~~gBAAgB~~,~~GAAG~~,~~MAAM~~,~~CAAC~~,~~iBAAiB,~~CAAC,~~GAAG~~,CAAC,~~CAAC~~,EAAE,~~EAAE~~,~~EAAE,~~CAAC,CAAC;~~YAC7D~~,~~IAAI~~,EAAE,EAAE~~;SACT~~,~~CAAC~~,~~CAAC~~,CAAC;~~QAEJ~~,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,0BAAe,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE;gBACtF,YAAY,EAAE,~~gBAAgB~~;~~aAC/B~~,CAAC,CAAC;YAEH,~~MAAM~~,~~gBAAgB~~,CAAC,~~EAAE~~,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;~~YAEpE~~,QAAQ,CAAC,IAAA,~~qBAAa~~,EAAC,~~cAAc~~,CAAC,CAAC,CAAC;~~QAC1C~~,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAA,oBAAc,EAAC,CAAC,EAAE,GAAG,EAAE,CACrB,QAAQ,CAAC,EAAE,KAAK,EAAE,8BAA8B,EAAE,OAAO,EAAE,IAAA,wBAAkB,EAAC,CAAC,CAAC,EAAE,CAAC,CACpF,CAAC;YACF,IAAI,IAAA,0BAAoB,EAAC,CAAU,CAAC,EAAE,CAAC;gBACrC,QAAQ,CAAC,IAAA,4BAAoB,GAAE,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC,CAAA,CAAC;IAEF,OAAO,CACL,8BAAC,eAAM,IAAC,aAAa,EAAE,~~yBAAyB~~,~~CAAC,UAAU,~~EAAE,~~OAAO,CAAC,EAAE,~~QAAQ,EAAE,YAAY;~~QAC3F~~,8BAAC,aAAa,IAAC,OAAO,EAAE,OAAO,GAAI,CAC5B,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,SAAS,CAAC"}
1	+ {"version":3,"file":"Operators.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/Operators.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterWizard/OperatorsBundle.js CHANGED Viewed

@@ -7,10 +7,10 @@ const common_1 = require("../../../common");
 const formik_1 = require("formik");
 const newFeatureSupportLevels_1 = require("../../../common/components/newFeatureSupportLevels");
 const use_feature_1 = require("../../hooks/use-feature");
-const utils_1 = require("../clusterConfiguration/operators/utils");
 const bundleSpecs_1 = require("../clusterConfiguration/operators/bundleSpecs");
 const operatorSpecs_1 = require("../../../common/components/operators/operatorSpecs");
 const ClusterWizardContext_1 = require("./ClusterWizardContext");
+const OptionalOperatorsDropdown_1 = tslib_1.__importDefault(require("./OptionalOperatorsDropdown"));
 require("./OperatorsBundle.css");
 const BundleLabel = ({ bundle, searchTerm }) => {
     var _a;
@@ -33,8 +33,8 @@ const BundleLabel = ({ bundle, searchTerm }) => {
                 (bundleSpec === null || bundleSpec === void 0 ? void 0 : bundleSpec.docsLink) && (React.createElement(react_core_1.StackItem, null,
                     React.createElement(common_1.ExternalLink, { href: bundleSpec.docsLink }, "Learn more")))) })));
 };
-const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) => {
-    var _a, _b, _c;
+const BundleCard = ({ bundle, bundles, searchTerm, informationalMessage, }) => {
+    var _a, _b, _c, _d;
     const { values, setFieldValue } = (0, formik_1.useFormikContext)();
     const { isFeatureSupported } = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
     const { byKey: opSpecs } = (0, operatorSpecs_1.useOperatorSpecs)();
@@ -47,7 +47,7 @@ const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) =>
         return !isFeatureSupported(operatorSpec.featureId);
     }));
     const bundleSpec = bundleSpecs_1.bundleSpecs[bundle.id || ''];
-    const incompatibleBundle = (_b = bundleSpec === null || bundleSpec === void 0 ? void 0 : bundleSpec.incompatibleBundles) === null || _b === void 0 ? void 0 : _b.find((b) => values.selectedBundles.includes(b));
+    const incompatibleBundle = (_b = bundleSpec === null || bundleSpec === void 0 ? void 0 : bundleSpec.incompatibleBundles) === null || _b === void 0 ? void 0 : _b.find((b) => values.selectedBundles.some((bundleSelection) => bundleSelection.id === b));
     const isAssistedMigration = uiSettings === null || uiSettings === void 0 ? void 0 : uiSettings.isAssistedMigration;
     const disabledReason = hasUnsupportedOperators
         ? 'Some operators in this bundle are not supported with the current configuration.'
@@ -58,15 +58,18 @@ const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) =>
                 : !bundles.some((b) => b.id === bundle.id)
                     ? 'This bundle is not available for the current configuration, you might be able to use the standalone operators instead.'
                     : undefined;
+    const addBundle = (selectedBundles, bundle) => [
+        ...selectedBundles,
+        { id: bundle.id || '', optionalOperators: bundle.optionalOperators || [] },
+    ];
+    const removeBundle = (selectedBundles, bundleId) => selectedBundles.filter((selectedBundle) => selectedBundle.id !== bundleId);
     const onSelect = (checked) => {
-        const newBundles = checked
-            ? [...values.selectedBundles, bundle.id || '']
-            : values.selectedBundles.filter((sb) => sb !== bundle.id);
-        setFieldValue('selectedBundles', newBundles);
-        const newOperators = (0, utils_1.getNewBundleOperators)(values.selectedOperators, newBundles, bundles, bundle, preflightRequirements, checked);
-        setFieldValue('selectedOperators', newOperators);
+        const nextBundles = checked
+            ? addBundle(values.selectedBundles, bundle)
+            : removeBundle(values.selectedBundles, bundle.id);
+        setFieldValue('selectedBundles', nextBundles);
     };
-    const isSelected = values.selectedBundles.includes(bundle.id || '');
+    const isSelected = values.selectedBundles.some((selectedBundle) => selectedBundle.id === bundle.id);
     const checkboxId = `bundle-${bundle.id || ''}`;
     return (React.createElement(react_core_1.Tooltip, { content: disabledReason, hidden: !disabledReason },
         React.createElement(react_core_1.Card, { isDisabled: !!disabledReason, isFullHeight: true, isClickable: true, isSelectable: true, isSelected: isSelected, className: "ai-bundle-card" },
@@ -74,7 +77,7 @@ const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) =>
                     selectableActionId: checkboxId,
                     selectableActionAriaLabelledby: checkboxId,
                     name: checkboxId,
-                    onChange: (_, checked) => onSelect(checked),
+                    onChange: (_, checked) => onSelect(!!checked),
                     isChecked: isSelected,
                 } },
                 React.createElement(react_core_1.CardTitle, null,
@@ -82,10 +85,26 @@ const BundleCard = ({ bundle, bundles, preflightRequirements, searchTerm, }) =>
             React.createElement(react_core_1.CardBody, { isFilled: true },
                 React.createElement(react_core_1.Stack, { hasGutter: true },
                     React.createElement(react_core_1.StackItem, { isFilled: true },
-                        React.createElement("div", null, (0, operatorSpecs_1.highlightMatch)(bundle.description || '', searchTerm))))))));
+                        React.createElement("div", null, (0, operatorSpecs_1.highlightMatch)(bundle.description || '', searchTerm))),
+                    !!((_d = bundle.optionalOperators) === null || _d === void 0 ? void 0 : _d.length) && (React.createElement(react_core_1.StackItem, { onClick: (e) => e.stopPropagation() },
+                        React.createElement(OptionalOperatorsDropdown_1.default, { bundleId: bundle.id || '', optionalOperatorIds: bundle.optionalOperators, selectedBundles: values.selectedBundles, setSelectedBundles: (selectedBundles) => setFieldValue('selectedBundles', selectedBundles), isDisabled: !isSelected || !!disabledReason, getOperatorLabel: (operatorId) => { var _a; return ((_a = opSpecs[operatorId]) === null || _a === void 0 ? void 0 : _a.title) || operatorId; } }))),
+                    informationalMessage && (React.createElement(react_core_1.StackItem, null,
+                        React.createElement(react_core_1.Alert, { isInline: true, variant: "info", title: informationalMessage }))))))));
 };
-const OperatorsBundle = ({ bundles, allBundles, preflightRequirements, searchTerm, }) => {
+const OperatorsBundle = ({ bundles, allBundles, searchTerm, cluster, }) => {
     const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
+    const openshiftAiGpuInfoMessage = React.useMemo(() => {
+        var _a;
+        const validationsInfo = (0, common_1.selectClusterValidationsInfo)(cluster);
+        if (!validationsInfo) {
+            return undefined;
+        }
+        return (_a = Object.values(validationsInfo)
+            .flat()
+            .find((validation) => (validation === null || validation === void 0 ? void 0 : validation.id) === 'openshift-ai-gpu-requirements-satisfied' &&
+            (validation === null || validation === void 0 ? void 0 : validation.status) === 'success' &&
+            !!validation.message)) === null || _a === void 0 ? void 0 : _a.message;
+    }, [cluster]);
     return (React.createElement(react_core_1.Stack, { hasGutter: true },
         React.createElement(react_core_1.StackItem, null,
             React.createElement(react_core_1.Title, { headingLevel: "h2", size: "lg" }, allBundles.length > 0 ? 'Bundles' : '')),
@@ -93,7 +112,7 @@ const OperatorsBundle = ({ bundles, allBundles, preflightRequirements, searchTer
             React.createElement(react_core_1.Gallery, { hasGutter: true, minWidths: { default: '350px' } }, (isSingleClusterFeatureEnabled
                 ? allBundles.filter((b) => b.id && common_1.singleClusterBundles.includes(b.id))
                 : allBundles).map((bundle) => (React.createElement(react_core_1.GalleryItem, { key: bundle.id },
-                React.createElement(BundleCard, { bundle: bundles.find((b) => b.id === bundle.id) || bundle, bundles: bundles, preflightRequirements: preflightRequirements, searchTerm: searchTerm }))))))));
+                React.createElement(BundleCard, { bundle: bundles.find((b) => b.id === bundle.id) || bundle, bundles: bundles, searchTerm: searchTerm, informationalMessage: bundle.id === 'openshift-ai' ? openshiftAiGpuInfoMessage : undefined }))))))));
 };
 exports.default = OperatorsBundle;
 //# sourceMappingURL=OperatorsBundle.js.map

package/build/cjs/ocm/components/clusterWizard/OperatorsBundle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OperatorsBundle.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,~~uDAagC~~;~~AAKhC~~,~~4CAAmG~~;~~AACnG~~,mCAA0C;AAC1C,gGAA+F;AAC/F,yDAAqD;AACrD~~,mEAAgF;AAChF~~,+EAA4E;AAC5E,sFAG4D;AAC5D,iEAAiE;AACjE,iCAA+B;AAE/B,MAAM,WAAW,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,EAA2C,EAAE,EAAE;;IACtF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,yBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,OAAO,CACL;QACE;YAAO,IAAA,8BAAc,EAAC,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,UAAU,CAAC;gBAAS;QAC9D,oBAAC,oBAAW,IACV,SAAS,EAAE,GAAG,EACd,aAAa,EAAE,iEAAwC,EACvD,WAAW,EACT,oBAAC,kBAAK,IAAC,SAAS;gBACb,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,KAAI,CAC1B,oBAAC,sBAAS;oBACR,oBAAC,UAAU,CAAC,WAAW,OAAG,CAChB,CACb;gBACA,CAAA,MAAA,MAAM,CAAC,SAAS,0CAAE,MAAM,KAAI,CAC3B;oBACE,oBAAC,sBAAS,4BAA8B;oBACxC,oBAAC,sBAAS;wBACR,oBAAC,iBAAI,QACF,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;4BAAC,OAAA,CAC5B,oBAAC,qBAAQ,IAAC,GAAG,EAAE,EAAE,IAAG,CAAA,MAAA,OAAO,CAAC,EAAE,CAAC,0CAAE,KAAK,KAAI,EAAE,CAAY,CACzD,CAAA;yBAAA,CAAC,CACG,CACG,CACX,CACJ;gBACA,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,KAAI,CACvB,oBAAC,sBAAS;oBACR,oBAAC,qBAAY,IAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,iBAA2B,CACxD,CACb,CACK,GAEV,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAClB,MAAM,EACN,OAAO,EACP,~~qBAAqB~~,~~EACrB~~,~~UAAU~~,~~GAMX~~,EAAE,EAAE;;IACH,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,yBAAgB,GAAmB,CAAC;IACtE,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,mDAAyB,GAAE,CAAC;IAC3D,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAC9C,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8CAAuB,GAAE,CAAC;IAEjD,MAAM,uBAAuB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QAC9D,MAAM,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC,CAAC,CAAA,CAAC;IAEH,MAAM,UAAU,GAAG,yBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhD,MAAM,kBAAkB,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,mBAAmB,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACrE,MAAM,CAAC,eAAe,CAAC,~~QAAQ~~,CAAC,CAAC,CAAC,~~CACnC~~,CAAC;IACF,MAAM,mBAAmB,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,mBAAmB,CAAC;IAC5D,MAAM,cAAc,GAAG,uBAAuB;QAC5C,CAAC,CAAC,iFAAiF;QACnF,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,4CACE,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,kBAAkB,CAAC,0CAAE,KAAK,KAAI,kBAChE,EAAE;YACJ,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,iFAAiF;gBACnF,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;oBAC1C,CAAC,CAAC,wHAAwH;oBAC1H,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,~~QAAQ~~,GAAG,~~CAAC~~,~~OAAgB~~,EAAE,~~EAAE~~;~~QACpC~~,~~MAAM,UAAU,~~GAAG,~~OAAO~~;~~YACxB~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~GAAG,~~MAAM,CAAC,~~eAAe~~,EAAE,MAAM,CAAC,~~EAAE~~,IAAI,EAAE,~~CAAC~~;~~YAC9C~~,CAAC,~~CAAC,~~MAAM,~~CAAC~~,eAAe,CAAC,MAAM,CAAC,CAAC,~~EAAE~~,EAAE,EAAE,CAAC,EAAE,KAAK,~~MAAM~~,CAAC,~~EAAE,~~CAAC~~,CAAC~~;~~QAC5D~~,~~aAAa~~,CAAC,~~iBAAiB~~,EAAE,~~UAAU,CAAC,CAAC~~;~~QAC7C~~,MAAM,~~YAAY~~,GAAG,~~IAAA~~,~~6BAAqB~~,~~EACxC~~,MAAM,CAAC,~~iBAAiB~~,~~EACxB~~,~~UAAU~~,~~EACV~~,~~OAAO~~,~~EACP~~,MAAM,~~EACN~~,~~qBAAqB~~,~~EACrB~~,~~OAAO~~,~~CACR~~,CAAC;~~QACF~~,aAAa,CAAC,~~mBAAmB~~,EAAE,~~YAAY~~,CAAC,CAAC;~~IACnD~~,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAC,~~QAAQ~~,CAAC,~~MAAM~~,~~CAAC~~,EAAE,~~IAAI~~,EAAE,CAAC,CAAC;~~IACpE~~,MAAM,UAAU,GAAG,UAAU,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;IAC/C,OAAO,CACL,oBAAC,oBAAO,IAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,cAAc;QACvD,oBAAC,iBAAI,IACH,UAAU,EAAE,CAAC,CAAC,cAAc,EAC5B,YAAY,QACZ,WAAW,QACX,YAAY,QACZ,UAAU,EAAE,UAAU,EACtB,SAAS,EAAC,gBAAgB;YAE1B,oBAAC,uBAAU,IACT,iBAAiB,EAAE;oBACjB,kBAAkB,EAAE,UAAU;oBAC9B,8BAA8B,EAAE,UAAU;oBAC1C,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;~~oBAC3C~~,SAAS,EAAE,UAAU;iBACtB;gBAED,oBAAC,sBAAS;oBACR,oBAAC,WAAW,IAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAI,CAC7C,CACD;YACb,oBAAC,qBAAQ,IAAC,QAAQ;gBAChB,oBAAC,kBAAK,IAAC,SAAS;oBACd,oBAAC,sBAAS,IAAC,QAAQ;wBACjB,iCAAM,IAAA,8BAAc,EAAC,MAAM,CAAC,WAAW,IAAI,EAAE,EAAE,UAAU,CAAC,CAAO,CACvD,~~CACN~~,CACC,CACN,CACC,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,EACvB,OAAO,EACP,UAAU,EACV,~~qBAAqB~~,~~EACrB~~,~~UAAU~~,~~GAMX~~,EAAE,EAAE;IACH,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;~~IAE9F~~,OAAO,CACL,oBAAC,kBAAK,IAAC,SAAS;QACd,oBAAC,sBAAS;YACR,oBAAC,kBAAK,IAAC,YAAY,EAAC,IAAI,EAAC,IAAI,EAAC,IAAI,IAC/B,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CACjC,CACE;QACZ,oBAAC,sBAAS;YACR,oBAAC,oBAAO,IAAC,SAAS,QAAC,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,IAC/C,CAAC,6BAA6B;gBAC7B,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,6BAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACvE,CAAC,CAAC,UAAU,CACb,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAChB,oBAAC,wBAAW,IAAC,GAAG,EAAE,MAAM,CAAC,EAAE;gBACzB,oBAAC,UAAU,IACT,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,EACzD,OAAO,EAAE,OAAO,EAChB,~~qBAAqB~~,EAAE,~~qBAAqB~~,~~EAC5C~~,~~UAAU~~,EAAE,~~UAAU~~,~~GACtB~~,CACU,CACf,CAAC,CACM,CACA,CACN,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
1	+ {"version":3,"file":"OperatorsBundle.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsBundle.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterWizard/OperatorsSelect.test.js CHANGED Viewed

@@ -4,7 +4,7 @@ const vitest_1 = require("vitest");
 // Test the counting logic that was implemented in OperatorsSelect
 function calculateSelectedOperators(values, bundles, opSpecs) {
     // Calculate all selected operators (direct selections + bundle selections)
-    const bundleOperators = values.selectedBundles.flatMap((bundleId) => { var _a; return ((_a = bundles.find((b) => b.id === bundleId)) === null || _a === void 0 ? void 0 : _a.operators) || []; });
+    const bundleOperators = values.selectedBundles.flatMap((bundle) => { var _a; return ((_a = bundles.find((b) => b.id === bundle.id)) === null || _a === void 0 ? void 0 : _a.operators) || []; });
     const allSelectedOperators = values.selectedOperators
         .concat(bundleOperators)
         .filter((op, index, array) => array.indexOf(op) === index); // Remove duplicates
@@ -47,7 +47,7 @@ function calculateSelectedOperators(values, bundles, opSpecs) {
     (0, vitest_1.it)('should count bundle operators when a bundle is selected', () => {
         const values = {
             selectedOperators: ['lvm'], // 1 manually selected
-            selectedBundles: ['virtualization'], // bundle with 3 operators: cnv, nmstate, mtv
+            selectedBundles: [{ id: 'virtualization', optionalOperators: [] }], // bundle with 3 operators: cnv, nmstate, mtv
         };
         const result = calculateSelectedOperators(values, mockBundles, mockOpSpecs);
         (0, vitest_1.expect)(result).toHaveLength(4);
@@ -59,7 +59,7 @@ function calculateSelectedOperators(values, bundles, opSpecs) {
     (0, vitest_1.it)('should not double-count operators that are both manually selected and in a bundle', () => {
         const values = {
             selectedOperators: ['lvm', 'cnv'], // cnv is also in the bundle
-            selectedBundles: ['virtualization'], // bundle with: cnv, nmstate, mtv
+            selectedBundles: [{ id: 'virtualization', optionalOperators: [] }], // bundle with: cnv, nmstate, mtv
         };
         const result = calculateSelectedOperators(values, mockBundles, mockOpSpecs);
         (0, vitest_1.expect)(result).toHaveLength(4);
@@ -83,7 +83,10 @@ function calculateSelectedOperators(values, bundles, opSpecs) {
     (0, vitest_1.it)('should handle multiple bundles correctly', () => {
         const values = {
             selectedOperators: ['lvm'],
-            selectedBundles: ['virtualization', 'openshift-ai'], // Two bundles
+            selectedBundles: [
+                { id: 'virtualization', optionalOperators: [] },
+                { id: 'openshift-ai', optionalOperators: [] },
+            ], // Two bundles
         };
         const result = calculateSelectedOperators(values, mockBundles, mockOpSpecs);
         (0, vitest_1.expect)(result).toHaveLength(7); // lvm + 3 from virtualization + 3 from openshift-ai
@@ -98,7 +101,10 @@ function calculateSelectedOperators(values, bundles, opSpecs) {
     (0, vitest_1.it)('should handle overlapping operators in multiple bundles', () => {
         const values = {
             selectedOperators: [],
-            selectedBundles: ['virtualization', 'openshift-ai'], // Both bundles have 'odf' (but only virtualization has it in our mock)
+            selectedBundles: [
+                { id: 'virtualization', optionalOperators: [] },
+                { id: 'openshift-ai', optionalOperators: [] },
+            ], // Both bundles have 'odf' (but only virtualization has it in our mock)
         };
         // Let's modify the virtualization bundle to include odf to test overlap
         const bundlesWithOverlap = [

package/build/cjs/ocm/components/clusterWizard/OperatorsSelect.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OperatorsSelect.test.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsSelect.test.ts"],"names":[],"mappings":";;AAAA,mCAA8C;AAI9C,kEAAkE;AAClE,SAAS,0BAA0B,CACjC,MAAuB,EACvB,OAAiB,EACjB,OAAgC;IAEhC,2EAA2E;IAC3E,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC,OAAO,CACpD,CAAC,~~QAAQ~~,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,~~QAAQ~~,CAAC,0CAAE,SAAS,KAAI,EAAE,CAAA,EAAA,~~CACtE~~,CAAC;IAEF,MAAM,oBAAoB,GAAG,MAAM,CAAC,iBAAiB;SAClD,MAAM,CAAC,eAAe,CAAC;SACvB,MAAM,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,oBAAoB;IAElF,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,IAAA,iBAAQ,EAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,MAAM,WAAW,GAAa;QAC5B;YACE,EAAE,EAAE,gBAAgB;YACpB,KAAK,EAAE,gBAAgB;YACvB,WAAW,EAAE,uBAAuB;YACpC,SAAS,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC;SACrC;QACD;YACE,EAAE,EAAE,cAAc;YAClB,KAAK,EAAE,cAAc;YACrB,WAAW,EAAE,WAAW;YACxB,SAAS,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC;SAC9C;KACF,CAAC;IAEF,MAAM,WAAW,GAAG;QAClB,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QACrB,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QACrB,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QACrB,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;QAC7B,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QACrB,YAAY,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE;QACrC,SAAS,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;KAClC,CAAC;IAEF,IAAA,WAAE,EAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,MAAM,MAAM,GAAoB;YAC9B,iBAAiB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;YACjC,eAAe,EAAE,EAAE;SACpB,CAAC;QAEF,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,MAAM,GAAoB;YAC9B,iBAAiB,EAAE,CAAC,KAAK,CAAC,EAAE,sBAAsB;YAClD,eAAe,EAAE,CAAC,gBAAgB,CAAC,EAAE,6CAA6C;~~SACnF~~,CAAC;QAEF,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACpC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,mFAAmF,EAAE,GAAG,EAAE;QAC3F,MAAM,MAAM,GAAoB;YAC9B,iBAAiB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,4BAA4B;YAC/D,eAAe,EAAE,CAAC,gBAAgB,CAAC,EAAE,iCAAiC;~~SACvE~~,CAAC;QAEF,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACpC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,4CAA4C;QAC5C,IAAA,eAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,MAAM,GAAoB;YAC9B,iBAAiB,EAAE,CAAC,KAAK,EAAE,kBAAkB,CAAC,EAAE,kCAAkC;YAClF,eAAe,EAAE,EAAE;SACpB,CAAC;QAEF,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAoB;YAC9B,iBAAiB,EAAE,CAAC,KAAK,CAAC;YAC1B,eAAe,EAAE,~~CAAC~~,gBAAgB,EAAE,cAAc,~~CAAC~~,EAAE,cAAc;~~SACpE~~,CAAC;QAEF,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,oDAAoD;QACpF,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACpC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACvC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACtC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,MAAM,GAAoB;YAC9B,iBAAiB,EAAE,EAAE;YACrB,eAAe,EAAE,~~CAAC~~,gBAAgB,EAAE,cAAc,~~CAAC~~,EAAE,uEAAuE;~~SAC7H~~,CAAC;QAEF,wEAAwE;QACxE,MAAM,kBAAkB,GAAa;YACnC;gBACE,EAAE,EAAE,gBAAgB;gBACpB,KAAK,EAAE,gBAAgB;gBACvB,WAAW,EAAE,uBAAuB;gBACpC,SAAS,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,YAAY;aAC1D;YACD;gBACE,EAAE,EAAE,cAAc;gBAClB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,WAAW;gBACxB,SAAS,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,yBAAyB;aACzE;SACF,CAAC;QAEF,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;QAEnF,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,yEAAyE;QACzG,IAAA,eAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,8BAA8B;IAC7F,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAoB;YAC9B,iBAAiB,EAAE,EAAE;YACrB,eAAe,EAAE,EAAE;SACpB,CAAC;QAEF,MAAM,MAAM,GAAG,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAE5E,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"OperatorsSelect.test.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsSelect.test.ts"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterWizard/OperatorsStep.js CHANGED Viewed

@@ -60,7 +60,7 @@ const OperatorsStep = ({ cluster }) => {
                 react_1.default.createElement(react_core_1.FlexItem, { style: { minWidth: '300px' } },
                     react_1.default.createElement(react_core_1.SearchInput, { placeholder: 'Find bundles or operators', value: searchTerm, onChange: (_e, value) => setSearchTerm(value), onClear: () => setSearchTerm('') })))),
         react_1.default.createElement(react_core_1.StackItem, null,
-            react_1.default.createElement(OperatorsBundle_1.default, { bundles: filteredBundles, preflightRequirements: preflightRequirements, searchTerm: searchTerm, allBundles: allBundles })),
+            react_1.default.createElement(OperatorsBundle_1.default, { bundles: filteredBundles, searchTerm: searchTerm, allBundles: allBundles, cluster: cluster })),
         react_1.default.createElement(react_core_1.StackItem, null,
             react_1.default.createElement(OperatorsSelect_1.default, { bundles: bundles, cluster: cluster, preflightRequirements: preflightRequirements, searchTerm: searchTerm }))));
 };

package/build/cjs/ocm/components/clusterWizard/OperatorsStep.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OperatorsStep.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsStep.tsx"],"names":[],"mappings":"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~~qBAAqB~~,EAAE,~~qBAAqB~~,~~EAC5C~~,UAAU,EAAE,UAAU,EACtB,~~UAAU~~,EAAE,~~UAAU~~,~~GACtB~~,CACQ;QACZ,8BAAC,sBAAS;YACR,8BAAC,yBAAe,IACd,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,qBAAqB,EAC5C,UAAU,EAAE,UAAU,GACtB,CACQ,CACN,CACT,CAAC;AACJ,CAAC,CAAC;AA7FW,QAAA,aAAa,iBA6FxB"}
1	+ {"version":3,"file":"OperatorsStep.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/OperatorsStep.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusterWizard/OptionalOperatorsDropdown.js ADDED Viewed

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_core_1 = require("@patternfly/react-core");
+const OptionalOperatorsDropdown = ({ bundleId, optionalOperatorIds, selectedBundles, setSelectedBundles, isDisabled, getOperatorLabel, }) => {
+    const [isOpen, setIsOpen] = React.useState(false);
+    const toggleLabel = bundleId === 'openshift-ai' ? 'GPU operators' : 'Optional operators';
+    const selectedBundleEntry = selectedBundles.find((bundleSelection) => bundleSelection.id === bundleId);
+    const selectedOptionalOperators = (selectedBundleEntry === null || selectedBundleEntry === void 0 ? void 0 : selectedBundleEntry.optionalOperators) || [];
+    const updateBundleOptionalOperators = (operatorId) => {
+        if (selectedBundleEntry) {
+            const isCurrentlySelected = selectedOptionalOperators.includes(operatorId);
+            const nextOptionalOperators = isCurrentlySelected
+                ? selectedOptionalOperators.filter((optionalOperator) => optionalOperator !== operatorId)
+                : [...selectedOptionalOperators, operatorId];
+            const updatedBundles = selectedBundles.map((bundleSelection) => bundleSelection.id === bundleId
+                ? Object.assign(Object.assign({}, bundleSelection), { optionalOperators: nextOptionalOperators }) : bundleSelection);
+            setSelectedBundles(updatedBundles);
+        }
+    };
+    const onSelect = (_event, value) => {
+        const operatorId = value;
+        updateBundleOptionalOperators(operatorId);
+    };
+    return (React.createElement(react_core_1.Select, { role: "menu", isOpen: isOpen, onSelect: onSelect, selected: selectedOptionalOperators, onOpenChange: (nextIsOpen) => setIsOpen(nextIsOpen), toggle: (toggleRef) => (React.createElement(react_core_1.MenuToggle, { ref: toggleRef, onClick: () => setIsOpen((prevIsOpen) => !prevIsOpen), isExpanded: isOpen, isDisabled: isDisabled, style: { minWidth: '190px' } },
+            toggleLabel,
+            selectedOptionalOperators.length > 0 && (React.createElement(React.Fragment, null,
+                ' ',
+                React.createElement(react_core_1.Badge, { isRead: true }, selectedOptionalOperators.length))))) },
+        React.createElement(react_core_1.SelectList, null, optionalOperatorIds.map((operatorId) => (React.createElement(react_core_1.SelectOption, { id: `optional-operator-${bundleId}-${operatorId}`, key: operatorId, value: operatorId, hasCheckbox: true, isSelected: selectedOptionalOperators.includes(operatorId) }, getOperatorLabel(operatorId)))))));
+};
+exports.default = OptionalOperatorsDropdown;
+//# sourceMappingURL=OptionalOperatorsDropdown.js.map

package/build/cjs/ocm/components/clusterWizard/OptionalOperatorsDropdown.js.map ADDED Viewed

@@ -0,0 +1 @@

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