@openshift-assisted/ui-lib 2.52.1 → 2.53.0

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

@@ -7,48 +7,63 @@ 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 MAX_BIND_RETRY_ATTEMPTS = 3;
 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 bindFailureCounts = (0, react_1.useRef)(new Map());
+    const alertsRef = (0, react_1.useRef)(alerts);
+    alertsRef.current = alerts;
     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 bindSingleHost = (0, react_1.useCallback)((host) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
+        setIsBinding(true);
+        try {
+            yield HostsService_1.default.bind(host, cluster.id);
+            // Binding succeeded: reset the failure counter and clear any alert that
+            // was shown after previous exhausted retries.
+            bindFailureCounts.current.delete(host.id);
+            const alertKey = (_a = alertsRef.current.find((alert) => alert.key === host.id)) === null || _a === void 0 ? void 0 : _a.key;
+            if (alertKey) {
+                removeAlert(alertKey);
+            }
+        }
+        catch (error) {
+            const failureCount = ((_b = bindFailureCounts.current.get(host.id)) !== null && _b !== void 0 ? _b : 0) + 1;
+            bindFailureCounts.current.set(host.id, failureCount);
+            // Suppress transient errors (e.g. 5xx during self-healing) and only
+            // surface the alert once silent retries have been exhausted.
+            if (failureCount >= MAX_BIND_RETRY_ATTEMPTS) {
+                addAlert({
+                    title: `Failed to bind host ${host.requestedHostname || ''}`,
+                    message: (0, utils_1.getErrorMessage)(error),
+                    key: host.id,
+                });
+            }
+        }
+        finally {
+            setIsBinding(false);
+        }
+    }), [cluster.id, addAlert, removeAlert]);
     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);
-                    }
-                }
+        if (!infraEnvHosts || infraEnvError || infraEnvLoading || !isSingleClusterFeatureEnabled) {
+            return;
+        }
+        for (const host of infraEnvHosts) {
+            if (host.clusterId !== cluster.id) {
+                yield bindSingleHost(host);
             }
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }), [
         infraEnvHosts,
         infraEnvError,
         infraEnvLoading,
         isSingleClusterFeatureEnabled,
         cluster.id,
-        addAlert,
-        removeAlert,
+        bindSingleHost,
     ]);
     (0, react_1.useEffect)(() => {
         if (isSingleClusterFeatureEnabled) {

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

@@ -1 +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,CAAC;YACzF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,EAAE,EAAE,CAAC;oBAClC,YAAY,CAAC,IAAI,CAAC,CAAC;oBACnB,IAAI,CAAC;wBACH,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,CAAC;4BACb,WAAW,CAAC,QAAQ,CAAC,CAAC;wBACxB,CAAC;wBACD,MAAM,sBAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC5C,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,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;oBACL,CAAC;4BAAS,CAAC;wBACT,YAAY,CAAC,KAAK,CAAC,CAAC;oBACtB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;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,CAAC;YAClC,KAAK,SAAS,EAAE,CAAC;QACnB,CAAC;IACH,CAAC,EAAE,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC,CAAC;IAE/C,OAAO,eAAe,IAAI,SAAS,CAAC;AACtC,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"useLateBinding.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useLateBinding.ts"],"names":[],"mappings":";;;AAAA,iCAAiE;AAEjE,yCAA0D;AAC1D,kFAAkD;AAClD,oFAAoD;AACpD,8CAAqD;AACrD,+CAA2C;AAE3C,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC,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;IAC9F,MAAM,iBAAiB,GAAG,IAAA,cAAM,EAAsB,IAAI,GAAG,EAAE,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,IAAA,cAAM,EAAC,MAAM,CAAC,CAAC;IACjC,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC;IAE3B,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,cAAc,GAAG,IAAA,mBAAW,EAChC,CAAO,IAA+C,EAAE,EAAE;;QACxD,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,sBAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1C,wEAAwE;YACxE,8CAA8C;YAC9C,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,QAAQ,GAAG,MAAA,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC,0CAAE,GAAG,CAAC;YAC/E,IAAI,QAAQ,EAAE,CAAC;gBACb,WAAW,CAAC,QAAQ,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,CAAC,MAAA,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACvE,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;YAErD,oEAAoE;YACpE,6DAA6D;YAC7D,IAAI,YAAY,IAAI,uBAAuB,EAAE,CAAC;gBAC5C,QAAQ,CAAC;oBACP,KAAK,EAAE,uBAAuB,IAAI,CAAC,iBAAiB,IAAI,EAAE,EAAE;oBAC5D,OAAO,EAAE,IAAA,uBAAe,EAAC,KAAK,CAAC;oBAC/B,GAAG,EAAE,IAAI,CAAC,EAAE;iBACb,CAAC,CAAC;YACL,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAA,EACD,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,CACpC,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,GAAS,EAAE;QACvC,IAAI,CAAC,aAAa,IAAI,aAAa,IAAI,eAAe,IAAI,CAAC,6BAA6B,EAAE,CAAC;YACzF,OAAO;QACT,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,EAAE,EAAE,CAAC;gBAClC,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC,CAAA,EAAE;QACD,aAAa;QACb,aAAa;QACb,eAAe;QACf,6BAA6B;QAC7B,OAAO,CAAC,EAAE;QACV,cAAc;KACf,CAAC,CAAC;IAEH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,6BAA6B,EAAE,CAAC;YAClC,KAAK,SAAS,EAAE,CAAC;QACnB,CAAC;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/hooks/usePullSecret.js

@@ -7,8 +7,8 @@ const api_1 = require("../../common/api");
 const common_1 = require("../../common");
 const access_token_api_1 = require("../../common/api/accounts-management-service/access-token-api");
 /**
- * Standalone / disconnected UI: bridge serves GET /pull-secret from a mounted manifest
- * (see assisted-disconnected-ui proxy).
+ * Standalone / disconnected UI: proxy serves GET /api/pull-secret with pull-secret JSON
+ * `{ "auths": … }` extracted from the mounted Secret manifest (see assisted-disconnected-ui proxy).
  */
 function fetchPullSecretFromBridge() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {

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

@@ -26,7 +26,7 @@ const useUISettings = (clusterId) => {
                 try {
                     const { data: customManifests } = yield apis_1.ClustersAPI.getManifests(clusterId);
                     const mockUISettings = {
-                        customManifestsAdded: !!customManifests.length,
+                        customManifestsAdded: customManifests.some((manifest) => manifest.manifestSource === 'user'),
                     };
                     setUISettings(mockUISettings);
                 }

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

@@ -1 +1 @@
-{"version":3,"file":"useUISettings.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useUISettings.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAE1B,0CAA+C;AAC/C,2CAA+C;AAG/C,MAAM,aAAa,GAAG,CAAC,SAAyB,EAAE,EAAE;IAClD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAoB,CAAC;IACvE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,EAAE,CAAC,CAAC;IAErD,MAAM,gBAAgB,GAAG,eAAK,CAAC,WAAW,CACxC,CAAO,WAA6B,EAAE,EAAE;QACtC,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,eAAe,mCAAQ,UAAU,GAAK,WAAW,CAAE,CAAC;YAC1D,IAAI,CAAC;gBACH,MAAM,2BAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBAC1D,aAAa,CAAC,eAAe,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC,CAAA,EACD,CAAC,SAAS,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,qBAAqB,GAAG,GAAS,EAAE;YACvC,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC;oBACH,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,MAAM,kBAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE5E,MAAM,cAAc,GAAqB;wBACvC,oBAAoB,EAAE,CAAC,CAAC,eAAe,CAAC,MAAM;qBAC/C,CAAC;oBAEF,aAAa,CAAC,cAAc,CAAC,CAAC;gBAChC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,QAAQ,CAAC,yDAAyD,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;QACH,CAAC,CAAA,CAAC;QAEF,MAAM,eAAe,GAAG,GAAS,EAAE;YACjC,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBACzD,aAAa,CAAC,QAAQ,CAAC,CAAC;gBAC1B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,qBAAqB,EAAE,CAAC;gBAChC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,EAAE,CAAC,CAAC;YACpB,CAAC;YACD,UAAU,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CAAA,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,KAAK,eAAe,EAAE,CAAC;QACzB,CAAC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,eAAK,CAAC,OAAO,CAC/B,GAAG,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,EACxD,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAC/C,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"useUISettings.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useUISettings.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAE1B,0CAA+C;AAC/C,2CAA+C;AAG/C,MAAM,aAAa,GAAG,CAAC,SAAyB,EAAE,EAAE;IAClD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAoB,CAAC;IACvE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,EAAE,CAAC,CAAC;IAErD,MAAM,gBAAgB,GAAG,eAAK,CAAC,WAAW,CACxC,CAAO,WAA6B,EAAE,EAAE;QACtC,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,eAAe,mCAAQ,UAAU,GAAK,WAAW,CAAE,CAAC;YAC1D,IAAI,CAAC;gBACH,MAAM,2BAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBAC1D,aAAa,CAAC,eAAe,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC,CAAA,EACD,CAAC,SAAS,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,qBAAqB,GAAG,GAAS,EAAE;YACvC,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC;oBACH,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,MAAM,kBAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE5E,MAAM,cAAc,GAAqB;wBACvC,oBAAoB,EAAE,eAAe,CAAC,IAAI,CACxC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,KAAK,MAAM,CACjD;qBACF,CAAC;oBAEF,aAAa,CAAC,cAAc,CAAC,CAAC;gBAChC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,QAAQ,CAAC,yDAAyD,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;QACH,CAAC,CAAA,CAAC;QAEF,MAAM,eAAe,GAAG,GAAS,EAAE;YACjC,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,MAAM,2BAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBACzD,aAAa,CAAC,QAAQ,CAAC,CAAC;gBAC1B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,qBAAqB,EAAE,CAAC;gBAChC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,EAAE,CAAC,CAAC;YACpB,CAAC;YACD,UAAU,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CAAA,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,KAAK,eAAe,EAAE,CAAC;QACzB,CAAC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,eAAK,CAAC,OAAO,CAC/B,GAAG,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,EACxD,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAC/C,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}

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

@@ -85,7 +85,7 @@ const ClusterDetailsService = {
         return params;
     },
     getClusterDetailsInitialValues(_a) {
-        var { cluster, infraEnv, urlSearchParams } = _a, args = tslib_1.__rest(_a, ["cluster", "infraEnv", "urlSearchParams"]);
+        var { cluster, infraEnv, urlSearchParams, isSingleClusterFeatureEnabled } = _a, args = tslib_1.__rest(_a, ["cluster", "infraEnv", "urlSearchParams", "isSingleClusterFeatureEnabled"]);
         const values = (0, common_1.getClusterDetailsInitialValues)(Object.assign({ cluster }, args));
         const cpuArchitecture = infraEnv
             ? getExistingClusterCpuArchitecture(infraEnv)
@@ -93,7 +93,9 @@ const ClusterDetailsService = {
         const hostsNetworkConfigurationType = (infraEnv === null || infraEnv === void 0 ? void 0 : infraEnv.staticNetworkConfig)
             ? types_1.HostsNetworkConfigurationType.STATIC
             : types_1.HostsNetworkConfigurationType.DHCP;
-        return Object.assign(Object.assign({}, values), { cpuArchitecture,
+        const platform = isSingleClusterFeatureEnabled && !cluster ? 'none' : values.platform;
+        return Object.assign(Object.assign({}, values), { platform,
+            cpuArchitecture,
             hostsNetworkConfigurationType, isCMNSupported: true, isSNODevPreview: false });
     },
 };

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

@@ -1 +1 @@
-{"version":3,"file":"ClusterDetailsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClusterDetailsService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/ClusterDetailsService.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,4FAA4D;AAC5D,mCAKiB;AACjB,0FAAmG;AACnG,0CAA2C;AAC3C,qEAAqE;AAOrE,0EAA0C;AAE1C,MAAM,4BAA4B,GAAG,CAAC,eAAuB,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,MAAM,CAAC;IAC1D,OAAO,iBAAiB,CAAC,CAAC,CAAC,wBAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,kDAAyB,GAAE,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,iCAAiC,GAAG,CAAC,QAAkB,EAAE,EAAE;IAC/D,OAAO,QAAQ,CAAC,eAAe,IAAI,IAAA,kDAAyB,GAAE,CAAC;AACjE,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAiB,EAAE,QAAmB,EAAsB,EAAE;;IACzF,MAAM,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,0CAAE,IAAI,EAAE,CAAC;IACzD,MAAM,SAAS,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,oBAAoB,0CAAE,IAAI,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,WAAW,IAAI,SAAS,CAAC;IACxC,OAAO,MAAM,IAAI,SAAS,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG;IAC5B,sBAAsB,CACpB,MAA+B,EAC/B,QAAmB;;QAEnB,MAAM,MAAM,GAA4C;YACtD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,iBAAiB,EAAE,IAAA,kBAAQ,EAAC,MAAM,CAAC,iBAAiB,CAAC;YACrD,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,eAAe,EAAE,MAAM,CAAC,eAAyC;YACjE,cAAc,EAAE,+BAAqB,CAAC,uBAAuB,CAAC,MAAM,CAAC;YACrE,QAAQ,kBACN,IAAI,EAAE,MAAM,CAAC,QAAQ,IAClB,CAAC,MAAM,CAAC,QAAQ,KAAK,UAAU;gBAChC,CAAC,CAAC;oBACE,QAAQ,EAAE;wBACR,YAAY,EAAE,KAAK;wBACnB,sBAAsB,EAAE,UAAU;qBACnC;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC,CACR;SACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAC3B,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACtC,CAAC;QAED,IAAI,MAAM,CAAC,6BAA6B,KAAK,qCAA6B,CAAC,MAAM,EAAE,CAAC;YAClF,MAAM,CAAC,mBAAmB,GAAG,IAAA,iCAAqB,GAAE,CAAC;QACvD,CAAC;QAED,IAAI,aAAO,EAAE,CAAC;YACZ,MAAM,CAAC,IAAI,GAAG,kBAAS,CAAC;QAC1B,CAAC;QAED,IAAI,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,IAAI,MAAK,MAAM,EAAE,CAAC;YACrC,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,MAAM,GAAG,GAAG,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,mBAAmB,GAAG,GAAG,CAAC;QACnC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sBAAsB,CACpB,MAA+B,EAC/B,QAAsB,EACtB,OAAiB,EACjB,QAAmB;QAEnB,MAAM,MAAM,GAA+B;YACzC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,aAAa,EAAE,MAAM,CAAC,aAAa;SACpC,CAAC;QAEF,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACxC,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,CAAC,QAAQ;gBACb,QAAQ,KAAK,UAAU;oBACrB,CAAC,CAAC;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,sBAAsB,EAAE,UAAU,EAAE;qBACtE;oBACH,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,GAAG,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnD,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,mBAAmB,GAAG,GAAG,CAAC;QACnC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,8BAA8B,CAAC,EAc9B;YAd8B,EAC7B,OAAO,EACP,QAAQ,EACR,eAAe,EACf,6BAA6B,OAU9B,EATI,IAAI,sBALsB,2EAM9B,CADQ;QAUP,MAAM,MAAM,GAAG,IAAA,uCAA8B,kBAC3C,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,eAAe,GAAG,QAAQ;YAC9B,CAAC,CAAC,iCAAiC,CAAC,QAAQ,CAAC;YAC7C,CAAC,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;QAElD,MAAM,6BAA6B,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,mBAAmB;YACjE,CAAC,CAAC,qCAA6B,CAAC,MAAM;YACtC,CAAC,CAAC,qCAA6B,CAAC,IAAI,CAAC;QAEvC,MAAM,QAAQ,GACZ,6BAA6B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,MAAuB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEzF,uCACK,MAAM,KACT,QAAQ;YACR,eAAe;YACf,6BAA6B,EAC7B,cAAc,EAAE,IAAI,EACpB,eAAe,EAAE,KAAK,IACtB;IACJ,CAAC;CACF,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}

package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizard.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Grid, GridItem, Wizard, WizardStep } from '@patternfly/react-core';
-import { AlertsContextProvider, LoadingState } from '../../../common';
+import { AlertsContextProvider, ErrorState, LoadingState } from '../../../common';
 import { ClusterDeploymentWizardProps } from './types';
 import { ACMFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { YamlPreview, useYamlPreview } from '../YamlPreview';
@@ -14,6 +14,7 @@ import { ClusterDeploymentHostsDiscoveryStep } from './hostDiscovery';
 import { ClusterDeploymentNetworkingStep } from './networking';
 import { ClusterDeploymentReviewStep } from './review';
 import { ClusterDeploymentCustomManifestsStep } from './customManifests';
+import { useAgents } from '../../hooks';
 
 export const ClusterDeploymentWizard = ({
   className,
@@ -27,7 +28,6 @@ export const ClusterDeploymentWizard = ({
   fetchSecret,
   clusterDeployment,
   agentClusterInstall,
-  agents,
   bareMetalHosts,
   clusterImages,
   aiConfigMap,
@@ -54,12 +54,20 @@ export const ClusterDeploymentWizard = ({
     fetchKlusterletAddonConfig,
   });
 
+  const [agents, loaded, error] = useAgents({ isList: true });
+
   // if initialStep is set, it is either 'host-selection' or 'host-discovery', both at index 4
   // if initialStep is not set, start at 'cluster-details' which is at index 2
   const startIndex = initialStep ? 4 : 2;
   const stepNames = wizardStepNames(t);
   const isAIFlow = !!infraEnv;
 
+  if (!loaded) {
+    return <LoadingState />;
+  } else if (error) {
+    return <ErrorState />;
+  }
+
   return (
     <Grid style={{ height: '100%' }}>
       <GridItem span={isPreviewOpen ? 7 : 12}>

package/lib/cim/components/ClusterDeployment/NetworkConfiguration.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { useFormikContext } from 'formik';
+import isCIDR from 'is-cidr';
 import { Checkbox, Grid } from '@patternfly/react-core';
 import { NetworkConfigurationValues } from '../../../common/types/clusters';
 import {
@@ -20,15 +21,17 @@ import {
   NETWORK_TYPE_OVN,
 } from '../../../common';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { NetworkTypeControlGroup } from '../../../common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup';
+import { NetworkTypeDropDown } from './networking/NetworkTypeDropdown';
 import { ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
 
 export type NetworkConfigurationProps = VirtualIPControlGroupProps & {
   defaultNetworkSettings: Pick<
     ClusterDefaultConfig,
     | 'clusterNetworksIpv4'
+    | 'clusterNetworksIpv6'
     | 'clusterNetworksDualstack'
     | 'serviceNetworksIpv4'
+    | 'serviceNetworksIpv6'
     | 'serviceNetworksDualstack'
   >;
   hideManagedNetworking?: boolean;
@@ -63,11 +66,23 @@ const NetworkConfiguration = ({
       setAdvanced(checked);
 
       if (!checked) {
-        setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv4);
-        setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv4);
+        const primaryCidr = values.machineNetworks?.[0]?.cidr;
+        const useIPv6Defaults = primaryCidr && isCIDR.v6(primaryCidr);
+        setFieldValue(
+          'clusterNetworks',
+          useIPv6Defaults
+            ? defaultNetworkSettings.clusterNetworksIpv6
+            : defaultNetworkSettings.clusterNetworksIpv4,
+        );
+        setFieldValue(
+          'serviceNetworks',
+          useIPv6Defaults
+            ? defaultNetworkSettings.serviceNetworksIpv6
+            : defaultNetworkSettings.serviceNetworksIpv4,
+        );
       }
     },
-    [setFieldValue, defaultNetworkSettings],
+    [setFieldValue, defaultNetworkSettings, values.machineNetworks],
   );
 
   // Auto-enable advanced networking when switching to dual-stack
@@ -77,6 +92,37 @@ const NetworkConfiguration = ({
     }
   }, [isDualStack, toggleAdvConfiguration]);
 
+  // Sync cluster/service networks to match primary machine network family when single-stack (fix mismatch)
+  useEffect(() => {
+    if (isDualStack) {
+      return;
+    }
+    const primaryCidr = values.machineNetworks?.[0]?.cidr;
+    const firstClusterCidr = values.clusterNetworks?.[0]?.cidr;
+    if (!primaryCidr || !firstClusterCidr) {
+      return;
+    }
+    const primaryIsIPv6 = isCIDR.v6(primaryCidr);
+    const primaryIsIPv4 = isCIDR.v4(primaryCidr);
+    const clusterIsIPv6 = isCIDR.v6(firstClusterCidr);
+    const clusterIsIPv4 = isCIDR.v4(firstClusterCidr);
+
+    if (primaryIsIPv4 && clusterIsIPv6) {
+      setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv4);
+      setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv4);
+    } else if (primaryIsIPv6 && clusterIsIPv4) {
+      setFieldValue('clusterNetworks', defaultNetworkSettings.clusterNetworksIpv6);
+      setFieldValue('serviceNetworks', defaultNetworkSettings.serviceNetworksIpv6);
+    }
+  }, [
+    isDualStack,
+    values.machineNetworks,
+    values.clusterNetworks,
+    values.serviceNetworks,
+    setFieldValue,
+    defaultNetworkSettings,
+  ]);
+
   const isUserManagedNetworking = values.managedNetworkingType === 'userManaged';
   const primaryMachineNetwork = values.machineNetworks?.[0]?.cidr;
 
@@ -117,6 +163,7 @@ const NetworkConfiguration = ({
     validateField,
     primaryMachineNetwork,
   ]);
+
   return (
     <Grid hasGutter>
       {!hideManagedNetworking && <ManagedNetworkingControlGroup />}
@@ -128,17 +175,18 @@ const NetworkConfiguration = ({
         />
       )}
 
+      <NetworkTypeDropDown isSDNSelectable={isSDNSelectable} />
+
       {(!isMultiNodeCluster || !isUserManagedNetworking) && (
         <StackTypeControlGroup
           clusterId={cluster.id}
           isDualStackSelectable={isDualStackSelectable}
           hostSubnets={hostSubnets}
           defaultNetworkValues={defaultNetworkSettings}
+          allowSingleStackIPv6
         />
       )}
 
-      <NetworkTypeControlGroup isSDNSelectable={isSDNSelectable} />
-
       {!(isMultiNodeCluster && isUserManagedNetworking) && (
         <AvailableSubnetsControl
           clusterId={cluster.id}
@@ -148,6 +196,7 @@ const NetworkConfiguration = ({
           openshiftVersion={cluster.openshiftVersion}
           hosts={cluster.hosts || []}
           isMultiNodeCluster={isMultiNodeCluster}
+          allowSingleStackIPv6
         />
       )}
 

package/lib/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.tsx

@@ -11,7 +11,12 @@ import {
   GridItem,
 } from '@patternfly/react-core';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
-import { ClusterWizardStepHeader, useTranslation } from '../../../../common';
+import {
+  ClusterWizardStepHeader,
+  CustomManifestsAlert,
+  isThirdPartyCNI,
+  useTranslation,
+} from '../../../../common';
 import { AgentClusterInstallK8sResource, AgentClusterInstallModel } from '../../../types';
 import { ConfigMapForm, CustomManifestFormType } from './ConfigMapForm';
 import { appendPatch } from '../../../utils';
@@ -31,6 +36,9 @@ export const ClusterDeploymentCustomManifestsStep = ({
       })) || [],
   };
 
+  const usesExternalPlatform = agentClusterInstall.spec?.platformType === 'External';
+  const usesThirdPartyCNI = isThirdPartyCNI(agentClusterInstall.spec?.networking.networkType);
+
   const validationSchema = Yup.lazy((values: CustomManifestFormType) =>
     Yup.object<CustomManifestFormType>({
       configMaps: Yup.array()
@@ -54,7 +62,7 @@ export const ClusterDeploymentCustomManifestsStep = ({
           }),
         )
         .min(
-          agentClusterInstall.spec?.platformType === 'External' ? 1 : 0,
+          usesExternalPlatform || usesThirdPartyCNI ? 1 : 0,
           t('ai:At least one config map is required'),
         ),
     }),
@@ -114,6 +122,14 @@ export const ClusterDeploymentCustomManifestsStep = ({
           </Content>
         </Alert>
       </GridItem>
+      {(usesExternalPlatform || usesThirdPartyCNI) && (
+        <GridItem>
+          <CustomManifestsAlert
+            usesExternalPlatform={usesExternalPlatform}
+            usesThirdPartyCNI={usesThirdPartyCNI}
+          />
+        </GridItem>
+      )}
       <GridItem>
         <Formik
           initialValues={initialValues}

package/lib/cim/components/ClusterDeployment/networkConfigurationValidation.ts

@@ -1,36 +1,50 @@
+import isCIDR from 'is-cidr';
 import {
   Cluster,
   ClusterDefaultConfig,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { NetworkConfigurationValues } from '../../../common/types/clusters';
 import { isDualStack } from '../../../common/components/clusterConfiguration/utils';
-import { DUAL_STACK, IPV4_STACK, NETWORK_TYPE_OVN } from '../../../common';
+import { DUAL_STACK, NETWORK_TYPE_OVN, SINGLE_STACK } from '../../../common';
 
 export const getNetworkInitialValues = (
   cluster: Cluster,
   defaultNetworkSettings: Pick<
     ClusterDefaultConfig,
     | 'clusterNetworksIpv4'
+    | 'clusterNetworksIpv6'
     | 'clusterNetworksDualstack'
     | 'serviceNetworksIpv4'
+    | 'serviceNetworksIpv6'
     | 'serviceNetworksDualstack'
   >,
 ): NetworkConfigurationValues => {
   const managedNetworkingType = cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged';
   const isDualStackCluster = isDualStack(cluster);
+  const primaryMachineCidr = cluster.machineNetworks?.[0]?.cidr;
+  const isSingleStackIPv6 =
+    !isDualStackCluster && primaryMachineCidr && isCIDR.v6(primaryMachineCidr);
 
   let clusterNetworks = cluster.clusterNetworks;
   if (!cluster.clusterNetworks?.length) {
-    clusterNetworks = isDualStackCluster
-      ? defaultNetworkSettings.clusterNetworksDualstack
-      : defaultNetworkSettings.clusterNetworksIpv4;
+    if (isDualStackCluster) {
+      clusterNetworks = defaultNetworkSettings.clusterNetworksDualstack;
+    } else if (isSingleStackIPv6) {
+      clusterNetworks = defaultNetworkSettings.clusterNetworksIpv6;
+    } else {
+      clusterNetworks = defaultNetworkSettings.clusterNetworksIpv4;
+    }
   }
 
   let serviceNetworks = cluster.serviceNetworks;
   if (!serviceNetworks?.length) {
-    serviceNetworks = isDualStackCluster
-      ? defaultNetworkSettings.serviceNetworksDualstack
-      : defaultNetworkSettings.serviceNetworksIpv4;
+    if (isDualStackCluster) {
+      serviceNetworks = defaultNetworkSettings.serviceNetworksDualstack;
+    } else if (isSingleStackIPv6) {
+      serviceNetworks = defaultNetworkSettings.serviceNetworksIpv6;
+    } else {
+      serviceNetworks = defaultNetworkSettings.serviceNetworksIpv4;
+    }
   }
 
   const machineNetworks = cluster.machineNetworks || [];
@@ -45,6 +59,6 @@ export const getNetworkInitialValues = (
     vipDhcpAllocation: cluster.vipDhcpAllocation,
     managedNetworkingType,
     networkType: cluster.networkType || NETWORK_TYPE_OVN,
-    stackType: isDualStackCluster ? DUAL_STACK : IPV4_STACK,
+    stackType: isDualStackCluster ? DUAL_STACK : SINGLE_STACK,
   };
 };

package/lib/cim/components/ClusterDeployment/networking/NetworkTypeDropdown.tsx

@@ -0,0 +1,81 @@
+import React from 'react';
+import { useField, useFormikContext } from 'formik';
+import {
+  Dropdown,
+  DropdownItem,
+  FormGroup,
+  MenuToggle,
+  MenuToggleElement,
+  Stack,
+  StackItem,
+} from '@patternfly/react-core';
+import { getFieldId } from '../../../../common/components/ui';
+import type { NetworkConfigurationValues } from '../../../../common/types/clusters';
+import {
+  NETWORK_TYPE_LABELS,
+  NETWORK_TYPE_SDN,
+  isThirdPartyCNI,
+} from '../../../../common/types/networkType';
+import { useTranslation } from '../../../../common/hooks';
+import { ThirdPartyCNIBanner } from '../../../../common';
+
+export const NetworkTypeDropDown = ({ isSDNSelectable }: { isSDNSelectable: boolean }) => {
+  const { t } = useTranslation();
+  const [field, , { setValue }] = useField<string>('networkType');
+  const [isOpen, setOpen] = React.useState(false);
+  const { values } = useFormikContext<NetworkConfigurationValues>();
+  const fieldId = getFieldId('networkType', 'input');
+
+  const showThirdPartyBanner = isThirdPartyCNI(values.networkType);
+
+  const currentDisplayValue = NETWORK_TYPE_LABELS(t)[field.value];
+  const dropdownItems = Object.entries(NETWORK_TYPE_LABELS(t)).map(([value, label]) => (
+    <DropdownItem
+      key={value}
+      id={value}
+      value={value}
+      isAriaDisabled={value === NETWORK_TYPE_SDN && !isSDNSelectable}
+    >
+      {label}
+    </DropdownItem>
+  ));
+
+  const onSelect = (_event?: React.MouseEvent<Element, MouseEvent>, nextValue?: string): void => {
+    if (nextValue) {
+      setValue(nextValue);
+    }
+    setOpen(false);
+  };
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      ref={toggleRef}
+      onClick={() => setOpen(!isOpen)}
+      isExpanded={isOpen}
+      id={fieldId}
+      className="pf-v6-u-w-100"
+      style={{ minWidth: '100%' }}
+    >
+      {currentDisplayValue || t('ai:Network type')}
+    </MenuToggle>
+  );
+
+  return (
+    <Stack hasGutter>
+      <StackItem>
+        <FormGroup fieldId={fieldId} label={t('ai:Network type')} id={`form-control__${fieldId}`}>
+          <Dropdown
+            id={`${fieldId}-dropdown`}
+            onOpenChange={(open: boolean) => setOpen(open)}
+            onSelect={onSelect}
+            toggle={toggle}
+            isOpen={isOpen}
+          >
+            {dropdownItems}
+          </Dropdown>
+        </FormGroup>
+      </StackItem>
+      {showThirdPartyBanner && <ThirdPartyCNIBanner />}
+    </Stack>
+  );
+};

package/lib/cim/components/ClusterDeployment/review/ClusterDeploymentReviewStep.tsx

@@ -1,3 +1,4 @@
+import * as React from 'react';
 import {
   Alert,
   AlertVariant,
@@ -7,7 +8,7 @@ import {
   useWizardFooter,
   WizardFooter,
 } from '@patternfly/react-core';
-import * as React from 'react';
+import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 import { canNextFromReviewStep } from '../wizardTransition';
 import {
   AgentClusterInstallK8sResource,
@@ -42,7 +43,6 @@ import { useTranslation } from '../../../../common/hooks/use-translation-wrapper
 import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
 import { ReviewConfigMapsTable } from './ReviewConfigMapsTable';
 import { ValidationSection } from '../components/ValidationSection';
-import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 
 type ClusterDeploymentReviewStepProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -77,7 +77,8 @@ export const ClusterDeploymentReviewStep = ({
 
   const canContinue = canNextFromReviewStep(agentClusterInstall, clusterAgents);
   const { t } = useTranslation();
-  const onNext = async () => {
+
+  const onNext = React.useCallback(async () => {
     clearAlerts();
     setSubmitting(true);
     try {
@@ -88,18 +89,21 @@ export const ClusterDeploymentReviewStep = ({
     } finally {
       setSubmitting(false);
     }
-  };
+  }, [addAlert, clearAlerts, onFinish, t]);
 
-  const footer = (
-    <WizardFooter
-      activeStep={activeStep}
-      onNext={onNext}
-      isNextDisabled={isSubmitting || !canContinue || !!syncError}
-      nextButtonText={t('ai:Install cluster')}
-      nextButtonProps={{ isLoading: isSubmitting }}
-      onBack={goToPrevStep}
-      onClose={close}
-    />
+  const footer = React.useMemo(
+    () => (
+      <WizardFooter
+        activeStep={activeStep}
+        onNext={onNext}
+        isNextDisabled={isSubmitting || !canContinue || !!syncError}
+        nextButtonText={t('ai:Install cluster')}
+        nextButtonProps={{ isLoading: isSubmitting }}
+        onBack={goToPrevStep}
+        onClose={close}
+      />
+    ),
+    [activeStep, canContinue, close, goToPrevStep, isSubmitting, onNext, syncError, t],
   );
   useWizardFooter(footer);
 

package/lib/cim/components/ClusterDeployment/types.ts

@@ -141,7 +141,6 @@ export type ClusterDeploymentWizardProps = {
 
   clusterDeployment: ClusterDeploymentK8sResource;
   agentClusterInstall: AgentClusterInstallK8sResource;
-  agents: AgentK8sResource[];
   bareMetalHosts: BareMetalHostK8sResource[];
   aiConfigMap?: ConfigMapK8sResource;
   infraEnv?: InfraEnvK8sResource;