@openshift-assisted/ui-lib 2.16.3-cim → 2.16.4-cim

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useFeatureDetection = exports.useInfraEnv = exports.useUISettings = exports.useClusterPreflightRequirements = exports.usePullSecret = exports.useInfraEnvId = exports.useUsedClusterNames = exports.useManagedDomains = void 0;
+exports.useFeatureDetection = exports.useInfraEnvHosts = exports.useInfraEnv = exports.useUISettings = exports.useClusterPreflightRequirements = exports.usePullSecret = exports.useInfraEnvId = exports.useUsedClusterNames = exports.useManagedDomains = void 0;
 var useManagedDomains_1 = require("./useManagedDomains");
 Object.defineProperty(exports, "useManagedDomains", { enumerable: true, get: function () { return __importDefault(useManagedDomains_1).default; } });
 var useUsedClusterNames_1 = require("./useUsedClusterNames");
@@ -18,6 +18,8 @@ var useUISettings_1 = require("./useUISettings");
 Object.defineProperty(exports, "useUISettings", { enumerable: true, get: function () { return __importDefault(useUISettings_1).default; } });
 var useInfraEnv_1 = require("./useInfraEnv");
 Object.defineProperty(exports, "useInfraEnv", { enumerable: true, get: function () { return __importDefault(useInfraEnv_1).default; } });
+var useInfraEnvHosts_1 = require("./useInfraEnvHosts");
+Object.defineProperty(exports, "useInfraEnvHosts", { enumerable: true, get: function () { return __importDefault(useInfraEnvHosts_1).default; } });
 var use_feature_detection_1 = require("./use-feature-detection");
 Object.defineProperty(exports, "useFeatureDetection", { enumerable: true, get: function () { return use_feature_detection_1.useFeatureDetection; } });
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAmE;AAA1D,uIAAA,OAAO,OAAqB;AACrC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,qFAA+F;AAAtF,mKAAA,OAAO,OAAmC;AACnD,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe;AAC/B,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/index.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAmE;AAA1D,uIAAA,OAAO,OAAqB;AACrC,6DAAuE;AAA9D,2IAAA,OAAO,OAAuB;AACvC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,qFAA+F;AAAtF,mKAAA,OAAO,OAAmC;AACnD,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe;AAC/B,uDAAiE;AAAxD,qIAAA,OAAO,OAAoB;AACpC,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA"}

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

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importDefault(require("react"));
+const useInfraEnvId_1 = tslib_1.__importDefault(require("./useInfraEnvId"));
+const common_1 = require("../../common");
+const utils_1 = require("../../common/utils");
+const apis_1 = require("../services/apis");
+const InfraEnvIdsCacheService_1 = tslib_1.__importDefault(require("../services/InfraEnvIdsCacheService"));
+const useInfraEnvHosts = (clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion) => {
+    const [hosts, setHosts] = react_1.default.useState();
+    const [error, setError] = react_1.default.useState('');
+    const { infraEnvId, error: infraEnvIdError } = (0, useInfraEnvId_1.default)(clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion);
+    const getHosts = react_1.default.useCallback(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        try {
+            if (infraEnvId) {
+                const { data: hostsData } = yield apis_1.InfraEnvsAPI.getHosts(infraEnvId);
+                setHosts(hostsData);
+            }
+        }
+        catch (e) {
+            // Invalidate this cluster's cached data
+            InfraEnvIdsCacheService_1.default.removeInfraEnvId(clusterId, cpuArchitecture);
+            setError((0, utils_1.getErrorMessage)(e));
+        }
+    }), [clusterId, cpuArchitecture, infraEnvId]);
+    react_1.default.useEffect(() => {
+        if (infraEnvIdError) {
+            setHosts(undefined);
+            setError(infraEnvIdError);
+        }
+        else {
+            if (infraEnvId) {
+                // Initial fetch
+                void getHosts();
+                // Set up polling to refetch hosts periodically
+                const intervalId = setInterval(() => {
+                    void getHosts();
+                }, common_1.DEFAULT_POLLING_INTERVAL);
+                return () => clearInterval(intervalId);
+            }
+        }
+    }, [getHosts, infraEnvId, infraEnvIdError]);
+    return { hosts, error, isLoading: !hosts && !error };
+};
+exports.default = useInfraEnvHosts;
+//# sourceMappingURL=useInfraEnvHosts.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useInfraEnvHosts.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvHosts.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,4EAA4C;AAC5C,yCAAyE;AACzE,8CAAqD;AACrD,2CAAgD;AAChD,0GAA0E;AAG1E,MAAM,gBAAgB,GAAG,CACvB,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB,EACzB,EAAE;IACF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAU,CAAC;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,IAAA,uBAAa,EAC1D,SAAS,EACT,eAAe,EACf,WAAW,EACX,UAAU,EACV,gBAAgB,CACjB,CAAC;IAEF,MAAM,QAAQ,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAC5C,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,mBAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACpE,QAAQ,CAAC,SAAS,CAAC,CAAC;aACrB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACxC,iCAAuB,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACrE,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC;IAE7C,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,eAAe,EAAE;YACnB,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpB,QAAQ,CAAC,eAAe,CAAC,CAAC;SAC3B;aAAM;YACL,IAAI,UAAU,EAAE;gBACd,gBAAgB;gBAChB,KAAK,QAAQ,EAAE,CAAC;gBAEhB,+CAA+C;gBAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;oBAClC,KAAK,QAAQ,EAAE,CAAC;gBAClB,CAAC,EAAE,iCAAwB,CAAC,CAAC;gBAE7B,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;aACxC;SACF;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;AACvD,CAAC,CAAC;AACF,kBAAe,gBAAgB,CAAC"}

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

@@ -4,12 +4,14 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const utils_1 = require("../../common/utils");
 const services_1 = require("../services");
+const use_feature_1 = require("./use-feature");
 function useInfraEnvId(clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion) {
     const [infraEnvId, setInfraEnv] = react_1.default.useState();
     const [error, setError] = react_1.default.useState('');
+    const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
     const findInfraEnvId = react_1.default.useCallback(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
-            const infraEnvId = yield services_1.InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
+            const infraEnvId = yield services_1.InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture, isSingleClusterFeatureEnabled);
             if (infraEnvId && !(infraEnvId instanceof Error)) {
                 setInfraEnv(infraEnvId);
             }
@@ -30,7 +32,14 @@ function useInfraEnvId(clusterId, cpuArchitecture, clusterName, pullSecret, open
         catch (e) {
             setError((0, utils_1.getErrorMessage)(e));
         }
-    }), [clusterId, cpuArchitecture, clusterName, pullSecret, openshiftVersion]);
+    }), [
+        clusterId,
+        cpuArchitecture,
+        isSingleClusterFeatureEnabled,
+        pullSecret,
+        clusterName,
+        openshiftVersion,
+    ]);
     react_1.default.useEffect(() => {
         if (!clusterId) {
             setError('Missing clusterId to load infrastructure environment');

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

@@ -1 +1 @@
-{"version":3,"file":"useInfraEnvId.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvId.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAE1B,8CAAqD;AACrD,0CAA+C;AAO/C,SAAwB,aAAa,CACnC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAEzB,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAkB,CAAC;IACnE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE7C,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAClD,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,2BAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACpF,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,YAAY,KAAK,CAAC,EAAE;gBAChD,WAAW,CAAC,UAAU,CAAC,CAAC;aACzB;iBAAM;gBACL,4CAA4C;gBAC5C,IAAI,UAAU,EAAE;oBACd,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,MAAM,CAAC;wBAC7C,IAAI,EAAE,2BAAgB,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;wBACrE,UAAU;wBACV,SAAS;wBACT,gBAAgB;wBAChB,eAAe,EAAE,eAA0D;qBAC5E,CAAC,CAAC;oBACH,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;iBAC1B;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE5E,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,SAAS,EAAE;YACd,QAAQ,CAAC,sDAAsD,CAAC,CAAC;SAClE;aAAM,IAAI,CAAC,UAAU,EAAE;YACtB,KAAK,cAAc,EAAE,CAAC;SACvB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC;AA1CD,gCA0CC"}
+{"version":3,"file":"useInfraEnvId.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useInfraEnvId.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAE1B,8CAAqD;AACrD,0CAA+C;AAM/C,+CAA2C;AAE3C,SAAwB,aAAa,CACnC,SAAwB,EACxB,eAAgC,EAChC,WAAoB,EACpB,UAAmB,EACnB,gBAAyB;IAEzB,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAkB,CAAC;IACnE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAClD,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,2BAAgB,CAAC,aAAa,CACrD,SAAS,EACT,eAAe,EACf,6BAA6B,CAC9B,CAAC;YACF,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,YAAY,KAAK,CAAC,EAAE;gBAChD,WAAW,CAAC,UAAU,CAAC,CAAC;aACzB;iBAAM;gBACL,4CAA4C;gBAC5C,IAAI,UAAU,EAAE;oBACd,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,MAAM,CAAC;wBAC7C,IAAI,EAAE,2BAAgB,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;wBACrE,UAAU;wBACV,SAAS;wBACT,gBAAgB;wBAChB,eAAe,EAAE,eAA0D;qBAC5E,CAAC,CAAC;oBACH,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;iBAC1B;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC,CAAA,EAAE;QACD,SAAS;QACT,eAAe;QACf,6BAA6B;QAC7B,UAAU;QACV,WAAW;QACX,gBAAgB;KACjB,CAAC,CAAC;IAEH,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,SAAS,EAAE;YACd,QAAQ,CAAC,sDAAsD,CAAC,CAAC;SAClE;aAAM,IAAI,CAAC,UAAU,EAAE;YACtB,KAAK,cAAc,EAAE,CAAC;SACvB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC;AAtDD,gCAsDC"}

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

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const react_1 = require("react");
+const common_1 = require("../../common");
+const useInfraEnvHosts_1 = tslib_1.__importDefault(require("./useInfraEnvHosts"));
+const HostsService_1 = tslib_1.__importDefault(require("../services/HostsService"));
+const utils_1 = require("../../common/utils");
+const use_feature_1 = require("./use-feature");
+const useLateBinding = (cluster) => {
+    const [isBinding, setIsBinding] = (0, react_1.useState)(false);
+    const { addAlert, removeAlert, alerts } = (0, common_1.useAlerts)();
+    const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
+    const { hosts: infraEnvHosts, error: infraEnvError, isLoading: infraEnvLoading, } = (0, useInfraEnvHosts_1.default)(isSingleClusterFeatureEnabled ? cluster.id : '', cluster.cpuArchitecture
+        ? cluster.cpuArchitecture
+        : common_1.CpuArchitecture.USE_DAY1_ARCHITECTURE, cluster.name, undefined, cluster.openshiftVersion);
+    const bindHosts = (0, react_1.useCallback)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        if (infraEnvHosts && !infraEnvError && !infraEnvLoading && isSingleClusterFeatureEnabled) {
+            for (const host of infraEnvHosts) {
+                if (host.clusterId !== cluster.id) {
+                    setIsBinding(true);
+                    try {
+                        const alertKey = (_a = alerts.find((alert) => alert.key === host.id)) === null || _a === void 0 ? void 0 : _a.key;
+                        if (alertKey) {
+                            removeAlert(alertKey);
+                        }
+                        yield HostsService_1.default.bind(host, cluster.id);
+                    }
+                    catch (error) {
+                        addAlert({
+                            title: `Failed to bind host ${host.requestedHostname || ''}`,
+                            message: (0, utils_1.getErrorMessage)(error),
+                            key: host.id,
+                        });
+                    }
+                    finally {
+                        setIsBinding(false);
+                    }
+                }
+            }
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }), [
+        infraEnvHosts,
+        infraEnvError,
+        infraEnvLoading,
+        isSingleClusterFeatureEnabled,
+        cluster.id,
+        addAlert,
+        removeAlert,
+    ]);
+    (0, react_1.useEffect)(() => {
+        if (isSingleClusterFeatureEnabled) {
+            void bindHosts();
+        }
+    }, [isSingleClusterFeatureEnabled, bindHosts]);
+    return infraEnvLoading || isBinding;
+};
+exports.default = useLateBinding;
+//# sourceMappingURL=useLateBinding.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useLateBinding.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useLateBinding.ts"],"names":[],"mappings":";;;AAAA,iCAAyD;AAEzD,yCAA0D;AAC1D,kFAAkD;AAClD,oFAAoD;AACpD,8CAAqD;AACrD,+CAA2C;AAE3C,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAW,EAAE;IACnD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IACtD,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAE9F,MAAM,EACJ,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,eAAe,GAC3B,GAAG,IAAA,0BAAgB,EAClB,6BAA6B,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAC/C,OAAO,CAAC,eAAe;QACrB,CAAC,CAAE,OAAO,CAAC,eAAmC;QAC9C,CAAC,CAAC,wBAAe,CAAC,qBAAqB,EACzC,OAAO,CAAC,IAAI,EACZ,SAAS,EACT,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,GAAS,EAAE;;QACvC,IAAI,aAAa,IAAI,CAAC,aAAa,IAAI,CAAC,eAAe,IAAI,6BAA6B,EAAE;YACxF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;gBAChC,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,EAAE,EAAE;oBACjC,YAAY,CAAC,IAAI,CAAC,CAAC;oBACnB,IAAI;wBACF,MAAM,QAAQ,GAAG,MAAA,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,0CAAE,GAAG,CAAC;wBACpE,IAAI,QAAQ,EAAE;4BACZ,WAAW,CAAC,QAAQ,CAAC,CAAC;yBACvB;wBACD,MAAM,sBAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;qBAC3C;oBAAC,OAAO,KAAK,EAAE;wBACd,QAAQ,CAAC;4BACP,KAAK,EAAE,uBAAuB,IAAI,CAAC,iBAAiB,IAAI,EAAE,EAAE;4BAC5D,OAAO,EAAE,IAAA,uBAAe,EAAC,KAAK,CAAC;4BAC/B,GAAG,EAAE,IAAI,CAAC,EAAE;yBACb,CAAC,CAAC;qBACJ;4BAAS;wBACR,YAAY,CAAC,KAAK,CAAC,CAAC;qBACrB;iBACF;aACF;SACF;QACD,uDAAuD;IACzD,CAAC,CAAA,EAAE;QACD,aAAa;QACb,aAAa;QACb,eAAe;QACf,6BAA6B;QAC7B,OAAO,CAAC,EAAE;QACV,QAAQ;QACR,WAAW;KACZ,CAAC,CAAC;IAEH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,6BAA6B,EAAE;YACjC,KAAK,SAAS,EAAE,CAAC;SAClB;IACH,CAAC,EAAE,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/C,OAAO,eAAe,IAAI,SAAS,CAAC;AACtC,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}

package/build/cjs/ocm/services/BundleService.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const BundleAPI_1 = tslib_1.__importDefault(require("../../common/api/assisted-service/BundleAPI"));
 const BundleService = {
-    listBundles() {
+    listBundles(openshiftVersion, cpuArchitecture, platformType, featureIds) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const { data: bundles } = yield BundleAPI_1.default.list();
+            const { data: bundles } = yield BundleAPI_1.default.list(openshiftVersion, cpuArchitecture, platformType, featureIds);
             return bundles;
         });
     },

package/build/cjs/ocm/services/BundleService.js.map

@@ -1 +1 @@
-{"version":3,"file":"BundleService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/BundleService.ts"],"names":[],"mappings":";;;AAAA,oGAAoE;AAEpE,MAAM,aAAa,GAAG;IACd,WAAW;;YACf,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,mBAAS,CAAC,IAAI,EAAE,CAAC;YACjD,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IACK,qBAAqB,CAAC,UAAkB;;YAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAS,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;CACF,CAAC;AAEF,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"BundleService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/BundleService.ts"],"names":[],"mappings":";;;AAAA,oGAAoE;AAEpE,MAAM,aAAa,GAAG;IACd,WAAW,CACf,gBAAyB,EACzB,eAAwB,EACxB,YAAqB,EACrB,UAAmB;;YAEnB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,mBAAS,CAAC,IAAI,CAC5C,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,UAAU,CACX,CAAC;YACF,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IACK,qBAAqB,CAAC,UAAkB;;YAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAS,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;CACF,CAAC;AAEF,kBAAe,aAAa,CAAC"}

package/build/cjs/ocm/services/ClustersService.js

@@ -11,7 +11,7 @@ const ClustersService = {
     findHost(hosts = [], hostId) {
         return hosts.find((host) => host.id === hostId);
     },
-    create(params, isAssistedMigration) {
+    create(params, isAssistedMigration, isSingleClusterFeatureEnabled) {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (isAssistedMigration) {
@@ -29,7 +29,9 @@ const ClustersService = {
             if (((_a = params.platform) === null || _a === void 0 ? void 0 : _a.type) === 'external' && ((_b = params.platform.external) === null || _b === void 0 ? void 0 : _b.platformName) === 'oci') {
                 infraEnvCreateParams.imageType = 'minimal-iso';
             }
-            yield InfraEnvsService_1.default.create(infraEnvCreateParams);
+            if (!isSingleClusterFeatureEnabled) {
+                yield InfraEnvsService_1.default.create(infraEnvCreateParams);
+            }
             return cluster;
         });
     },
@@ -126,6 +128,12 @@ const ClustersService = {
     updateCustomManifest(existingManifest, updatedManifest, clusterId) {
         return ClustersAPI_1.default.updateCustomManifest(clusterId, this.getUpdateManifestParams(existingManifest, updatedManifest));
     },
+    registerDisconnected(params) {
+        return ClustersAPI_1.default.registerDisconnected({
+            name: params.name,
+            openshiftVersion: params.openshiftVersion,
+        });
+    },
 };
 exports.default = ClustersService;
 //# sourceMappingURL=ClustersService.js.map

package/build/cjs/ocm/services/ClustersService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":";;;AAYA,wEAAqC;AACrC,wGAAwE;AACxE,0EAA0C;AAC1C,kFAAkD;AAClD,6DAIuC;AACvC,8DAAuD;AAEvD,MAAM,eAAe,GAAG;IACtB,QAAQ,CAAC,QAA0B,EAAE,EAAE,MAAkB;QACvD,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;IAClD,CAAC;IAEK,MAAM,CAAC,MAA+C,EAAE,mBAA6B;;;YACzF,IAAI,mBAAmB,EAAE;gBACvB,MAAM,CAAC,IAAI,GAAG,qCAAyB,CAAC;aACzC;YACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAW,CAAC,QAAQ,CAAC,IAAA,iBAAI,EAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;YAC1F,MAAM,oBAAoB,GAAyB;gBACjD,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,YAAY;gBAChC,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,eAAe,EAAE,MAAM,CAAC,eAA0D;gBAClF,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;aAChD,CAAC;YAEF,IAAI,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,IAAI,MAAK,UAAU,IAAI,CAAA,MAAA,MAAM,CAAC,QAAQ,CAAC,QAAQ,0CAAE,YAAY,MAAK,KAAK,EAAE;gBAC5F,oBAAoB,CAAC,SAAS,GAAG,aAAa,CAAC;aAChD;YAED,MAAM,0BAAgB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAEpD,OAAO,OAAO,CAAC;;KAChB;IAEK,MAAM,CAAC,SAAwB;;;YACnC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,EAAE,CAAC;YAElC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpB,MAAM,sBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aACrC;YACD,MAAM,0BAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,qBAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;;KACzC;IAEK,YAAY,CAChB,SAAwB,EACxB,MAAmB;;;YAKnB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAW,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC5E,MAAM,aAAa,GAAuB,OAAO,CAAC,qBAAqB,CAAuB,CAAC;YAC/F,MAAM,QAAQ,GAAuB,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,CAAC,iBAAiB,CAAC,0CAAG,CAAC,CAAC,CAAC;YAClF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;;KAC3B;IAED,MAAM,CAAC,SAAwB,EAAE,WAA4B,EAAE,MAA6B;QAC1F,qBAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,qBAAO,EAAE;YACX,MAAM,GAAG,eAAe,CAAC,iBAAiB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;SACjE;QACD,OAAO,qBAAW,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAEK,OAAO,CAAC,SAAwB,EAAE,WAA4B;;YAClE,IAAI,qBAAO,EAAE;gBACX,MAAM,MAAM,GAAG,eAAe,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBAClE,IAAI,MAAM,CAAC,IAAI,EAAE;oBACf,MAAM,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;iBAC1D;aACF;YAED,OAAO,qBAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;KAAA;IAED,iBAAiB,CACf,WAA4B,EAC5B,MAA6B;QAE7B,MAAM,IAAI,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,GAAG,CAAC,KAAc,EAAE,CAAC;QACrD,IAAI,IAAI,CAAC,QAAQ,CAAC,qBAAS,CAAC,EAAE;YAC5B,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,mCAAuB,CAAC,EAAE;gBAChE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,mCAAuB,CAAC,CAAC;gBACpC,MAAM,CAAC,IAAI,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;iBAAM;gBACL,OAAO,MAAM,CAAC,IAAI,CAAC;aACpB;SACF;aAAM;YACL,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,qBAAS,CAAC,CAAC;YACtB,MAAM,CAAC,IAAI,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;SAC/B;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEK,GAAG,CAAC,SAAwB;;YAChC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3D,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IAED,yBAAyB,CAAC,QAA8B;QACtD,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;SAC5C,CAAC;IACJ,CAAC;IAED,uBAAuB,CACrB,gBAAsC,EACtC,eAAqC;QAErC,OAAO;YACL,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;YACnC,aAAa,EAAE,eAAe,CAAC,MAAM;YACrC,eAAe,EAAE,eAAe,CAAC,QAAQ;YACzC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC;SAC1D,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,SAAiC,EAAE,SAAwB;QAChF,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC1C,OAAO,qBAAW,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,sBAAsB,CAAC,eAAsC,EAAE,SAAwB;QACrF,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChD,OAAO,qBAAW,CAAC,oBAAoB,CACrC,SAAS,EACT,QAAQ,CAAC,MAAM,IAAI,EAAE,EACrB,QAAQ,CAAC,QAAQ,IAAI,EAAE,CACxB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,oBAAoB,CAClB,gBAAsC,EACtC,eAAqC,EACrC,SAAwB;QAExB,OAAO,qBAAW,CAAC,oBAAoB,CACrC,SAAS,EACT,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAChE,CAAC;IACJ,CAAC;CACF,CAAC;AACF,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"ClustersService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClustersService.ts"],"names":[],"mappings":"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"}

package/build/cjs/ocm/services/HostsService.js

@@ -63,6 +63,12 @@ const HostsService = {
         }
         return apis_1.HostsAPI.installHost(host.infraEnvId, host.id);
     },
+    bind(host, clusterId) {
+        if (!host.infraEnvId) {
+            throw new Error(`Cannot bind host ${host.id}, missing infraEnvId`);
+        }
+        return apis_1.HostsAPI.bindHost(host.infraEnvId, host.id, clusterId);
+    },
     installAll(hosts) {
         const promises = [];
         for (const host of hosts) {

package/build/cjs/ocm/services/HostsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"HostsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/HostsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HostsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/HostsService.ts"],"names":[],"mappings":";;AAOA,2CAA4C;AAE5C,MAAM,YAAY,GAAG;IACnB;;;;OAIG;IACH,SAAS,CAAC,KAAa;QACrB,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,KAAK,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,KAAK,EAAE;YACtC,oEAAoE;YACpE,QAAQ,CAAC,IAAI,CAAC,eAAQ,CAAC,UAAU,CAAC,UAAW,EAAE,EAAE,CAAC,CAAC,CAAC;SACrD;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAU,EAAE,MAAwB;QACzC,eAAQ,CAAC,mBAAmB,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAC;SACtE;QAED,OAAO,eAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED,cAAc,CAAC,IAAU,EAAE,WAAyC;QAClE,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,UAAU,CAAC,IAAU,EAAE,WAAyC;QAC9D,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CAAC,IAAU,EAAE,aAA6C;QACrE,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,mBAAmB;IACtF,CAAC;IAED,cAAc,CAAC,IAAU,EAAE,MAA4B,EAAE,WAAqB;QAC5E,MAAM,MAAM,GAAqB;YAC/B,mBAAmB,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;SACzD,CAAC;QACF,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,MAAM,CAAC,mBAAmB,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;SAClE;QACD,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,qBAAqB,CAAC,IAAU,EAAE,WAAiC,EAAE,gBAAyB;QAC5F,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE;YAC/B,mBAAmB,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC;SACjF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAC;SACtE;QAED,OAAO,eAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,IAAU;QACd,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAC;SACrE;QAED,OAAO,eAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,CAAC,IAAU;QAChB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAC;SACvE;QAED,OAAO,eAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,CAAC,IAAU,EAAE,SAAwB;QACvC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,EAAE,sBAAsB,CAAC,CAAC;SACpE;QAED,OAAO,eAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED,UAAU,CAAC,KAAa;QACtB,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;SAC3C;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;CACF,CAAC;AAEF,kBAAe,YAAY,CAAC"}

package/build/cjs/ocm/services/InfraEnvsService.js

@@ -5,11 +5,11 @@ const apis_1 = require("./apis");
 const InfraEnvIdsCacheService_1 = tslib_1.__importDefault(require("./InfraEnvIdsCacheService"));
 const dummyData_1 = require("../components/clusterConfiguration/staticIp/data/dummyData");
 const InfraEnvsService = {
-    getInfraEnvId(clusterId, cpuArchitecture) {
+    getInfraEnvId(clusterId, cpuArchitecture, isSingleClusterFeatureEnabled) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let infraEnvId = InfraEnvIdsCacheService_1.default.getInfraEnvId(clusterId, cpuArchitecture);
             if (infraEnvId instanceof Error) {
-                const { data: infraEnvs } = yield apis_1.InfraEnvsAPI.list(clusterId);
+                const { data: infraEnvs } = yield apis_1.InfraEnvsAPI.list(!isSingleClusterFeatureEnabled ? clusterId : '');
                 if (infraEnvs.length > 0) {
                     InfraEnvIdsCacheService_1.default.updateInfraEnvs(clusterId, infraEnvs);
                     infraEnvId = InfraEnvIdsCacheService_1.default.getInfraEnvId(clusterId, cpuArchitecture);

package/build/cjs/ocm/services/InfraEnvsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"InfraEnvsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/InfraEnvsService.ts"],"names":[],"mappings":";;;AAEA,iCAAsC;AACtC,gGAAsD;AACtD,0FAAmG;AAQnG,MAAM,gBAAgB,GAAG;IACjB,aAAa,CACjB,SAAwB,EACxB,eAAgC;;YAEhC,IAAI,UAAU,GAAG,iCAAa,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACzE,IAAI,UAAU,YAAY,KAAK,EAAE;gBAC/B,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,mBAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC/D,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxB,iCAAa,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBACpD,UAAU,GAAG,iCAAa,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;iBACtE;gBACD,IAAI,CAAC,UAAU,EAAE;oBACf,iCAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;iBAC5D;aACF;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;KAAA;IAEK,WAAW,CAAC,SAAwB,EAAE,eAAgC;;YAC1E,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACpF,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,YAAY,KAAK,CAAC,EAAE;gBAChD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACpD,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,OAAO,IAAI,KAAK,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;aACtE;QACH,CAAC;KAAA;IAEK,iBAAiB,CAAC,SAAwB;;YAC9C,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACpE,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC;KAAA;IAEK,eAAe,CAAC,SAAwB;;YAC5C,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,mBAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/D,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEK,MAAM,CAAC,MAA4B;;YACvC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;aACjE;YAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,mBAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAE/D,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;aACnE;YAED,iCAAa,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5D,OAAO,QAAQ,CAAC;QAClB,CAAC;KAAA;IAEK,SAAS,CAAC,SAAwB;;YACtC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,mBAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE/D,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC1C,OAAO,mBAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,iCAAa,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEzC,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;KAAA;IAEK,wBAAwB,CAAC,SAAwB;;YACrD,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACxE,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC7C,mBAAY,CAAC,MAAM,CAAC,EAAE,EAAE;gBACtB,mBAAmB,EAAE,EAAE;aACxB,CAAC,CACH,CAAC;YACF,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACtC,CAAC;KAAA;IAEK,8BAA8B,CAAC,UAA0B;;YAC7D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAY,CAAC,MAAM,CAAC,UAAU,EAAE;gBACrD,mBAAmB,EAAE,IAAA,iCAAqB,GAAE;aAC7C,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,mBAAmB,CACvB,SAAwB,EACxB,iBAAiC,EACjC,mBAA8C;;YAE9C,8DAA8D;YAC9D,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,MAAM,mBAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE;gBAC7E,mBAAmB;aACpB,CAAC,CAAC;YAEH,MAAM,cAAc,GAAgD,EAAE,CAAC;YACvE,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACxE,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBACjC,2EAA2E;gBAC3E,IAAI,UAAU,KAAK,iBAAiB,EAAE;oBACpC,cAAc,CAAC,IAAI,CACjB,mBAAY,CAAC,MAAM,CAAC,UAAU,EAAE;wBAC9B,mBAAmB;qBACpB,CAAC,CACH,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YAEH,mGAAmG;YACnG,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC3C,OAAO,eAAe,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAED,gBAAgB,CAAC,eAAuB,EAAE,IAAa;QACrD,OAAO,GAAG,IAAI,IAAI,EAAE,cAAc,eAAe,EAAE,CAAC;IACtD,CAAC;CACF,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"InfraEnvsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/InfraEnvsService.ts"],"names":[],"mappings":"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"}

package/lib/cim/components/Agent/AgentStatus.tsx

@@ -7,7 +7,7 @@ import { getAIHosts } from '../helpers/toAssisted';
 import { getAgentStatus, getWizardStepAgentStatus } from '../helpers/status';
 
 import '@patternfly/react-styles/css/utilities/Text/text.css';
-import { AdditionalNTPSourcesDialogToggle } from '../ClusterDeployment/components';
+import { AdditionalNTPSourcesDialogToggle } from '../ClusterDeployment/AdditionalNTPSourcesDialogToggle';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import ValidationsRunningAlert from '../common/ValidationsRunningAlert';
 import { agentStatus } from '../helpers/agentStatus';
@@ -90,7 +90,7 @@ const AgentStatus: React.FC<AgentStatusProps> = ({
             </Button>
           }
         >
-          <Button variant="link" isInline className="pf-v5-u-font-size-xs">
+          <Button variant="link" isInline className="pf-v6-u-font-size-xs">
             {t('ai:Approve host')}
           </Button>
         </Popover>

package/lib/cim/components/Agent/BMCForm.tsx

@@ -10,12 +10,11 @@ import {
   FormGroup,
   Grid,
   GridItem,
-  ModalBoxBody,
-  ModalBoxFooter,
-  Text,
+  Content,
   TextInputTypes,
-  TextVariants,
+  ContentVariants,
 } from '@patternfly/react-core';
+import { ModalBoxBody, ModalBoxFooter } from '@patternfly/react-core/deprecated';
 import {
   Formik,
   FormikProps,
@@ -81,10 +80,10 @@ const MacMapping = () => {
         render={({ push, remove }) => (
           <Grid hasGutter>
             <GridItem span={5}>
-              <Text component={TextVariants.small}>MAC address</Text>
+              <Content component={ContentVariants.small}>MAC address</Content>
             </GridItem>
             <GridItem span={5}>
-              <Text component={TextVariants.small}>NIC</Text>
+              <Content component={ContentVariants.small}>NIC</Content>
             </GridItem>
             {field.value.map((mac, index) => {
               const macField = `macMapping[${index}].macAddress`;

package/lib/cim/components/Agent/MinimalHWRequirements.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { Button, ButtonVariant, Modal, ModalVariant } from '@patternfly/react-core';
+import { Button, ButtonVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 
 import { ConfigMapK8sResource } from '../../types';

package/lib/cim/components/ClusterDeployment/{clusterDetails/ACMClusterDeploymentDetailsStep.tsx → ACMClusterDeploymentDetailsStep.tsx}

@@ -2,13 +2,13 @@ import React from 'react';
 import { Formik, FormikProps, useFormikContext } from 'formik';
 import { Stack } from '@patternfly/react-core';
 import noop from 'lodash-es/noop.js';
-import { ClusterDetailsValues, getRichTextValidation } from '../../../../common';
-import { ClusterImageSetK8sResource } from '../../../types/k8s/cluster-image-set';
+import { ClusterDetailsValues, getRichTextValidation } from '../../../common';
+import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
+import ClusterDeploymentDetailsForm from './ClusterDeploymentDetailsForm';
 import { useDetailsFormik } from './ClusterDeploymentDetailsStep';
 import { ClusterDetailsFormFieldsProps } from './ClusterDetailsFormFields';
-import { OsImage } from '../../../types';
-import { getOCPVersions } from '../../helpers';
-import { ClusterDeploymentDetailsForm } from './ClusterDeploymentDetailsForm';
+import { OsImage } from '../../types';
+import { getOCPVersions } from '../helpers';
 
 type DetailsFormBodyProps = {
   clusterImages: ClusterImageSetK8sResource[];
@@ -49,7 +49,7 @@ type ACMClusterDeploymentDetailsStepProps = DetailsFormBodyProps & {
   formRef: React.Ref<FormikProps<ClusterDetailsValues>>;
 };
 
-export const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepProps> = ({
+const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepProps> = ({
   clusterImages,
   formRef,
   usedClusterNames,
@@ -80,3 +80,5 @@ export const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetai
     </Formik>
   );
 };
+
+export default ACMClusterDeploymentDetailsStep;

package/lib/cim/components/ClusterDeployment/{components/AdditionalNTPSourcesDialogToggle.tsx → AdditionalNTPSourcesDialogToggle.tsx}

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 // TODO we should use hostValidationFailureHints instead of passing this 'action' which is actually a hint
 export const AdditionalNTPSourcesDialogToggle: React.FC = () => {

package/lib/cim/components/ClusterDeployment/{clusterDetails/ClusterDeploymentDetailsForm.tsx → ClusterDeploymentDetailsForm.tsx}

@@ -8,26 +8,18 @@ import {
   useWizardFooter,
   WizardFooter,
 } from '@patternfly/react-core';
-import {
-  AgentClusterInstallK8sResource,
-  ClusterDeploymentK8sResource,
-  OsImage,
-} from '../../../types';
-import { ClusterImageSetK8sResource } from '../../../types/k8s/cluster-image-set';
-import { getOCPVersions, getSelectedVersion } from '../../helpers';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { AgentClusterInstallK8sResource, ClusterDeploymentK8sResource, OsImage } from '../../types';
+import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
+import { getOCPVersions, getSelectedVersion } from '../helpers';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import {
   ClusterDetailsFormFields,
   ClusterDetailsFormFieldsProps,
 } from './ClusterDetailsFormFields';
 import { useFormikContext } from 'formik';
-import {
-  ClusterDetailsValues,
-  CpuArchitecture,
-  SupportedCpuArchitecture,
-} from '../../../../common';
-import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
-import { ValidationSection } from '../components/ValidationSection';
+import { ClusterDetailsValues, CpuArchitecture, SupportedCpuArchitecture } from '../../../common';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
+import { ValidationSection } from './components/ValidationSection';
 import { toNumber } from 'lodash-es';
 
 type ClusterDeploymentDetailsFormProps = {
@@ -82,7 +74,7 @@ export const ClusterDeploymentDetailsFormWrapper = ({
       {syncError && (
         <StackItem>
           <ValidationSection currentStepId={'networking'} hosts={[]}>
-            <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
               {syncError}
             </Alert>
           </ValidationSection>
@@ -92,7 +84,7 @@ export const ClusterDeploymentDetailsFormWrapper = ({
   );
 };
 
-export const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
+const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
   agentClusterInstall,
   clusterDeployment,
   clusterImages,
@@ -158,3 +150,5 @@ export const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsForm
     </>
   );
 };
+
+export default ClusterDeploymentDetailsForm;

package/lib/cim/components/ClusterDeployment/{clusterDetails/ClusterDeploymentDetailsStep.tsx → ClusterDeploymentDetailsStep.tsx}

@@ -11,22 +11,21 @@ import {
   ClusterDetailsValues,
   getRichTextValidation,
   OpenshiftVersionOptionType,
-} from '../../../../common';
+} from '../../../common';
 
-import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from '../types';
-import { getAICluster, getNetworkType, getOCPVersions } from '../../helpers';
+import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from './types';
+import { getAICluster, getNetworkType, getOCPVersions } from '../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   InfraEnvK8sResource,
-} from '../../../types';
-import {
-  ClusterDeploymentDetailsForm,
+} from '../../types';
+import ClusterDeploymentDetailsForm, {
   ClusterDeploymentDetailsFormWrapper,
 } from './ClusterDeploymentDetailsForm';
-import { getGridSpans } from '../helpers';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { getGridSpans } from './helpers';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type UseDetailsFormikArgs = {
   usedClusterNames: string[];
@@ -97,7 +96,7 @@ export const useDetailsFormik = ({
   return [initialValues, validationSchema];
 };
 
-export const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps> = ({
+const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps> = ({
   clusterImages,
   clusterDeployment,
   agentClusterInstall,
@@ -160,3 +159,5 @@ export const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStep
     </Formik>
   );
 };
+
+export default ClusterDeploymentDetailsStep;

package/lib/cim/components/ClusterDeployment/{hostDiscovery/ClusterDeploymentHostDiscoveryTable.tsx → ClusterDeploymentHostDiscoveryTable.tsx}

@@ -6,11 +6,11 @@ import {
   agentStatusColumn,
   useAgentsTable,
   canChangeHostname,
-} from '../../Agent/tableUtils';
+} from '../Agent/tableUtils';
 import HostsTable, {
   DefaultExpandComponent,
   HostsTableEmptyState,
-} from '../../../../common/components/hosts/HostsTable';
+} from '../../../common/components/hosts/HostsTable';
 import {
   cpuCoresColumn,
   discoveredAtColumn,
@@ -18,22 +18,22 @@ import {
   hostnameColumn,
   memoryColumn,
   roleColumn,
-} from '../../../../common/components/hosts/tableUtils';
+} from '../../../common/components/hosts/tableUtils';
 import {
   DiscoveryTroubleshootingModal,
   ChangeHostnameAction,
   MassChangeHostnameModal,
   TableToolbar,
-} from '../../../../common';
-import { ClusterDeploymentHostDiscoveryTableProps } from '../types';
-import MassApproveAgentModal from '../../modals/MassApproveAgentModal';
-import MassApproveAction from '../../modals/MassApproveAction';
-import { usePagination } from '../../../../common/components/hosts/usePagination';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { ExpandComponent } from '../../Agent/AgentsSelectionTable';
-import { HostsTableDetailContextProvider } from '../../../../common/components/hosts/HostsTableDetailContext';
-import { agentStatus, bmhStatus } from '../../helpers/agentStatus';
-import { onAgentChangeHostname } from '../../helpers';
+} from '../../../common';
+import { ClusterDeploymentHostDiscoveryTableProps } from '../ClusterDeployment/types';
+import MassApproveAgentModal from '../modals/MassApproveAgentModal';
+import MassApproveAction from '../modals/MassApproveAction';
+import { usePagination } from '../../../common/components/hosts/usePagination';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ExpandComponent } from '../Agent/AgentsSelectionTable';
+import { HostsTableDetailContextProvider } from '../../../common/components/hosts/HostsTableDetailContext';
+import { agentStatus, bmhStatus } from '../helpers/agentStatus';
+import { onAgentChangeHostname } from '../helpers';
 
 const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscoveryTableProps> = ({
   agents,