@openshift-assisted/ui-lib 2.14.3-cim → 2.14.5-cim

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

@@ -11,7 +11,7 @@ const global_success_color_100_1 = require("@patternfly/react-tokens/dist/js/glo
 const global_info_color_100_1 = require("@patternfly/react-tokens/dist/js/global_info_color_100");
 const common_1 = require("../../../../common");
 const ClusterWizardContext_1 = require("../../clusterWizard/ClusterWizardContext");
-const OpenshiftVersionsContext_1 = require("../../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../../clusterWizard/OpenShiftVersionsContext");
 const constants_1 = require("../../clusterWizard/constants");
 const wizardTransition_1 = require("../../clusterWizard/wizardTransition");
 const featureSupportLevels_1 = require("../../featureSupportLevels");
@@ -48,7 +48,7 @@ const getCheckIcon = (validationStatuses) => {
 const PreflightChecksDetailCollapsed = ({ cluster }) => {
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
     const featureSupportLevelData = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
-    const { isSupportedOpenShiftVersion } = (0, OpenshiftVersionsContext_1.useOpenshiftVersionsContext)();
+    const { isSupportedOpenShiftVersion } = (0, OpenShiftVersionsContext_1.useOpenShiftVersionsContext)();
     const { isFullySupported } = react_1.default.useMemo(() => (0, ReviewClusterFeatureSupportLevels_1.getSupportLevelInfo)(cluster, featureSupportLevelData, isSupportedOpenShiftVersion, t), [cluster, featureSupportLevelData, t, isSupportedOpenShiftVersion]);
     const supportLevelIcon = isFullySupported ? (react_1.default.createElement(check_circle_icon_1.CheckCircleIcon, { color: global_success_color_100_1.global_success_color_100.value })) : (react_1.default.createElement(info_circle_icon_1.InfoCircleIcon, { color: global_info_color_100_1.global_info_color_100.value }));
     const clusterValidations = react_1.default.useMemo(() => Object.values((0, utils_1.stringToJSON)(cluster.validationsInfo) || {})

package/build/cjs/ocm/components/clusterDetail/AssistedInstallerDetailCard.js

@@ -22,7 +22,7 @@ const BackButton_1 = require("../ui/Buttons/BackButton");
 const featureSupportLevels_1 = require("../featureSupportLevels");
 const hooks_1 = require("../../hooks");
 const use_feature_detection_1 = require("../../hooks/use-feature-detection");
-const OpenshiftVersionsContext_1 = require("../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
 const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
 const LoadingCard = () => (react_1.default.createElement(react_core_1.Card, { "data-testid": "ai-cluster-details-card" },
     react_1.default.createElement(react_core_1.CardHeader, null,
@@ -68,7 +68,7 @@ const AssistedInstallerDetailCard = ({ aiClusterId, allEnabledFeatures, history,
     const isOutdatedClusterData = uiState === common_1.ResourceUIState.POLLING_ERROR;
     return (react_1.default.createElement(react_router_dom_v5_compat_1.unstable_HistoryRouter, { history: history, basename: basename },
         react_1.default.createElement(common_1.AlertsContextProvider, null,
-            react_1.default.createElement(OpenshiftVersionsContext_1.OpenshiftVersionsContextProvider, null,
+            react_1.default.createElement(OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider, null,
                 react_1.default.createElement(SentryErrorMonitorContextProvider_1.SentryErrorMonitorContextProvider, null,
                     react_1.default.createElement(ModalDialogsContext_1.ModalDialogsContextProvider, null,
                         react_1.default.createElement(ClusterDefaultConfigurationContext_1.ClusterDefaultConfigurationProvider, { loadingUI: react_1.default.createElement(LoadingCard, null), errorUI: react_1.default.createElement(LoadingDefaultConfigFailedCard, null) },

package/build/cjs/ocm/components/clusterDetail/AssistedInstallerExtraDetailCard.js

@@ -13,7 +13,7 @@ const useInfraEnv_1 = tslib_1.__importDefault(require("../../hooks/useInfraEnv")
 const hooks_1 = require("../../hooks");
 const selectors_1 = require("../../store/slices/current-cluster/selectors");
 const use_feature_detection_1 = require("../../hooks/use-feature-detection");
-const OpenshiftVersionsContext_1 = require("../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
 const AssistedInstallerExtraDetailCard = ({ allEnabledFeatures, }) => {
     var _a;
     (0, use_feature_detection_1.useFeatureDetection)(allEnabledFeatures);
@@ -33,7 +33,7 @@ const AssistedInstallerExtraDetailCard = ({ allEnabledFeatures, }) => {
 const Wrapper = (props) => {
     return (react_1.default.createElement(react_redux_1.Provider, { store: store_1.storeDay1 },
         react_1.default.createElement(common_1.AlertsContextProvider, null,
-            react_1.default.createElement(OpenshiftVersionsContext_1.OpenshiftVersionsContextProvider, null,
+            react_1.default.createElement(OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider, null,
                 react_1.default.createElement(AssistedInstallerExtraDetailCard, Object.assign({}, props))))));
 };
 exports.default = Wrapper;

package/build/cjs/ocm/components/clusterDetail/OpenShiftVersionDetail.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const common_1 = require("../../../common");
-const OpenshiftVersionsContext_1 = require("../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
 const exclamation_triangle_icon_1 = require("@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon");
 const react_core_1 = require("@patternfly/react-core");
 const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
@@ -19,7 +19,7 @@ const UnsupportedVersion = ({ version }) => {
 };
 const OpenShiftVersionDetail = ({ cluster }) => {
     const { openshiftVersion } = cluster;
-    const { isSupportedOpenShiftVersion, latestVersions: versions } = (0, OpenshiftVersionsContext_1.useOpenshiftVersionsContext)();
+    const { isSupportedOpenShiftVersion, latestVersions: versions } = (0, OpenShiftVersionsContext_1.useOpenShiftVersionsContext)();
     const isSupported = isSupportedOpenShiftVersion(openshiftVersion);
     const version = react_1.default.useMemo(() => {
         return (0, common_1.getOpenshiftVersionText)({

package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js

@@ -11,7 +11,7 @@ const slice_1 = require("../../store/slices/current-cluster/slice");
 const ClusterWizardContext_1 = require("./ClusterWizardContext");
 const wizardTransition_1 = require("./wizardTransition");
 const hooks_2 = require("../../hooks");
-const OpenshiftVersionsContext_1 = require("./OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("./OpenShiftVersionsContext");
 const ClusterDetailsForm_1 = tslib_1.__importDefault(require("./ClusterDetailsForm"));
 const ClusterWizardNavigation_1 = tslib_1.__importDefault(require("./ClusterWizardNavigation"));
 const services_1 = require("../../services");
@@ -23,7 +23,7 @@ const ClusterDetails = ({ cluster, infraEnv }) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const { usedClusterNames } = (0, hooks_2.useUsedClusterNames)((cluster === null || cluster === void 0 ? void 0 : cluster.id) || '');
     const pullSecret = (0, hooks_1.usePullSecret)();
-    const { error: errorOCPVersions, loading: loadingOCPVersions, latestVersions: versions, } = (0, OpenshiftVersionsContext_1.useOpenshiftVersionsContext)();
+    const { error: errorOCPVersions, loading: loadingOCPVersions, latestVersions: versions, } = (0, OpenShiftVersionsContext_1.useOpenShiftVersionsContext)();
     const location = (0, react_router_dom_v5_compat_1.useLocation)();
     const handleClusterUpdate = react_1.default.useCallback((clusterId, params, addCustomManifests) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         clearAlerts();

package/build/cjs/ocm/components/clusterWizard/{OpenshiftVersionsContext.js → OpenShiftVersionsContext.js}

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useOpenshiftVersionsContext = exports.OpenshiftVersionsContextProvider = void 0;
+exports.useOpenShiftVersionsContext = exports.OpenShiftVersionsContextProvider = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const api_1 = require("../../../common/api");
 const apis_1 = require("../../services/apis");
 const utils_1 = require("../../../common/utils");
 const supportedVersionLevels = ['production', 'maintenance'];
-const OpenshiftVersionsContext = (0, react_1.createContext)(null);
-const OpenshiftVersionsContextProvider = ({ children }) => {
+const OpenShiftVersionsContext = (0, react_1.createContext)(null);
+const OpenShiftVersionsContextProvider = ({ children }) => {
     const [allVersions, setAllVersions] = react_1.default.useState([]);
     const [latestVersions, setLatestVersions] = react_1.default.useState([]);
     const [error, setError] = react_1.default.useState();
@@ -72,7 +72,7 @@ const OpenshiftVersionsContextProvider = ({ children }) => {
         const matchingVersion = findVersionItemByVersion(version);
         return (_a = matchingVersion === null || matchingVersion === void 0 ? void 0 : matchingVersion.cpuArchitectures) !== null && _a !== void 0 ? _a : [];
     }, [findVersionItemByVersion]);
-    return (react_1.default.createElement(OpenshiftVersionsContext.Provider, { value: {
+    return (react_1.default.createElement(OpenShiftVersionsContext.Provider, { value: {
             allVersions,
             latestVersions,
             loading: !error && ((allVersions === null || allVersions === void 0 ? void 0 : allVersions.length) === 0 || (latestVersions === null || latestVersions === void 0 ? void 0 : latestVersions.length) === 0),
@@ -81,13 +81,13 @@ const OpenshiftVersionsContextProvider = ({ children }) => {
             getCpuArchitectures,
         } }, children));
 };
-exports.OpenshiftVersionsContextProvider = OpenshiftVersionsContextProvider;
-const useOpenshiftVersionsContext = () => {
-    const context = react_1.default.useContext(OpenshiftVersionsContext);
+exports.OpenShiftVersionsContextProvider = OpenShiftVersionsContextProvider;
+const useOpenShiftVersionsContext = () => {
+    const context = react_1.default.useContext(OpenShiftVersionsContext);
     if (!context) {
-        throw new Error('useOpenshiftVersionsContext must be used within OpenshiftVersionsContext');
+        throw new Error('useOpenShiftVersionsContext must be used within OpenShiftVersionsContext');
     }
     return context;
 };
-exports.useOpenshiftVersionsContext = useOpenshiftVersionsContext;
-//# sourceMappingURL=OpenshiftVersionsContext.js.map
+exports.useOpenShiftVersionsContext = useOpenShiftVersionsContext;
+//# sourceMappingURL=OpenShiftVersionsContext.js.map

package/build/cjs/ocm/components/clusterWizard/{OpenshiftVersionsContext.js.map → OpenShiftVersionsContext.js.map}

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

package/build/cjs/ocm/components/clusterWizard/index.js

@@ -3,11 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClusterWizardContextProvider = exports.NewClusterWizard = exports.ClusterDetailsForm = void 0;
+exports.OpenShiftVersionsContextProvider = exports.ClusterWizardContextProvider = exports.NewClusterWizard = exports.ClusterDetailsForm = void 0;
 var ClusterDetailsForm_1 = require("./ClusterDetailsForm");
 Object.defineProperty(exports, "ClusterDetailsForm", { enumerable: true, get: function () { return __importDefault(ClusterDetailsForm_1).default; } });
 var NewClusterWizard_1 = require("./NewClusterWizard");
 Object.defineProperty(exports, "NewClusterWizard", { enumerable: true, get: function () { return __importDefault(NewClusterWizard_1).default; } });
 var ClusterWizardContextProvider_1 = require("./ClusterWizardContextProvider");
 Object.defineProperty(exports, "ClusterWizardContextProvider", { enumerable: true, get: function () { return __importDefault(ClusterWizardContextProvider_1).default; } });
+var OpenShiftVersionsContext_1 = require("./OpenShiftVersionsContext");
+Object.defineProperty(exports, "OpenShiftVersionsContextProvider", { enumerable: true, get: function () { return OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider; } });
 //# sourceMappingURL=index.js.map

package/build/cjs/ocm/components/clusterWizard/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/index.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB;AACtC,uDAAiE;AAAxD,qIAAA,OAAO,OAAoB;AACpC,+EAAyF;AAAhF,6JAAA,OAAO,OAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/index.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB;AACtC,uDAAiE;AAAxD,qIAAA,OAAO,OAAoB;AACpC,+EAAyF;AAAhF,6JAAA,OAAO,OAAgC;AAChD,uEAA8E;AAArE,4IAAA,gCAAgC,OAAA"}

package/build/cjs/ocm/components/clusters/ClusterPage.js

@@ -30,7 +30,7 @@ const BackButton_1 = require("../ui/Buttons/BackButton");
 const featureSupportLevels_1 = require("../featureSupportLevels");
 const hooks_1 = require("../../hooks");
 const AssistedInstallerHeader_1 = require("./AssistedInstallerHeader");
-const OpenshiftVersionsContext_1 = require("../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
 const ClusterPageGeneric = ({ clusterId, showBreadcrumbs = false, }) => {
     var _a;
     if (!clusterId) {
@@ -50,7 +50,7 @@ const ClusterPageGeneric = ({ clusterId, showBreadcrumbs = false, }) => {
                 return Promise.resolve();
             });
             return (react_1.default.createElement(common_1.AddHostsContextProvider, { cluster: cluster, resetCluster: onReset },
-                react_1.default.createElement(OpenshiftVersionsContext_1.OpenshiftVersionsContextProvider, null,
+                react_1.default.createElement(OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider, null,
                     react_1.default.createElement(AddHosts_1.AddHosts, null))));
         }
         else if ([
@@ -100,7 +100,7 @@ const ClusterPageGeneric = ({ clusterId, showBreadcrumbs = false, }) => {
                 react_1.default.createElement(SentryErrorMonitorContextProvider_1.SentryErrorMonitorContextProvider, null,
                     react_1.default.createElement(ModalDialogsContext_1.ModalDialogsContextProvider, null,
                         react_1.default.createElement(ClusterDefaultConfigurationContext_1.ClusterDefaultConfigurationProvider, { loadingUI: react_1.default.createElement(ClusterLoading_1.default, null), errorUI: react_1.default.createElement(ClusterPageErrors_1.ClusterUiError, null) },
-                            react_1.default.createElement(OpenshiftVersionsContext_1.OpenshiftVersionsContextProvider, null,
+                            react_1.default.createElement(OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider, null,
                                 react_1.default.createElement(featureSupportLevels_1.NewFeatureSupportLevelProvider, { loadingUi: react_1.default.createElement(ClusterLoading_1.default, null), cluster: cluster, cpuArchitecture: infraEnv.cpuArchitecture, openshiftVersion: cluster.openshiftVersion, platformType: (_a = cluster.platform) === null || _a === void 0 ? void 0 : _a.type },
                                     getContent(cluster, infraEnv),
                                     uiState === common_1.ResourceUIState.POLLING_ERROR && react_1.default.createElement(ClusterPollingErrorModal_1.default, null),

package/build/cjs/ocm/components/clusters/NewClusterPage.js

@@ -15,13 +15,13 @@ const ClusterPageErrors_1 = require("./ClusterPageErrors");
 const featureSupportLevels_1 = require("../featureSupportLevels");
 const AssistedInstallerHeader_1 = require("./AssistedInstallerHeader");
 const ModalDialogsContext_1 = require("../hosts/ModalDialogsContext");
-const OpenshiftVersionsContext_1 = require("../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
 const NewClusterPageGeneric = ({ pageTitleSection }) => {
     return (react_1.default.createElement(common_1.AlertsContextProvider, null,
         react_1.default.createElement(SentryErrorMonitorContextProvider_1.SentryErrorMonitorContextProvider, null,
             react_1.default.createElement(ModalDialogsContext_1.ModalDialogsContextProvider, null,
                 react_1.default.createElement(ClusterDefaultConfigurationContext_1.ClusterDefaultConfigurationProvider, { loadingUI: react_1.default.createElement(ClusterLoading_1.default, null), errorUI: react_1.default.createElement(ClusterPageErrors_1.ClusterUiError, null) },
-                    react_1.default.createElement(OpenshiftVersionsContext_1.OpenshiftVersionsContextProvider, null,
+                    react_1.default.createElement(OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider, null,
                         react_1.default.createElement(featureSupportLevels_1.NewFeatureSupportLevelProvider, { loadingUi: react_1.default.createElement(ClusterLoading_1.default, null) },
                             pageTitleSection,
                             react_1.default.createElement(react_core_1.PageSection, { variant: react_core_1.PageSectionVariants.light, isFilled: true },

package/build/cjs/ocm/components/featureSupportLevels/FeatureSupportLevelProvider.js

@@ -9,13 +9,13 @@ const featureStateUtils_1 = require("./featureStateUtils");
 const useInfraEnv_1 = tslib_1.__importDefault(require("../../hooks/useInfraEnv"));
 const newFeatureSupportLevels_1 = require("../../../common/components/newFeatureSupportLevels");
 const useSupportLevelsAPI_1 = tslib_1.__importDefault(require("../../hooks/useSupportLevelsAPI"));
-const OpenshiftVersionsContext_1 = require("../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
 const getFeatureSupported = (featureSupportLevels, featureId) => {
     return featureSupportLevels && (0, featureStateUtils_1.isFeatureSupportedAndAvailable)(featureSupportLevels[featureId]);
 };
 exports.getFeatureSupported = getFeatureSupported;
 const NewFeatureSupportLevelProvider = ({ cluster, children, loadingUi, cpuArchitecture, openshiftVersion, platformType, }) => {
-    const { loading: loadingOCPVersions } = (0, OpenshiftVersionsContext_1.useOpenshiftVersionsContext)();
+    const { loading: loadingOCPVersions } = (0, OpenShiftVersionsContext_1.useOpenShiftVersionsContext)();
     const pullSecret = (0, hooks_1.usePullSecret)();
     const { infraEnv, isLoading: isInfraEnvLoading } = (0, useInfraEnv_1.default)((cluster === null || cluster === void 0 ? void 0 : cluster.id) || '', (cluster === null || cluster === void 0 ? void 0 : cluster.cpuArchitecture)
         ? cluster.cpuArchitecture

package/build/cjs/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.js

@@ -14,7 +14,7 @@ const common_1 = require("../../../common");
 const utils_1 = require("../../../common/components/newFeatureSupportLevels/utils");
 const WithErrorBoundary_1 = require("../../../common/components/ErrorHandling/WithErrorBoundary");
 const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
-const OpenshiftVersionsContext_1 = require("../clusterWizard/OpenshiftVersionsContext");
+const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
 const newFeatureSupportLevels_1 = require("../../../common/components/newFeatureSupportLevels");
 const getFeatureReviewText = (featureId) => {
     switch (featureId) {
@@ -93,7 +93,7 @@ exports.getSupportLevelInfo = getSupportLevelInfo;
 const SupportLevel = ({ cluster }) => {
     const { t } = (0, use_translation_wrapper_1.useTranslation)();
     const featureSupportLevelData = (0, newFeatureSupportLevels_1.useNewFeatureSupportLevel)();
-    const { isSupportedOpenShiftVersion } = (0, OpenshiftVersionsContext_1.useOpenshiftVersionsContext)();
+    const { isSupportedOpenShiftVersion } = (0, OpenShiftVersionsContext_1.useOpenShiftVersionsContext)();
     const { limitedClusterFeatures, hasSupportedVersion, isFullySupported } = react_1.default.useMemo(() => (0, exports.getSupportLevelInfo)(cluster, featureSupportLevelData, isSupportedOpenShiftVersion, t), [cluster, featureSupportLevelData, t, isSupportedOpenShiftVersion]);
     if (!limitedClusterFeatures) {
         return null;

package/build/cjs/ocm/components/featureSupportLevels/featureStateUtils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLvmsIncompatibleWithOdfReason = exports.getOpenShiftAIIncompatibleWithLvmsReason = exports.getOdfIncompatibleWithLvmsReason = exports.hostsNetworkConfigurationDisabledReason = exports.isFeatureSupportedAndAvailable = exports.getNewFeatureDisabledReason = exports.getLvmIncompatibleWithCnvReason = exports.getCnvIncompatibleWithLvmReason = exports.clusterExistsReason = void 0;
 const common_1 = require("../../../common");
 const constants_1 = require("../clusterConfiguration/platformIntegration/constants");
-const CNV_OPERATOR_LABEL = 'Openshift Virtualization';
+const CNV_OPERATOR_LABEL = 'OpenShift Virtualization';
 const LVMS_OPERATOR_LABEL = 'Logical Volume Manager Storage';
 const LVM_OPERATOR_LABEL = 'Logical Volume Manager';
 const ODF_OPERATOR_LABEL = 'OpenShift Data Foundation';

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

@@ -31,13 +31,13 @@ const OperatorsService = {
         return Object.values(enabledOlmOperatorsByName);
     },
     /**
-     * Depending on the Openshift version and certain selected operators, the
+     * Depending on the OpenShift version and certain selected operators, the
      * Backend can activate some other operators.
      * We need to synchronise them back to the form
      */
     syncOperators(uiOperators, updatedOperators) {
         const updates = {};
-        // LVM operator can be automatically selected depending on Openshift version + other operators
+        // LVM operator can be automatically selected depending on OpenShift version + other operators
         const lvmPrevInactive = (uiOperators === null || uiOperators === void 0 ? void 0 : uiOperators.find((op) => op.name === common_1.OPERATOR_NAME_LVM)) === undefined;
         const lvmNowActive = (updatedOperators === null || updatedOperators === void 0 ? void 0 : updatedOperators.find((op) => op.name === common_1.OPERATOR_NAME_LVM)) !== undefined;
         if (lvmPrevInactive && lvmNowActive) {

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

@@ -20,6 +20,7 @@ import { useFormikContext } from 'formik';
 import { ClusterDetailsValues, CpuArchitecture, SupportedCpuArchitecture } from '../../../common';
 import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 import { ValidationSection } from './components/ValidationSection';
+import { toNumber } from 'lodash-es';
 
 type ClusterDeploymentDetailsFormProps = {
   clusterImages: ClusterImageSetK8sResource[];
@@ -92,11 +93,16 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
   osImages,
 }) => {
   const { t } = useTranslation();
-  const ocpVersions = React.useMemo(
+  const versions = React.useMemo(
     () => getOCPVersions(clusterImages, isNutanix, osImages),
     [clusterImages, isNutanix, osImages],
   );
 
+  const allVersions = React.useMemo(
+    () => getOCPVersions(clusterImages, isNutanix, osImages, true),
+    [clusterImages, isNutanix, osImages],
+  );
+
   const forceOpenshiftVersion = agentClusterInstall
     ? getSelectedVersion(clusterImages, agentClusterInstall)
     : undefined;
@@ -104,22 +110,17 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
 
   const { values } = useFormikContext<ClusterDetailsValues>();
 
-  const cpuArchitectures = React.useMemo(() => {
+  const [cpuArchitectures, allowHighlyAvailable] = React.useMemo(() => {
     const cpuArchitectures = [CpuArchitecture.x86, CpuArchitecture.ARM, CpuArchitecture.s390x];
-    if (!osImages) {
-      return cpuArchitectures;
-    }
-
-    const openshiftVersion = ocpVersions
-      .find((ver) => ver.value === values.openshiftVersion)
-      ?.version.split('.')
-      .slice(0, 2)
-      .join('.');
+    const version = allVersions.find((ver) => ver.value === values.openshiftVersion);
+    const isMulti = version?.cpuArchitectures?.[0] === CpuArchitecture.MULTI;
 
-    return osImages
-      .filter((osImage) => osImage.openshiftVersion === openshiftVersion)
-      .map((osImage) => osImage.cpuArchitecture as SupportedCpuArchitecture);
-  }, [osImages, ocpVersions, values.openshiftVersion]);
+    const highlyAvailableSupported = toNumber(version?.version?.split('.')?.[1]) >= 18;
+    return [
+      (isMulti ? cpuArchitectures : version?.cpuArchitectures) as SupportedCpuArchitecture[],
+      highlyAvailableSupported && !isMulti,
+    ];
+  }, [allVersions, values.openshiftVersion]);
 
   return (
     <>
@@ -134,12 +135,14 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
       )}
       <StackItem>
         <ClusterDetailsFormFields
-          versions={ocpVersions}
+          versions={versions}
+          allVersions={allVersions}
           isEditFlow={isEditFlow}
           forceOpenshiftVersion={forceOpenshiftVersion}
           extensionAfter={extensionAfter}
           isNutanix={isNutanix}
           cpuArchitectures={cpuArchitectures}
+          allowHighlyAvailable={allowHighlyAvailable}
         />
       </StackItem>
     </>

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

@@ -2,10 +2,10 @@ import * as React from 'react';
 import { Alert, AlertVariant, FlexItem, Form } from '@patternfly/react-core';
 import { useFormikContext } from 'formik';
 
+import { OpenShiftVersionDropdown, OpenShiftVersionModal } from '../../../common';
 import { StaticTextField } from '../../../common/components/ui/StaticTextField';
-import OpenShiftVersionSelect from '../../../common/components/clusterConfiguration/OpenShiftVersionSelect';
 import { PullSecret } from '../../../common/components/clusters';
-import { OpenshiftVersionOptionType } from '../../../common/types';
+import { OpenshiftVersionOptionType, SupportedCpuArchitecture } from '../../../common/types';
 import {
   InputField,
   RichInputField,
@@ -14,15 +14,17 @@ import {
 import { ClusterDetailsValues } from '../../../common/components/clusterWizard/types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import CpuArchitectureDropdown from '../common/CpuArchitectureDropdown';
-import { getNetworkType } from '../helpers';
 import ControlPlaneNodesDropdown from '../../../common/components/clusterConfiguration/ControlPlaneNodesDropdown';
+
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
   forceOpenshiftVersion?: string;
   extensionAfter?: { [key: string]: React.ReactElement };
   versions: OpenshiftVersionOptionType[];
+  allVersions: OpenshiftVersionOptionType[];
   isNutanix?: boolean;
-  cpuArchitectures?: string[];
+  cpuArchitectures?: SupportedCpuArchitecture[];
+  allowHighlyAvailable?: boolean;
 };
 
 export const BaseDnsHelperText: React.FC<{ name?: string; baseDnsDomain?: string }> = ({
@@ -46,13 +48,40 @@ export const BaseDnsHelperText: React.FC<{ name?: string; baseDnsDomain?: string
 export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> = ({
   isEditFlow,
   versions,
+  allVersions,
   forceOpenshiftVersion,
   extensionAfter,
   isNutanix,
   cpuArchitectures,
+  allowHighlyAvailable,
 }) => {
-  const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
+  const { values } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain } = values;
+  const [openshiftVersionModalOpen, setOpenshiftVersionModalOpen] = React.useState(false);
+
+  const selectOptions = React.useMemo(
+    () =>
+      versions.map((version) => ({
+        label: version.label,
+        value: version.value,
+      })),
+    [versions],
+  );
+
+  const additionalSelectOptions = React.useMemo(() => {
+    if (
+      values.customOpenshiftSelect &&
+      !selectOptions.some((option) => option.value === values.customOpenshiftSelect?.value)
+    ) {
+      return [
+        {
+          value: values.customOpenshiftSelect.value,
+          label: values.customOpenshiftSelect.label,
+        },
+      ];
+    }
+    return [];
+  }, [selectOptions, values.customOpenshiftSelect]);
 
   const nameInputRef = React.useRef<HTMLInputElement>();
   React.useEffect(() => {
@@ -102,15 +131,27 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
           {t('ai:OpenShift')} {forceOpenshiftVersion}
         </StaticTextField>
       ) : (
-        <OpenShiftVersionSelect
-          versions={versions}
-          onChange={(_event, value) => {
-            const ocpVersion = versions.find((v) => v.value === value);
-            setFieldValue('networkType', getNetworkType(ocpVersion));
-          }}
-        />
+        <>
+          <OpenShiftVersionDropdown
+            name="openshiftVersion"
+            items={selectOptions}
+            versions={versions}
+            showReleasesLink={false}
+            showOpenshiftVersionModal={() => setOpenshiftVersionModalOpen(true)}
+            customItems={additionalSelectOptions}
+          />
+          {openshiftVersionModalOpen && (
+            <OpenShiftVersionModal
+              allVersions={allVersions}
+              setOpenshiftVersionModalOpen={setOpenshiftVersionModalOpen}
+            />
+          )}
+        </>
       )}
-      <ControlPlaneNodesDropdown isNutanix={isNutanix} isDisabled={isEditFlow} />
+      <ControlPlaneNodesDropdown
+        isDisabled={isEditFlow}
+        allowHighlyAvailable={allowHighlyAvailable}
+      />
       {!isNutanix && (
         <CpuArchitectureDropdown cpuArchitectures={cpuArchitectures} isDisabled={isEditFlow} />
       )}

package/lib/cim/components/Hypershift/DetailsPage/HypershiftKubeconfigDownload.tsx

@@ -15,8 +15,8 @@ const HypershiftKubeconfigDownload = ({
   fetchSecret,
 }: HypershiftKubeconfigDownloadProps) => {
   const { t } = useTranslation();
-  const kubeconfigSecretName = hostedCluster.status?.customkubeconfig
-    ? hostedCluster.status.customkubeconfig?.name
+  const kubeconfigSecretName = hostedCluster.status?.customKubeconfig
+    ? hostedCluster.status.customKubeconfig?.name
     : hostedCluster.status?.kubeconfig?.name;
   const handleKubeconfigDownload = async () => {
     const kubeconfigSecretNamespace = hostedCluster.metadata?.namespace;

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

@@ -157,7 +157,7 @@ export type HostedClusterK8sResource = K8sResourceCommon & {
     kubeconfig?: {
       name: string;
     };
-    customkubeconfig?: {
+    customKubeconfig?: {
       name: string;
     };
     kubeadminPassword?: {

package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx

@@ -49,7 +49,7 @@ import { getErrorMessage } from '../../../common/utils';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';
 import CpuArchitectureDropdown from '../common/CpuArchitectureDropdown';
-import OpenshiftVersionDropdown from './OpenshiftVersionDropdown';
+import InfraEnvOpenShiftVersionDropdown from './InfraEnvOpenShiftVersionDropdown';
 import { OsImage } from '../../types';
 
 export type EnvironmentStepFormValues = {
@@ -228,7 +228,7 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
             </Flex>
           </FormGroup>
           <CpuArchitectureDropdown />
-          {!!osImages && <OpenshiftVersionDropdown osImages={osImages} />}
+          {!!osImages && <InfraEnvOpenShiftVersionDropdown osImages={osImages} />}
           <RichInputField
             label={t('ai:Location')}
             name="location"

package/lib/cim/components/InfraEnv/{OpenshiftVersionDropdown.tsx → InfraEnvOpenShiftVersionDropdown.tsx}

@@ -6,7 +6,7 @@ import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { architectureData, getFieldId, SupportedCpuArchitecture } from '../../../common';
 import { OsImage } from '../../types';
 
-const OpenshiftVersionDropdown = ({ osImages }: { osImages: OsImage[] }) => {
+const InfraEnvOpenShiftVersionDropdown = ({ osImages }: { osImages: OsImage[] }) => {
   const { t } = useTranslation();
   const [{ name, value }, , { setValue }] = useField<string>('osImageVersion');
   const [{ value: cpuArchitecture }] = useField<string>('cpuArchitecture');
@@ -69,4 +69,4 @@ const OpenshiftVersionDropdown = ({ osImages }: { osImages: OsImage[] }) => {
   );
 };
 
-export default OpenshiftVersionDropdown;
+export default InfraEnvOpenShiftVersionDropdown;