ydb-embedded-ui 12.12.0 → 12.12.2
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/dist/containers/App/Content.js +1 -1
- package/dist/containers/App/Content.js.map +1 -1
- package/dist/containers/Authentication/Authentication.js +14 -8
- package/dist/containers/Authentication/Authentication.js.map +1 -1
- package/dist/store/reducers/cluster/cluster.d.ts +1 -1
- package/dist/store/reducers/cluster/cluster.js +2 -1
- package/dist/store/reducers/cluster/cluster.js.map +1 -1
- package/dist/store/reducers/cluster/parseFields.d.ts +2 -1
- package/dist/store/reducers/cluster/parseFields.js +15 -0
- package/dist/store/reducers/cluster/parseFields.js.map +1 -1
- package/dist/store/reducers/clusters/utils.js +4 -2
- package/dist/store/reducers/clusters/utils.js.map +1 -1
- package/dist/types/api/meta.d.ts +1 -2
- package/dist/utils/hooks/useMetaAuth.d.ts +2 -2
- package/dist/utils/hooks/useMetaAuth.js +8 -6
- package/dist/utils/hooks/useMetaAuth.js.map +1 -1
- package/package.json +1 -1
|
@@ -169,7 +169,7 @@ function ContentWrapper(props) {
|
|
|
169
169
|
}
|
|
170
170
|
return _jsx(Authentication, {});
|
|
171
171
|
};
|
|
172
|
-
return (_jsxs(Switch, { children: [!authUnavailable && (_jsx(Route, { path: routes.auth, children: _jsx(Authentication, { closable: true }) })), _jsx(Route, { children: _jsx("div", { className: b({ embedded: singleClusterMode }), children: isAuthenticated ? props.children : renderNotAuthenticated() }) })] }));
|
|
172
|
+
return (_jsxs(Switch, { children: [!authUnavailable && !metaAuthUnavailable && (_jsx(Route, { path: routes.auth, children: _jsx(Authentication, { closable: true }) })), _jsx(Route, { children: _jsx("div", { className: b({ embedded: singleClusterMode }), children: isAuthenticated ? props.children : renderNotAuthenticated() }) })] }));
|
|
173
173
|
}
|
|
174
174
|
function mapStateToProps(state) {
|
|
175
175
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Content.js","sourceRoot":"","sources":["../../../src/containers/App/Content.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAC,SAAS,EAAC,MAAM,6CAA6C,CAAC;AACtE,OAAO,EAAC,aAAa,EAAC,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAGhD,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,OAAO,EAAC,iBAAiB,EAAC,MAAM,oDAAoD,CAAC;AACrF,OAAO,EACH,oBAAoB,EACpB,yBAAyB,EACzB,yBAAyB,EACzB,wBAAwB,GAC3B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAC,EAAE,EAAC,MAAM,gBAAgB,CAAC;AAClC,OAAO,EAAC,oBAAoB,EAAC,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAC,WAAW,EAAE,sBAAsB,EAAC,MAAM,+BAA+B,CAAC;AAClF,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACrE,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,MAAM,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACH,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,aAAa,GAChB,MAAM,YAAY,CAAC;AAEpB,OAAO,YAAY,CAAC;AAEpB,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AASpB,MAAM,WAAW,GAAgB;IAC7B;QACI,IAAI,EAAE,MAAM,CAAC,OAAO;QACpB,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC;QACvE,OAAO,EAAE,WAAW;KACvB;IACD;QACI,IAAI,EAAE,MAAM,CAAC,MAAM;QACnB,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC;QACpE,OAAO,EAAE,WAAW;KACvB;IACD;QACI,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAC9D,OAAO,EAAE,WAAW;KACvB;IACD;QACI,IAAI,EAAE,MAAM,CAAC,KAAK;QAClB,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,EAAE,WAAW,CAAC;QAC7E,OAAO,EAAE,WAAW;KACvB;IACD;QACI,IAAI,EAAE,MAAM,CAAC,KAAK;QAClB,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,EAAE,WAAW,CAAC;QAC7E,OAAO,EAAE,WAAW;KACvB;IACD;QACI,IAAI,EAAE,MAAM,CAAC,YAAY;QACzB,IAAI,EAAE,gBAAgB;QACtB,SAAS,EAAE,aAAa,CACpB,GAAG,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC,EACpD,kBAAkB,CACrB;QACD,OAAO,EAAE,WAAW;KACvB;IACD;QACI,IAAI,EAAE,MAAM,CAAC,MAAM;QACnB,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC;QAC7D,OAAO,EAAE,WAAW;KACvB;CACJ,CAAC;AAEF,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,UAAU,CAAC,CAAC;AAEjF,SAAS,eAAe,CAAC,KAAc,EAAE,KAAgB;IACrD,OAAO,CACH,KAAC,KAAK,IAEF,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;;YACd,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,OAAO,CAAC;YACZ,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;gBAClC,OAAO,GAAG,KAAC,SAAS,OAAK,KAAK,GAAI,CAAC;YACvC,CAAC;iBAAM,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC7C,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,KAAK,EAAC,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC5B,CAAC;YACD,MAAM,OAAO,GAAG,MAAA,KAAK,CAAC,OAAO,mCAAI,KAAK,CAAC,QAAQ,CAAC;YAChD,OAAO,CACH,eAAM,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,YACtB,KAAC,OAAO,cAAE,OAAO,GAAW,GACzB,CACV,CAAC;QACN,CAAC,IApBI,KAAK,CAAC,IAAI,CAqBjB,CACL,CAAC;AACN,CAAC;AAMD,MAAM,UAAU,OAAO,CAAC,KAAmB;;IACvC,MAAM,EAAC,iBAAiB,EAAC,GAAG,KAAK,CAAC;IAElC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9B,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAE/C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACzC,MAAM,aAAa,GACf,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,mCAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAC,EAAE,EAAE,cAAc,EAAE,EAAC,CAAC,CAAC,CAAC,EAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAC,CAAC,CAAC;IAE5F,OAAO,CACH,MAAC,MAAM,eACF,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,EAC3B,MAAC,KAAK,eACF,KAAC,MAAM,KAAG,EACV,MAAC,MAAM,eACF,iBAAiB;gCACd,CAAC,CAAC,IAAI;gCACN,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE;oCACnB,IAAI,EAAE,MAAM,CAAC,QAAQ;oCACrB,KAAK,EAAE,IAAI;oCACX,SAAS,EAAE,QAAQ;oCACnB,IAAI,EAAE,YAAY;oCAClB,OAAO,EAAE,mBAAmB;iCAC/B,CAAC,EAEP,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gCACvB,OAAO,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;4BACzC,CAAC,CAAC,EACF,KAAC,KAAK,IACF,IAAI,EAAE,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,EAC9C,KAAK,EAAE,aAAa,CAAC,KAAK,EAC1B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,KAAC,QAAQ,IAAC,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,GAAI,GAC5E,IACG,IACL,IACH,CACZ,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAAC,EAAC,QAAQ,EAA8B;IACxD,OAAO;IACH,4GAA4G;IAC5G,KAAC,eAAe,cACZ,MAAC,OAAO,eACJ,KAAC,YAAY,KAAG,EAEhB,KAAC,eAAe,cAAE,QAAQ,GAAmB,IACvC,GACI,CACrB,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB,CAAC,EAAC,QAAQ,EAA8B;IAChE,OAAO,CACH,KAAC,mBAAmB,cAChB,KAAC,WAAW,cAAE,QAAQ,GAAe,GACnB,CACzB,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAAC,EAAC,QAAQ,EAA8B;IACxD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,KAAC,OAAO,IAAC,OAAO,kBAAE,QAAQ,GAAW,CAAC;IACjD,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,OAAO,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAiD;IAChF,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAC;IAExC,MAAM,EAAC,UAAU,EAAE,KAAK,EAAC,GAAG,iBAAiB,CAAC,cAAc,CAAC;QACzD,QAAQ;QACR,OAAO;KACV,CAAC,CAAC;IACH,MAAM,EAAC,QAAQ,EAAC,GAAG,WAAW,EAAE,CAAC;IAEjC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,EAAC,GAAG,SAAS,CAAC,4BAA4B,EAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEnF,OAAO,CACH,KAAC,aAAa,IAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC,GAAG,EAAC,KAAK,EAAE,CAAC,YACjD,KAAC,SAAS,IAAC,KAAK,EAAE,KAAK,KAAM,UAAU,EAAE,cAAc,EAAE,QAAQ,YAC5D,QAAQ,GACD,GACA,CACnB,CAAC;AACN,CAAC;AAED,SAAS,YAAY;IACjB,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAC;IACxC,YAAY,CAAC,oBAAoB,CAAC,EAAC,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC;IACzD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,EAAC,QAAQ,EAA8B;IAC5D,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,oBAAoB,EAAE,CAAC;IAE7C,wBAAwB,EAAE,CAAC;IAC3B,8EAA8E;IAC9E,MAAM,sBAAsB,GAAG,yBAAyB,EAAE,CAAC;IAE3D,yDAAyD;IACzD,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,KAAC,YAAY,KAAG,CAAC;IAC5B,CAAC;IAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC;IAElD,OAAO,CACH,KAAC,aAAa,IAAC,OAAO,EAAE,CAAC,kBAAkB,IAAI,CAAC,sBAAsB,EAAE,IAAI,EAAC,GAAG,YAC3E,QAAQ,GACG,CACnB,CAAC;AACN,CAAC;AAED,mGAAmG;AACnG,gHAAgH;AAChH,SAAS,mBAAmB,CAAC,EAAC,QAAQ,EAA8B;IAChE,wBAAwB,EAAE,CAAC;IAC3B,8EAA8E;IAC9E,MAAM,sBAAsB,GAAG,yBAAyB,EAAE,CAAC;IAE3D,OAAO,CACH,KAAC,aAAa,IAAC,OAAO,EAAE,CAAC,sBAAsB,EAAE,IAAI,EAAC,GAAG,YACpD,QAAQ,GACG,CACnB,CAAC;AACN,CAAC;AAQD,SAAS,cAAc,CAAC,KAA0B;IAC9C,MAAM,EAAC,iBAAiB,EAAE,eAAe,EAAC,GAAG,KAAK,CAAC;IACnD,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;IAEpD,MAAM,mBAAmB,GAAG,sBAAsB,EAAE,CAAC;IAErD,MAAM,sBAAsB,GAAG,GAAG,EAAE;QAChC,IAAI,eAAe,IAAI,mBAAmB,EAAE,CAAC;YACzC,OAAO,KAAC,YAAY,KAAG,CAAC;QAC5B,CAAC;QACD,OAAO,KAAC,cAAc,KAAG,CAAC;IAC9B,CAAC,CAAC;IAEF,OAAO,CACH,MAAC,MAAM,eACF,CAAC,eAAe,IAAI,
|
|
1
|
+
{"version":3,"file":"Content.js","sourceRoot":"","sources":["../../../src/containers/App/Content.tsx"],"names":[],"mappings":"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"}
|
|
@@ -17,9 +17,21 @@ function Authentication({ closable = false }) {
|
|
|
17
17
|
const history = useHistory();
|
|
18
18
|
const location = useLocation();
|
|
19
19
|
const needDatabase = useLoginWithDatabase();
|
|
20
|
-
const useMeta = useMetaAuth();
|
|
21
20
|
const [authenticate, { isLoading }] = authenticationApi.useAuthenticateMutation();
|
|
22
21
|
const { returnUrl, database: databaseFromQuery } = parseQuery(location);
|
|
22
|
+
const path = React.useMemo(() => {
|
|
23
|
+
let path;
|
|
24
|
+
if (returnUrl) {
|
|
25
|
+
const decodedUrl = decodeURIComponent(returnUrl.toString());
|
|
26
|
+
// to prevent page reload we use router history
|
|
27
|
+
// history navigates relative to origin
|
|
28
|
+
// so we remove origin to make it work properly
|
|
29
|
+
const url = new URL(decodedUrl);
|
|
30
|
+
path = url.pathname + url.search;
|
|
31
|
+
}
|
|
32
|
+
return path;
|
|
33
|
+
}, [returnUrl]);
|
|
34
|
+
const useMeta = useMetaAuth(path);
|
|
23
35
|
const [login, setLogin] = React.useState('');
|
|
24
36
|
const [database, setDatabase] = React.useState((_a = databaseFromQuery === null || databaseFromQuery === void 0 ? void 0 : databaseFromQuery.toString()) !== null && _a !== void 0 ? _a : '');
|
|
25
37
|
const [password, setPass] = React.useState('');
|
|
@@ -43,13 +55,7 @@ function Authentication({ closable = false }) {
|
|
|
43
55
|
authenticate({ user: login, password, database, useMeta })
|
|
44
56
|
.unwrap()
|
|
45
57
|
.then(() => {
|
|
46
|
-
if (
|
|
47
|
-
const decodedUrl = decodeURIComponent(returnUrl.toString());
|
|
48
|
-
// to prevent page reload we use router history
|
|
49
|
-
// history navigates relative to origin
|
|
50
|
-
// so we remove origin to make it work properly
|
|
51
|
-
const url = new URL(decodedUrl);
|
|
52
|
-
const path = url.pathname + url.search;
|
|
58
|
+
if (path) {
|
|
53
59
|
history.replace(path);
|
|
54
60
|
}
|
|
55
61
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Authentication.js","sourceRoot":"","sources":["../../../src/containers/Authentication/Authentication.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAC,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAC,MAAM,EAAE,IAAI,IAAI,YAAY,EAAE,IAAI,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,iBAAiB,EAAC,MAAM,oDAAoD,CAAC;AACrF,OAAO,EAAC,oBAAoB,EAAC,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAC,EAAE,EAAC,MAAM,gBAAgB,CAAC;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,SAAS,CAAC;AAEtE,OAAO,WAAW,MAAM,4BAA4B,CAAC;AAErD,OAAO,uBAAuB,CAAC;AAE/B,MAAM,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC;AAM/B,SAAS,cAAc,CAAC,EAAC,QAAQ,GAAG,KAAK,EAAsB;;IAC3D,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,YAAY,GAAG,oBAAoB,EAAE,CAAC;IAE5C,MAAM,
|
|
1
|
+
{"version":3,"file":"Authentication.js","sourceRoot":"","sources":["../../../src/containers/Authentication/Authentication.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ export declare function useClusterBaseInfo(): {
|
|
|
21
21
|
traceView: import("../../../types/api/meta").MetaClusterTraceView | undefined;
|
|
22
22
|
cores: import("../../../types/api/meta").MetaClusterCoresUrl | undefined;
|
|
23
23
|
logging: import("../../../types/api/meta").MetaClusterLogsUrls | undefined;
|
|
24
|
+
settings: import("../../../types/api/meta").MetaClusterSettings | undefined;
|
|
24
25
|
owner?: string;
|
|
25
26
|
location?: string;
|
|
26
27
|
image?: string;
|
|
@@ -35,7 +36,6 @@ export declare function useClusterBaseInfo(): {
|
|
|
35
36
|
use_embedded_ui?: boolean;
|
|
36
37
|
trace_view?: string | import("../../../types/api/meta").MetaClusterTraceView;
|
|
37
38
|
trace_check?: string | import("../../../types/api/meta").MetaClusterTraceCheck;
|
|
38
|
-
settings?: import("../../../types/api/meta").MetaClusterSettings;
|
|
39
39
|
};
|
|
40
40
|
export type ClusterInfo = ReturnType<typeof useClusterBaseInfo> & Record<string, unknown>;
|
|
41
41
|
export declare const selectClusterTitle: ((state: {
|
|
@@ -8,7 +8,7 @@ import { useIsViewerUser } from '../../../utils/hooks/useIsUserAllowedToMakeChan
|
|
|
8
8
|
import { isQueryErrorResponse } from '../../../utils/query';
|
|
9
9
|
import { api } from '../api';
|
|
10
10
|
import { selectNodesMap } from '../nodesList';
|
|
11
|
-
import { parseCoresUrl, parseLoggingUrls, parseTraceField } from './parseFields';
|
|
11
|
+
import { parseCoresUrl, parseLoggingUrls, parseSettingsField, parseTraceField } from './parseFields';
|
|
12
12
|
import { createSelectClusterGroupsQuery, getGroupStatsFromClusterInfo, normalizeDomain, parseGroupsStatsQueryResponse, } from './utils';
|
|
13
13
|
export const INITIAL_DEFAULT_CLUSTER_TAB = clusterTabsIds.tenants;
|
|
14
14
|
const defaultClusterTabLS = localStorage.getItem(DEFAULT_CLUSTER_TAB_KEY);
|
|
@@ -132,6 +132,7 @@ export function useClusterBaseInfo() {
|
|
|
132
132
|
traceView: parseTraceField(data.trace_view),
|
|
133
133
|
cores: parseCoresUrl(data.cores),
|
|
134
134
|
logging: parseLoggingUrls(data.logging),
|
|
135
|
+
settings: parseSettingsField(data.settings),
|
|
135
136
|
};
|
|
136
137
|
}
|
|
137
138
|
const createClusterInfoSelector = createSelector((clusterName) => clusterName, (clusterName) => clusterApi.endpoints.getClusterInfo.select(clusterName));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/cluster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAC,qBAAqB,EAAE,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAC,uBAAuB,EAAC,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAC,eAAe,EAAC,MAAM,oDAAoD,CAAC;AACnF,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/cluster.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { MetaBaseClusterInfo, MetaClusterCoresUrl, MetaClusterLogsUrls, MetaClusterTraceView } from '../../../types/api/meta';
|
|
1
|
+
import type { MetaBaseClusterInfo, MetaClusterCoresUrl, MetaClusterLogsUrls, MetaClusterSettings, MetaClusterTraceView } from '../../../types/api/meta';
|
|
2
2
|
export declare function parseTraceField(traceView: MetaBaseClusterInfo['trace_view']): MetaClusterTraceView | undefined;
|
|
3
3
|
export declare function parseCoresUrl(cores: MetaBaseClusterInfo['cores']): MetaClusterCoresUrl | undefined;
|
|
4
4
|
export declare function parseLoggingUrls(logging: MetaBaseClusterInfo['logging']): MetaClusterLogsUrls | undefined;
|
|
5
|
+
export declare function parseSettingsField(settings: MetaBaseClusterInfo['settings']): MetaClusterSettings | undefined;
|
|
@@ -46,4 +46,19 @@ export function parseLoggingUrls(logging) {
|
|
|
46
46
|
}
|
|
47
47
|
return undefined;
|
|
48
48
|
}
|
|
49
|
+
const settingsSchema = z.object({
|
|
50
|
+
use_meta_proxy: z.boolean().optional(),
|
|
51
|
+
});
|
|
52
|
+
export function parseSettingsField(settings) {
|
|
53
|
+
if (settings && typeof settings === 'object') {
|
|
54
|
+
return settings;
|
|
55
|
+
}
|
|
56
|
+
try {
|
|
57
|
+
return settings ? settingsSchema.parse(JSON.parse(settings)) : undefined;
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
console.error('Error parsing settings field:', e);
|
|
61
|
+
}
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
49
64
|
//# sourceMappingURL=parseFields.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseFields.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/parseFields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"parseFields.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/parseFields.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { uiFactory } from '../../../uiFactory/uiFactory';
|
|
2
2
|
import { prepareBackendFromBalancer } from '../../../utils/parseBalancer';
|
|
3
3
|
import { getVersionMap, getVersionsData, prepareClusterVersions, } from '../../../utils/versions/clusterVersionColors';
|
|
4
|
+
import { parseSettingsField } from '../cluster/parseFields';
|
|
4
5
|
export const prepareClustersData = (data) => {
|
|
5
6
|
const { clusters = [] } = data;
|
|
6
7
|
let allMinorVersions = new Map();
|
|
@@ -12,9 +13,9 @@ export const prepareClustersData = (data) => {
|
|
|
12
13
|
const versionsData = getVersionsData(allMinorVersions);
|
|
13
14
|
// Apply color map to every cluster in the list
|
|
14
15
|
return clusters.map((cluster) => {
|
|
15
|
-
|
|
16
|
+
const parsedSettings = parseSettingsField(cluster.settings);
|
|
16
17
|
// If no backend is provided, it will be automatically generated by API instance
|
|
17
|
-
const useMetaProxy = uiFactory.useMetaProxy && (
|
|
18
|
+
const useMetaProxy = uiFactory.useMetaProxy && (parsedSettings === null || parsedSettings === void 0 ? void 0 : parsedSettings.use_meta_proxy) !== false;
|
|
18
19
|
const preparedBackend = cluster.balancer && !useMetaProxy
|
|
19
20
|
? prepareBackendFromBalancer(cluster.balancer)
|
|
20
21
|
: undefined;
|
|
@@ -22,6 +23,7 @@ export const prepareClustersData = (data) => {
|
|
|
22
23
|
...cluster,
|
|
23
24
|
preparedVersions: prepareClusterVersions(cluster.versions, versionsData),
|
|
24
25
|
preparedBackend,
|
|
26
|
+
settings: parsedSettings,
|
|
25
27
|
};
|
|
26
28
|
});
|
|
27
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AACxE,OAAO,EACH,aAAa,EACb,eAAe,EACf,sBAAsB,GACzB,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AACxE,OAAO,EACH,aAAa,EACb,eAAe,EACf,sBAAsB,GACzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAI1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAkB,EAAqB,EAAE;IACzE,MAAM,EAAC,QAAQ,GAAG,EAAE,EAAC,GAAG,IAAI,CAAC;IAE7B,IAAI,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAEjC,sCAAsC;IACtC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,QAAQ,GAAG,EAAE,EAAC,EAAE,EAAE;QACjC,gBAAgB,GAAG,aAAa,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,YAAY,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAEvD,+CAA+C;IAC/C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5D,gFAAgF;QAChF,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,MAAK,KAAK,CAAC;QACxF,MAAM,eAAe,GACjB,OAAO,CAAC,QAAQ,IAAI,CAAC,YAAY;YAC7B,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC9C,CAAC,CAAC,SAAS,CAAC;QAEpB,OAAO;YACH,GAAG,OAAO;YACV,gBAAgB,EAAE,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC;YACxE,eAAe;YACf,QAAQ,EAAE,cAAc;SAC3B,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
|
package/dist/types/api/meta.d.ts
CHANGED
|
@@ -41,7 +41,7 @@ export interface MetaBaseClusterInfo {
|
|
|
41
41
|
logging?: string | MetaClusterLogsUrls;
|
|
42
42
|
trace_view?: string | MetaClusterTraceView;
|
|
43
43
|
trace_check?: string | MetaClusterTraceCheck;
|
|
44
|
-
settings?: MetaClusterSettings;
|
|
44
|
+
settings?: string | MetaClusterSettings;
|
|
45
45
|
}
|
|
46
46
|
export interface MetaGeneralClusterInfo extends MetaBaseClusterInfo {
|
|
47
47
|
cluster?: MetaViewerClusterInfo;
|
|
@@ -80,5 +80,4 @@ export interface MetaClusterTraceCheck {
|
|
|
80
80
|
}
|
|
81
81
|
export interface MetaClusterSettings {
|
|
82
82
|
use_meta_proxy?: boolean;
|
|
83
|
-
proxy?: unknown;
|
|
84
83
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function useMetaAuth(): boolean;
|
|
2
|
-
export declare function useMetaAuthUnavailable(): boolean;
|
|
1
|
+
export declare function useMetaAuth(path?: string): boolean;
|
|
2
|
+
export declare function useMetaAuthUnavailable(path?: string): boolean;
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
import { useLocation } from 'react-router-dom';
|
|
2
2
|
import { checkIsClustersPage } from '../../routes';
|
|
3
3
|
import { useMetaLoginAvailable, useMetaWhoAmIAvailable, } from '../../store/reducers/capabilities/hooks';
|
|
4
|
-
function useMetaAuthState() {
|
|
4
|
+
function useMetaAuthState(path) {
|
|
5
5
|
const location = useLocation();
|
|
6
|
-
const isClustersPage =
|
|
6
|
+
const isClustersPage = path
|
|
7
|
+
? checkIsClustersPage(path)
|
|
8
|
+
: checkIsClustersPage(location.pathname);
|
|
7
9
|
const metaLoginAvailable = useMetaLoginAvailable();
|
|
8
10
|
const metaWhoAmIAvailable = useMetaWhoAmIAvailable();
|
|
9
11
|
return { isClustersPage, metaAuthAvailable: metaLoginAvailable && metaWhoAmIAvailable };
|
|
10
12
|
}
|
|
11
|
-
export function useMetaAuth() {
|
|
12
|
-
const { isClustersPage, metaAuthAvailable } = useMetaAuthState();
|
|
13
|
+
export function useMetaAuth(path) {
|
|
14
|
+
const { isClustersPage, metaAuthAvailable } = useMetaAuthState(path);
|
|
13
15
|
return isClustersPage && metaAuthAvailable;
|
|
14
16
|
}
|
|
15
|
-
export function useMetaAuthUnavailable() {
|
|
16
|
-
const { isClustersPage, metaAuthAvailable } = useMetaAuthState();
|
|
17
|
+
export function useMetaAuthUnavailable(path) {
|
|
18
|
+
const { isClustersPage, metaAuthAvailable } = useMetaAuthState(path);
|
|
17
19
|
return isClustersPage && !metaAuthAvailable;
|
|
18
20
|
}
|
|
19
21
|
//# sourceMappingURL=useMetaAuth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMetaAuth.js","sourceRoot":"","sources":["../../../src/utils/hooks/useMetaAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,cAAc,CAAC;AACjD,OAAO,EACH,qBAAqB,EACrB,sBAAsB,GACzB,MAAM,yCAAyC,CAAC;AAEjD,SAAS,gBAAgB;
|
|
1
|
+
{"version":3,"file":"useMetaAuth.js","sourceRoot":"","sources":["../../../src/utils/hooks/useMetaAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAC,mBAAmB,EAAC,MAAM,cAAc,CAAC;AACjD,OAAO,EACH,qBAAqB,EACrB,sBAAsB,GACzB,MAAM,yCAAyC,CAAC;AAEjD,SAAS,gBAAgB,CAAC,IAAa;IACnC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,cAAc,GAAG,IAAI;QACvB,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAC3B,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,kBAAkB,GAAG,qBAAqB,EAAE,CAAC;IACnD,MAAM,mBAAmB,GAAG,sBAAsB,EAAE,CAAC;IAErD,OAAO,EAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,IAAI,mBAAmB,EAAC,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAa;IACrC,MAAM,EAAC,cAAc,EAAE,iBAAiB,EAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEnE,OAAO,cAAc,IAAI,iBAAiB,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAa;IAChD,MAAM,EAAC,cAAc,EAAE,iBAAiB,EAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEnE,OAAO,cAAc,IAAI,CAAC,iBAAiB,CAAC;AAChD,CAAC"}
|