@openshift-assisted/ui-lib 2.38.4 → 2.38.5
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/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.d.ts.map +1 -1
- package/build/cjs/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js +10 -9
- package/build/cjs/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.js.map +1 -1
- package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx +12 -9
- package/package.json +3 -3
package/build/@types/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostsClusterDetailTabContent.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAezC,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAYrD,eAAO,MAAM,4BAA4B,wCAGtC,0BAA0B,
|
|
1
|
+
{"version":3,"file":"HostsClusterDetailTabContent.d.ts","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAezC,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAYrD,eAAO,MAAM,4BAA4B,wCAGtC,0BAA0B,sBAgJ5B,CAAC"}
|
|
@@ -21,6 +21,8 @@ const HostsClusterDetailTabContent = ({ cluster: ocmCluster, isVisible, }) => {
|
|
|
21
21
|
const [error, setError] = react_1.default.useState();
|
|
22
22
|
const [day2Cluster, setDay2Cluster] = (0, hooks_1.useStateSafely)(null);
|
|
23
23
|
const pullSecret = (0, hooks_2.usePullSecret)();
|
|
24
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
25
|
+
const ocmClusterMemo = react_1.default.useMemo(() => ocmCluster, []);
|
|
24
26
|
const handleClickTryAgainLink = react_1.default.useCallback(() => {
|
|
25
27
|
setError(undefined);
|
|
26
28
|
setDay2Cluster(null);
|
|
@@ -34,17 +36,17 @@ const HostsClusterDetailTabContent = ({ cluster: ocmCluster, isVisible, }) => {
|
|
|
34
36
|
setDay2Cluster(null);
|
|
35
37
|
return;
|
|
36
38
|
}
|
|
37
|
-
const day1ClusterHostCount = ((_b = (_a =
|
|
38
|
-
const openshiftClusterId = Day2ClusterService_1.default.getOpenshiftClusterId(
|
|
39
|
+
const day1ClusterHostCount = ((_b = (_a = ocmClusterMemo === null || ocmClusterMemo === void 0 ? void 0 : ocmClusterMemo.metrics) === null || _a === void 0 ? void 0 : _a.nodes) === null || _b === void 0 ? void 0 : _b.total) || 0;
|
|
40
|
+
const openshiftClusterId = Day2ClusterService_1.default.getOpenshiftClusterId(ocmClusterMemo);
|
|
39
41
|
if (day1ClusterHostCount === 0 || !openshiftClusterId) {
|
|
40
42
|
setError(react_1.default.createElement(HostsClusterDetailTabContentErrors_1.UnableToAddHostsError, { onTryAgain: handleClickTryAgainLink }));
|
|
41
43
|
}
|
|
42
44
|
if (!day2Cluster && pullSecret) {
|
|
43
|
-
const { apiVipDnsname, errorType } = (0, Day2ClusterService_1.getApiVipDnsName)(
|
|
45
|
+
const { apiVipDnsname, errorType } = (0, Day2ClusterService_1.getApiVipDnsName)(ocmClusterMemo);
|
|
44
46
|
if (errorType) {
|
|
45
47
|
const wrongUrlMessage = errorType === 'console'
|
|
46
|
-
? `Cluster Console URL is not valid (${((_c =
|
|
47
|
-
: `Cluster API URL is not valid (${((_d =
|
|
48
|
+
? `Cluster Console URL is not valid (${((_c = ocmClusterMemo.console) === null || _c === void 0 ? void 0 : _c.url) || ''})`
|
|
49
|
+
: `Cluster API URL is not valid (${((_d = ocmClusterMemo.api) === null || _d === void 0 ? void 0 : _d.url) || ''})`;
|
|
48
50
|
setError(react_1.default.createElement(react_1.default.Fragment, null,
|
|
49
51
|
wrongUrlMessage,
|
|
50
52
|
", you can",
|
|
@@ -60,8 +62,8 @@ const HostsClusterDetailTabContent = ({ cluster: ocmCluster, isVisible, }) => {
|
|
|
60
62
|
const loadDay2Cluster = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
61
63
|
var _e, _f;
|
|
62
64
|
try {
|
|
63
|
-
const day2Cluster = yield Day2ClusterService_1.default.fetchCluster(
|
|
64
|
-
const aiCluster = Day2ClusterService_1.default.completeAiClusterWithOcmCluster(day2Cluster,
|
|
65
|
+
const day2Cluster = yield Day2ClusterService_1.default.fetchCluster(ocmClusterMemo, pullSecret);
|
|
66
|
+
const aiCluster = Day2ClusterService_1.default.completeAiClusterWithOcmCluster(day2Cluster, ocmClusterMemo);
|
|
65
67
|
setDay2Cluster(aiCluster !== null && aiCluster !== void 0 ? aiCluster : null);
|
|
66
68
|
}
|
|
67
69
|
catch (e) {
|
|
@@ -70,12 +72,11 @@ const HostsClusterDetailTabContent = ({ cluster: ocmCluster, isVisible, }) => {
|
|
|
70
72
|
const isImport = (_f = (_e = e.config) === null || _e === void 0 ? void 0 : _e.url) === null || _f === void 0 ? void 0 : _f.includes('/import');
|
|
71
73
|
setError(react_1.default.createElement(HostsClusterDetailTabContentErrors_1.AddHostsApiError, { isImport: isImport || false, onTryAgain: handleClickTryAgainLink }));
|
|
72
74
|
}
|
|
73
|
-
return;
|
|
74
75
|
}
|
|
75
76
|
});
|
|
76
77
|
void loadDay2Cluster();
|
|
77
78
|
}
|
|
78
|
-
}, [
|
|
79
|
+
}, [pullSecret, day2Cluster, setDay2Cluster, isVisible, handleClickTryAgainLink, ocmClusterMemo]);
|
|
79
80
|
const refreshCluster = react_1.default.useCallback(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
80
81
|
if (!(day2Cluster === null || day2Cluster === void 0 ? void 0 : day2Cluster.id)) {
|
|
81
82
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostsClusterDetailTabContent.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx"],"names":[],"mappings":";;;;AAAA,0DAAyC;AACzC,iDAAuD;AACvD,4CAMyB;AACzB,uCAA4C;AAC5C,uDAAmE;AACnE,gGAAyF;AACzF,6CAAqD;AACrD,qDAAuD;AACvD,0CAAuC;AAEvC,kEAAyE;AACzE,6FAI8C;AAC9C,kFAAkD;AAClD,kFAAoF;AAEpF,wFAA6F;AAEtF,MAAM,4BAA4B,GAAG,CAAC,EAC3C,OAAO,EAAE,UAAU,EACnB,SAAS,GACkB,EAAE,EAAE;;IAC/B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAa,CAAC;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,sBAAc,EAAiB,IAAI,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,IAAA,qBAAa,GAAE,CAAC;IAEnC,MAAM,uBAAuB,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACrD,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpB,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAW,EAC9B,UAAU,CAAC,EAAE,IAAI,EAAE,EACnB,IAAA,oDAA2B,EAAC,UAAU,CAAC,gBAAgB,CAAC;QACtD,wBAAe,CAAC,qBAAqB,EACvC,UAAU,CAAC,IAAI,EACf,UAAU,EACV,UAAU,CAAC,iBAAiB,CAC7B,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;;QACnB,IAAI,CAAC,SAAS,EAAE;YACd,uCAAuC;YACvC,cAAc,CAAC,IAAI,CAAC,CAAC;YACrB,OAAO;SACR;
|
|
1
|
+
{"version":3,"file":"HostsClusterDetailTabContent.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx"],"names":[],"mappings":";;;;AAAA,0DAAyC;AACzC,iDAAuD;AACvD,4CAMyB;AACzB,uCAA4C;AAC5C,uDAAmE;AACnE,gGAAyF;AACzF,6CAAqD;AACrD,qDAAuD;AACvD,0CAAuC;AAEvC,kEAAyE;AACzE,6FAI8C;AAC9C,kFAAkD;AAClD,kFAAoF;AAEpF,wFAA6F;AAEtF,MAAM,4BAA4B,GAAG,CAAC,EAC3C,OAAO,EAAE,UAAU,EACnB,SAAS,GACkB,EAAE,EAAE;;IAC/B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAa,CAAC;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,sBAAc,EAAiB,IAAI,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,IAAA,qBAAa,GAAE,CAAC;IAEnC,uDAAuD;IACvD,MAAM,cAAc,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE3D,MAAM,uBAAuB,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACrD,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpB,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAW,EAC9B,UAAU,CAAC,EAAE,IAAI,EAAE,EACnB,IAAA,oDAA2B,EAAC,UAAU,CAAC,gBAAgB,CAAC;QACtD,wBAAe,CAAC,qBAAqB,EACvC,UAAU,CAAC,IAAI,EACf,UAAU,EACV,UAAU,CAAC,iBAAiB,CAC7B,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;;QACnB,IAAI,CAAC,SAAS,EAAE;YACd,uCAAuC;YACvC,cAAc,CAAC,IAAI,CAAC,CAAC;YACrB,OAAO;SACR;QAED,MAAM,oBAAoB,GAAG,CAAA,MAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,0CAAE,KAAK,0CAAE,KAAK,KAAI,CAAC,CAAC;QACxE,MAAM,kBAAkB,GAAG,4BAAkB,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;QACpF,IAAI,oBAAoB,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE;YACrD,QAAQ,CAAC,8BAAC,0DAAqB,IAAC,UAAU,EAAE,uBAAuB,GAAI,CAAC,CAAC;SAC1E;QAED,IAAI,CAAC,WAAW,IAAI,UAAU,EAAE;YAC9B,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,IAAA,qCAAgB,EAAC,cAAc,CAAC,CAAC;YACtE,IAAI,SAAS,EAAE;gBACb,MAAM,eAAe,GACnB,SAAS,KAAK,SAAS;oBACrB,CAAC,CAAC,qCAAqC,CAAA,MAAA,cAAc,CAAC,OAAO,0CAAE,GAAG,KAAI,EAAE,GAAG;oBAC3E,CAAC,CAAC,iCAAiC,CAAA,MAAA,cAAc,CAAC,GAAG,0CAAE,GAAG,KAAI,EAAE,GAAG,CAAC;gBACxE,QAAQ,CACN;oBACG,eAAe;;oBAAW,GAAG;oBAC9B,8BAAC,mBAAM,IAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,QAAC,OAAO,EAAE,uBAAuB,gBAEzD;wBAER,CACJ,CAAC;gBACF,OAAO;aACR;YAED,IAAI,CAAC,aAAa,EAAE;gBAClB,QAAQ,CAAC,kIAAsE,CAAC,CAAC;gBACjF,OAAO;aACR;YAED,MAAM,eAAe,GAAG,GAAS,EAAE;;gBACjC,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,4BAAkB,CAAC,YAAY,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;oBAEtF,MAAM,SAAS,GAAG,4BAAkB,CAAC,+BAA+B,CAClE,WAAW,EACX,cAAc,CACf,CAAC;oBACF,cAAc,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,CAAC,CAAC;iBACnC;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAA,oBAAc,EAAC,CAAC,CAAC,CAAC;oBAClB,IAAI,IAAA,kBAAU,EAAC,CAAC,CAAC,EAAE;wBACjB,MAAM,QAAQ,GAAG,MAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,GAAG,0CAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;wBACpD,QAAQ,CACN,8BAAC,qDAAgB,IACf,QAAQ,EAAE,QAAQ,IAAI,KAAK,EAC3B,UAAU,EAAE,uBAAuB,GACnC,CACH,CAAC;qBACH;iBACF;YACH,CAAC,CAAA,CAAC;YAEF,KAAK,eAAe,EAAE,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,uBAAuB,EAAE,cAAc,CAAC,CAAC,CAAC;IAElG,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAClD,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,EAAE,CAAA,EAAE;YACpB,OAAO;SACR;QACD,IAAI;YACF,MAAM,kBAAkB,GAAG,MAAM,4BAAkB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACrF,MAAM,SAAS,GAAG,4BAAkB,CAAC,+BAA+B,CAClE,kBAAkB,EAClB,UAAU,CACX,CAAC;YACF,cAAc,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,CAAC,CAAC;SACnC;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,oBAAc,EAAC,CAAC,CAAC,CAAC;YAClB,QAAQ,CAAC,8BAAC,sDAAiB,IAAC,UAAU,EAAE,uBAAuB,GAAI,CAAC,CAAC;SACtE;IACH,CAAC,CAAA,EAAE,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,EAAE,EAAE,uBAAuB,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAE3E,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE;YAC1B,KAAK,cAAc,EAAE,CAAC;QACxB,CAAC,EAAE,yBAAgB,CAAC,CAAC;QACrB,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,IAAI,KAAK,EAAE;QACT,OAAO,CACL,8BAAC,mBAAU,IACT,OAAO,EAAE,8BAAiB,CAAC,EAAE,EAC7B,OAAO,EAAE,KAAK,EACd,KAAK,EAAC,iDAAiD,GACvD,CACH,CAAC;KACH;IAED,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,8BAAC,qBAAY,IAAC,OAAO,EAAC,uCAAuC,GAAG,CAAC;KACzE;IAED,OAAO,CACL,8BAAC,gCAAuB,IACtB,OAAO,EAAE,WAAW,EACpB,YAAY,EAAE,cAAc,EAC5B,aAAa,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,0CAAE,GAAG,EACvC,OAAO,EAAE,UAAU,CAAC,OAAO;QAE3B,8BAAC,2DAAgC;YAC/B,8BAAC,qDAA8B,IAC7B,SAAS,EAAE,8BAAC,qBAAY,OAAG,EAC3B,OAAO,EAAE,WAAW,EACpB,eAAe,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAkC,EAC7D,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,EAC9C,YAAY,EAAE,MAAA,WAAW,CAAC,QAAQ,0CAAE,IAAI;gBAExC,8BAAC,mBAAQ,OAAG,CACmB,CACA,CACX,CAC3B,CAAC;AACJ,CAAC,CAAC;AAnJW,QAAA,4BAA4B,gCAmJvC"}
|
|
@@ -33,6 +33,9 @@ export const HostsClusterDetailTabContent = ({
|
|
|
33
33
|
const [day2Cluster, setDay2Cluster] = useStateSafely<Cluster | null>(null);
|
|
34
34
|
const pullSecret = usePullSecret();
|
|
35
35
|
|
|
36
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
37
|
+
const ocmClusterMemo = React.useMemo(() => ocmCluster, []);
|
|
38
|
+
|
|
36
39
|
const handleClickTryAgainLink = React.useCallback(() => {
|
|
37
40
|
setError(undefined);
|
|
38
41
|
setDay2Cluster(null);
|
|
@@ -53,19 +56,20 @@ export const HostsClusterDetailTabContent = ({
|
|
|
53
56
|
setDay2Cluster(null);
|
|
54
57
|
return;
|
|
55
58
|
}
|
|
56
|
-
|
|
57
|
-
const
|
|
59
|
+
|
|
60
|
+
const day1ClusterHostCount = ocmClusterMemo?.metrics?.nodes?.total || 0;
|
|
61
|
+
const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmClusterMemo);
|
|
58
62
|
if (day1ClusterHostCount === 0 || !openshiftClusterId) {
|
|
59
63
|
setError(<UnableToAddHostsError onTryAgain={handleClickTryAgainLink} />);
|
|
60
64
|
}
|
|
61
65
|
|
|
62
66
|
if (!day2Cluster && pullSecret) {
|
|
63
|
-
const { apiVipDnsname, errorType } = getApiVipDnsName(
|
|
67
|
+
const { apiVipDnsname, errorType } = getApiVipDnsName(ocmClusterMemo);
|
|
64
68
|
if (errorType) {
|
|
65
69
|
const wrongUrlMessage =
|
|
66
70
|
errorType === 'console'
|
|
67
|
-
? `Cluster Console URL is not valid (${
|
|
68
|
-
: `Cluster API URL is not valid (${
|
|
71
|
+
? `Cluster Console URL is not valid (${ocmClusterMemo.console?.url || ''})`
|
|
72
|
+
: `Cluster API URL is not valid (${ocmClusterMemo.api?.url || ''})`;
|
|
69
73
|
setError(
|
|
70
74
|
<>
|
|
71
75
|
{wrongUrlMessage}, you can{' '}
|
|
@@ -85,11 +89,11 @@ export const HostsClusterDetailTabContent = ({
|
|
|
85
89
|
|
|
86
90
|
const loadDay2Cluster = async () => {
|
|
87
91
|
try {
|
|
88
|
-
const day2Cluster = await Day2ClusterService.fetchCluster(
|
|
92
|
+
const day2Cluster = await Day2ClusterService.fetchCluster(ocmClusterMemo, pullSecret);
|
|
89
93
|
|
|
90
94
|
const aiCluster = Day2ClusterService.completeAiClusterWithOcmCluster(
|
|
91
95
|
day2Cluster,
|
|
92
|
-
|
|
96
|
+
ocmClusterMemo,
|
|
93
97
|
);
|
|
94
98
|
setDay2Cluster(aiCluster ?? null);
|
|
95
99
|
} catch (e) {
|
|
@@ -103,13 +107,12 @@ export const HostsClusterDetailTabContent = ({
|
|
|
103
107
|
/>,
|
|
104
108
|
);
|
|
105
109
|
}
|
|
106
|
-
return;
|
|
107
110
|
}
|
|
108
111
|
};
|
|
109
112
|
|
|
110
113
|
void loadDay2Cluster();
|
|
111
114
|
}
|
|
112
|
-
}, [
|
|
115
|
+
}, [pullSecret, day2Cluster, setDay2Cluster, isVisible, handleClickTryAgainLink, ocmClusterMemo]);
|
|
113
116
|
|
|
114
117
|
const refreshCluster = React.useCallback(async () => {
|
|
115
118
|
if (!day2Cluster?.id) {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.38.
|
|
4
|
-
"@openshift-assisted/types": "2.38.
|
|
3
|
+
"@openshift-assisted/locales": "2.38.5",
|
|
4
|
+
"@openshift-assisted/types": "2.38.5",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "5.2.0",
|
|
7
7
|
"@patternfly/react-code-editor": "5.2.0",
|
|
@@ -139,5 +139,5 @@
|
|
|
139
139
|
]
|
|
140
140
|
}
|
|
141
141
|
},
|
|
142
|
-
"version": "2.38.
|
|
142
|
+
"version": "2.38.5"
|
|
143
143
|
}
|