@openshift-assisted/ui-lib 2.52.0 → 2.52.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/@types/common/components/clusters/PullSecret.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterWizard/ClusterDetails.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/ClusterBreadcrumbs.d.ts +6 -0
- package/build/@types/ocm/components/clusters/ClusterBreadcrumbs.d.ts.map +1 -0
- package/build/@types/ocm/components/clusters/ClusterPage.d.ts.map +1 -1
- package/build/@types/ocm/components/clusters/NewClusterPage.d.ts +1 -1
- package/build/@types/ocm/components/clusters/NewClusterPage.d.ts.map +1 -1
- package/build/cjs/common/components/clusters/PullSecret.js +2 -2
- package/build/cjs/common/components/clusters/PullSecret.js.map +1 -1
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js +8 -3
- package/build/cjs/ocm/components/clusterWizard/ClusterDetails.js.map +1 -1
- package/build/cjs/ocm/components/clusters/ClusterBreadcrumbs.js +16 -0
- package/build/cjs/ocm/components/clusters/ClusterBreadcrumbs.js.map +1 -0
- package/build/cjs/ocm/components/clusters/ClusterPage.js +6 -3
- package/build/cjs/ocm/components/clusters/ClusterPage.js.map +1 -1
- package/build/cjs/ocm/components/clusters/NewClusterPage.js +3 -2
- package/build/cjs/ocm/components/clusters/NewClusterPage.js.map +1 -1
- package/lib/common/components/clusters/PullSecret.tsx +4 -2
- package/lib/ocm/components/clusterWizard/ClusterDetails.tsx +10 -4
- package/lib/ocm/components/clusters/ClusterBreadcrumbs.tsx +25 -0
- package/lib/ocm/components/clusters/ClusterPage.tsx +7 -4
- package/lib/ocm/components/clusters/NewClusterPage.tsx +3 -2
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PullSecret.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,MAAM,eAAe,GAAG;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC,CAAC;AAEF,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"PullSecret.d.ts","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,MAAM,eAAe,GAAG;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC,CAAC;AAEF,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA8CzC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyB1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AAIzF,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,QAAA,MAAM,cAAc,GAAI,uBAAuB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"ClusterDetails.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAyB1B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sDAAsD,CAAC;AAIzF,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,QAAA,MAAM,cAAc,GAAI,uBAAuB,mBAAmB,sBAkJjE,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ClusterBreadcrumbs.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClusterBreadcrumbs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,QAAA,MAAM,kBAAkB,GAAI,iBAAiB;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,8BAiBpE,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterPage.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClusterPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterPage.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClusterPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAqM1B,eAAO,MAAM,iBAAiB,GAAI,4BAG/B;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B,sBAOA,CAAC;AAEF,eAAO,MAAM,WAAW,yBAOvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewClusterPage.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/NewClusterPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"NewClusterPage.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/NewClusterPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,eAAO,MAAM,cAAc,yBA2B1B,CAAC"}
|
|
@@ -7,8 +7,8 @@ const formik_1 = require("formik");
|
|
|
7
7
|
const ui_1 = require("../ui");
|
|
8
8
|
const use_translation_wrapper_1 = require("../../hooks/use-translation-wrapper");
|
|
9
9
|
const PullSecret = ({ defaultPullSecret, isOcm = false, isPullSecretSet = false, isSingleClusterFeatureEnabled = false, }) => {
|
|
10
|
-
//
|
|
11
|
-
const [isExpanded, setExpanded] = react_1.default.useState(!defaultPullSecret);
|
|
10
|
+
// Existing cluster with a pull secret on the server: start collapsed so the secret text is not shown until the user chooses "Edit pull secret".
|
|
11
|
+
const [isExpanded, setExpanded] = react_1.default.useState(() => isPullSecretSet ? false : !defaultPullSecret);
|
|
12
12
|
const { setFieldValue } = (0, formik_1.useFormikContext)();
|
|
13
13
|
const { t } = (0, use_translation_wrapper_1.useTranslation)();
|
|
14
14
|
const onCheckboxChange = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PullSecret.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAAuE;AACvE,mCAA0C;AAE1C,8BAAwD;AACxD,iFAAqE;AASrE,MAAM,UAAU,GAA8B,CAAC,EAC7C,iBAAiB,EACjB,KAAK,GAAG,KAAK,EACb,eAAe,GAAG,KAAK,EACvB,6BAA6B,GAAG,KAAK,GACtC,EAAE,EAAE;IACH,
|
|
1
|
+
{"version":3,"file":"PullSecret.js","sourceRoot":"","sources":["../../../../../lib/common/components/clusters/PullSecret.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAAuE;AACvE,mCAA0C;AAE1C,8BAAwD;AACxD,iFAAqE;AASrE,MAAM,UAAU,GAA8B,CAAC,EAC7C,iBAAiB,EACjB,KAAK,GAAG,KAAK,EACb,eAAe,GAAG,KAAK,EACvB,6BAA6B,GAAG,KAAK,GACtC,EAAE,EAAE;IACH,gJAAgJ;IAChJ,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CACpD,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAC7C,CAAC;IACF,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,yBAAgB,GAAuB,CAAC;IAClE,MAAM,EAAE,CAAC,EAAE,GAAG,IAAA,wCAAc,GAAE,CAAC;IAC/B,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC5B,IAAI,UAAU,EAAE,CAAC;YACf,6CAA6C;YAC7C,aAAa,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;QACjD,CAAC;QACD,WAAW,CAAC,CAAC,UAAU,CAAC,CAAC;IAC3B,CAAC,CAAC;IAEF,IAAI,CAAC,CAAC,KAAK,IAAI,6BAA6B,CAAC,EAAE,CAAC;QAC9C,OAAO,8BAAC,oBAAe,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC;IAC3C,CAAC;IAED,OAAO,CACL;QACG,eAAe,IAAI,CAClB,8BAAC,kBAAK,IAAC,OAAO,EAAE,yBAAY,CAAC,OAAO,EAAE,QAAQ,QAAC,KAAK,EAAE,CAAC,CAAC,2BAA2B,CAAC,IACjF,CAAC,CAAC,gFAAgF,CAAC,CAC9E,CACT;QACD,8BAAC,qBAAQ,IACP,EAAE,EAAC,sBAAsB,EACzB,SAAS,EAAC,6BAA6B,gBAC3B,CAAC,CAAC,qBAAqB,CAAC,EACpC,SAAS,EAAE,UAAU,EACrB,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EACH;gBACG,CAAC,CAAC,qBAAqB,CAAC;;gBAAE,8BAAC,mBAAc,IAAC,KAAK,EAAE,KAAK,GAAI,CAC1D,GAEL;QACD,UAAU,IAAI,8BAAC,oBAAe,IAAC,KAAK,EAAE,KAAK,GAAI,CAC/C,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,UAAU,CAAC"}
|
|
@@ -27,7 +27,9 @@ const ClusterDetails = ({ cluster, infraEnv }) => {
|
|
|
27
27
|
const { error: errorOCPVersions, loading: loadingOCPVersions, latestVersions: versions, } = (0, OpenShiftVersionsContext_1.useOpenShiftVersionsContext)();
|
|
28
28
|
const location = (0, react_router_dom_v5_compat_1.useLocation)();
|
|
29
29
|
const isSingleClusterFeatureEnabled = (0, use_feature_1.useFeature)('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
|
|
30
|
-
const
|
|
30
|
+
const fetchedPullSecret = (0, hooks_1.usePullSecret)(isSingleClusterFeatureEnabled);
|
|
31
|
+
/** With a cluster resource, never pre-fill the form with a pull secret (API does not return it); new-cluster flow uses the hook default. */
|
|
32
|
+
const pullSecretForForm = cluster ? '' : fetchedPullSecret !== null && fetchedPullSecret !== void 0 ? fetchedPullSecret : '';
|
|
31
33
|
const handleClusterUpdate = react_1.default.useCallback((clusterId, params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
32
34
|
clearAlerts();
|
|
33
35
|
try {
|
|
@@ -93,7 +95,10 @@ const ClusterDetails = ({ cluster, infraEnv }) => {
|
|
|
93
95
|
dispatch,
|
|
94
96
|
]);
|
|
95
97
|
const navigation = react_1.default.createElement(ClusterWizardNavigation_1.default, { cluster: cluster });
|
|
96
|
-
if (
|
|
98
|
+
if ((!cluster && fetchedPullSecret === undefined) ||
|
|
99
|
+
!managedDomains ||
|
|
100
|
+
loadingOCPVersions ||
|
|
101
|
+
!usedClusterNames) {
|
|
97
102
|
return (react_1.default.createElement(common_1.ClusterWizardStep, { navigation: navigation },
|
|
98
103
|
react_1.default.createElement(common_1.LoadingState, null)));
|
|
99
104
|
}
|
|
@@ -101,7 +106,7 @@ const ClusterDetails = ({ cluster, infraEnv }) => {
|
|
|
101
106
|
return (react_1.default.createElement(common_1.ClusterWizardStep, { navigation: navigation },
|
|
102
107
|
react_1.default.createElement(common_1.ErrorState, { title: errorOCPVersions.title || 'Failed to retrieve OpenShift versions', content: errorOCPVersions.message || 'No OpenShift versions available.' })));
|
|
103
108
|
}
|
|
104
|
-
return (react_1.default.createElement(ClusterDetailsForm_1.default, { cluster: cluster, pullSecret:
|
|
109
|
+
return (react_1.default.createElement(ClusterDetailsForm_1.default, { cluster: cluster, pullSecret: pullSecretForForm, managedDomains: managedDomains, ocpVersions: versions, usedClusterNames: usedClusterNames, handleClusterUpdate: handleClusterUpdate, handleClusterCreate: handleClusterCreate, navigation: navigation, infraEnv: infraEnv }));
|
|
105
110
|
};
|
|
106
111
|
exports.default = ClusterDetails;
|
|
107
112
|
//# sourceMappingURL=ClusterDetails.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterDetails.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,2EAAsE;AACtE,6CAA0C;AAC1C,4CAMyB;AACzB,uCAA4C;AAC5C,6CAA+F;AAC/F,oEAA+F;AAC/F,iEAAiE;AACjE,yDAAsF;AACtF,uCAAqE;AACrE,yEAAyE;AACzE,sFAAsD;AACtD,gGAAgE;AAChE,6CAKwB;AAExB,yFAAyD;AACzD,yDAAqD;AAOrD,MAAM,cAAc,GAAG,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAuB,EAAE,EAAE;IACpE,MAAM,oBAAoB,GAAG,IAAA,8CAAuB,GAAE,CAAC;IACvD,MAAM,cAAc,GAAG,IAAA,yBAAiB,GAAE,CAAC;IAC3C,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAA,wCAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;IAC/B,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,2BAAmB,EAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,KAAI,EAAE,CAAC,CAAC;IACpE,MAAM,EACJ,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,QAAQ,GACzB,GAAG,IAAA,sDAA2B,GAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,IAAA,wCAAW,GAAE,CAAC;IAC/B,MAAM,6BAA6B,GAAG,IAAA,wBAAU,EAAC,2CAA2C,CAAC,CAAC;IAC9F,MAAM,
|
|
1
|
+
{"version":3,"file":"ClusterDetails.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterWizard/ClusterDetails.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
|
5
|
+
const react_core_1 = require("@patternfly/react-core");
|
|
6
|
+
const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
|
|
7
|
+
const api_1 = require("../../../common/api");
|
|
8
|
+
const ClusterBreadcrumbs = ({ clusterName }) => {
|
|
9
|
+
return (!api_1.isInOcm && (react_1.default.createElement(react_core_1.PageSection, { hasBodyWrapper: false },
|
|
10
|
+
react_1.default.createElement(react_core_1.Breadcrumb, { "data-testid": "cluster-breadcrumbs" },
|
|
11
|
+
react_1.default.createElement(react_core_1.BreadcrumbItem, { "data-testid": "assisted-clusters-breadcrumb" },
|
|
12
|
+
react_1.default.createElement(react_router_dom_v5_compat_1.Link, { to: `..` }, "Assisted Clusters")),
|
|
13
|
+
clusterName && (react_1.default.createElement(react_core_1.BreadcrumbItem, { "data-testid": "cluster-breadcrumb", isActive: true }, clusterName))))));
|
|
14
|
+
};
|
|
15
|
+
exports.default = ClusterBreadcrumbs;
|
|
16
|
+
//# sourceMappingURL=ClusterBreadcrumbs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ClusterBreadcrumbs.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClusterBreadcrumbs.tsx"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,uDAAiF;AACjF,2EAAkD;AAClD,6CAA8C;AAE9C,MAAM,kBAAkB,GAAG,CAAC,EAAE,WAAW,EAA4B,EAAE,EAAE;IACvE,OAAO,CACL,CAAC,aAAO,IAAI,CACV,8BAAC,wBAAW,IAAC,cAAc,EAAE,KAAK;QAChC,8BAAC,uBAAU,mBAAa,qBAAqB;YAC3C,8BAAC,2BAAc,mBAAa,8BAA8B;gBACxD,8BAAC,iCAAI,IAAC,EAAE,EAAE,IAAI,wBAA0B,CACzB;YAChB,WAAW,IAAI,CACd,8BAAC,2BAAc,mBAAa,oBAAoB,EAAC,QAAQ,UACtD,WAAW,CACG,CAClB,CACU,CACD,CACf,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,kBAAkB,CAAC"}
|
|
@@ -12,6 +12,7 @@ const CancelInstallationModal_1 = tslib_1.__importDefault(require("../clusterDet
|
|
|
12
12
|
const ResetClusterModal_1 = tslib_1.__importDefault(require("../clusterDetail/ResetClusterModal"));
|
|
13
13
|
const AddHosts_1 = require("../AddHosts");
|
|
14
14
|
const ClusterDefaultConfigurationContext_1 = require("../clusterConfiguration/ClusterDefaultConfigurationContext");
|
|
15
|
+
const ClusterBreadcrumbs_1 = tslib_1.__importDefault(require("./ClusterBreadcrumbs"));
|
|
15
16
|
const ClusterWizard_1 = tslib_1.__importDefault(require("../clusterWizard/ClusterWizard"));
|
|
16
17
|
const ModalDialogsContext_1 = require("../hosts/ModalDialogsContext");
|
|
17
18
|
const clusterPolling_1 = require("./clusterPolling");
|
|
@@ -30,7 +31,7 @@ const featureSupportLevels_1 = require("../featureSupportLevels");
|
|
|
30
31
|
const hooks_1 = require("../../hooks");
|
|
31
32
|
const AssistedInstallerHeader_1 = require("./AssistedInstallerHeader");
|
|
32
33
|
const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
|
|
33
|
-
const ClusterPageGeneric = ({ clusterId,
|
|
34
|
+
const ClusterPageGeneric = ({ clusterId, showBreadcrumbs = false, resetModal, }) => {
|
|
34
35
|
var _a;
|
|
35
36
|
const fetchCluster = (0, clusterPolling_1.useFetchCluster)(clusterId);
|
|
36
37
|
const dispatch = (0, react_redux_1.useDispatch)();
|
|
@@ -59,6 +60,7 @@ const ClusterPageGeneric = ({ clusterId, showHeader = false, resetModal, }) => {
|
|
|
59
60
|
'cancelled',
|
|
60
61
|
].includes(cluster.status)) {
|
|
61
62
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
63
|
+
showBreadcrumbs && react_1.default.createElement(ClusterBreadcrumbs_1.default, { clusterName: cluster.name }),
|
|
62
64
|
react_1.default.createElement(react_core_1.PageSection, { hasBodyWrapper: false },
|
|
63
65
|
react_1.default.createElement(react_core_1.Content, { component: "h1" }, cluster.name)),
|
|
64
66
|
react_1.default.createElement(react_core_1.PageSection, { hasBodyWrapper: false, isFilled: true },
|
|
@@ -66,7 +68,8 @@ const ClusterPageGeneric = ({ clusterId, showHeader = false, resetModal, }) => {
|
|
|
66
68
|
}
|
|
67
69
|
else {
|
|
68
70
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
69
|
-
|
|
71
|
+
showBreadcrumbs && react_1.default.createElement(ClusterBreadcrumbs_1.default, { clusterName: cluster.name }),
|
|
72
|
+
showBreadcrumbs && (react_1.default.createElement(react_core_1.PageSection, { hasBodyWrapper: false },
|
|
70
73
|
react_1.default.createElement(AssistedInstallerHeader_1.AssistedInstallerHeader, null))),
|
|
71
74
|
react_1.default.createElement(react_core_1.PageSection, { hasBodyWrapper: false },
|
|
72
75
|
react_1.default.createElement(ClusterWizardContextProvider_1.default, { cluster: cluster, infraEnv: infraEnv },
|
|
@@ -113,7 +116,7 @@ exports.SingleClusterPage = SingleClusterPage;
|
|
|
113
116
|
const ClusterPage = () => {
|
|
114
117
|
const { clusterId } = (0, react_router_dom_v5_compat_1.useParams)();
|
|
115
118
|
return (react_1.default.createElement(common_1.AlertsContextProvider, null,
|
|
116
|
-
react_1.default.createElement(ClusterPageGeneric, { clusterId: clusterId || '',
|
|
119
|
+
react_1.default.createElement(ClusterPageGeneric, { clusterId: clusterId || '', showBreadcrumbs: true })));
|
|
117
120
|
};
|
|
118
121
|
exports.ClusterPage = ClusterPage;
|
|
119
122
|
//# sourceMappingURL=ClusterPage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterPage.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClusterPage.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,2EAAiE;AACjE,6CAA0C;AAC1C,uDAA8D;AAC9D,4CAMyB;AACzB,2FAA2D;AAC3D,+GAA+E;AAC/E,mGAAmE;AACnE,0CAAuC;AACvC,mHAAiH;AACjH,2FAA2D;AAC3D,sEAA2E;AAC3E,qDAAsE;AACtE,qFAAkF;AAClF,yCAA6C;AAC7C,yHAAyF;AACzF,kFAAkD;AAClD,4FAAyF;AACzF,oEAAuE;AACvE,2DAAqD;AACrD,8EAA8C;AAC9C,iHAAiF;AACjF,+GAA+E;AAC/E,yDAAsD;AACtD,kEAAyE;AACzE,uCAA4C;AAE5C,uEAAoE;AACpE,wFAA6F;AAE7F,MAAM,kBAAkB,GAAG,CAAC,EAC1B,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"ClusterPage.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClusterPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
6
6
|
const react_core_1 = require("@patternfly/react-core");
|
|
7
7
|
const common_1 = require("../../../common");
|
|
8
|
+
const ClusterBreadcrumbs_1 = tslib_1.__importDefault(require("./ClusterBreadcrumbs"));
|
|
8
9
|
const ClusterDefaultConfigurationContext_1 = require("../clusterConfiguration/ClusterDefaultConfigurationContext");
|
|
9
10
|
const NewClusterWizard_1 = tslib_1.__importDefault(require("../clusterWizard/NewClusterWizard"));
|
|
10
11
|
const ClusterWizardContextProvider_1 = tslib_1.__importDefault(require("../clusterWizard/ClusterWizardContextProvider"));
|
|
@@ -15,14 +16,14 @@ const featureSupportLevels_1 = require("../featureSupportLevels");
|
|
|
15
16
|
const AssistedInstallerHeader_1 = require("./AssistedInstallerHeader");
|
|
16
17
|
const ModalDialogsContext_1 = require("../hosts/ModalDialogsContext");
|
|
17
18
|
const OpenShiftVersionsContext_1 = require("../clusterWizard/OpenShiftVersionsContext");
|
|
18
|
-
const NewClusterPage = (
|
|
19
|
+
const NewClusterPage = () => {
|
|
19
20
|
return (react_1.default.createElement(common_1.AlertsContextProvider, null,
|
|
20
21
|
react_1.default.createElement(SentryErrorMonitorContextProvider_1.SentryErrorMonitorContextProvider, null,
|
|
21
22
|
react_1.default.createElement(ModalDialogsContext_1.ModalDialogsContextProvider, null,
|
|
22
23
|
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) },
|
|
23
24
|
react_1.default.createElement(OpenShiftVersionsContext_1.OpenShiftVersionsContextProvider, null,
|
|
24
25
|
react_1.default.createElement(featureSupportLevels_1.NewFeatureSupportLevelProvider, { loadingUi: react_1.default.createElement(ClusterLoading_1.default, null) },
|
|
25
|
-
|
|
26
|
+
react_1.default.createElement(ClusterBreadcrumbs_1.default, { clusterName: "New cluster" }),
|
|
26
27
|
react_1.default.createElement(react_core_1.PageSection, { hasBodyWrapper: false, isFilled: true },
|
|
27
28
|
react_1.default.createElement(AssistedInstallerHeader_1.AssistedInstallerHeader, null)),
|
|
28
29
|
react_1.default.createElement(react_core_1.PageSection, { hasBodyWrapper: false, isFilled: true },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewClusterPage.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/NewClusterPage.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAqD;AACrD,4CAAwD;AACxD,mHAAiH;AACjH,iGAAiE;AACjE,yHAAyF;AACzF,4FAAyF;AACzF,8EAA8C;AAC9C,2DAAqD;AACrD,kEAAyE;AACzE,uEAAoE;AACpE,sEAA2E;AAC3E,wFAA6F;AAEtF,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"NewClusterPage.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/NewClusterPage.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,uDAAqD;AACrD,4CAAwD;AACxD,sFAAsD;AACtD,mHAAiH;AACjH,iGAAiE;AACjE,yHAAyF;AACzF,4FAAyF;AACzF,8EAA8C;AAC9C,2DAAqD;AACrD,kEAAyE;AACzE,uEAAoE;AACpE,sEAA2E;AAC3E,wFAA6F;AAEtF,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,OAAO,CACL,8BAAC,8BAAqB;QACpB,8BAAC,qEAAiC;YAChC,8BAAC,iDAA2B;gBAC1B,8BAAC,wEAAmC,IAClC,SAAS,EAAE,8BAAC,wBAAc,OAAG,EAC7B,OAAO,EAAE,8BAAC,kCAAc,OAAG;oBAE3B,8BAAC,2DAAgC;wBAC/B,8BAAC,qDAA8B,IAAC,SAAS,EAAE,8BAAC,wBAAc,OAAG;4BAC3D,8BAAC,4BAAkB,IAAC,WAAW,EAAC,aAAa,GAAG;4BAChD,8BAAC,wBAAW,IAAC,cAAc,EAAE,KAAK,EAAE,QAAQ;gCAC1C,8BAAC,iDAAuB,OAAG,CACf;4BACd,8BAAC,wBAAW,IAAC,cAAc,EAAE,KAAK,EAAE,QAAQ;gCAC1C,8BAAC,sCAA4B;oCAC3B,8BAAC,0BAAgB,OAAG,CACS,CACnB,CACiB,CACA,CACC,CACV,CACI,CACd,CACzB,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,cAAc,kBA2BzB"}
|
|
@@ -18,8 +18,10 @@ const PullSecret: React.FC<PullSecretProps> = ({
|
|
|
18
18
|
isPullSecretSet = false,
|
|
19
19
|
isSingleClusterFeatureEnabled = false,
|
|
20
20
|
}) => {
|
|
21
|
-
//
|
|
22
|
-
const [isExpanded, setExpanded] = React.useState(
|
|
21
|
+
// Existing cluster with a pull secret on the server: start collapsed so the secret text is not shown until the user chooses "Edit pull secret".
|
|
22
|
+
const [isExpanded, setExpanded] = React.useState(() =>
|
|
23
|
+
isPullSecretSet ? false : !defaultPullSecret,
|
|
24
|
+
);
|
|
23
25
|
const { setFieldValue } = useFormikContext<ClusterCreateParams>();
|
|
24
26
|
const { t } = useTranslation();
|
|
25
27
|
const onCheckboxChange = () => {
|
|
@@ -46,7 +46,9 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
|
|
|
46
46
|
} = useOpenShiftVersionsContext();
|
|
47
47
|
const location = useLocation();
|
|
48
48
|
const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
|
|
49
|
-
const
|
|
49
|
+
const fetchedPullSecret = usePullSecret(isSingleClusterFeatureEnabled);
|
|
50
|
+
/** With a cluster resource, never pre-fill the form with a pull secret (API does not return it); new-cluster flow uses the hook default. */
|
|
51
|
+
const pullSecretForForm = cluster ? '' : fetchedPullSecret ?? '';
|
|
50
52
|
|
|
51
53
|
const handleClusterUpdate = React.useCallback(
|
|
52
54
|
async (clusterId: Cluster['id'], params: ClusterDetailsUpdateParams) => {
|
|
@@ -59,7 +61,6 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
|
|
|
59
61
|
params,
|
|
60
62
|
);
|
|
61
63
|
dispatch(updateCluster(updatedCluster));
|
|
62
|
-
|
|
63
64
|
canNextClusterDetails({ cluster: updatedCluster }) && clusterWizardContext.moveNext();
|
|
64
65
|
} catch (e) {
|
|
65
66
|
handleApiError(e, () =>
|
|
@@ -140,7 +141,12 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
|
|
|
140
141
|
);
|
|
141
142
|
|
|
142
143
|
const navigation = <ClusterWizardNavigation cluster={cluster} />;
|
|
143
|
-
if (
|
|
144
|
+
if (
|
|
145
|
+
(!cluster && fetchedPullSecret === undefined) ||
|
|
146
|
+
!managedDomains ||
|
|
147
|
+
loadingOCPVersions ||
|
|
148
|
+
!usedClusterNames
|
|
149
|
+
) {
|
|
144
150
|
return (
|
|
145
151
|
<ClusterWizardStep navigation={navigation}>
|
|
146
152
|
<LoadingState />
|
|
@@ -162,7 +168,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
|
|
|
162
168
|
return (
|
|
163
169
|
<ClusterDetailsForm
|
|
164
170
|
cluster={cluster}
|
|
165
|
-
pullSecret={
|
|
171
|
+
pullSecret={pullSecretForForm}
|
|
166
172
|
managedDomains={managedDomains}
|
|
167
173
|
ocpVersions={versions}
|
|
168
174
|
usedClusterNames={usedClusterNames}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { Breadcrumb, BreadcrumbItem, PageSection } from '@patternfly/react-core';
|
|
3
|
+
import { Link } from 'react-router-dom-v5-compat';
|
|
4
|
+
import { isInOcm } from '../../../common/api';
|
|
5
|
+
|
|
6
|
+
const ClusterBreadcrumbs = ({ clusterName }: { clusterName?: string }) => {
|
|
7
|
+
return (
|
|
8
|
+
!isInOcm && (
|
|
9
|
+
<PageSection hasBodyWrapper={false}>
|
|
10
|
+
<Breadcrumb data-testid="cluster-breadcrumbs">
|
|
11
|
+
<BreadcrumbItem data-testid="assisted-clusters-breadcrumb">
|
|
12
|
+
<Link to={`..`}>Assisted Clusters</Link>
|
|
13
|
+
</BreadcrumbItem>
|
|
14
|
+
{clusterName && (
|
|
15
|
+
<BreadcrumbItem data-testid="cluster-breadcrumb" isActive>
|
|
16
|
+
{clusterName}
|
|
17
|
+
</BreadcrumbItem>
|
|
18
|
+
)}
|
|
19
|
+
</Breadcrumb>
|
|
20
|
+
</PageSection>
|
|
21
|
+
)
|
|
22
|
+
);
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
export default ClusterBreadcrumbs;
|
|
@@ -14,6 +14,7 @@ import CancelInstallationModal from '../clusterDetail/CancelInstallationModal';
|
|
|
14
14
|
import ResetClusterModal from '../clusterDetail/ResetClusterModal';
|
|
15
15
|
import { AddHosts } from '../AddHosts';
|
|
16
16
|
import { ClusterDefaultConfigurationProvider } from '../clusterConfiguration/ClusterDefaultConfigurationContext';
|
|
17
|
+
import ClusterBreadcrumbs from './ClusterBreadcrumbs';
|
|
17
18
|
import ClusterWizard from '../clusterWizard/ClusterWizard';
|
|
18
19
|
import { ModalDialogsContextProvider } from '../hosts/ModalDialogsContext';
|
|
19
20
|
import { useClusterPolling, useFetchCluster } from './clusterPolling';
|
|
@@ -36,11 +37,11 @@ import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVers
|
|
|
36
37
|
|
|
37
38
|
const ClusterPageGeneric = ({
|
|
38
39
|
clusterId,
|
|
39
|
-
|
|
40
|
+
showBreadcrumbs = false,
|
|
40
41
|
resetModal,
|
|
41
42
|
}: {
|
|
42
43
|
clusterId: string;
|
|
43
|
-
|
|
44
|
+
showBreadcrumbs?: boolean;
|
|
44
45
|
resetModal?: React.ReactNode;
|
|
45
46
|
}) => {
|
|
46
47
|
const fetchCluster = useFetchCluster(clusterId);
|
|
@@ -88,6 +89,7 @@ const ClusterPageGeneric = ({
|
|
|
88
89
|
) {
|
|
89
90
|
return (
|
|
90
91
|
<>
|
|
92
|
+
{showBreadcrumbs && <ClusterBreadcrumbs clusterName={cluster.name} />}
|
|
91
93
|
<PageSection hasBodyWrapper={false}>
|
|
92
94
|
<Content component="h1">{cluster.name}</Content>
|
|
93
95
|
</PageSection>
|
|
@@ -99,7 +101,8 @@ const ClusterPageGeneric = ({
|
|
|
99
101
|
} else {
|
|
100
102
|
return (
|
|
101
103
|
<>
|
|
102
|
-
{
|
|
104
|
+
{showBreadcrumbs && <ClusterBreadcrumbs clusterName={cluster.name} />}
|
|
105
|
+
{showBreadcrumbs && (
|
|
103
106
|
<PageSection hasBodyWrapper={false}>
|
|
104
107
|
<AssistedInstallerHeader />
|
|
105
108
|
</PageSection>
|
|
@@ -211,7 +214,7 @@ export const ClusterPage = () => {
|
|
|
211
214
|
const { clusterId } = useParams<{ clusterId: string }>();
|
|
212
215
|
return (
|
|
213
216
|
<AlertsContextProvider>
|
|
214
|
-
<ClusterPageGeneric clusterId={clusterId || ''}
|
|
217
|
+
<ClusterPageGeneric clusterId={clusterId || ''} showBreadcrumbs />
|
|
215
218
|
</AlertsContextProvider>
|
|
216
219
|
);
|
|
217
220
|
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { PageSection } from '@patternfly/react-core';
|
|
3
3
|
import { AlertsContextProvider } from '../../../common';
|
|
4
|
+
import ClusterBreadcrumbs from './ClusterBreadcrumbs';
|
|
4
5
|
import { ClusterDefaultConfigurationProvider } from '../clusterConfiguration/ClusterDefaultConfigurationContext';
|
|
5
6
|
import NewClusterWizard from '../clusterWizard/NewClusterWizard';
|
|
6
7
|
import ClusterWizardContextProvider from '../clusterWizard/ClusterWizardContextProvider';
|
|
@@ -12,7 +13,7 @@ import { AssistedInstallerHeader } from './AssistedInstallerHeader';
|
|
|
12
13
|
import { ModalDialogsContextProvider } from '../hosts/ModalDialogsContext';
|
|
13
14
|
import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVersionsContext';
|
|
14
15
|
|
|
15
|
-
export const NewClusterPage = (
|
|
16
|
+
export const NewClusterPage = () => {
|
|
16
17
|
return (
|
|
17
18
|
<AlertsContextProvider>
|
|
18
19
|
<SentryErrorMonitorContextProvider>
|
|
@@ -23,7 +24,7 @@ export const NewClusterPage = ({ children }: React.PropsWithChildren<unknown>) =
|
|
|
23
24
|
>
|
|
24
25
|
<OpenShiftVersionsContextProvider>
|
|
25
26
|
<NewFeatureSupportLevelProvider loadingUi={<ClusterLoading />}>
|
|
26
|
-
|
|
27
|
+
<ClusterBreadcrumbs clusterName="New cluster" />
|
|
27
28
|
<PageSection hasBodyWrapper={false} isFilled>
|
|
28
29
|
<AssistedInstallerHeader />
|
|
29
30
|
</PageSection>
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.52.
|
|
4
|
-
"@openshift-assisted/types": "2.52.
|
|
3
|
+
"@openshift-assisted/locales": "2.52.1",
|
|
4
|
+
"@openshift-assisted/types": "2.52.1",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "^4.19.1",
|
|
6
6
|
"@patternfly/patternfly": "6.4.0",
|
|
7
7
|
"@patternfly/react-code-editor": "6.4.1",
|
|
@@ -136,5 +136,5 @@
|
|
|
136
136
|
]
|
|
137
137
|
}
|
|
138
138
|
},
|
|
139
|
-
"version": "2.52.
|
|
139
|
+
"version": "2.52.1"
|
|
140
140
|
}
|