ydb-embedded-ui 8.18.0-hotfix.1 → 8.19.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/components/CriticalActionDialog/CriticalActionDialog.js +14 -8
- package/dist/components/CriticalActionDialog/CriticalActionDialog.js.map +1 -1
- package/dist/components/EntityStatus/EntityStatus.d.ts +3 -1
- package/dist/components/EntityStatus/EntityStatus.js +15 -7
- package/dist/components/EntityStatus/EntityStatus.js.map +1 -1
- package/dist/components/EntityStatus/EntityStatus.scss +35 -2
- package/dist/components/NodeHostWrapper/NodeHostWrapper.js +1 -3
- package/dist/components/NodeHostWrapper/NodeHostWrapper.js.map +1 -1
- package/dist/components/TenantNameWrapper/TenantNameWrapper.js +6 -6
- package/dist/components/TenantNameWrapper/TenantNameWrapper.js.map +1 -1
- package/dist/containers/Storage/StorageGroups/columns/StorageGroupsColumns.scss +4 -0
- package/dist/containers/Storage/StorageGroups/columns/columns.js +4 -4
- package/dist/containers/Storage/StorageGroups/columns/columns.js.map +1 -1
- package/dist/containers/Tenant/Query/utils/isQueryCancelledError.js +1 -3
- package/dist/containers/Tenant/Query/utils/isQueryCancelledError.js.map +1 -1
- package/dist/store/reducers/pdisk/utils.js +6 -4
- package/dist/store/reducers/pdisk/utils.js.map +1 -1
- package/dist/types/api/error.d.ts +1 -4
- package/dist/types/api/nodes.d.ts +1 -0
- package/dist/types/api/nodes.js.map +1 -1
- package/dist/utils/__test__/response.test.d.ts +1 -0
- package/dist/utils/__test__/response.test.js +50 -0
- package/dist/utils/__test__/response.test.js.map +1 -0
- package/dist/utils/errors/index.js +9 -8
- package/dist/utils/errors/index.js.map +1 -1
- package/dist/utils/nodes.js +4 -3
- package/dist/utils/nodes.js.map +1 -1
- package/dist/utils/query.d.ts +1 -1
- package/dist/utils/response.d.ts +11 -4
- package/dist/utils/response.js +24 -5
- package/dist/utils/response.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,18 +4,24 @@ import { CircleXmarkFill, TriangleExclamationFill } from '@gravity-ui/icons';
|
|
|
4
4
|
import { Checkbox, Dialog, Icon } from '@gravity-ui/uikit';
|
|
5
5
|
import { ResultIssues } from '../../containers/Tenant/Query/Issues/Issues';
|
|
6
6
|
import { cn } from '../../utils/cn';
|
|
7
|
+
import { isResponseError, isResponseErrorWithIssues } from '../../utils/response';
|
|
7
8
|
import { criticalActionDialogKeyset } from './i18n';
|
|
8
9
|
import './CriticalActionDialog.scss';
|
|
9
10
|
const b = cn('ydb-critical-dialog');
|
|
10
11
|
const parseError = (error) => {
|
|
11
|
-
if (error
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
12
|
+
if (isResponseError(error)) {
|
|
13
|
+
if (error.status === 403) {
|
|
14
|
+
return criticalActionDialogKeyset('no-rights-error');
|
|
15
|
+
}
|
|
16
|
+
if (typeof error.data === 'string') {
|
|
17
|
+
return error.data;
|
|
18
|
+
}
|
|
19
|
+
if (isResponseErrorWithIssues(error) && error.data) {
|
|
20
|
+
return _jsx(ResultIssues, { hideSeverity: true, data: error.data });
|
|
21
|
+
}
|
|
22
|
+
if (error.statusText) {
|
|
23
|
+
return error.statusText;
|
|
24
|
+
}
|
|
19
25
|
}
|
|
20
26
|
return criticalActionDialogKeyset('default-error');
|
|
21
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CriticalActionDialog.js","sourceRoot":"","sources":["../../../src/components/CriticalActionDialog/CriticalActionDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,eAAe,EAAE,uBAAuB,EAAC,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAEzE,OAAO,EAAC,EAAE,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"CriticalActionDialog.js","sourceRoot":"","sources":["../../../src/components/CriticalActionDialog/CriticalActionDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import React from 'react';
|
|
1
2
|
import { EFlag } from '../../types/api/enums';
|
|
2
3
|
import type { StatusIconMode, StatusIconSize } from '../StatusIcon/StatusIcon';
|
|
3
4
|
import './EntityStatus.scss';
|
|
@@ -13,8 +14,9 @@ interface EntityStatusProps {
|
|
|
13
14
|
externalLink?: boolean;
|
|
14
15
|
withLeftTrim?: boolean;
|
|
15
16
|
hasClipboardButton?: boolean;
|
|
17
|
+
infoPopoverContent?: React.ReactNode;
|
|
16
18
|
clipboardButtonAlwaysVisible?: boolean;
|
|
17
19
|
className?: string;
|
|
18
20
|
}
|
|
19
|
-
export declare function EntityStatus({ status, name, label, path, iconPath, size, mode, showStatus, externalLink, withLeftTrim, hasClipboardButton, clipboardButtonAlwaysVisible, className, }: EntityStatusProps): import("react/jsx-runtime").JSX.Element;
|
|
21
|
+
export declare function EntityStatus({ status, name, label, path, iconPath, size, mode, showStatus, externalLink, withLeftTrim, hasClipboardButton, infoPopoverContent, clipboardButtonAlwaysVisible, className, }: EntityStatusProps): import("react/jsx-runtime").JSX.Element;
|
|
20
22
|
export {};
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import
|
|
2
|
+
import React from 'react';
|
|
3
|
+
import { CircleInfo } from '@gravity-ui/icons';
|
|
4
|
+
import { Button, ClipboardButton, Icon, Popover, Link as UIKitLink } from '@gravity-ui/uikit';
|
|
3
5
|
import { EFlag } from '../../types/api/enums';
|
|
4
6
|
import { cn } from '../../utils/cn';
|
|
5
7
|
import { InternalLink } from '../InternalLink/InternalLink';
|
|
6
8
|
import { StatusIcon } from '../StatusIcon/StatusIcon';
|
|
7
9
|
import './EntityStatus.scss';
|
|
8
10
|
const b = cn('entity-status');
|
|
9
|
-
export function EntityStatus({ status = EFlag.Grey, name = '', label, path, iconPath, size = 's', mode = 'color', showStatus = true, externalLink = false, withLeftTrim = false, hasClipboardButton, clipboardButtonAlwaysVisible = false, className, }) {
|
|
11
|
+
export function EntityStatus({ status = EFlag.Grey, name = '', label, path, iconPath, size = 's', mode = 'color', showStatus = true, externalLink = false, withLeftTrim = false, hasClipboardButton, infoPopoverContent, clipboardButtonAlwaysVisible = false, className, }) {
|
|
12
|
+
const [infoIconHovered, setInfoIconHovered] = React.useState(false);
|
|
10
13
|
const renderIcon = () => {
|
|
11
14
|
if (!showStatus) {
|
|
12
15
|
return null;
|
|
@@ -25,10 +28,15 @@ export function EntityStatus({ status = EFlag.Grey, name = '', label, path, icon
|
|
|
25
28
|
}
|
|
26
29
|
return name && _jsx("span", { className: b('name'), children: name });
|
|
27
30
|
};
|
|
28
|
-
return (_jsxs("div", { className: b(null, className), children: [iconPath ? renderStatusLink(iconPath) : renderIcon(), label && (_jsx("span", { title: label, className: b('label', { size, state: status.toLowerCase() }), children: label })), (path || name) && (_jsxs("div", { className: b('wrapper', {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
return (_jsxs("div", { className: b(null, className), children: [iconPath ? renderStatusLink(iconPath) : renderIcon(), label && (_jsx("span", { title: label, className: b('label', { size, state: status.toLowerCase() }), children: label })), (path || name) && (_jsxs("div", { className: b('wrapper', {
|
|
32
|
+
'with-clipboard-button': hasClipboardButton,
|
|
33
|
+
'with-info-button': Boolean(infoPopoverContent),
|
|
34
|
+
}), children: [_jsx("span", { className: b('link', { 'with-left-trim': withLeftTrim }), title: name, children: renderLink() }), (hasClipboardButton || infoPopoverContent) && (_jsxs("div", { className: b('controls-wrapper', {
|
|
35
|
+
visible: clipboardButtonAlwaysVisible || infoIconHovered,
|
|
36
|
+
}), children: [infoPopoverContent && (_jsx(Popover, { className: b('info-popover'), content: infoPopoverContent, tooltipOffset: [-4, 4], placement: ['top-start', 'bottom-start'], onOpenChange: (visible) => setInfoIconHovered(visible), children: _jsx(Button, { view: "normal", size: "xs", children: _jsx(Icon, { data: CircleInfo, size: "12", className: b('info-icon', {
|
|
37
|
+
visible: clipboardButtonAlwaysVisible || infoIconHovered,
|
|
38
|
+
}) }) }) })), hasClipboardButton && (_jsx(ClipboardButton, { text: name, size: "xs", view: "normal", className: b('clipboard-button', {
|
|
39
|
+
visible: clipboardButtonAlwaysVisible || infoIconHovered,
|
|
40
|
+
}) }))] }))] }))] }));
|
|
33
41
|
}
|
|
34
42
|
//# sourceMappingURL=EntityStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityStatus.js","sourceRoot":"","sources":["../../../src/components/EntityStatus/EntityStatus.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,eAAe,EAAE,IAAI,IAAI,SAAS,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"EntityStatus.js","sourceRoot":"","sources":["../../../src/components/EntityStatus/EntityStatus.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAE5F,OAAO,EAAC,KAAK,EAAC,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAC,EAAE,EAAC,MAAM,gBAAgB,CAAC;AAClC,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGpD,OAAO,qBAAqB,CAAC;AAE7B,MAAM,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC;AAuB9B,MAAM,UAAU,YAAY,CAAC,EACzB,MAAM,GAAG,KAAK,CAAC,IAAI,EACnB,IAAI,GAAG,EAAE,EACT,KAAK,EACL,IAAI,EACJ,QAAQ,EAER,IAAI,GAAG,GAAG,EACV,IAAI,GAAG,OAAO,EAEd,UAAU,GAAG,IAAI,EACjB,YAAY,GAAG,KAAK,EACpB,YAAY,GAAG,KAAK,EAEpB,kBAAkB,EAClB,kBAAkB,EAClB,4BAA4B,GAAG,KAAK,EAEpC,SAAS,GACO;IAChB,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAG,GAAG,EAAE;QACpB,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,KAAC,UAAU,IAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAI,CAAC;IACxF,CAAC,CAAC;IACF,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;QACtC,OAAO,CACH,KAAC,SAAS,IAAC,MAAM,EAAC,QAAQ,EAAC,IAAI,EAAE,IAAI,YAChC,UAAU,EAAE,GACL,CACf,CAAC;IACN,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,EAAE;QACpB,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,YAAY,EAAE,CAAC;gBACf,OAAO,CACH,KAAC,SAAS,IAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,YACtC,IAAI,GACG,CACf,CAAC;YACN,CAAC;YAED,OAAO,CACH,KAAC,YAAY,IAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,YACvC,IAAI,GACM,CAClB,CAAC;QACN,CAAC;QACD,OAAO,IAAI,IAAI,eAAM,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,YAAG,IAAI,GAAQ,CAAC;IAC7D,CAAC,CAAC;IACF,OAAO,CACH,eAAK,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,aAC7B,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,EACpD,KAAK,IAAI,CACN,eAAM,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,EAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE,EAAC,CAAC,YACzE,KAAK,GACH,CACV,EACA,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CACf,eACI,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE;oBACpB,uBAAuB,EAAE,kBAAkB;oBAC3C,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,CAAC;iBAClD,CAAC,aAEF,eAAM,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAC,gBAAgB,EAAE,YAAY,EAAC,CAAC,EAAE,KAAK,EAAE,IAAI,YACpE,UAAU,EAAE,GACV,EACN,CAAC,kBAAkB,IAAI,kBAAkB,CAAC,IAAI,CAC3C,eACI,SAAS,EAAE,CAAC,CAAC,kBAAkB,EAAE;4BAC7B,OAAO,EAAE,4BAA4B,IAAI,eAAe;yBAC3D,CAAC,aAED,kBAAkB,IAAI,CACnB,KAAC,OAAO,IACJ,SAAS,EAAE,CAAC,CAAC,cAAc,CAAC,EAC5B,OAAO,EAAE,kBAAkB,EAC3B,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EACtB,SAAS,EAAE,CAAC,WAAW,EAAE,cAAc,CAAC,EACxC,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAEtD,KAAC,MAAM,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,IAAI,YAC3B,KAAC,IAAI,IACD,IAAI,EAAE,UAAU,EAChB,IAAI,EAAC,IAAI,EACT,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE;4CACtB,OAAO,EACH,4BAA4B,IAAI,eAAe;yCACtD,CAAC,GACJ,GACG,GACH,CACb,EACA,kBAAkB,IAAI,CACnB,KAAC,eAAe,IACZ,IAAI,EAAE,IAAI,EACV,IAAI,EAAC,IAAI,EACT,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,CAAC,CAAC,kBAAkB,EAAE;oCAC7B,OAAO,EAAE,4BAA4B,IAAI,eAAe;iCAC3D,CAAC,GACJ,CACL,IACC,CACT,IACC,CACT,IACC,CACT,CAAC;AACN,CAAC"}
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
margin-right: var(--g-spacing-2);
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
+
&__info-icon,
|
|
19
20
|
&__clipboard-button {
|
|
20
21
|
color: var(--g-color-text-secondary);
|
|
21
22
|
|
|
@@ -26,14 +27,30 @@
|
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
|
|
30
|
+
&__info-icon {
|
|
31
|
+
&:hover {
|
|
32
|
+
color: var(--g-color-text-primary);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
29
36
|
&__wrapper {
|
|
30
37
|
position: relative;
|
|
31
38
|
|
|
32
39
|
overflow: hidden;
|
|
33
40
|
|
|
34
|
-
&_with-button {
|
|
41
|
+
&_with-clipboard-button {
|
|
42
|
+
padding-right: var(--button-width);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
&_with-info-button {
|
|
35
46
|
padding-right: var(--button-width);
|
|
36
47
|
}
|
|
48
|
+
|
|
49
|
+
&_with-clipboard-button {
|
|
50
|
+
&.entity-status__wrapper_with-info-button {
|
|
51
|
+
padding-right: calc(2 * var(--button-width));
|
|
52
|
+
}
|
|
53
|
+
}
|
|
37
54
|
}
|
|
38
55
|
|
|
39
56
|
&__controls-wrapper {
|
|
@@ -51,6 +68,8 @@
|
|
|
51
68
|
&_visible {
|
|
52
69
|
width: min-content;
|
|
53
70
|
padding: var(--g-spacing-1);
|
|
71
|
+
|
|
72
|
+
background-color: var(--g-color-base-background);
|
|
54
73
|
}
|
|
55
74
|
|
|
56
75
|
.data-table__row:hover &,
|
|
@@ -79,13 +98,27 @@
|
|
|
79
98
|
display: inline-block;
|
|
80
99
|
overflow: hidden;
|
|
81
100
|
|
|
82
|
-
width:
|
|
101
|
+
width: 100%;
|
|
83
102
|
margin-top: 5px;
|
|
84
103
|
|
|
85
104
|
white-space: nowrap;
|
|
86
105
|
text-overflow: ellipsis;
|
|
87
106
|
}
|
|
88
107
|
|
|
108
|
+
&__wrapper_with-clipboard-button &__link {
|
|
109
|
+
width: calc(100% + var(--button-width));
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
&__wrapper_with-info-button &__link {
|
|
113
|
+
width: calc(100% + var(--button-width));
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
&__wrapper_with-clipboard-button {
|
|
117
|
+
&.entity-status__wrapper_with-info-button .entity-status__link {
|
|
118
|
+
width: calc(100% + 2 * var(--button-width));
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
|
|
89
122
|
&__link_with-left-trim {
|
|
90
123
|
text-align: end;
|
|
91
124
|
direction: rtl;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { PopoverBehavior } from '@gravity-ui/uikit';
|
|
3
2
|
import { getDefaultNodePath } from '../../containers/Node/NodePages';
|
|
4
3
|
import { createDeveloperUIInternalPageHref, createDeveloperUILinkWithNodeId, } from '../../utils/developerUI/developerUI';
|
|
5
4
|
import { isUnavailableNode } from '../../utils/nodes';
|
|
6
|
-
import { CellWithPopover } from '../CellWithPopover/CellWithPopover';
|
|
7
5
|
import { EntityStatus } from '../EntityStatus/EntityStatus';
|
|
8
6
|
import { NodeEndpointsTooltipContent } from '../TooltipsContent';
|
|
9
7
|
export const NodeHostWrapper = ({ node, getNodeRef, database, statusForIcon, }) => {
|
|
@@ -28,6 +26,6 @@ export const NodeHostWrapper = ({ node, getNodeRef, database, statusForIcon, })
|
|
|
28
26
|
database: database !== null && database !== void 0 ? database : node.TenantName,
|
|
29
27
|
}, node.TenantName ? 'tablets' : 'storage')
|
|
30
28
|
: undefined;
|
|
31
|
-
return (_jsx(
|
|
29
|
+
return (_jsx(EntityStatus, { name: node.Host, status: status, path: nodePath, hasClipboardButton: true, infoPopoverContent: isNodeAvailable ? (_jsx(NodeEndpointsTooltipContent, { data: node, nodeHref: developerUIInternalHref })) : null }));
|
|
32
30
|
};
|
|
33
31
|
//# sourceMappingURL=NodeHostWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeHostWrapper.js","sourceRoot":"","sources":["../../../src/components/NodeHostWrapper/NodeHostWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"NodeHostWrapper.js","sourceRoot":"","sources":["../../../src/components/NodeHostWrapper/NodeHostWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EACH,iCAAiC,EACjC,+BAA+B,GAClC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAC,2BAA2B,EAAC,MAAM,oBAAoB,CAAC;AAkB/D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC5B,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,aAAa,GACM,EAAE,EAAE;IACvB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACb,OAAO,oCAAc,CAAC;IAC1B,CAAC;IAED,MAAM,MAAM,GAAG,aAAa,KAAK,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;IAEzF,MAAM,eAAe,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEjD,IAAI,uBAA2C,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACb,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACzC,uBAAuB,GAAG,eAAe;YACrC,CAAC,CAAC,iCAAiC,CAAC,eAAe,CAAC;YACpD,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;SAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,eAAe,GAAG,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrE,uBAAuB,GAAG,iCAAiC,CAAC,eAAe,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe;QAC5B,CAAC,CAAC,kBAAkB,CACd,IAAI,CAAC,MAAM,EACX;YACI,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,IAAI,CAAC,UAAU;SACxC,EACD,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAC1C;QACH,CAAC,CAAC,SAAS,CAAC;IAEhB,OAAO,CACH,KAAC,YAAY,IACT,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,QAAQ,EACd,kBAAkB,QAClB,kBAAkB,EACd,eAAe,CAAC,CAAC,CAAC,CACd,KAAC,2BAA2B,IAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,uBAAuB,GAAI,CACjF,CAAC,CAAC,CAAC,IAAI,GAEd,CACL,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { DefinitionList, Flex
|
|
2
|
+
import { DefinitionList, Flex } from '@gravity-ui/uikit';
|
|
3
3
|
import { getTenantPath } from '../../containers/Tenant/TenantPages';
|
|
4
4
|
import { useIsUserAllowedToMakeChanges } from '../../utils/hooks/useIsUserAllowedToMakeChanges';
|
|
5
|
-
import { CellWithPopover } from '../CellWithPopover/CellWithPopover';
|
|
6
5
|
import { EntityStatus } from '../EntityStatus/EntityStatus';
|
|
7
6
|
import { LinkWithIcon } from '../LinkWithIcon/LinkWithIcon';
|
|
8
7
|
import i18n from './i18n';
|
|
@@ -26,9 +25,10 @@ export function TenantNameWrapper({ tenant, additionalTenantsProps }) {
|
|
|
26
25
|
const isExternalLink = Boolean(backend);
|
|
27
26
|
const monitoringLink = (_a = additionalTenantsProps === null || additionalTenantsProps === void 0 ? void 0 : additionalTenantsProps.getMonitoringLink) === null || _a === void 0 ? void 0 : _a.call(additionalTenantsProps, tenant.Name, tenant.Type);
|
|
28
27
|
const logsLink = (_b = additionalTenantsProps === null || additionalTenantsProps === void 0 ? void 0 : additionalTenantsProps.getLogsLink) === null || _b === void 0 ? void 0 : _b.call(additionalTenantsProps, tenant.Name);
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
28
|
+
const infoPopoverContent = (monitoringLink || logsLink) && isUserAllowedToMakeChanges ? (_jsx(DefinitionList, { responsive: true, children: _jsx(DefinitionList.Item, { name: i18n('field_links'), children: _jsxs(Flex, { gap: 2, wrap: "wrap", children: [monitoringLink && (_jsx(LinkWithIcon, { title: i18n('field_monitoring-link'), url: monitoringLink })), logsLink && (_jsx(LinkWithIcon, { title: i18n('field_logs-link'), url: logsLink }))] }) }) })) : null;
|
|
29
|
+
return (_jsx(EntityStatus, { externalLink: isExternalLink, name: tenant.Name || i18n('context_unknown'), withLeftTrim: true, status: tenant.Overall, infoPopoverContent: infoPopoverContent, hasClipboardButton: true, path: getTenantPath({
|
|
30
|
+
database: tenant.Name,
|
|
31
|
+
backend,
|
|
32
|
+
}) }));
|
|
33
33
|
}
|
|
34
34
|
//# sourceMappingURL=TenantNameWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TenantNameWrapper.js","sourceRoot":"","sources":["../../../src/components/TenantNameWrapper/TenantNameWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,cAAc,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"TenantNameWrapper.js","sourceRoot":"","sources":["../../../src/components/TenantNameWrapper/TenantNameWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { ShieldKeyhole } from '@gravity-ui/icons';
|
|
|
3
3
|
import DataTable from '@gravity-ui/react-data-table';
|
|
4
4
|
import { Icon, Label, Popover, PopoverBehavior } from '@gravity-ui/uikit';
|
|
5
5
|
import { CellWithPopover } from '../../../../components/CellWithPopover/CellWithPopover';
|
|
6
|
-
import {
|
|
6
|
+
import { EntityStatus } from '../../../../components/EntityStatus/EntityStatus';
|
|
7
7
|
import { StatusIcon } from '../../../../components/StatusIcon/StatusIcon';
|
|
8
8
|
import { UsageLabel } from '../../../../components/UsageLabel/UsageLabel';
|
|
9
9
|
import { getStorageGroupPath } from '../../../../routes';
|
|
@@ -87,12 +87,12 @@ const diskSpaceUsageColumn = {
|
|
|
87
87
|
const groupIdColumn = {
|
|
88
88
|
name: STORAGE_GROUPS_COLUMNS_IDS.GroupId,
|
|
89
89
|
header: STORAGE_GROUPS_COLUMNS_TITLES.GroupId,
|
|
90
|
-
width:
|
|
90
|
+
width: 140,
|
|
91
91
|
render: ({ row }) => {
|
|
92
|
-
return row.GroupId ? (_jsx(
|
|
92
|
+
return row.GroupId ? (_jsx(EntityStatus, { name: String(row.GroupId), path: getStorageGroupPath(row.GroupId), hasClipboardButton: true, showStatus: false })) : ('-');
|
|
93
93
|
},
|
|
94
94
|
sortAccessor: (row) => Number(row.GroupId),
|
|
95
|
-
align: DataTable.
|
|
95
|
+
align: DataTable.LEFT,
|
|
96
96
|
};
|
|
97
97
|
const usedColumn = {
|
|
98
98
|
name: STORAGE_GROUPS_COLUMNS_IDS.Used,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../../../src/containers/Storage/StorageGroups/columns/columns.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAChD,OAAO,SAAS,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAC,eAAe,EAAC,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAC,YAAY,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../../../src/containers/Storage/StorageGroups/columns/columns.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import { isQueryErrorResponse, parseQueryError } from '../../../../utils/query';
|
|
2
|
+
import { isResponseError } from '../../../../utils/response';
|
|
2
3
|
function isAbortError(error) {
|
|
3
4
|
return (typeof error === 'object' &&
|
|
4
5
|
error !== null &&
|
|
5
6
|
'name' in error &&
|
|
6
7
|
error.name === 'AbortError');
|
|
7
8
|
}
|
|
8
|
-
function isResponseError(error) {
|
|
9
|
-
return typeof error === 'object' && error !== null && 'isCancelled' in error;
|
|
10
|
-
}
|
|
11
9
|
export function isQueryCancelledError(error) {
|
|
12
10
|
var _a;
|
|
13
11
|
if (isAbortError(error)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isQueryCancelledError.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/utils/isQueryCancelledError.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"isQueryCancelledError.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/utils/isQueryCancelledError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAE3D,SAAS,YAAY,CAAC,KAAc;IAChC,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,KAAK,CAAC,IAAI,KAAK,YAAY,CAC9B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;;IAChD,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,CACH,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAA,MAAA,WAAW,CAAC,KAAK,0CAAE,OAAO,MAAK,qBAAqB,CAC5F,CAAC;AACN,CAAC"}
|
|
@@ -35,10 +35,12 @@ export function preparePDiskDataResponse([pdiskResponse = {}, nodeResponse]) {
|
|
|
35
35
|
preparedVDisks.sort((disk1, disk2) => Number(disk2.VDiskSlotId) - Number(disk1.VDiskSlotId));
|
|
36
36
|
const vdisksSlots = preparedVDisks.map((preparedVDisk) => {
|
|
37
37
|
var _a;
|
|
38
|
-
//
|
|
39
|
-
//
|
|
40
|
-
//
|
|
41
|
-
|
|
38
|
+
// Use only space severity for VDisks inside PDiskSpaceDistribution
|
|
39
|
+
// Motivation - PDiskSpaceDistribution is needed to see how PDisk space is distributed among slots
|
|
40
|
+
// Other vdisks statuses make distribution harder to read
|
|
41
|
+
// Moreover, slots are named with Group ID and pool name, so we don't know actual vdisk before hovering or clicking
|
|
42
|
+
// VDisks with their full statuses can be seen in popup on hover, in Storage table and on vdisks pages
|
|
43
|
+
const slotSeverity = getSpaceSeverity(preparedVDisk.AllocatedPercent);
|
|
42
44
|
return {
|
|
43
45
|
SlotType: 'vDisk',
|
|
44
46
|
Id: (_a = preparedVDisk.VDiskId) === null || _a === void 0 ? void 0 : _a.GroupID,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/pdisk/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAE,cAAc,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EACH,0BAA0B,EAC1B,0BAA0B,GAC7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,sBAAsB,CAAC;AAI5D,MAAM,UAAU,wBAAwB,CAAC,CAAC,aAAa,GAAG,EAAE,EAAE,YAAY,CAGzE;;IACG,MAAM,OAAO,GAAG,MAAA,YAAY,CAAC,eAAe,0CAAG,CAAC,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,EAAC,GAAG,GAAG,EAAE,EAAE,UAAU,GAAG,EAAE,EAAC,GAAG,aAAa,IAAI,EAAE,CAAC;IAExD,MAAM,EAAC,KAAK,EAAE,mBAAmB,GAAG,EAAE,EAAE,MAAM,EAAE,oBAAoB,GAAG,EAAE,EAAC,GAAG,UAAU,CAAC;IACxF,MAAM,EAAC,KAAK,EAAE,YAAY,GAAG,EAAE,EAAC,GAAG,GAAG,CAAC;IAEvC,MAAM,aAAa,GAAG,0BAA0B,CAAC;QAC7C,GAAG,YAAY;QACf,GAAG,mBAAmB;KACzB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAA,aAAa,CAAC,MAAM,mCAAI,YAAY,CAAC,MAAM,CAAC;IAE3D,MAAM,EACF,WAAW,EACX,YAAY,EACZ,SAAS,EAAE,cAAc,EACzB,UAAU,EACV,iBAAiB,EACjB,QAAQ,GACX,GAAG,aAAa,CAAC;IAElB,IAAI,OAAoC,CAAC;IAEzC,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;QAExE,OAAO,GAAG;YACN,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC;YACzB,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC;YAC3B,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,gBAAgB,CAAC,YAAY,CAAC;YACxC,QAAQ,EAAE;gBACN,WAAW;gBACX,YAAY;gBACZ,UAAU;aACb;SACJ,CAAC;IACN,CAAC;IAED,MAAM,cAAc,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACrD,0BAA0B,CAAC,EAAC,GAAG,IAAI,EAAE,MAAM,EAAC,CAAC,CAChD,CAAC;IACF,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAE7F,MAAM,WAAW,GAAwB,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;;QAC1E,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/pdisk/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
type ResponseErrorData = TIssueMessage;
|
|
3
|
-
export interface IResponseError<T = ResponseErrorData> {
|
|
1
|
+
export interface IResponseError<T = unknown> {
|
|
4
2
|
data?: T;
|
|
5
3
|
status?: number;
|
|
6
4
|
statusText?: string;
|
|
@@ -21,4 +19,3 @@ export interface NetworkError {
|
|
|
21
19
|
export type AuthErrorResponse = IResponseError<{
|
|
22
20
|
error?: string;
|
|
23
21
|
}>;
|
|
24
|
-
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/types/api/nodes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/types/api/nodes.ts"],"names":[],"mappings":"AAmOA,IAAK,YAGJ;AAHD,WAAK,YAAY;IACb,yCAA2B,CAAA;IAC3B,qCAAuB,CAAA;AAC3B,CAAC,EAHI,YAAY,KAAZ,YAAY,QAGhB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { isResponseError, isResponseErrorWithIssues } from '../response';
|
|
2
|
+
describe('isResponseError', () => {
|
|
3
|
+
test('should return false on incorrect data', () => {
|
|
4
|
+
const incorrectValues = [{}, [], 'hello', 123, null, undefined];
|
|
5
|
+
incorrectValues.forEach((value) => {
|
|
6
|
+
expect(isResponseError(value)).toBe(false);
|
|
7
|
+
});
|
|
8
|
+
});
|
|
9
|
+
test('should return true if it is object with status or status text', () => {
|
|
10
|
+
expect(isResponseError({ status: 403 })).toBe(true);
|
|
11
|
+
expect(isResponseError({ statusText: 'Gateway timeout' })).toBe(true);
|
|
12
|
+
});
|
|
13
|
+
test('should return true if it is cancelled', () => {
|
|
14
|
+
expect(isResponseError({ isCancelled: true })).toBe(true);
|
|
15
|
+
});
|
|
16
|
+
test('should return true if it has data', () => {
|
|
17
|
+
expect(isResponseError({ data: 'Everything is broken' })).toBe(true);
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
describe('isResponseErrorWithIssues', () => {
|
|
21
|
+
test('should return false on incorrect data', () => {
|
|
22
|
+
const incorrectValues = [{}, [], 'hello', 123, null, undefined];
|
|
23
|
+
incorrectValues.forEach((value) => {
|
|
24
|
+
expect(isResponseErrorWithIssues({ data: value })).toBe(false);
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
test('should return false on empty issues', () => {
|
|
28
|
+
expect(isResponseErrorWithIssues({
|
|
29
|
+
data: { issues: [] },
|
|
30
|
+
})).toBe(false);
|
|
31
|
+
});
|
|
32
|
+
test('should return false on incorrect issues value', () => {
|
|
33
|
+
const incorrectValues = [{}, [], 'hello', 123, null, undefined];
|
|
34
|
+
incorrectValues.forEach((value) => {
|
|
35
|
+
expect(isResponseErrorWithIssues({ data: { issues: value } })).toBe(false);
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
test('should return false on incorrect issue inside issues', () => {
|
|
39
|
+
const incorrectValues = [{}, [], 'hello', 123, null, undefined];
|
|
40
|
+
incorrectValues.forEach((value) => {
|
|
41
|
+
expect(isResponseErrorWithIssues({ data: { issues: [value] } })).toBe(false);
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
test('should return true if it is an array of issues', () => {
|
|
45
|
+
expect(isResponseErrorWithIssues({
|
|
46
|
+
data: { issues: [{ message: 'Some error' }] },
|
|
47
|
+
})).toBe(true);
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
//# sourceMappingURL=response.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"response.test.js","sourceRoot":"","sources":["../../../src/utils/__test__/response.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isNetworkError } from '../response';
|
|
1
|
+
import { isNetworkError, isResponseError } from '../response';
|
|
2
2
|
import i18n from './i18n';
|
|
3
3
|
/**
|
|
4
4
|
* Prepares a consistent error message from various error types
|
|
@@ -6,7 +6,6 @@ import i18n from './i18n';
|
|
|
6
6
|
* @returns A formatted error message string
|
|
7
7
|
*/
|
|
8
8
|
export function prepareCommonErrorMessage(err) {
|
|
9
|
-
var _a;
|
|
10
9
|
// Handle string errors
|
|
11
10
|
if (typeof err === 'string') {
|
|
12
11
|
return err;
|
|
@@ -19,13 +18,15 @@ export function prepareCommonErrorMessage(err) {
|
|
|
19
18
|
if (isNetworkError(err)) {
|
|
20
19
|
return err.message;
|
|
21
20
|
}
|
|
22
|
-
if (
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
if (isResponseError(err)) {
|
|
22
|
+
if (err.data &&
|
|
23
|
+
typeof err.data === 'object' &&
|
|
24
|
+
'message' in err.data &&
|
|
25
|
+
typeof err.data.message === 'string') {
|
|
26
|
+
return err.data.message;
|
|
26
27
|
}
|
|
27
|
-
else if (typeof
|
|
28
|
-
return
|
|
28
|
+
else if (typeof err.data === 'string') {
|
|
29
|
+
return err.data;
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
32
|
if (err instanceof Error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/errors/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/errors/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAE5D,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,GAAY;IAClD,uBAAuB;IACvB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,GAAG,CAAC;IACf,CAAC;IAED,wBAAwB;IACxB,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC;IACjC,CAAC;IAED,sBAAsB;IACtB,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,GAAG,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,IACI,GAAG,CAAC,IAAI;YACR,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ;YAC5B,SAAS,IAAI,GAAG,CAAC,IAAI;YACrB,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,KAAK,QAAQ,EACtC,CAAC;YACC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QAC5B,CAAC;aAAM,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,GAAG,CAAC,IAAI,CAAC;QACpB,CAAC;IACL,CAAC;IAED,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC"}
|
package/dist/utils/nodes.js
CHANGED
|
@@ -29,12 +29,13 @@ export const prepareNodesMap = (nodesList) => {
|
|
|
29
29
|
}, new Map());
|
|
30
30
|
};
|
|
31
31
|
export function calculateLoadAveragePercents(node = {}) {
|
|
32
|
-
const { LoadAverage, NumberOfCpus } = node;
|
|
33
|
-
|
|
32
|
+
const { LoadAverage, NumberOfCpus, RealNumberOfCpus } = node;
|
|
33
|
+
const cpuCount = RealNumberOfCpus !== null && RealNumberOfCpus !== void 0 ? RealNumberOfCpus : NumberOfCpus;
|
|
34
|
+
if (!valueIsDefined(LoadAverage) || !cpuCount) {
|
|
34
35
|
return undefined;
|
|
35
36
|
}
|
|
36
37
|
return LoadAverage.map((value) => {
|
|
37
|
-
return (value * 100) /
|
|
38
|
+
return (value * 100) / cpuCount;
|
|
38
39
|
});
|
|
39
40
|
}
|
|
40
41
|
export function prepareNodeSystemState(systemState = {}) {
|
package/dist/utils/nodes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../src/utils/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,mBAAmB,EAAC,MAAM,qCAAqC,CAAC;AAExE,OAAO,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAKzC,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,GAAG,CAAC;AAEjC,MAAM,CAAN,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IAC/B,sCAAa,CAAA;IACb,sDAA6B,CAAA;AACjC,CAAC,EAHW,uBAAuB,KAAvB,uBAAuB,QAGlC;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC;KACzC,UAAU,CAAC,uBAAuB,CAAC;KACnC,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACnC,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,KAAK;IACpC,CAAC,uBAAuB,CAAC,WAAW,CAAC,EAAE,aAAa;CACvD,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAG7B,IAAO,EACT,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,IAAI,CAAC;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAuB,EAAE,EAAE;IACvD,OAAO,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAW,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;;QACnD,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAC1B,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,EAAE,EAAE,MAAA,IAAI,CAAC,gBAAgB,0CAAE,YAAY;aAC1C,CAAC,CAAC;QACP,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,UAAU,4BAA4B,CAAC,OAAyB,EAAE;IACpE,MAAM,EAAC,WAAW,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../src/utils/nodes.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/query.d.ts
CHANGED
|
@@ -41,7 +41,7 @@ export declare const QUERY_SYNTAX: {
|
|
|
41
41
|
readonly yql: "yql_v1";
|
|
42
42
|
readonly pg: "pg";
|
|
43
43
|
};
|
|
44
|
-
export declare const getColumnType: (type: string) => "
|
|
44
|
+
export declare const getColumnType: (type: string) => "number" | "string" | "boolean" | "date" | undefined;
|
|
45
45
|
/** parse response result from ArrayRow to KeyValueRow and format values */
|
|
46
46
|
export declare const parseResult: (rows: ArrayRow[], columns: ColumnType[]) => KeyValueRow[];
|
|
47
47
|
type UnsupportedQueryResponseFormat = Array<unknown> | string | null | undefined | {
|
package/dist/utils/response.d.ts
CHANGED
|
@@ -1,18 +1,25 @@
|
|
|
1
1
|
import type { AxiosError, AxiosResponse } from 'axios';
|
|
2
|
-
import type { NetworkError } from '../types/api/error';
|
|
2
|
+
import type { IResponseError, NetworkError } from '../types/api/error';
|
|
3
|
+
import type { TIssueMessage } from '../types/api/operations';
|
|
4
|
+
import type { IssueMessage } from '../types/api/query';
|
|
5
|
+
export declare function isResponseError(error: unknown): error is IResponseError;
|
|
3
6
|
export declare const isNetworkError: (error: unknown) => error is NetworkError;
|
|
4
7
|
export declare const isAxiosResponse: (response: unknown) => response is AxiosResponse;
|
|
5
8
|
type AxiosErrorObject = {
|
|
6
9
|
[K in keyof AxiosError]: AxiosError[K] extends Function ? never : AxiosError[K];
|
|
7
10
|
};
|
|
8
11
|
export declare function isAxiosError(error: unknown): error is AxiosErrorObject;
|
|
9
|
-
export declare function isAccessError(error: unknown): error is
|
|
10
|
-
status: number;
|
|
11
|
-
};
|
|
12
|
+
export declare function isAccessError(error: unknown): error is IResponseError;
|
|
12
13
|
export declare function isRedirectToAuth(error: unknown): error is {
|
|
13
14
|
status: 401;
|
|
14
15
|
data: {
|
|
15
16
|
authUrl: string;
|
|
16
17
|
};
|
|
17
18
|
};
|
|
19
|
+
type Issue = TIssueMessage | IssueMessage;
|
|
20
|
+
export declare function isResponseErrorWithIssues(error: unknown): error is IResponseError<{
|
|
21
|
+
issues: Issue[];
|
|
22
|
+
}>;
|
|
23
|
+
export declare function isIssuesArray(arr: unknown): arr is Issue[];
|
|
24
|
+
export declare function isIssue(obj: unknown): obj is Issue;
|
|
18
25
|
export {};
|
package/dist/utils/response.js
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
export function isResponseError(error) {
|
|
2
|
+
if (!error || typeof error !== 'object') {
|
|
3
|
+
return false;
|
|
4
|
+
}
|
|
5
|
+
const hasData = 'data' in error;
|
|
6
|
+
const hasStatus = 'status' in error && typeof error.status === 'number';
|
|
7
|
+
const hasStatusText = 'statusText' in error && typeof error.statusText === 'string';
|
|
8
|
+
const isCancelled = 'isCancelled' in error && typeof error.isCancelled === 'boolean';
|
|
9
|
+
return hasData || hasStatus || hasStatusText || isCancelled;
|
|
10
|
+
}
|
|
1
11
|
export const isNetworkError = (error) => {
|
|
2
12
|
return Boolean(error &&
|
|
3
13
|
typeof error === 'object' &&
|
|
@@ -12,19 +22,28 @@ export function isAxiosError(error) {
|
|
|
12
22
|
return Boolean(error && typeof error === 'object' && 'name' in error && error.name === 'AxiosError');
|
|
13
23
|
}
|
|
14
24
|
export function isAccessError(error) {
|
|
15
|
-
return Boolean(error &&
|
|
16
|
-
typeof error === 'object' &&
|
|
17
|
-
'status' in error &&
|
|
18
|
-
(error.status === 403 || error.status === 401));
|
|
25
|
+
return Boolean(isResponseError(error) && (error.status === 403 || error.status === 401));
|
|
19
26
|
}
|
|
20
27
|
export function isRedirectToAuth(error) {
|
|
21
28
|
return Boolean(isAccessError(error) &&
|
|
22
29
|
error.status === 401 &&
|
|
23
|
-
'data' in error &&
|
|
24
30
|
error.data &&
|
|
25
31
|
typeof error.data === 'object' &&
|
|
26
32
|
'authUrl' in error.data &&
|
|
27
33
|
error.data.authUrl &&
|
|
28
34
|
typeof error.data.authUrl === 'string');
|
|
29
35
|
}
|
|
36
|
+
export function isResponseErrorWithIssues(error) {
|
|
37
|
+
return Boolean(isResponseError(error) &&
|
|
38
|
+
error.data &&
|
|
39
|
+
typeof error.data === 'object' &&
|
|
40
|
+
'issues' in error.data &&
|
|
41
|
+
isIssuesArray(error.data.issues));
|
|
42
|
+
}
|
|
43
|
+
export function isIssuesArray(arr) {
|
|
44
|
+
return Boolean(Array.isArray(arr) && arr.length && arr.every(isIssue));
|
|
45
|
+
}
|
|
46
|
+
export function isIssue(obj) {
|
|
47
|
+
return Boolean(obj && typeof obj === 'object' && 'message' in obj && typeof obj.message === 'string');
|
|
48
|
+
}
|
|
30
49
|
//# sourceMappingURL=response.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,eAAe,CAAC,KAAc;IAC1C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,IAAI,KAAK,CAAC;IAChC,MAAM,SAAS,GAAG,QAAQ,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC;IACxE,MAAM,aAAa,GAAG,YAAY,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC;IACpF,MAAM,WAAW,GAAG,aAAa,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC;IAErF,OAAO,OAAO,IAAI,SAAS,IAAI,aAAa,IAAI,WAAW,CAAC;AAChE,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAc,EAAyB,EAAE;IACpE,OAAO,OAAO,CACV,KAAK;QACD,OAAO,KAAK,KAAK,QAAQ;QACzB,SAAS,IAAI,KAAK;QAClB,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QACjC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,eAAe,CACtD,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAiB,EAA6B,EAAE;IAC5E,OAAO,OAAO,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,IAAI,QAAQ,CAAC,CAAC;AACrF,CAAC,CAAC;AAMF,MAAM,UAAU,YAAY,CAAC,KAAc;IACvC,OAAO,OAAO,CACV,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,CACvF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAc;IACxC,OAAO,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC3C,OAAO,OAAO,CACV,aAAa,CAAC,KAAK,CAAC;QAChB,KAAK,CAAC,MAAM,KAAK,GAAG;QACpB,KAAK,CAAC,IAAI;QACV,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC9B,SAAS,IAAI,KAAK,CAAC,IAAI;QACvB,KAAK,CAAC,IAAI,CAAC,OAAO;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,QAAQ,CAC7C,CAAC;AACN,CAAC;AAID,MAAM,UAAU,yBAAyB,CACrC,KAAc;IAEd,OAAO,OAAO,CACV,eAAe,CAAC,KAAK,CAAC;QAClB,KAAK,CAAC,IAAI;QACV,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC9B,QAAQ,IAAI,KAAK,CAAC,IAAI;QACtB,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CACvC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAY;IACtC,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAY;IAChC,OAAO,OAAO,CACV,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,SAAS,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CACxF,CAAC;AACN,CAAC"}
|