ydb-embedded-ui 22.8.0 → 22.9.0
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/App.js +1 -1
- package/dist/containers/App/App.js.map +1 -1
- package/dist/containers/App/App.scss +0 -2
- package/dist/containers/Tenant/Diagnostics/Diagnostics.js +6 -3
- package/dist/containers/Tenant/Diagnostics/Diagnostics.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/Overview/AsyncReplicationPaths/i18n/en.json +1 -1
- package/dist/containers/Tenant/Diagnostics/useDiagnosticsPages.js +5 -2
- package/dist/containers/Tenant/Diagnostics/useDiagnosticsPages.js.map +1 -1
- package/dist/containers/VDiskPage/VDiskStorageDetails.js +1 -3
- package/dist/containers/VDiskPage/VDiskStorageDetails.js.map +1 -1
- package/dist/services/parsers/parseMetaTenants.js +1 -0
- package/dist/services/parsers/parseMetaTenants.js.map +1 -1
- package/dist/store/reducers/tenant/tenant.d.ts +4 -0
- package/dist/store/reducers/tenant/tenant.js +10 -2
- package/dist/store/reducers/tenant/tenant.js.map +1 -1
- package/dist/store/reducers/tenants/tenants.js +13 -1
- package/dist/store/reducers/tenants/tenants.js.map +1 -1
- package/dist/store/reducers/tenants/types.d.ts +3 -1
- package/dist/store/reducers/tenants/utils.d.ts +1 -1
- package/dist/store/reducers/tenants/utils.js +2 -1
- package/dist/store/reducers/tenants/utils.js.map +1 -1
- package/dist/types/api/meta.d.ts +4 -0
- package/dist/types/api/tenant.d.ts +3 -0
- package/dist/types/api/tenant.js.map +1 -1
- package/package.json +1 -1
- package/src/containers/App/App.scss +0 -2
- package/src/containers/App/App.tsx +8 -1
- package/src/containers/Tenant/Diagnostics/Diagnostics.tsx +21 -5
- package/src/containers/Tenant/Diagnostics/Overview/AsyncReplicationPaths/i18n/en.json +1 -1
- package/src/containers/Tenant/Diagnostics/useDiagnosticsPages.ts +6 -2
- package/src/containers/VDiskPage/VDiskStorageDetails.tsx +1 -3
- package/src/services/parsers/parseMetaTenants.ts +1 -0
- package/src/store/reducers/tenant/tenant.ts +13 -2
- package/src/store/reducers/tenants/tenants.ts +12 -1
- package/src/store/reducers/tenants/types.ts +3 -1
- package/src/store/reducers/tenants/utils.ts +5 -1
- package/src/types/api/meta.ts +4 -0
- package/src/types/api/tenant.ts +3 -0
|
@@ -18,7 +18,7 @@ function AppContent({ userSettings, children, }) {
|
|
|
18
18
|
const { appTitle } = useAppTitle();
|
|
19
19
|
const singleClusterMode = useTypedSelector((state) => state.singleClusterMode);
|
|
20
20
|
const fullscreenRootRef = React.useRef(null);
|
|
21
|
-
return (_jsxs(React.Fragment, { children: [_jsx(Helmet, { defaultTitle: appTitle, titleTemplate: `%s — ${appTitle}
|
|
21
|
+
return (_jsxs(React.Fragment, { children: [_jsx(Helmet, { defaultTitle: appTitle, titleTemplate: `%s — ${appTitle}`, children: singleClusterMode && (_jsx("link", { rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Rubik&display=swap" })) }), _jsx(FullscreenProvider, { fullscreenRootRef: fullscreenRootRef, children: _jsx(ContentWrapper, { children: _jsxs(NavigationWrapper, { singleClusterMode: singleClusterMode, userSettings: userSettings, children: [_jsx(Content, { singleClusterMode: singleClusterMode, children: children }), _jsx("div", { ref: fullscreenRootRef })] }) }) })] }));
|
|
22
22
|
}
|
|
23
23
|
export default App;
|
|
24
24
|
//# sourceMappingURL=App.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/containers/App/App.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAE1C,OAAO,EAAC,kBAAkB,EAAC,MAAM,+CAA+C,CAAC;AACjF,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oCAAoC,CAAC;AAGpE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,cAAc,EAAE,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClD,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,YAAY,CAAC;AAEpB,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAUzC,SAAS,GAAG,CAAC,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,GAAG,eAAe,EAAW;IACvF,MAAM,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC;IAE5C,OAAO,CACH,MAAC,SAAS,IAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,aACzD,KAAC,UAAU,IAAC,YAAY,EAAE,YAAY,YAAG,QAAQ,GAAc,EAC9D,SAAS,IAAI,KAAC,SAAS,KAAG,IACnB,CACf,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,EAChB,YAAY,EACZ,QAAQ,GAIX;IACG,MAAM,EAAC,QAAQ,EAAC,GAAG,WAAW,EAAE,CAAC;IACjC,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC/E,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAiB,IAAI,CAAC,CAAC;IAE7D,OAAO,CACH,MAAC,KAAK,CAAC,QAAQ,eACX,KAAC,MAAM,IAAC,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"App.js","sourceRoot":"","sources":["../../../src/containers/App/App.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAE1C,OAAO,EAAC,kBAAkB,EAAC,MAAM,+CAA+C,CAAC;AACjF,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oCAAoC,CAAC;AAGpE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,cAAc,EAAE,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClD,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,OAAO,YAAY,CAAC;AAEpB,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAUzC,SAAS,GAAG,CAAC,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,GAAG,eAAe,EAAW;IACvF,MAAM,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC;IAE5C,OAAO,CACH,MAAC,SAAS,IAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,aACzD,KAAC,UAAU,IAAC,YAAY,EAAE,YAAY,YAAG,QAAQ,GAAc,EAC9D,SAAS,IAAI,KAAC,SAAS,KAAG,IACnB,CACf,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,EAChB,YAAY,EACZ,QAAQ,GAIX;IACG,MAAM,EAAC,QAAQ,EAAC,GAAG,WAAW,EAAE,CAAC;IACjC,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC/E,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAiB,IAAI,CAAC,CAAC;IAE7D,OAAO,CACH,MAAC,KAAK,CAAC,QAAQ,eACX,KAAC,MAAM,IAAC,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,QAAQ,EAAE,YAC5D,iBAAiB,IAAI,CAClB,eACI,GAAG,EAAC,YAAY,EAChB,IAAI,EAAC,6DAA6D,GACpE,CACL,GACI,EACT,KAAC,kBAAkB,IAAC,iBAAiB,EAAE,iBAAiB,YACpD,KAAC,cAAc,cACX,MAAC,iBAAiB,IACd,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY,aAE1B,KAAC,OAAO,IAAC,iBAAiB,EAAE,iBAAiB,YAAG,QAAQ,GAAW,EACnE,cAAK,GAAG,EAAE,iBAAiB,GAAQ,IACnB,GACP,GACA,IACR,CACpB,CAAC;AACN,CAAC;AAED,eAAe,GAAG,CAAC"}
|
|
@@ -4,8 +4,6 @@
|
|
|
4
4
|
@forward '../../styles/versions.scss';
|
|
5
5
|
@forward '../../styles/unipika.scss';
|
|
6
6
|
|
|
7
|
-
@import url('https://fonts.googleapis.com/css2?family=Rubik&display=swap');
|
|
8
|
-
|
|
9
7
|
* {
|
|
10
8
|
// FIXME: this is an overkill, potentially could break external components, needs refactoring
|
|
11
9
|
box-sizing: border-box;
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { Text } from '@gravity-ui/uikit';
|
|
3
|
+
import { Flex, Text } from '@gravity-ui/uikit';
|
|
4
4
|
import { Helmet } from 'react-helmet-async';
|
|
5
|
+
import { CopyableValue } from '../../../components/CopyableValue/CopyableValue';
|
|
5
6
|
import { DrawerContextProvider } from '../../../components/Drawer/DrawerContext';
|
|
6
7
|
import { TENANT_DIAGNOSTICS_TABS_IDS } from '../../../store/reducers/tenant/constants';
|
|
7
8
|
import { setDiagnosticsTab, useTenantBaseInfo } from '../../../store/reducers/tenant/tenant';
|
|
8
9
|
import { useScrollPosition, useTypedDispatch, useTypedSelector } from '../../../utils/hooks';
|
|
10
|
+
import i18n from '../i18n';
|
|
9
11
|
import { useNavigationV2Enabled } from '../utils/useNavigationV2Enabled';
|
|
10
12
|
import { DiagnosticsTabs } from './DiagnosticsTabs/DiagnosticsTabs';
|
|
11
13
|
import { b } from './shared';
|
|
@@ -17,7 +19,8 @@ function Diagnostics({ path, database, databaseFullPath, type, subType, database
|
|
|
17
19
|
const dispatch = useTypedDispatch();
|
|
18
20
|
const { diagnosticsTab = TENANT_DIAGNOSTICS_TABS_IDS.overview } = useTypedSelector((state) => state.tenant);
|
|
19
21
|
const isV2NavigationEnabled = useNavigationV2Enabled();
|
|
20
|
-
const { name } = useTenantBaseInfo(database);
|
|
22
|
+
const { name, id, controlPlane, metaErrors } = useTenantBaseInfo(database);
|
|
23
|
+
const showDatabaseId = Boolean(id && (controlPlane || (metaErrors === null || metaErrors === void 0 ? void 0 : metaErrors.control_plane)));
|
|
21
24
|
const pages = useDiagnosticsPages({
|
|
22
25
|
path,
|
|
23
26
|
database,
|
|
@@ -52,7 +55,7 @@ function Diagnostics({ path, database, databaseFullPath, type, subType, database
|
|
|
52
55
|
useScrollPosition(containerRef, `tenant-diagnostics-${database}-${activeTab === null || activeTab === void 0 ? void 0 : activeTab.id}`, (activeTab === null || activeTab === void 0 ? void 0 : activeTab.id) === TENANT_DIAGNOSTICS_TABS_IDS.overview);
|
|
53
56
|
const renderDBName = () => {
|
|
54
57
|
if (isV2NavigationEnabled && databasePagesDisplay === 'database') {
|
|
55
|
-
return (
|
|
58
|
+
return (_jsxs(Flex, { alignItems: "center", gap: 3, wrap: "wrap", className: b('db-name'), qa: "database-header", children: [_jsx(Text, { variant: "header-1", children: name }), showDatabaseId && (_jsx(CopyableValue, { copyText: id, fieldName: i18n('title_database'), children: _jsx(Text, { variant: "header-1", color: "hint", children: id }) }))] }));
|
|
56
59
|
}
|
|
57
60
|
return null;
|
|
58
61
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Diagnostics.js","sourceRoot":"","sources":["../../../../src/containers/Tenant/Diagnostics/Diagnostics.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"Diagnostics.js","sourceRoot":"","sources":["../../../../src/containers/Tenant/Diagnostics/Diagnostics.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAE1C,OAAO,EAAC,aAAa,EAAC,MAAM,iDAAiD,CAAC;AAC9E,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAC,2BAA2B,EAAC,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AAG3F,OAAO,EAAC,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3F,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,EAAC,sBAAsB,EAAC,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EAAC,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAC,CAAC,EAAC,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAC,2BAA2B,EAAC,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D,OAAO,oBAAoB,CAAC;AAa5B,SAAS,WAAW,CAAC,EACjB,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,oBAAoB,EACpB,qBAAqB,GACN;IACf,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAiB,IAAI,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,gBAAgB,EAAE,CAAC;IACpC,MAAM,EAAC,cAAc,GAAG,2BAA2B,CAAC,QAAQ,EAAC,GAAG,gBAAgB,CAC5E,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAC1B,CAAC;IAEF,MAAM,qBAAqB,GAAG,sBAAsB,EAAE,CAAC;IAEvD,MAAM,EAAC,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAC,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,KAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,aAAa,CAAA,CAAC,CAAC,CAAC;IAElF,MAAM,KAAK,GAAG,mBAAmB,CAAC;QAC9B,IAAI;QACJ,QAAQ;QACR,gBAAgB;QAChB,IAAI;QACJ,OAAO;QACP,oBAAoB;KACvB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,cAAc,CAAC,CAAC;QAC7D,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;IAE5B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,SAAS,IAAI,SAAS,CAAC,EAAE,KAAK,cAAc,EAAE,CAAC;YAC/C,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE1C,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC1B,OAAO,2BAA2B,CAAC;YAC/B,WAAW,EAAE,SAAS,CAAC,EAAE;YACzB,IAAI;YACJ,QAAQ;YACR,IAAI;YACJ,gBAAgB;YAChB,qBAAqB;YACrB,kBAAkB,EAAE,YAAY;SACnC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,iBAAiB,CACb,YAAY,EACZ,sBAAsB,QAAQ,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,EAAE,EAAE,EACjD,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,EAAE,MAAK,2BAA2B,CAAC,QAAQ,CACzD,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,EAAE;QACtB,IAAI,qBAAqB,IAAI,oBAAoB,KAAK,UAAU,EAAE,CAAC;YAC/D,OAAO,CACH,MAAC,IAAI,IACD,UAAU,EAAC,QAAQ,EACnB,GAAG,EAAE,CAAC,EACN,IAAI,EAAC,MAAM,EACX,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,EACvB,EAAE,EAAC,iBAAiB,aAEpB,KAAC,IAAI,IAAC,OAAO,EAAC,UAAU,YAAE,IAAI,GAAQ,EACrC,cAAc,IAAI,CACf,KAAC,aAAa,IAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAC1D,KAAC,IAAI,IAAC,OAAO,EAAC,UAAU,EAAC,KAAK,EAAC,MAAM,YAChC,EAAE,GACA,GACK,CACnB,IACE,CACV,CAAC;QACN,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,CACH,eAAK,SAAS,EAAE,CAAC,EAAE,aACd,SAAS,CAAC,CAAC,CAAC,CACT,KAAC,MAAM,cACH,0BAAQ,SAAS,CAAC,KAAK,GAAS,GAC3B,CACZ,CAAC,CAAC,CAAC,IAAI,EACP,YAAY,EAAE,EACf,KAAC,eAAe,IAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,GAAI,EACtD,KAAC,qBAAqB,cAClB,cAAK,SAAS,EAAE,CAAC,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,YAAY,YAC/C,gBAAgB,EAAE,GACjB,GACc,IACtB,CACT,CAAC;AACN,CAAC;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -9,7 +9,8 @@ import { isDatabaseEntityType } from '../utils/schema';
|
|
|
9
9
|
import { getPagesByType } from './DiagnosticsPages';
|
|
10
10
|
export function useDiagnosticsPages({ path, database, databaseFullPath, type, subType, databasePagesDisplay, }) {
|
|
11
11
|
const isDatabase = isDatabaseEntityType(type) || path === databaseFullPath;
|
|
12
|
-
const { controlPlane, databaseType } = useTenantBaseInfo(isDatabase ? database : '');
|
|
12
|
+
const { controlPlane, databaseType, metaErrors } = useTenantBaseInfo(isDatabase ? database : '');
|
|
13
|
+
const controlPlaneError = metaErrors === null || metaErrors === void 0 ? void 0 : metaErrors.control_plane;
|
|
13
14
|
const { monitoring: clusterMonitoring } = useClusterBaseInfo();
|
|
14
15
|
const hasConfigs = useConfigAvailable();
|
|
15
16
|
const newStorageViewEnabled = useNewStorageViewEnabled();
|
|
@@ -23,7 +24,8 @@ export function useDiagnosticsPages({ path, database, databaseFullPath, type, su
|
|
|
23
24
|
hasTopicData,
|
|
24
25
|
isDatabase,
|
|
25
26
|
hasStorageUsage,
|
|
26
|
-
hasBackups: typeof uiFactory.renderBackups === 'function' &&
|
|
27
|
+
hasBackups: typeof uiFactory.renderBackups === 'function' &&
|
|
28
|
+
Boolean(controlPlane || controlPlaneError),
|
|
27
29
|
hasConfigs: isViewerUser && hasConfigs,
|
|
28
30
|
hasAccess: uiFactory.hasAccess({ userPermissions }),
|
|
29
31
|
hasMonitoring: canShowTenantMonitoringTab(controlPlane, clusterMonitoring),
|
|
@@ -37,6 +39,7 @@ export function useDiagnosticsPages({ path, database, databaseFullPath, type, su
|
|
|
37
39
|
isDatabase,
|
|
38
40
|
hasStorageUsage,
|
|
39
41
|
controlPlane,
|
|
42
|
+
controlPlaneError,
|
|
40
43
|
isViewerUser,
|
|
41
44
|
hasConfigs,
|
|
42
45
|
clusterMonitoring,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDiagnosticsPages.js","sourceRoot":"","sources":["../../../../src/containers/Tenant/Diagnostics/useDiagnosticsPages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACH,kBAAkB,EAClB,wBAAwB,EACxB,wBAAwB,EACxB,qBAAqB,GACxB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAC,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AACnF,OAAO,EAAC,0BAA0B,EAAC,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAC,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAYlD,MAAM,UAAU,mBAAmB,CAAC,EAChC,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,oBAAoB,GACI;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,gBAAgB,CAAC;IAE3E,MAAM,EAAC,YAAY,EAAE,YAAY,EAAC,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useDiagnosticsPages.js","sourceRoot":"","sources":["../../../../src/containers/Tenant/Diagnostics/useDiagnosticsPages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACH,kBAAkB,EAClB,wBAAwB,EACxB,wBAAwB,EACxB,qBAAqB,GACxB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAC,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AACnF,OAAO,EAAC,0BAA0B,EAAC,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAC,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAYlD,MAAM,UAAU,mBAAmB,CAAC,EAChC,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,oBAAoB,GACI;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,gBAAgB,CAAC;IAE3E,MAAM,EAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAC,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/F,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,aAAa,CAAC;IACpD,MAAM,EAAC,UAAU,EAAE,iBAAiB,EAAC,GAAG,kBAAkB,EAAE,CAAC;IAE7D,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;IACxC,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IACzD,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IACzD,MAAM,eAAe,GAAG,qBAAqB,IAAI,qBAAqB,CAAC;IACvE,MAAM,YAAY,GAAG,qBAAqB,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;IAE7C,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACtB,OAAO,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE;YACjC,YAAY;YACZ,UAAU;YACV,eAAe;YACf,UAAU,EACN,OAAO,SAAS,CAAC,aAAa,KAAK,UAAU;gBAC7C,OAAO,CAAC,YAAY,IAAI,iBAAiB,CAAC;YAC9C,UAAU,EAAE,YAAY,IAAI,UAAU;YACtC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,EAAC,eAAe,EAAC,CAAC;YACjD,aAAa,EAAE,0BAA0B,CAAC,YAAY,EAAE,iBAAiB,CAAC;YAC1E,YAAY;YACZ,oBAAoB;SACvB,CAAC,CAAC;IACP,CAAC,EAAE;QACC,IAAI;QACJ,OAAO;QACP,YAAY;QACZ,UAAU;QACV,eAAe;QACf,YAAY;QACZ,iBAAiB;QACjB,YAAY;QACZ,UAAU;QACV,iBAAiB;QACjB,YAAY;QACZ,oBAAoB;QACpB,eAAe;KAClB,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -7,7 +7,6 @@ import { DatacenterLabel } from '../../components/Datacenter/DatacenterLabel';
|
|
|
7
7
|
import { InternalLinkButton } from '../../components/InternalLinkButton';
|
|
8
8
|
import { getVDiskLocationItems } from '../../components/VDiskInfo/getVDiskDetails';
|
|
9
9
|
import { getPDiskPagePath } from '../../routes';
|
|
10
|
-
import { useNewStorageViewEnabled } from '../../store/reducers/capabilities/hooks';
|
|
11
10
|
import { cn } from '../../utils/cn';
|
|
12
11
|
import { useIsViewerUser } from '../../utils/hooks/useIsUserAllowedToMakeChanges';
|
|
13
12
|
import { vDiskPageKeyset } from './i18n';
|
|
@@ -22,7 +21,6 @@ function DetailItem({ item, datacenterColorKey, }) {
|
|
|
22
21
|
}
|
|
23
22
|
export function VDiskStorageDetails({ className, data = {} }) {
|
|
24
23
|
const isViewerUser = useIsViewerUser();
|
|
25
|
-
const newStorageViewEnabled = useNewStorageViewEnabled();
|
|
26
24
|
const pDiskPath = isViewerUser && !isNil(data.NodeId) && !isNil(data.PDiskId)
|
|
27
25
|
? getPDiskPagePath(data.PDiskId, data.NodeId)
|
|
28
26
|
: undefined;
|
|
@@ -30,7 +28,7 @@ export function VDiskStorageDetails({ className, data = {} }) {
|
|
|
30
28
|
Host: data.NodeHost,
|
|
31
29
|
Rack: data.NodeRack,
|
|
32
30
|
DC: data.NodeDC,
|
|
33
|
-
})
|
|
31
|
+
});
|
|
34
32
|
return (_jsxs("div", { className: b(null, className), "data-qa": "vdisk-location", children: [_jsx("div", { className: b('card'), children: LOCATION_IDS.map((id) => {
|
|
35
33
|
const item = items.find((entry) => entry.id === id);
|
|
36
34
|
return item ? (_jsx(DetailItem, { item: item, datacenterColorKey: data.NodeDCKey }, id)) : null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VDiskStorageDetails.js","sourceRoot":"","sources":["../../../src/containers/VDiskPage/VDiskStorageDetails.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAC,eAAe,EAAC,MAAM,kDAAkD,CAAC;AACjF,OAAO,EAAC,aAAa,EAAC,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAC,eAAe,EAAC,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAC,qBAAqB,EAAC,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"VDiskStorageDetails.js","sourceRoot":"","sources":["../../../src/containers/VDiskPage/VDiskStorageDetails.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export const parseMetaTenants = (data) => {
|
|
2
2
|
return {
|
|
3
3
|
TenantInfo: data === null || data === void 0 ? void 0 : data.databases,
|
|
4
|
+
...((data === null || data === void 0 ? void 0 : data.errors) !== undefined ? { errors: data.errors } : {}),
|
|
4
5
|
};
|
|
5
6
|
};
|
|
6
7
|
//# sourceMappingURL=parseMetaTenants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseMetaTenants.js","sourceRoot":"","sources":["../../../src/services/parsers/parseMetaTenants.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAiB,EAAe,EAAE;IAC/D,OAAO;QACH,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"parseMetaTenants.js","sourceRoot":"","sources":["../../../src/services/parsers/parseMetaTenants.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAiB,EAAe,EAAE;IAC/D,OAAO;QACH,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS;QAC3B,GAAG,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,MAAK,SAAS,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/D,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -15,6 +15,10 @@ export declare function useTenantBaseInfo(database: string, clusterNameOverride?
|
|
|
15
15
|
}): {
|
|
16
16
|
databaseData: import("../tenants/types").PreparedTenant | undefined;
|
|
17
17
|
controlPlane: import("../../../types/api/tenant").ControlPlane | undefined;
|
|
18
|
+
metaErrors: {
|
|
19
|
+
viewer?: string;
|
|
20
|
+
control_plane?: string;
|
|
21
|
+
} | undefined;
|
|
18
22
|
name: string | undefined;
|
|
19
23
|
id: string | undefined;
|
|
20
24
|
databaseType: import("../../../types/api/tenant").ETenantType | undefined;
|
|
@@ -48,7 +48,7 @@ export const tenantApi = api.injectEndpoints({
|
|
|
48
48
|
else {
|
|
49
49
|
tenantData = await window.api.viewer.getTenantInfo({ database }, { signal });
|
|
50
50
|
}
|
|
51
|
-
const databases = prepareTenants(tenantData.TenantInfo || []);
|
|
51
|
+
const databases = prepareTenants(tenantData.TenantInfo || [], tenantData.errors);
|
|
52
52
|
// previous meta versions do not support filtering databases by name
|
|
53
53
|
const data = (_a = databases.find((tenant) => {
|
|
54
54
|
var _a;
|
|
@@ -57,7 +57,14 @@ export const tenantApi = api.injectEndpoints({
|
|
|
57
57
|
((_a = tenant.ControlPlane) === null || _a === void 0 ? void 0 : _a.id) === database;
|
|
58
58
|
})) !== null && _a !== void 0 ? _a : databases[0];
|
|
59
59
|
if (!data) {
|
|
60
|
-
return {
|
|
60
|
+
return {
|
|
61
|
+
error: {
|
|
62
|
+
code: 'EMPTY_TENANT_INFO',
|
|
63
|
+
...(tenantData.errors !== undefined
|
|
64
|
+
? { metaErrors: tenantData.errors }
|
|
65
|
+
: {}),
|
|
66
|
+
},
|
|
67
|
+
};
|
|
61
68
|
}
|
|
62
69
|
return { data };
|
|
63
70
|
}
|
|
@@ -99,6 +106,7 @@ export function useTenantBaseInfo(database, clusterNameOverride, { skip = false
|
|
|
99
106
|
return {
|
|
100
107
|
databaseData: currentData,
|
|
101
108
|
controlPlane: ControlPlane,
|
|
109
|
+
metaErrors: currentData === null || currentData === void 0 ? void 0 : currentData.metaErrors,
|
|
102
110
|
name: Name,
|
|
103
111
|
id: Id,
|
|
104
112
|
databaseType: Type,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenant/tenant.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenant/tenant.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export const tenantsApi = api.injectEndpoints({
|
|
|
5
5
|
endpoints: (build) => ({
|
|
6
6
|
getTenantsInfo: build.query({
|
|
7
7
|
queryFn: async ({ clusterName, environmentName, isMetaDatabasesAvailable, }, { signal }) => {
|
|
8
|
+
var _a, _b;
|
|
8
9
|
try {
|
|
9
10
|
let response;
|
|
10
11
|
if (isMetaDatabasesAvailable && window.api.meta) {
|
|
@@ -18,11 +19,22 @@ export const tenantsApi = api.injectEndpoints({
|
|
|
18
19
|
}
|
|
19
20
|
let data;
|
|
20
21
|
if (Array.isArray(response.TenantInfo)) {
|
|
21
|
-
data = prepareTenants(response.TenantInfo);
|
|
22
|
+
data = prepareTenants(response.TenantInfo, response.errors);
|
|
22
23
|
}
|
|
23
24
|
else {
|
|
24
25
|
data = [];
|
|
25
26
|
}
|
|
27
|
+
if (!data.length && Object.keys((_a = response.errors) !== null && _a !== void 0 ? _a : {}).length) {
|
|
28
|
+
return {
|
|
29
|
+
error: {
|
|
30
|
+
code: 'EMPTY_TENANT_INFO',
|
|
31
|
+
metaErrors: response.errors,
|
|
32
|
+
message: Object.entries((_b = response.errors) !== null && _b !== void 0 ? _b : {})
|
|
33
|
+
.map(([source, message]) => `${source}: ${message}`)
|
|
34
|
+
.join('\n'),
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
}
|
|
26
38
|
return { data };
|
|
27
39
|
}
|
|
28
40
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/tenants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAC,sBAAsB,EAAC,MAAM,mBAAmB,CAAC;AAGzD,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAC;AAEvC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC;IAC1C,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC;YACxB,OAAO,EAAE,KAAK,EACV,EACI,WAAW,EACX,eAAe,EACf,wBAAwB,GAK3B,EACD,EAAC,MAAM,EAAC,EACV,EAAE
|
|
1
|
+
{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/tenants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import type { TTenant } from '../../../types/api/tenant';
|
|
1
|
+
import type { TTenant, TTenantInfo } from '../../../types/api/tenant';
|
|
2
2
|
import type { ValueOf } from '../../../types/common';
|
|
3
3
|
import type { METRIC_STATUS } from './contants';
|
|
4
4
|
export interface PreparedTenant extends TTenant {
|
|
5
|
+
/** Partial errors for the meta response this database was loaded from. */
|
|
6
|
+
metaErrors?: TTenantInfo['errors'];
|
|
5
7
|
sharedTenantName: string | undefined;
|
|
6
8
|
sharedNodeIds: number[] | undefined;
|
|
7
9
|
sharedControlPlane?: TTenant['ControlPlane'];
|
|
@@ -40,6 +40,6 @@ export declare const calculateTenantMetrics: (tenant?: TTenant) => {
|
|
|
40
40
|
networkUtilization: number | undefined;
|
|
41
41
|
networkThroughput: number | undefined;
|
|
42
42
|
};
|
|
43
|
-
export declare const prepareTenants: (tenants: TTenant[]) => PreparedTenant[];
|
|
43
|
+
export declare const prepareTenants: (tenants: TTenant[], metaErrors?: PreparedTenant["metaErrors"]) => PreparedTenant[];
|
|
44
44
|
export declare function getMetricStatusFromUsage(usage?: number): "Unspecified" | "Good" | "Warning" | "Danger";
|
|
45
45
|
export declare const normalizeProgress: (progress: number) => number;
|
|
@@ -238,7 +238,7 @@ const calculateTenantEntities = (tenant) => {
|
|
|
238
238
|
const groupsCount = isNumeric(StorageGroups) ? Number(StorageGroups) : 0;
|
|
239
239
|
return { nodesCount, groupsCount };
|
|
240
240
|
};
|
|
241
|
-
export const prepareTenants = (tenants) => {
|
|
241
|
+
export const prepareTenants = (tenants, metaErrors) => {
|
|
242
242
|
return tenants.map((tenant) => {
|
|
243
243
|
const sharedDatabase = tenants.find((item) => item.Id === tenant.ResourceId);
|
|
244
244
|
const sharedTenantName = sharedDatabase === null || sharedDatabase === void 0 ? void 0 : sharedDatabase.Name;
|
|
@@ -248,6 +248,7 @@ export const prepareTenants = (tenants) => {
|
|
|
248
248
|
const { nodesCount, groupsCount } = calculateTenantEntities(tenant);
|
|
249
249
|
return {
|
|
250
250
|
...tenant,
|
|
251
|
+
...(metaErrors !== undefined ? { metaErrors } : {}),
|
|
251
252
|
sharedTenantName,
|
|
252
253
|
sharedNodeIds,
|
|
253
254
|
...((sharedDatabase === null || sharedDatabase === void 0 ? void 0 : sharedDatabase.ControlPlane)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/types/api/meta.d.ts
CHANGED
|
@@ -11,6 +11,10 @@ export interface MetaCluster {
|
|
|
11
11
|
}
|
|
12
12
|
export interface MetaTenants {
|
|
13
13
|
databases?: TTenant[];
|
|
14
|
+
errors?: {
|
|
15
|
+
viewer?: string;
|
|
16
|
+
control_plane?: string;
|
|
17
|
+
};
|
|
14
18
|
}
|
|
15
19
|
/** With fields present only in /api/meta/meta/clusters */
|
|
16
20
|
export interface MetaExtendedClusterInfo extends MetaGeneralClusterInfo {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { EFlag } from './enums';
|
|
2
|
+
import type { MetaTenants } from './meta';
|
|
2
3
|
import type { TMemoryStats, TPoolStats } from './nodes';
|
|
3
4
|
import type { TTabletStateInfo } from './tablet';
|
|
4
5
|
/**
|
|
@@ -17,6 +18,8 @@ export interface TTenants {
|
|
|
17
18
|
export interface TTenantInfo {
|
|
18
19
|
TenantInfo?: TTenant[];
|
|
19
20
|
Errors?: string[];
|
|
21
|
+
/** Partial errors from meta; database data may still be available. */
|
|
22
|
+
errors?: MetaTenants['errors'];
|
|
20
23
|
}
|
|
21
24
|
export interface TTenant {
|
|
22
25
|
Name?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../src/types/api/tenant.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../src/types/api/tenant.ts"],"names":[],"mappings":"AA4KA,MAAM,CAAN,IAAY,KAOX;AAPD,WAAY,KAAK;IACb,gDAAyC,CAAA;IACzC,8BAAuB,CAAA;IACvB,4BAAqB,CAAA;IACrB,8BAAuB,CAAA;IACvB,gDAAyC,CAAA;IACzC,oCAA6B,CAAA;AACjC,CAAC,EAPW,KAAK,KAAL,KAAK,QAOhB;AAED,MAAM,CAAN,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAC5B,uFAAiE,CAAA;IACjE,uFAAiE,CAAA;IACjE,uFAAiE,CAAA;IACjE,yFAAmE,CAAA;IACnE,uFAAiE,CAAA;AACrE,CAAC,EANW,oBAAoB,KAApB,oBAAoB,QAM/B;AAoCD,MAAM,CAAN,IAAY,KAIX;AAJD,WAAY,KAAK;IACb,sBAAa,CAAA;IACb,oBAAW,CAAA;IACX,oBAAW,CAAA;AACf,CAAC,EAJW,KAAK,KAAL,KAAK,QAIhB"}
|
package/package.json
CHANGED
|
@@ -4,8 +4,6 @@
|
|
|
4
4
|
@forward '../../styles/versions.scss';
|
|
5
5
|
@forward '../../styles/unipika.scss';
|
|
6
6
|
|
|
7
|
-
@import url('https://fonts.googleapis.com/css2?family=Rubik&display=swap');
|
|
8
|
-
|
|
9
7
|
* {
|
|
10
8
|
// FIXME: this is an overkill, potentially could break external components, needs refactoring
|
|
11
9
|
box-sizing: border-box;
|
|
@@ -50,7 +50,14 @@ function AppContent({
|
|
|
50
50
|
|
|
51
51
|
return (
|
|
52
52
|
<React.Fragment>
|
|
53
|
-
<Helmet defaultTitle={appTitle} titleTemplate={`%s — ${appTitle}`}
|
|
53
|
+
<Helmet defaultTitle={appTitle} titleTemplate={`%s — ${appTitle}`}>
|
|
54
|
+
{singleClusterMode && (
|
|
55
|
+
<link
|
|
56
|
+
rel="stylesheet"
|
|
57
|
+
href="https://fonts.googleapis.com/css2?family=Rubik&display=swap"
|
|
58
|
+
/>
|
|
59
|
+
)}
|
|
60
|
+
</Helmet>
|
|
54
61
|
<FullscreenProvider fullscreenRootRef={fullscreenRootRef}>
|
|
55
62
|
<ContentWrapper>
|
|
56
63
|
<NavigationWrapper
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
|
|
3
|
-
import {Text} from '@gravity-ui/uikit';
|
|
3
|
+
import {Flex, Text} from '@gravity-ui/uikit';
|
|
4
4
|
import {Helmet} from 'react-helmet-async';
|
|
5
5
|
|
|
6
|
+
import {CopyableValue} from '../../../components/CopyableValue/CopyableValue';
|
|
6
7
|
import {DrawerContextProvider} from '../../../components/Drawer/DrawerContext';
|
|
7
8
|
import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../store/reducers/tenant/constants';
|
|
8
9
|
import {setDiagnosticsTab, useTenantBaseInfo} from '../../../store/reducers/tenant/tenant';
|
|
9
10
|
import type {AdditionalTenantsProps} from '../../../types/additionalProps';
|
|
10
11
|
import type {EPathSubType, EPathType} from '../../../types/api/schema';
|
|
11
12
|
import {useScrollPosition, useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
|
|
13
|
+
import i18n from '../i18n';
|
|
12
14
|
import {useNavigationV2Enabled} from '../utils/useNavigationV2Enabled';
|
|
13
15
|
|
|
14
16
|
import type {DatabasePagesDisplay} from './DiagnosticsPages';
|
|
@@ -47,7 +49,8 @@ function Diagnostics({
|
|
|
47
49
|
|
|
48
50
|
const isV2NavigationEnabled = useNavigationV2Enabled();
|
|
49
51
|
|
|
50
|
-
const {name} = useTenantBaseInfo(database);
|
|
52
|
+
const {name, id, controlPlane, metaErrors} = useTenantBaseInfo(database);
|
|
53
|
+
const showDatabaseId = Boolean(id && (controlPlane || metaErrors?.control_plane));
|
|
51
54
|
|
|
52
55
|
const pages = useDiagnosticsPages({
|
|
53
56
|
path,
|
|
@@ -94,9 +97,22 @@ function Diagnostics({
|
|
|
94
97
|
const renderDBName = () => {
|
|
95
98
|
if (isV2NavigationEnabled && databasePagesDisplay === 'database') {
|
|
96
99
|
return (
|
|
97
|
-
<
|
|
98
|
-
|
|
99
|
-
|
|
100
|
+
<Flex
|
|
101
|
+
alignItems="center"
|
|
102
|
+
gap={3}
|
|
103
|
+
wrap="wrap"
|
|
104
|
+
className={b('db-name')}
|
|
105
|
+
qa="database-header"
|
|
106
|
+
>
|
|
107
|
+
<Text variant="header-1">{name}</Text>
|
|
108
|
+
{showDatabaseId && (
|
|
109
|
+
<CopyableValue copyText={id} fieldName={i18n('title_database')}>
|
|
110
|
+
<Text variant="header-1" color="hint">
|
|
111
|
+
{id}
|
|
112
|
+
</Text>
|
|
113
|
+
</CopyableValue>
|
|
114
|
+
)}
|
|
115
|
+
</Flex>
|
|
100
116
|
);
|
|
101
117
|
}
|
|
102
118
|
|
|
@@ -36,7 +36,8 @@ export function useDiagnosticsPages({
|
|
|
36
36
|
}: UseDiagnosticsPagesParams): Page[] {
|
|
37
37
|
const isDatabase = isDatabaseEntityType(type) || path === databaseFullPath;
|
|
38
38
|
|
|
39
|
-
const {controlPlane, databaseType} = useTenantBaseInfo(isDatabase ? database : '');
|
|
39
|
+
const {controlPlane, databaseType, metaErrors} = useTenantBaseInfo(isDatabase ? database : '');
|
|
40
|
+
const controlPlaneError = metaErrors?.control_plane;
|
|
40
41
|
const {monitoring: clusterMonitoring} = useClusterBaseInfo();
|
|
41
42
|
|
|
42
43
|
const hasConfigs = useConfigAvailable();
|
|
@@ -52,7 +53,9 @@ export function useDiagnosticsPages({
|
|
|
52
53
|
hasTopicData,
|
|
53
54
|
isDatabase,
|
|
54
55
|
hasStorageUsage,
|
|
55
|
-
hasBackups:
|
|
56
|
+
hasBackups:
|
|
57
|
+
typeof uiFactory.renderBackups === 'function' &&
|
|
58
|
+
Boolean(controlPlane || controlPlaneError),
|
|
56
59
|
hasConfigs: isViewerUser && hasConfigs,
|
|
57
60
|
hasAccess: uiFactory.hasAccess({userPermissions}),
|
|
58
61
|
hasMonitoring: canShowTenantMonitoringTab(controlPlane, clusterMonitoring),
|
|
@@ -66,6 +69,7 @@ export function useDiagnosticsPages({
|
|
|
66
69
|
isDatabase,
|
|
67
70
|
hasStorageUsage,
|
|
68
71
|
controlPlane,
|
|
72
|
+
controlPlaneError,
|
|
69
73
|
isViewerUser,
|
|
70
74
|
hasConfigs,
|
|
71
75
|
clusterMonitoring,
|
|
@@ -7,7 +7,6 @@ import {DatacenterLabel} from '../../components/Datacenter/DatacenterLabel';
|
|
|
7
7
|
import {InternalLinkButton} from '../../components/InternalLinkButton';
|
|
8
8
|
import {getVDiskLocationItems} from '../../components/VDiskInfo/getVDiskDetails';
|
|
9
9
|
import {getPDiskPagePath} from '../../routes';
|
|
10
|
-
import {useNewStorageViewEnabled} from '../../store/reducers/capabilities/hooks';
|
|
11
10
|
import type {VDiskData} from '../../store/reducers/vdisk/types';
|
|
12
11
|
import {cn} from '../../utils/cn';
|
|
13
12
|
import type {DiskDetailItem} from '../../utils/disks/diskInfo/getDiskLocationItems';
|
|
@@ -69,7 +68,6 @@ function DetailItem({
|
|
|
69
68
|
|
|
70
69
|
export function VDiskStorageDetails({className, data = {}}: VDiskStorageDetailsProps) {
|
|
71
70
|
const isViewerUser = useIsViewerUser();
|
|
72
|
-
const newStorageViewEnabled = useNewStorageViewEnabled();
|
|
73
71
|
const pDiskPath =
|
|
74
72
|
isViewerUser && !isNil(data.NodeId) && !isNil(data.PDiskId)
|
|
75
73
|
? getPDiskPagePath(data.PDiskId, data.NodeId)
|
|
@@ -78,7 +76,7 @@ export function VDiskStorageDetails({className, data = {}}: VDiskStorageDetailsP
|
|
|
78
76
|
Host: data.NodeHost,
|
|
79
77
|
Rack: data.NodeRack,
|
|
80
78
|
DC: data.NodeDC,
|
|
81
|
-
})
|
|
79
|
+
});
|
|
82
80
|
|
|
83
81
|
return (
|
|
84
82
|
<div className={b(null, className)} data-qa="vdisk-location">
|
|
@@ -77,7 +77,10 @@ export const tenantApi = api.injectEndpoints({
|
|
|
77
77
|
} else {
|
|
78
78
|
tenantData = await window.api.viewer.getTenantInfo({database}, {signal});
|
|
79
79
|
}
|
|
80
|
-
const databases = prepareTenants(
|
|
80
|
+
const databases = prepareTenants(
|
|
81
|
+
tenantData.TenantInfo || [],
|
|
82
|
+
tenantData.errors,
|
|
83
|
+
);
|
|
81
84
|
// previous meta versions do not support filtering databases by name
|
|
82
85
|
const data =
|
|
83
86
|
databases.find(
|
|
@@ -87,7 +90,14 @@ export const tenantApi = api.injectEndpoints({
|
|
|
87
90
|
tenant.ControlPlane?.id === database,
|
|
88
91
|
) ?? databases[0];
|
|
89
92
|
if (!data) {
|
|
90
|
-
return {
|
|
93
|
+
return {
|
|
94
|
+
error: {
|
|
95
|
+
code: 'EMPTY_TENANT_INFO',
|
|
96
|
+
...(tenantData.errors !== undefined
|
|
97
|
+
? {metaErrors: tenantData.errors}
|
|
98
|
+
: {}),
|
|
99
|
+
},
|
|
100
|
+
};
|
|
91
101
|
}
|
|
92
102
|
return {data};
|
|
93
103
|
} catch (error) {
|
|
@@ -142,6 +152,7 @@ export function useTenantBaseInfo(
|
|
|
142
152
|
return {
|
|
143
153
|
databaseData: currentData,
|
|
144
154
|
controlPlane: ControlPlane,
|
|
155
|
+
metaErrors: currentData?.metaErrors,
|
|
145
156
|
name: Name,
|
|
146
157
|
id: Id,
|
|
147
158
|
databaseType: Type,
|
|
@@ -35,10 +35,21 @@ export const tenantsApi = api.injectEndpoints({
|
|
|
35
35
|
}
|
|
36
36
|
let data: PreparedTenant[];
|
|
37
37
|
if (Array.isArray(response.TenantInfo)) {
|
|
38
|
-
data = prepareTenants(response.TenantInfo);
|
|
38
|
+
data = prepareTenants(response.TenantInfo, response.errors);
|
|
39
39
|
} else {
|
|
40
40
|
data = [];
|
|
41
41
|
}
|
|
42
|
+
if (!data.length && Object.keys(response.errors ?? {}).length) {
|
|
43
|
+
return {
|
|
44
|
+
error: {
|
|
45
|
+
code: 'EMPTY_TENANT_INFO',
|
|
46
|
+
metaErrors: response.errors,
|
|
47
|
+
message: Object.entries(response.errors ?? {})
|
|
48
|
+
.map(([source, message]) => `${source}: ${message}`)
|
|
49
|
+
.join('\n'),
|
|
50
|
+
},
|
|
51
|
+
};
|
|
52
|
+
}
|
|
42
53
|
return {data};
|
|
43
54
|
} catch (error) {
|
|
44
55
|
return {error};
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import type {TTenant} from '../../../types/api/tenant';
|
|
1
|
+
import type {TTenant, TTenantInfo} from '../../../types/api/tenant';
|
|
2
2
|
import type {ValueOf} from '../../../types/common';
|
|
3
3
|
|
|
4
4
|
import type {METRIC_STATUS} from './contants';
|
|
5
5
|
|
|
6
6
|
export interface PreparedTenant extends TTenant {
|
|
7
|
+
/** Partial errors for the meta response this database was loaded from. */
|
|
8
|
+
metaErrors?: TTenantInfo['errors'];
|
|
7
9
|
sharedTenantName: string | undefined;
|
|
8
10
|
sharedNodeIds: number[] | undefined;
|
|
9
11
|
sharedControlPlane?: TTenant['ControlPlane'];
|
|
@@ -363,7 +363,10 @@ const calculateTenantEntities = (tenant: TTenant) => {
|
|
|
363
363
|
return {nodesCount, groupsCount};
|
|
364
364
|
};
|
|
365
365
|
|
|
366
|
-
export const prepareTenants = (
|
|
366
|
+
export const prepareTenants = (
|
|
367
|
+
tenants: TTenant[],
|
|
368
|
+
metaErrors?: PreparedTenant['metaErrors'],
|
|
369
|
+
): PreparedTenant[] => {
|
|
367
370
|
return tenants.map((tenant) => {
|
|
368
371
|
const sharedDatabase = tenants.find((item) => item.Id === tenant.ResourceId);
|
|
369
372
|
const sharedTenantName = sharedDatabase?.Name;
|
|
@@ -374,6 +377,7 @@ export const prepareTenants = (tenants: TTenant[]): PreparedTenant[] => {
|
|
|
374
377
|
|
|
375
378
|
return {
|
|
376
379
|
...tenant,
|
|
380
|
+
...(metaErrors !== undefined ? {metaErrors} : {}),
|
|
377
381
|
|
|
378
382
|
sharedTenantName,
|
|
379
383
|
sharedNodeIds,
|
package/src/types/api/meta.ts
CHANGED
package/src/types/api/tenant.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type {EFlag} from './enums';
|
|
2
|
+
import type {MetaTenants} from './meta';
|
|
2
3
|
import type {TMemoryStats, TPoolStats} from './nodes';
|
|
3
4
|
import type {TTabletStateInfo} from './tablet';
|
|
4
5
|
|
|
@@ -19,6 +20,8 @@ export interface TTenants {
|
|
|
19
20
|
export interface TTenantInfo {
|
|
20
21
|
TenantInfo?: TTenant[];
|
|
21
22
|
Errors?: string[];
|
|
23
|
+
/** Partial errors from meta; database data may still be available. */
|
|
24
|
+
errors?: MetaTenants['errors'];
|
|
22
25
|
}
|
|
23
26
|
|
|
24
27
|
export interface TTenant {
|