ydb-embedded-ui 12.15.0 → 12.15.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/CellWithPopover/CellWithPopover.scss +4 -3
- package/dist/components/FullNodeViewer/i18n/index.d.ts +1 -1
- package/dist/components/NodeHostWrapper/NodeHostWrapper.js +8 -4
- package/dist/components/NodeHostWrapper/NodeHostWrapper.js.map +1 -1
- package/dist/components/ProblemFilter/ProblemFilter.d.ts +3 -4
- package/dist/components/ProblemFilter/ProblemFilter.js +8 -4
- package/dist/components/ProblemFilter/ProblemFilter.js.map +1 -1
- package/dist/components/ProblemFilter/i18n/en.json +4 -0
- package/dist/components/ProblemFilter/i18n/index.d.ts +2 -0
- package/dist/components/ProblemFilter/i18n/index.js +5 -0
- package/dist/components/ProblemFilter/i18n/index.js.map +1 -0
- package/dist/components/ResizeableDataTable/ResizeableDataTable.d.ts +12 -2
- package/dist/components/ResizeableDataTable/ResizeableDataTable.js +28 -12
- package/dist/components/ResizeableDataTable/ResizeableDataTable.js.map +1 -1
- package/dist/components/VDiskInfo/i18n/index.d.ts +1 -1
- package/dist/components/nodesColumns/i18n/index.d.ts +1 -1
- package/dist/containers/Clusters/constants.d.ts +1 -1
- package/dist/containers/Node/Node.js +5 -5
- package/dist/containers/Node/Node.js.map +1 -1
- package/dist/containers/Node/Threads/Threads.js +1 -1
- package/dist/containers/Node/Threads/Threads.js.map +1 -1
- package/dist/containers/Nodes/NodesControls/NodesControls.js +3 -5
- package/dist/containers/Nodes/NodesControls/NodesControls.js.map +1 -1
- package/dist/containers/Nodes/NodesTable.d.ts +2 -3
- package/dist/containers/Nodes/NodesTable.js +4 -4
- package/dist/containers/Nodes/NodesTable.js.map +1 -1
- package/dist/containers/Nodes/PaginatedNodes/GroupedNodesComponent.js +1 -1
- package/dist/containers/Nodes/PaginatedNodes/GroupedNodesComponent.js.map +1 -1
- package/dist/containers/Nodes/PaginatedNodes/NodesComponent.js +3 -5
- package/dist/containers/Nodes/PaginatedNodes/NodesComponent.js.map +1 -1
- package/dist/containers/Nodes/PaginatedNodes/PaginatedNodes.js +5 -7
- package/dist/containers/Nodes/PaginatedNodes/PaginatedNodes.js.map +1 -1
- package/dist/containers/Nodes/getNodes.js +3 -3
- package/dist/containers/Nodes/getNodes.js.map +1 -1
- package/dist/containers/Nodes/useNodesPageQueryParams.d.ts +2 -0
- package/dist/containers/Nodes/useNodesPageQueryParams.js +17 -9
- package/dist/containers/Nodes/useNodesPageQueryParams.js.map +1 -1
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupsColumns.scss +0 -4
- package/dist/containers/Tenant/Diagnostics/Network/Network.js +11 -16
- package/dist/containers/Tenant/Diagnostics/Network/Network.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/Partitions/Partitions.js +1 -5
- package/dist/containers/Tenant/Diagnostics/Partitions/Partitions.js.map +1 -1
- package/dist/containers/Tenant/Diagnostics/TopQueries/QueriesTableWithDrawer.js +1 -1
- package/dist/containers/Tenant/Diagnostics/TopQueries/QueriesTableWithDrawer.js.map +1 -1
- package/dist/containers/Tenants/Tenants.js +23 -20
- package/dist/containers/Tenants/Tenants.js.map +1 -1
- package/dist/containers/Tenants/useTenantsQueryParams.d.ts +6 -0
- package/dist/containers/Tenants/useTenantsQueryParams.js +21 -0
- package/dist/containers/Tenants/useTenantsQueryParams.js.map +1 -0
- package/dist/containers/VDiskPage/i18n/index.d.ts +1 -1
- package/dist/containers/Versions/groupNodes.js +5 -11
- package/dist/containers/Versions/groupNodes.js.map +1 -1
- package/dist/store/configureStore.d.ts +0 -4
- package/dist/store/defaultStore.d.ts +0 -2
- package/dist/store/reducers/capabilities/capabilities.d.ts +0 -24
- package/dist/store/reducers/cluster/cluster.d.ts +0 -2
- package/dist/store/reducers/healthcheckInfo/healthcheckInfo.d.ts +0 -18
- package/dist/store/reducers/index.d.ts +0 -3
- package/dist/store/reducers/index.js +0 -2
- package/dist/store/reducers/index.js.map +1 -1
- package/dist/store/reducers/node/selectors.d.ts +0 -1
- package/dist/store/reducers/nodes/types.d.ts +1 -2
- package/dist/store/reducers/nodesList.d.ts +0 -4
- package/dist/store/reducers/query/query.d.ts +0 -1
- package/dist/store/reducers/schema/schema.d.ts +0 -4
- package/dist/store/reducers/schemaAcl/schemaAcl.d.ts +0 -11
- package/dist/store/reducers/settings/settings.d.ts +1 -10
- package/dist/store/reducers/settings/settings.js +1 -11
- package/dist/store/reducers/settings/settings.js.map +1 -1
- package/dist/store/reducers/settings/types.d.ts +0 -4
- package/dist/store/reducers/tablets.d.ts +0 -1
- package/dist/store/reducers/tenants/filters.d.ts +4 -0
- package/dist/store/reducers/tenants/filters.js +23 -0
- package/dist/store/reducers/tenants/filters.js.map +1 -0
- package/dist/store/reducers/tenants/tenants.d.ts +1 -4
- package/dist/store/reducers/tenants/tenants.js +0 -13
- package/dist/store/reducers/tenants/tenants.js.map +1 -1
- package/dist/store/reducers/tenants/types.d.ts +0 -6
- package/dist/store/reducers/topic.d.ts +0 -15
- package/dist/store/state-url-mapping.d.ts +1 -18
- package/dist/store/state-url-mapping.js +2 -19
- package/dist/store/state-url-mapping.js.map +1 -1
- package/dist/utils/hooks/useWithProblemsQueryParam.d.ts +4 -0
- package/dist/utils/hooks/useWithProblemsQueryParam.js +15 -0
- package/dist/utils/hooks/useWithProblemsQueryParam.js.map +1 -0
- package/dist/utils/nodes.d.ts +2 -2
- package/dist/utils/nodes.js +7 -4
- package/dist/utils/nodes.js.map +1 -1
- package/package.json +1 -1
- package/dist/components/ProblemFilter/index.d.ts +0 -1
- package/dist/components/ProblemFilter/index.js +0 -2
- package/dist/components/ProblemFilter/index.js.map +0 -1
- package/dist/store/reducers/settings/hooks.d.ts +0 -5
- package/dist/store/reducers/settings/hooks.js +0 -14
- package/dist/store/reducers/settings/hooks.js.map +0 -1
- package/dist/store/reducers/tenants/selectors.d.ts +0 -750
- package/dist/store/reducers/tenants/selectors.js +0 -38
- package/dist/store/reducers/tenants/selectors.js.map +0 -1
|
@@ -2,12 +2,12 @@ import { isNil } from 'lodash';
|
|
|
2
2
|
import { NODES_COLUMNS_TO_DATA_FIELDS, getNodesColumnSortField, } from '../../components/nodesColumns/constants';
|
|
3
3
|
import { prepareStorageNodesResponse } from '../../store/reducers/storage/utils';
|
|
4
4
|
import { prepareSortValue } from '../../utils/filters';
|
|
5
|
-
import {
|
|
5
|
+
import { getUptimeParamValue } from '../../utils/nodes';
|
|
6
6
|
import { getRequiredDataFields } from '../../utils/tableUtils/getRequiredDataFields';
|
|
7
7
|
export const getNodes = async (params) => {
|
|
8
8
|
const { type = 'any', storage, limit, offset, sortParams, filters, columnsIds } = params;
|
|
9
9
|
const { sortOrder, columnId } = sortParams !== null && sortParams !== void 0 ? sortParams : {};
|
|
10
|
-
const { path, databaseFullPath, database, searchValue,
|
|
10
|
+
const { path, databaseFullPath, database, searchValue, withProblems, uptimeFilter, peerRoleFilter, filterGroup, filterGroupBy, } = filters !== null && filters !== void 0 ? filters : {};
|
|
11
11
|
const sortField = getNodesColumnSortField(columnId);
|
|
12
12
|
const sort = sortField ? prepareSortValue(sortField, sortOrder) : undefined;
|
|
13
13
|
const dataFieldsRequired = getRequiredDataFields(columnsIds, NODES_COLUMNS_TO_DATA_FIELDS);
|
|
@@ -21,7 +21,7 @@ export const getNodes = async (params) => {
|
|
|
21
21
|
path: schemePathParam,
|
|
22
22
|
database,
|
|
23
23
|
filter: searchValue,
|
|
24
|
-
problems_only:
|
|
24
|
+
problems_only: withProblems,
|
|
25
25
|
uptime: getUptimeParamValue(uptimeFilter),
|
|
26
26
|
filter_peer_role: peerRoleFilter,
|
|
27
27
|
filter_group: filterGroup,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNodes.js","sourceRoot":"","sources":["../../../src/containers/Nodes/getNodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAC;AAG7B,OAAO,EACH,4BAA4B,EAC5B,uBAAuB,GAC1B,MAAM,yCAAyC,CAAC;AAGjD,OAAO,EAAC,2BAA2B,EAAC,MAAM,oCAAoC,CAAC;AAE/E,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"getNodes.js","sourceRoot":"","sources":["../../../src/containers/Nodes/getNodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAC;AAG7B,OAAO,EACH,4BAA4B,EAC5B,uBAAuB,GAC1B,MAAM,yCAAyC,CAAC;AAGjD,OAAO,EAAC,2BAA2B,EAAC,MAAM,oCAAoC,CAAC;AAE/E,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8CAA8C,CAAC;AAEnF,MAAM,CAAC,MAAM,QAAQ,GAIjB,KAAK,EAAE,MAAM,EAAE,EAAE;IACjB,MAAM,EAAC,IAAI,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAC,GAAG,MAAM,CAAC;IAEvF,MAAM,EAAC,SAAS,EAAE,QAAQ,EAAC,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC;IAC/C,MAAM,EACF,IAAI,EACJ,gBAAgB,EAChB,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,WAAW,EACX,aAAa,GAChB,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;IAElB,MAAM,SAAS,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,UAAU,EAAE,4BAA4B,CAAC,CAAC;IAE3F,MAAM,eAAe,GACjB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAC,IAAI,EAAE,gBAAgB,EAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC9C,IAAI;QACJ,OAAO;QACP,KAAK;QACL,MAAM;QACN,IAAI;QACJ,IAAI,EAAE,eAAe;QACrB,QAAQ;QACR,MAAM,EAAE,WAAW;QACnB,aAAa,EAAE,YAAY;QAC3B,MAAM,EAAE,mBAAmB,CAAC,YAAY,CAAC;QACzC,gBAAgB,EAAE,cAAc;QAChC,YAAY,EAAE,WAAW;QACzB,eAAe,EAAE,aAAa;QAC9B,cAAc,EAAE,kBAAkB;KACrC,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IAE/D,OAAO;QACH,IAAI,EAAE,gBAAgB,CAAC,KAAK,IAAI,EAAE;QAClC,KAAK,EAAE,gBAAgB,CAAC,KAAK,IAAI,CAAC;QAClC,KAAK,EAAE,gBAAgB,CAAC,KAAK,IAAI,CAAC;KACrC,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -5,8 +5,10 @@ export declare function useNodesPageQueryParams(groupByParams: NodesGroupByField
|
|
|
5
5
|
searchValue: string;
|
|
6
6
|
peerRoleFilter: NodesPeerRole | undefined;
|
|
7
7
|
groupByParam: NodesGroupByField | undefined;
|
|
8
|
+
withProblems: boolean;
|
|
8
9
|
handleSearchQueryChange: (value: string) => void;
|
|
9
10
|
handleUptimeFilterChange: (value: NodesUptimeFilterValues) => void;
|
|
10
11
|
handlePeerRoleFilterChange: (value: NodesPeerRole) => void;
|
|
11
12
|
handleGroupByParamChange: (value: string) => void;
|
|
13
|
+
handleWithProblemsChange: (value: boolean) => void;
|
|
12
14
|
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { BooleanParam, StringParam, useQueryParams } from 'use-query-params';
|
|
2
3
|
import { useViewerNodesHandlerHasGroupingBySystemState } from '../../store/reducers/capabilities/hooks';
|
|
3
4
|
import { useIsViewerUser } from '../../utils/hooks/useIsUserAllowedToMakeChanges';
|
|
4
5
|
import { nodesUptimeFilterValuesSchema } from '../../utils/nodes';
|
|
@@ -11,10 +12,12 @@ export function useNodesPageQueryParams(groupByParams, withPeerRoleFilter) {
|
|
|
11
12
|
peerRole: StringParam,
|
|
12
13
|
search: StringParam,
|
|
13
14
|
nodesGroupBy: StringParam,
|
|
15
|
+
withProblems: BooleanParam,
|
|
14
16
|
});
|
|
15
17
|
const isViewerUser = useIsViewerUser();
|
|
16
18
|
const uptimeFilter = nodesUptimeFilterValuesSchema.parse(queryParams.uptimeFilter);
|
|
17
19
|
const searchValue = (_a = queryParams.search) !== null && _a !== void 0 ? _a : '';
|
|
20
|
+
const withProblems = Boolean(queryParams.withProblems);
|
|
18
21
|
let peerRoleFilter;
|
|
19
22
|
// Do not add peerRoleFilter on Cluster page Network tab
|
|
20
23
|
if (withPeerRoleFilter) {
|
|
@@ -24,27 +27,32 @@ export function useNodesPageQueryParams(groupByParams, withPeerRoleFilter) {
|
|
|
24
27
|
}
|
|
25
28
|
const systemStateGroupingAvailable = useViewerNodesHandlerHasGroupingBySystemState();
|
|
26
29
|
const groupByParam = parseNodesGroupByParam(queryParams.nodesGroupBy, groupByParams !== null && groupByParams !== void 0 ? groupByParams : [], systemStateGroupingAvailable);
|
|
27
|
-
const handleSearchQueryChange = (value) => {
|
|
30
|
+
const handleSearchQueryChange = React.useCallback((value) => {
|
|
28
31
|
setQueryParams({ search: value || undefined }, 'replaceIn');
|
|
29
|
-
};
|
|
30
|
-
const handleUptimeFilterChange = (value) => {
|
|
32
|
+
}, [setQueryParams]);
|
|
33
|
+
const handleUptimeFilterChange = React.useCallback((value) => {
|
|
31
34
|
setQueryParams({ uptimeFilter: value }, 'replaceIn');
|
|
32
|
-
};
|
|
33
|
-
const handlePeerRoleFilterChange = (value) => {
|
|
35
|
+
}, [setQueryParams]);
|
|
36
|
+
const handlePeerRoleFilterChange = React.useCallback((value) => {
|
|
34
37
|
setQueryParams({ peerRole: value }, 'replaceIn');
|
|
35
|
-
};
|
|
36
|
-
const handleGroupByParamChange = (value) => {
|
|
38
|
+
}, [setQueryParams]);
|
|
39
|
+
const handleGroupByParamChange = React.useCallback((value) => {
|
|
37
40
|
setQueryParams({ nodesGroupBy: value }, 'replaceIn');
|
|
38
|
-
};
|
|
41
|
+
}, [setQueryParams]);
|
|
42
|
+
const handleWithProblemsChange = React.useCallback((value) => {
|
|
43
|
+
setQueryParams({ withProblems: value || undefined }, 'replaceIn');
|
|
44
|
+
}, [setQueryParams]);
|
|
39
45
|
return {
|
|
40
46
|
uptimeFilter,
|
|
41
47
|
searchValue,
|
|
42
48
|
peerRoleFilter,
|
|
43
49
|
groupByParam,
|
|
50
|
+
withProblems,
|
|
44
51
|
handleSearchQueryChange,
|
|
45
52
|
handleUptimeFilterChange,
|
|
46
53
|
handlePeerRoleFilterChange,
|
|
47
54
|
handleGroupByParamChange,
|
|
55
|
+
handleWithProblemsChange,
|
|
48
56
|
};
|
|
49
57
|
}
|
|
50
58
|
//# sourceMappingURL=useNodesPageQueryParams.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useNodesPageQueryParams.js","sourceRoot":"","sources":["../../../src/containers/Nodes/useNodesPageQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"useNodesPageQueryParams.js","sourceRoot":"","sources":["../../../src/containers/Nodes/useNodesPageQueryParams.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,13 @@ import { Checkbox, Icon, Loader } from '@gravity-ui/uikit';
|
|
|
4
4
|
import { Link } from 'react-router-dom';
|
|
5
5
|
import { ResponseError } from '../../../../components/Errors/ResponseError';
|
|
6
6
|
import { Illustration } from '../../../../components/Illustration';
|
|
7
|
-
import { ProblemFilter } from '../../../../components/ProblemFilter';
|
|
7
|
+
import { ProblemFilter } from '../../../../components/ProblemFilter/ProblemFilter';
|
|
8
8
|
import { getDefaultNodePath } from '../../../../routes';
|
|
9
9
|
import { networkApi } from '../../../../store/reducers/network/network';
|
|
10
|
-
import { ProblemFilterValues, changeFilter, selectProblemFilter, } from '../../../../store/reducers/settings/settings';
|
|
11
10
|
import { hideTooltip, showTooltip } from '../../../../store/reducers/tooltip';
|
|
12
11
|
import { cn } from '../../../../utils/cn';
|
|
13
|
-
import { useAutoRefreshInterval, useTypedDispatch
|
|
12
|
+
import { useAutoRefreshInterval, useTypedDispatch } from '../../../../utils/hooks';
|
|
13
|
+
import { useWithProblemsQueryParam } from '../../../../utils/hooks/useWithProblemsQueryParam';
|
|
14
14
|
import { NodeNetwork } from './NodeNetwork/NodeNetwork';
|
|
15
15
|
import { getConnectedNodesCount } from './utils';
|
|
16
16
|
import networkIcon from '../../../../assets/icons/network.svg';
|
|
@@ -19,8 +19,7 @@ const b = cn('network');
|
|
|
19
19
|
export function Network({ database, databaseFullPath }) {
|
|
20
20
|
var _a, _b;
|
|
21
21
|
const [autoRefreshInterval] = useAutoRefreshInterval();
|
|
22
|
-
const
|
|
23
|
-
const dispatch = useTypedDispatch();
|
|
22
|
+
const { withProblems, handleWithProblemsChange } = useWithProblemsQueryParam();
|
|
24
23
|
const [clickedNode, setClickedNode] = React.useState();
|
|
25
24
|
const [showId, setShowId] = React.useState(false);
|
|
26
25
|
const [showRacks, setShowRacks] = React.useState(false);
|
|
@@ -38,16 +37,14 @@ export function Network({ database, databaseFullPath }) {
|
|
|
38
37
|
}
|
|
39
38
|
const nodesGroupedByType = groupNodesByField(nodes, 'NodeType');
|
|
40
39
|
const rightNodes = clickedNode ? groupNodesByField((_b = clickedNode.Peers) !== null && _b !== void 0 ? _b : [], 'NodeType') : {};
|
|
41
|
-
return (_jsxs("div", { className: b(), children: [error ? _jsx(ResponseError, { error: error }) : null, nodes.length > 0 ? (_jsx("div", { className: b('inner'), children: _jsxs("div", { className: b('nodes-row'), children: [_jsxs("div", { className: b('left'), children: [_jsx("div", { className: b('controls-wrapper'), children: _jsxs("div", { className: b('controls'), children: [_jsx(ProblemFilter, { value:
|
|
42
|
-
dispatch(changeFilter(v));
|
|
43
|
-
}, className: b('problem-filter') }), _jsx("div", { className: b('checkbox-wrapper'), children: _jsx(Checkbox, { onUpdate: () => {
|
|
40
|
+
return (_jsxs("div", { className: b(), children: [error ? _jsx(ResponseError, { error: error }) : null, nodes.length > 0 ? (_jsx("div", { className: b('inner'), children: _jsxs("div", { className: b('nodes-row'), children: [_jsxs("div", { className: b('left'), children: [_jsx("div", { className: b('controls-wrapper'), children: _jsxs("div", { className: b('controls'), children: [_jsx(ProblemFilter, { value: withProblems, onChange: handleWithProblemsChange, className: b('problem-filter') }), _jsx("div", { className: b('checkbox-wrapper'), children: _jsx(Checkbox, { onUpdate: () => {
|
|
44
41
|
setShowId(!showId);
|
|
45
42
|
}, checked: showId, children: "ID" }) }), _jsx("div", { className: b('checkbox-wrapper'), children: _jsx(Checkbox, { onUpdate: () => {
|
|
46
43
|
setShowRacks(!showRacks);
|
|
47
44
|
}, checked: showRacks, children: "Racks" }) })] }) }), _jsx(Nodes, { nodes: nodesGroupedByType, showId: showId, showRacks: showRacks, clickedNode: clickedNode, onClickNode: setClickedNode })] }), _jsx("div", { className: b('right'), children: clickedNode ? (_jsxs("div", { children: [_jsxs("div", { className: b('label'), children: ["Connectivity of node", ' ', _jsx(Link, { className: b('link'), to: getDefaultNodePath({ id: clickedNode.NodeId }), children: clickedNode.NodeId }), ' ', "to other nodes"] }), _jsx("div", { className: b('nodes-row'), children: _jsx(Nodes, { nodes: rightNodes, isRight: true, showId: showId, showRacks: showRacks, clickedNode: clickedNode, onClickNode: setClickedNode }) })] })) : (_jsxs("div", { className: b('placeholder'), children: [_jsx("div", { className: b('placeholder-img'), children: _jsx(Icon, { data: networkIcon, width: 221, height: 204 }) }), _jsx("div", { className: b('placeholder-text'), children: "Select node to see its connectivity to other nodes" })] })) })] }) })) : null] }));
|
|
48
45
|
}
|
|
49
46
|
function Nodes({ nodes, isRight, showId, showRacks, clickedNode, onClickNode }) {
|
|
50
|
-
const
|
|
47
|
+
const { withProblems } = useWithProblemsQueryParam();
|
|
51
48
|
const dispatch = useTypedDispatch();
|
|
52
49
|
let problemNodesCount = 0;
|
|
53
50
|
const result = Object.keys(nodes).map((key, j) => {
|
|
@@ -59,9 +56,8 @@ function Nodes({ nodes, isRight, showId, showRacks, clickedNode, onClickNode })
|
|
|
59
56
|
capacity = Object.keys(nodeInfo.Peers).length;
|
|
60
57
|
connected = getConnectedNodesCount(nodeInfo.Peers);
|
|
61
58
|
}
|
|
62
|
-
if ((
|
|
63
|
-
|
|
64
|
-
filter === ProblemFilterValues.ALL ||
|
|
59
|
+
if ((withProblems && capacity !== connected) ||
|
|
60
|
+
!withProblems ||
|
|
65
61
|
isRight) {
|
|
66
62
|
problemNodesCount++;
|
|
67
63
|
return (_jsx(NodeNetwork, { nodeId: nodeInfo.NodeId, showID: showId, rack: nodeInfo.Rack, status: 'ConnectStatus' in nodeInfo
|
|
@@ -91,9 +87,8 @@ function Nodes({ nodes, isRight, showId, showRacks, clickedNode, onClickNode })
|
|
|
91
87
|
capacity = nodeInfo.Peers.length;
|
|
92
88
|
connected = getConnectedNodesCount(peers);
|
|
93
89
|
}
|
|
94
|
-
if ((
|
|
95
|
-
|
|
96
|
-
filter === ProblemFilterValues.ALL ||
|
|
90
|
+
if ((withProblems && capacity !== connected) ||
|
|
91
|
+
!withProblems ||
|
|
97
92
|
isRight) {
|
|
98
93
|
problemNodesCount++;
|
|
99
94
|
return (_jsx(NodeNetwork, { nodeId: nodeInfo.NodeId, showID: showId, rack: nodeInfo.Rack, status: 'ConnectStatus' in nodeInfo
|
|
@@ -117,7 +112,7 @@ function Nodes({ nodes, isRight, showId, showRacks, clickedNode, onClickNode })
|
|
|
117
112
|
return null;
|
|
118
113
|
}) })] }, j));
|
|
119
114
|
});
|
|
120
|
-
if (
|
|
115
|
+
if (withProblems && problemNodesCount === 0) {
|
|
121
116
|
return _jsx(Illustration, { name: "thumbsUp", width: 200 });
|
|
122
117
|
}
|
|
123
118
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Network.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Diagnostics/Network/Network.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAC,aAAa,EAAC,MAAM,6CAA6C,CAAC;AAC1E,OAAO,EAAC,YAAY,EAAC,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Network.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Diagnostics/Network/Network.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import { skipToken } from '@reduxjs/toolkit/query';
|
|
|
4
4
|
import { ResponseError } from '../../../../components/Errors/ResponseError';
|
|
5
5
|
import { ResizeableDataTable } from '../../../../components/ResizeableDataTable/ResizeableDataTable';
|
|
6
6
|
import { TableColumnSetup } from '../../../../components/TableColumnSetup/TableColumnSetup';
|
|
7
|
-
import { TableSkeleton } from '../../../../components/TableSkeleton/TableSkeleton';
|
|
8
7
|
import { TableWithControlsLayout } from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
|
|
9
8
|
import { nodesListApi, selectNodesMap } from '../../../../store/reducers/nodesList';
|
|
10
9
|
import { partitionsApi, setSelectedConsumer } from '../../../../store/reducers/partitions/partitions';
|
|
@@ -61,10 +60,7 @@ export const Partitions = ({ path, database, databaseFullPath }) => {
|
|
|
61
60
|
return _jsx(TableColumnSetup, { items: columnsToSelect, showStatus: true, onUpdate: setColumns });
|
|
62
61
|
};
|
|
63
62
|
const renderContent = () => {
|
|
64
|
-
|
|
65
|
-
return _jsx(TableSkeleton, { className: b('loader') });
|
|
66
|
-
}
|
|
67
|
-
return (_jsx(ResizeableDataTable, { columnsWidthLSKey: PARTITIONS_COLUMNS_WIDTH_LS_KEY, wrapperClassName: b('table'), data: partitionsToRender, columns: columnsToShow, settings: DEFAULT_TABLE_SETTINGS, emptyDataMessage: i18n('table.emptyDataMessage') }));
|
|
63
|
+
return (_jsx(ResizeableDataTable, { columnsWidthLSKey: PARTITIONS_COLUMNS_WIDTH_LS_KEY, wrapperClassName: b('table'), data: partitionsToRender, columns: columnsToShow, isLoading: loading, settings: DEFAULT_TABLE_SETTINGS, emptyDataMessage: i18n('table.emptyDataMessage') }));
|
|
68
64
|
};
|
|
69
65
|
return (_jsxs(TableWithControlsLayout, { className: b(), children: [_jsx(TableWithControlsLayout.Controls, { renderExtraControls: renderExtraControls, children: renderControls() }), _jsxs(TableWithControlsLayout.Table, { children: [error ? _jsx(ResponseError, { error: error }) : null, partitionsData ? renderContent() : null] })] }));
|
|
70
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Partitions.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAC,aAAa,EAAC,MAAM,6CAA6C,CAAC;AAC1E,OAAO,EAAC,mBAAmB,EAAC,MAAM,gEAAgE,CAAC;AACnG,OAAO,EAAC,gBAAgB,EAAC,MAAM,0DAA0D,CAAC;AAC1F,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"Partitions.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Diagnostics/Partitions/Partitions.tsx"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,6 @@ export function QueriesTableWithDrawer({ columns, data, loading, onRowClick, col
|
|
|
24
24
|
const renderDrawerContent = React.useCallback(() => _jsx(QueryDetailsDrawerContent, { row: selectedRow, onClose: handleCloseDetails }), [selectedRow, handleCloseDetails]);
|
|
25
25
|
const defaultDrawerControls = React.useMemo(() => [{ type: 'close' }], []);
|
|
26
26
|
const finalDrawerControls = drawerControls || defaultDrawerControls;
|
|
27
|
-
return (_jsx(DrawerWrapper, { isDrawerVisible: isDrawerVisible, onCloseDrawer: handleCloseDetails, renderDrawerContent: renderDrawerContent, drawerId: drawerId, storageKey: storageKey, detectClickOutside: true, isPercentageWidth: true, title: i18n('query-details.title'), drawerControls: finalDrawerControls, children: _jsx(ResizeableDataTable, { emptyDataMessage: emptyDataMessage || i18n('no-data'), columnsWidthLSKey: columnsWidthLSKey, columns: columns, data: data,
|
|
27
|
+
return (_jsx(DrawerWrapper, { isDrawerVisible: isDrawerVisible, onCloseDrawer: handleCloseDetails, renderDrawerContent: renderDrawerContent, drawerId: drawerId, storageKey: storageKey, detectClickOutside: true, isPercentageWidth: true, title: i18n('query-details.title'), drawerControls: finalDrawerControls, children: _jsx(ResizeableDataTable, { emptyDataMessage: emptyDataMessage || i18n('no-data'), columnsWidthLSKey: columnsWidthLSKey, columns: columns, data: data, isFetching: loading, settings: tableSettings, onRowClick: handleRowClick, rowClassName: (row) => b('row', { active: isEqual(row, selectedRow) }), sortOrder: sortOrder, onSort: onSort }) }));
|
|
28
28
|
}
|
|
29
29
|
//# sourceMappingURL=QueriesTableWithDrawer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueriesTableWithDrawer.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Diagnostics/TopQueries/QueriesTableWithDrawer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAC,mBAAmB,EAAC,MAAM,gEAAgE,CAAC;AAEnG,OAAO,EAAC,EAAE,EAAC,MAAM,sBAAsB,CAAC;AAExC,OAAO,EAAC,yBAAyB,EAAC,MAAM,0CAA0C,CAAC;AACnF,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAEnD,MAAM,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC;AAuB/B,MAAM,UAAU,sBAAsB,CAAC,EACnC,OAAO,EACP,IAAI,EACJ,OAAO,EACP,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,WAAW,EAAE,mBAAmB,EAChC,mBAAmB,EACnB,cAAc,EACd,QAAQ,GAAG,eAAe,EAC1B,UAAU,GAAG,6BAA6B,EAC1C,aAAa,GAAG,0BAA0B,GACjB;IACzB,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAElE,SAAS,CAAC,CAAC;IAEb,MAAM,WAAW,GACb,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAClF,MAAM,cAAc,GAAG,mBAAmB,IAAI,sBAAsB,CAAC;IAErE,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC9C,cAAc,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,MAAM,eAAe,GAAG,WAAW,KAAK,SAAS,CAAC;IAElD,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CACpC,CACI,GAAuB,EACvB,KAAc,EACd,KAA6C,EAC/C,EAAE;QACA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,eAAe,EAAE,CAAC;QACzB,cAAc,CAAC,GAAG,CAAC,CAAC;QACpB,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC,EACD,CAAC,UAAU,EAAE,cAAc,CAAC,CAC/B,CAAC;IAEF,MAAM,mBAAmB,GAAG,KAAK,CAAC,WAAW,CACzC,GAAG,EAAE,CAAC,KAAC,yBAAyB,IAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,GAAI,EAClF,CAAC,WAAW,EAAE,kBAAkB,CAAC,CACpC,CAAC;IAEF,MAAM,qBAAqB,GAAoB,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1F,MAAM,mBAAmB,GAAG,cAAc,IAAI,qBAAqB,CAAC;IAEpE,OAAO,CACH,KAAC,aAAa,IACV,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,kBAAkB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,UAAU,EACtB,kBAAkB,QAClB,iBAAiB,QACjB,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,EAClC,cAAc,EAAE,mBAAmB,YAEnC,KAAC,mBAAmB,IAChB,gBAAgB,EAAE,gBAAgB,IAAI,IAAI,CAAC,SAAS,CAAC,EACrD,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,
|
|
1
|
+
{"version":3,"file":"QueriesTableWithDrawer.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Diagnostics/TopQueries/QueriesTableWithDrawer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,25 +7,25 @@ import { EntitiesCount } from '../../components/EntitiesCount';
|
|
|
7
7
|
import { ResponseError } from '../../components/Errors/ResponseError';
|
|
8
8
|
import { Illustration } from '../../components/Illustration';
|
|
9
9
|
import { PoolsGraph } from '../../components/PoolsGraph/PoolsGraph';
|
|
10
|
-
import { ProblemFilter } from '../../components/ProblemFilter';
|
|
10
|
+
import { ProblemFilter } from '../../components/ProblemFilter/ProblemFilter';
|
|
11
11
|
import { ResizeableDataTable } from '../../components/ResizeableDataTable/ResizeableDataTable';
|
|
12
12
|
import { Search } from '../../components/Search';
|
|
13
13
|
import { TableWithControlsLayout } from '../../components/TableWithControlsLayout/TableWithControlsLayout';
|
|
14
14
|
import { TenantNameWrapper } from '../../components/TenantNameWrapper/TenantNameWrapper';
|
|
15
15
|
import { useCreateDatabaseFeatureAvailable, useDatabasesAvailable, useDeleteDatabaseFeatureAvailable, useEditDatabaseFeatureAvailable, } from '../../store/reducers/capabilities/hooks';
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import { setSearchValue, tenantsApi } from '../../store/reducers/tenants/tenants';
|
|
16
|
+
import { filterTenantsByDomain, filterTenantsByProblems, filterTenantsBySearch, } from '../../store/reducers/tenants/filters';
|
|
17
|
+
import { tenantsApi } from '../../store/reducers/tenants/tenants';
|
|
19
18
|
import { State } from '../../types/api/tenant';
|
|
20
19
|
import { uiFactory } from '../../uiFactory/uiFactory';
|
|
21
20
|
import { formatBytes } from '../../utils/bytesParsers';
|
|
22
21
|
import { cn } from '../../utils/cn';
|
|
23
|
-
import { DEFAULT_TABLE_SETTINGS, EMPTY_DATA_PLACEHOLDER, SHOW_NETWORK_UTILIZATION, } from '../../utils/constants';
|
|
22
|
+
import { DEFAULT_TABLE_SETTINGS, EMPTY_DATA_PLACEHOLDER, SHOW_DOMAIN_DATABASE_KEY, SHOW_NETWORK_UTILIZATION, } from '../../utils/constants';
|
|
24
23
|
import { formatCPU, formatNumber, formatStorageValuesToGb, } from '../../utils/dataFormatters/dataFormatters';
|
|
25
|
-
import { useAutoRefreshInterval, useSetting
|
|
24
|
+
import { useAutoRefreshInterval, useSetting } from '../../utils/hooks';
|
|
26
25
|
import { useClusterNameFromQuery } from '../../utils/hooks/useDatabaseFromQuery';
|
|
27
26
|
import { isNumeric } from '../../utils/utils';
|
|
28
27
|
import i18n from './i18n';
|
|
28
|
+
import { useTenantsQueryParams } from './useTenantsQueryParams';
|
|
29
29
|
import './Tenants.scss';
|
|
30
30
|
const b = cn('tenants');
|
|
31
31
|
const DATABASES_COLUMNS_WIDTH_LS_KEY = 'databasesTableColumnsWidth';
|
|
@@ -45,7 +45,6 @@ function formatDatabaseState(state) {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
export const Tenants = ({ additionalTenantsProps, scrollContainerRef }) => {
|
|
48
|
-
const dispatch = useTypedDispatch();
|
|
49
48
|
const clusterName = useClusterNameFromQuery();
|
|
50
49
|
const isMetaDatabasesAvailable = useDatabasesAvailable();
|
|
51
50
|
const [autoRefreshInterval] = useAutoRefreshInterval();
|
|
@@ -56,17 +55,21 @@ export const Tenants = ({ additionalTenantsProps, scrollContainerRef }) => {
|
|
|
56
55
|
const isCreateDBAvailable = useCreateDatabaseFeatureAvailable() && uiFactory.onCreateDB !== undefined;
|
|
57
56
|
const isEditDBAvailable = useEditDatabaseFeatureAvailable() && uiFactory.onEditDB !== undefined;
|
|
58
57
|
const isDeleteDBAvailable = useDeleteDatabaseFeatureAvailable() && uiFactory.onDeleteDB !== undefined;
|
|
59
|
-
const
|
|
60
|
-
const searchValue = useTypedSelector(selectTenantsSearchValue);
|
|
61
|
-
const filteredTenants = useTypedSelector((state) => selectFilteredTenants(state, clusterName));
|
|
62
|
-
const problemFilter = useTypedSelector(selectProblemFilter);
|
|
58
|
+
const { search, withProblems, handleSearchChange, handleWithProblemsChange } = useTenantsQueryParams();
|
|
63
59
|
const [showNetworkUtilization] = useSetting(SHOW_NETWORK_UTILIZATION);
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
60
|
+
const [showDomainDatabase] = useSetting(SHOW_DOMAIN_DATABASE_KEY);
|
|
61
|
+
// We should apply domain filter before other filters
|
|
62
|
+
// It is done to ensure proper entities count
|
|
63
|
+
// It should be 8/8 instead of 8/9 when no filters applied but show domain setting is off
|
|
64
|
+
const tenants = React.useMemo(() => {
|
|
65
|
+
const rawTenants = currentData !== null && currentData !== void 0 ? currentData : [];
|
|
66
|
+
return filterTenantsByDomain(rawTenants, showDomainDatabase);
|
|
67
|
+
}, [currentData, showDomainDatabase]);
|
|
68
|
+
const filteredTenants = React.useMemo(() => {
|
|
69
|
+
const filteredByProblems = filterTenantsByProblems(tenants, withProblems);
|
|
70
|
+
const filteredBySearch = filterTenantsBySearch(filteredByProblems, search);
|
|
71
|
+
return filteredBySearch;
|
|
72
|
+
}, [tenants, withProblems, search]);
|
|
70
73
|
const renderCreateDBButton = () => {
|
|
71
74
|
const buttonAvailable = isCreateDBAvailable && clusterName;
|
|
72
75
|
if (buttonAvailable && !loading) {
|
|
@@ -75,7 +78,7 @@ export const Tenants = ({ additionalTenantsProps, scrollContainerRef }) => {
|
|
|
75
78
|
return null;
|
|
76
79
|
};
|
|
77
80
|
const renderControls = () => {
|
|
78
|
-
return (_jsxs(React.Fragment, { children: [_jsx(Search, { value:
|
|
81
|
+
return (_jsxs(React.Fragment, { children: [_jsx(Search, { value: search, onChange: handleSearchChange, placeholder: "Database name", className: b('search') }), _jsx(ProblemFilter, { value: withProblems, onChange: handleWithProblemsChange }), _jsx(EntitiesCount, { total: tenants === null || tenants === void 0 ? void 0 : tenants.length, current: (filteredTenants === null || filteredTenants === void 0 ? void 0 : filteredTenants.length) || 0, label: 'Databases', loading: loading })] }));
|
|
79
82
|
};
|
|
80
83
|
const renderTable = () => {
|
|
81
84
|
const columns = [
|
|
@@ -198,12 +201,12 @@ export const Tenants = ({ additionalTenantsProps, scrollContainerRef }) => {
|
|
|
198
201
|
});
|
|
199
202
|
columns.push(actionsColumn);
|
|
200
203
|
}
|
|
201
|
-
if (filteredTenants.length === 0 &&
|
|
204
|
+
if (filteredTenants.length === 0 && withProblems) {
|
|
202
205
|
return _jsx(Illustration, { name: "thumbsUp", width: 200 });
|
|
203
206
|
}
|
|
204
207
|
return (_jsx(ResizeableDataTable, { columnsWidthLSKey: DATABASES_COLUMNS_WIDTH_LS_KEY, data: filteredTenants, columns: columns, settings: DEFAULT_TABLE_SETTINGS, emptyDataMessage: "No such tenants", onSortChange: setSortParams }));
|
|
205
208
|
};
|
|
206
|
-
return (_jsx("div", { className: b('table-wrapper'), children: _jsxs(TableWithControlsLayout, { fullHeight: true, children: [_jsx(TableWithControlsLayout.Controls, { renderExtraControls: renderCreateDBButton, children: renderControls() }), error ? _jsx(ResponseError, { error: error }) : null, _jsx(TableWithControlsLayout.Table, { scrollContainerRef: scrollContainerRef, loading: loading, scrollDependencies: [
|
|
209
|
+
return (_jsx("div", { className: b('table-wrapper'), children: _jsxs(TableWithControlsLayout, { fullHeight: true, children: [_jsx(TableWithControlsLayout.Controls, { renderExtraControls: renderCreateDBButton, children: renderControls() }), error ? _jsx(ResponseError, { error: error }) : null, _jsx(TableWithControlsLayout.Table, { scrollContainerRef: scrollContainerRef, loading: loading, scrollDependencies: [search, withProblems, sortParams], children: currentData ? renderTable() : null })] }) }));
|
|
207
210
|
};
|
|
208
211
|
function getDBActionsColumn({ clusterName, isEditDBAvailable, isDeleteDBAvailable, }) {
|
|
209
212
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tenants.js","sourceRoot":"","sources":["../../../src/containers/Tenants/Tenants.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAE/D,OAAO,SAAS,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAC,aAAa,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Tenants.js","sourceRoot":"","sources":["../../../src/containers/Tenants/Tenants.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { BooleanParam, StringParam, useQueryParams } from 'use-query-params';
|
|
3
|
+
export function useTenantsQueryParams() {
|
|
4
|
+
const [{ withProblems, search }, setQueryParams] = useQueryParams({
|
|
5
|
+
withProblems: BooleanParam,
|
|
6
|
+
search: StringParam,
|
|
7
|
+
});
|
|
8
|
+
const handleWithProblemsChange = React.useCallback((value) => {
|
|
9
|
+
setQueryParams({ withProblems: value || undefined }, 'replaceIn');
|
|
10
|
+
}, [setQueryParams]);
|
|
11
|
+
const handleSearchChange = React.useCallback((value) => {
|
|
12
|
+
setQueryParams({ search: value || undefined }, 'replaceIn');
|
|
13
|
+
}, [setQueryParams]);
|
|
14
|
+
return {
|
|
15
|
+
withProblems: Boolean(withProblems),
|
|
16
|
+
search: search || '',
|
|
17
|
+
handleWithProblemsChange,
|
|
18
|
+
handleSearchChange,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=useTenantsQueryParams.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useTenantsQueryParams.js","sourceRoot":"","sources":["../../../src/containers/Tenants/useTenantsQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,YAAY,EAAE,WAAW,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAE3E,MAAM,UAAU,qBAAqB;IACjC,MAAM,CAAC,EAAC,YAAY,EAAE,MAAM,EAAC,EAAE,cAAc,CAAC,GAAG,cAAc,CAAC;QAC5D,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,WAAW;KACtB,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG,KAAK,CAAC,WAAW,CAC9C,CAAC,KAAc,EAAE,EAAE;QACf,cAAc,CAAC,EAAC,YAAY,EAAE,KAAK,IAAI,SAAS,EAAC,EAAE,WAAW,CAAC,CAAC;IACpE,CAAC,EACD,CAAC,cAAc,CAAC,CACnB,CAAC;IACF,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,CACxC,CAAC,KAAa,EAAE,EAAE;QACd,cAAc,CAAC,EAAC,MAAM,EAAE,KAAK,IAAI,SAAS,EAAC,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC,EACD,CAAC,cAAc,CAAC,CACnB,CAAC;IAEF,OAAO;QACH,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;QACnC,MAAM,EAAE,MAAM,IAAI,EAAE;QAEpB,wBAAwB;QACxB,kBAAkB;KACrB,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const vDiskPageKeyset: (key: "tablets" | "storage" | "size" | "
|
|
1
|
+
export declare const vDiskPageKeyset: (key: "tablets" | "storage" | "size" | "count" | "node" | "fqdn" | "tablet-id" | "pdisk" | "vdisk" | "channel-id" | "evict-vdisk-button" | "force-evict-vdisk-button" | "evict-vdisk-dialog-header" | "evict-vdisk-dialog-text" | "evict-vdisk-not-allowed", params?: import("@gravity-ui/i18n").Params) => string;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import groupBy from 'lodash/groupBy';
|
|
2
|
+
import { checkIsStorageNode, checkIsTenantNode } from '../../utils/nodes';
|
|
2
3
|
import { getColorFromVersionsData, parseNodesToPreparedVersions } from '../../utils/versions';
|
|
3
4
|
import { GroupByValue } from './types';
|
|
4
5
|
const sortByTitle = (a, b) => { var _a; return ((_a = a.title) === null || _a === void 0 ? void 0 : _a.localeCompare(b.title || '')) || -1; };
|
|
@@ -10,7 +11,7 @@ export const getGroupedTenantNodes = (nodes, versionsDataMap, groupByValue) => {
|
|
|
10
11
|
const dividedByVersion = groupBy(nodes, 'Version');
|
|
11
12
|
return Object.keys(dividedByVersion)
|
|
12
13
|
.map((version) => {
|
|
13
|
-
const filteredNodes = dividedByVersion[version].filter(
|
|
14
|
+
const filteredNodes = dividedByVersion[version].filter(checkIsTenantNode);
|
|
14
15
|
const dividedByTenant = groupBy(filteredNodes, 'Tenants');
|
|
15
16
|
const items = Object.keys(dividedByTenant)
|
|
16
17
|
.map((tenant) => {
|
|
@@ -33,7 +34,7 @@ export const getGroupedTenantNodes = (nodes, versionsDataMap, groupByValue) => {
|
|
|
33
34
|
.filter((item) => Boolean(item));
|
|
34
35
|
}
|
|
35
36
|
else {
|
|
36
|
-
const filteredNodes = nodes.filter(
|
|
37
|
+
const filteredNodes = nodes.filter(checkIsTenantNode);
|
|
37
38
|
const dividedByTenant = groupBy(filteredNodes, 'Tenants');
|
|
38
39
|
return Object.keys(dividedByTenant)
|
|
39
40
|
.map((tenant) => {
|
|
@@ -64,7 +65,7 @@ export const getGroupedStorageNodes = (nodes, versionsDataMap) => {
|
|
|
64
65
|
if (!nodes || !nodes.length) {
|
|
65
66
|
return undefined;
|
|
66
67
|
}
|
|
67
|
-
const storageNodes = nodes.filter(
|
|
68
|
+
const storageNodes = nodes.filter(checkIsStorageNode);
|
|
68
69
|
const storageNodesDividedByVersion = groupBy(storageNodes, 'Version');
|
|
69
70
|
return Object.keys(storageNodesDividedByVersion).map((version) => {
|
|
70
71
|
return {
|
|
@@ -79,7 +80,7 @@ export const getOtherNodes = (nodes, versionsDataMap) => {
|
|
|
79
80
|
return undefined;
|
|
80
81
|
}
|
|
81
82
|
// Nodes that are not included in other groups
|
|
82
|
-
const otherNodes = nodes.filter((node) => !
|
|
83
|
+
const otherNodes = nodes.filter((node) => !checkIsStorageNode(node) && !checkIsTenantNode(node) && node.Version);
|
|
83
84
|
const otherNodesDividedByVersion = groupBy(otherNodes, 'Version');
|
|
84
85
|
return Object.keys(otherNodesDividedByVersion).map((version) => {
|
|
85
86
|
return {
|
|
@@ -89,11 +90,4 @@ export const getOtherNodes = (nodes, versionsDataMap) => {
|
|
|
89
90
|
};
|
|
90
91
|
});
|
|
91
92
|
};
|
|
92
|
-
function isStorageNode(node) {
|
|
93
|
-
var _a;
|
|
94
|
-
return Boolean((_a = node.Roles) === null || _a === void 0 ? void 0 : _a.includes('Storage'));
|
|
95
|
-
}
|
|
96
|
-
function isTenantNode(node) {
|
|
97
|
-
return Boolean(node.Tenants);
|
|
98
|
-
}
|
|
99
93
|
//# sourceMappingURL=groupNodes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groupNodes.js","sourceRoot":"","sources":["../../../src/containers/Versions/groupNodes.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAGrC,OAAO,EAAC,wBAAwB,EAAE,4BAA4B,EAAC,MAAM,sBAAsB,CAAC;AAI5F,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,MAAM,WAAW,GAAG,CAAC,CAAmB,EAAE,CAAmB,EAAE,EAAE,WAC7D,OAAA,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,KAAI,CAAC,CAAC,CAAA,EAAA,CAAC;AAEhD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACjC,KAAwC,EACxC,eAA4C,EAC5C,YAA0B,EACI,EAAE;IAChC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,YAAY,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAEnD,OAAO,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;aAC/B,GAAG,CAA0B,CAAC,OAAO,EAAE,EAAE;YACtC,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"groupNodes.js","sourceRoot":"","sources":["../../../src/containers/Versions/groupNodes.ts"],"names":[],"mappings":"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"}
|