ydb-embedded-ui 12.24.1 → 12.25.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.
Files changed (33) hide show
  1. package/dist/components/VDiskInfo/VDiskInfo.js +2 -2
  2. package/dist/components/VDiskInfo/VDiskInfo.js.map +1 -1
  3. package/dist/components/VDiskPopup/VDiskPopup.js +2 -2
  4. package/dist/components/nodesColumns/i18n/index.d.ts +1 -1
  5. package/dist/containers/Clusters/utils.js +6 -3
  6. package/dist/containers/Clusters/utils.js.map +1 -1
  7. package/dist/containers/Operations/columns.js +4 -6
  8. package/dist/containers/Operations/columns.js.map +1 -1
  9. package/dist/containers/Storage/PaginatedStorage.js +2 -1
  10. package/dist/containers/Storage/PaginatedStorage.js.map +1 -1
  11. package/dist/containers/Storage/i18n/index.d.ts +1 -1
  12. package/dist/containers/Storage/useStorageQueryParams.d.ts +3 -2
  13. package/dist/containers/Storage/useStorageQueryParams.js +19 -4
  14. package/dist/containers/Storage/useStorageQueryParams.js.map +1 -1
  15. package/dist/containers/Tenant/Diagnostics/Consumers/TopicStats/ConsumersTopicStats.js +3 -3
  16. package/dist/containers/Tenant/Diagnostics/Consumers/columns/columns.js +4 -4
  17. package/dist/containers/Tenant/Diagnostics/Partitions/columns/columns.js +6 -6
  18. package/dist/store/reducers/cluster/parseFields.js +1 -0
  19. package/dist/store/reducers/cluster/parseFields.js.map +1 -1
  20. package/dist/store/reducers/clusters/types.d.ts +1 -0
  21. package/dist/store/reducers/clusters/utils.js +1 -0
  22. package/dist/store/reducers/clusters/utils.js.map +1 -1
  23. package/dist/store/reducers/settings/constants.d.ts +2 -0
  24. package/dist/store/reducers/settings/constants.js +3 -0
  25. package/dist/store/reducers/settings/constants.js.map +1 -1
  26. package/dist/types/api/meta.d.ts +1 -0
  27. package/dist/utils/dataFormatters/__test__/{formatUptime.test.js → formatDuration.test.js} +20 -20
  28. package/dist/utils/dataFormatters/__test__/formatDuration.test.js.map +1 -0
  29. package/dist/utils/dataFormatters/dataFormatters.d.ts +3 -3
  30. package/dist/utils/dataFormatters/dataFormatters.js +6 -6
  31. package/package.json +5 -1
  32. package/dist/utils/dataFormatters/__test__/formatUptime.test.js.map +0 -1
  33. /package/dist/utils/dataFormatters/__test__/{formatUptime.test.d.ts → formatDuration.test.d.ts} +0 -0
@@ -4,7 +4,7 @@ import { isNil } from 'lodash';
4
4
  import { getPDiskPagePath, useVDiskPagePath } from '../../routes';
5
5
  import { EVDiskState } from '../../types/api/vdisk';
6
6
  import { cn } from '../../utils/cn';
7
- import { formatStorageValuesToGb, formatUptimeInSeconds, } from '../../utils/dataFormatters/dataFormatters';
7
+ import { formatDurationSeconds, formatStorageValuesToGb, } from '../../utils/dataFormatters/dataFormatters';
8
8
  import { createVDiskDeveloperUILink } from '../../utils/developerUI/developerUI';
9
9
  import { getSeverityColor } from '../../utils/disks/helpers';
10
10
  import { useIsUserAllowedToMakeChanges } from '../../utils/hooks/useIsUserAllowedToMakeChanges';
@@ -97,7 +97,7 @@ export function VDiskInfo({ data, withVDiskPageLink, withTitle, className, wrap,
97
97
  });
98
98
  }
99
99
  if (!isNil(ReplicationSecondsRemaining)) {
100
- const timeRemaining = formatUptimeInSeconds(ReplicationSecondsRemaining);
100
+ const timeRemaining = formatDurationSeconds(ReplicationSecondsRemaining);
101
101
  if (timeRemaining) {
102
102
  rightColumn.push({
103
103
  label: vDiskInfoKeyset('replication-time-remaining'),
@@ -1 +1 @@
1
- {"version":3,"file":"VDiskInfo.js","sourceRoot":"","sources":["../../../src/components/VDiskInfo/VDiskInfo.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"VDiskInfo.js","sourceRoot":"","sources":["../../../src/components/VDiskInfo/VDiskInfo.tsx"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ import { EFlag } from '../../types/api/enums';
8
8
  import { EVDiskState } from '../../types/api/vdisk';
9
9
  import { cn } from '../../utils/cn';
10
10
  import { EMPTY_DATA_PLACEHOLDER } from '../../utils/constants';
11
- import { formatUptimeInSeconds } from '../../utils/dataFormatters/dataFormatters';
11
+ import { formatDurationSeconds } from '../../utils/dataFormatters/dataFormatters';
12
12
  import { createVDiskDeveloperUILink } from '../../utils/developerUI/developerUI';
13
13
  import { getStateSeverity } from '../../utils/disks/calculateVDiskSeverity';
14
14
  import { DISK_COLOR_STATE_TO_NUMERIC_SEVERITY, NOT_AVAILABLE_SEVERITY, NUMERIC_SEVERITY_TO_LABEL_VIEW, VDISK_LABEL_CONFIG, } from '../../utils/disks/constants';
@@ -125,7 +125,7 @@ const prepareVDiskData = (data, getVDiskLinkFn) => {
125
125
  });
126
126
  }
127
127
  if (!isNil(ReplicationSecondsRemaining)) {
128
- const timeRemaining = formatUptimeInSeconds(ReplicationSecondsRemaining);
128
+ const timeRemaining = formatDurationSeconds(ReplicationSecondsRemaining);
129
129
  if (timeRemaining) {
130
130
  vdiskData.push({
131
131
  name: vDiskPopupKeyset('label_remaining'),
@@ -1,2 +1,2 @@
1
- declare const _default: (key: "tablets" | "cpu" | "memory" | "missing" | "version" | "database" | "max" | "min" | "ping" | "uptime" | "dc" | "load" | "send" | "node-id" | "host" | "node-name" | "rack" | "ram" | "pools" | "disk-usage" | "load-average" | "sessions" | "pdisks" | "field_memory-used" | "field_memory-limit" | "field_pile-name" | "system-state" | "connect-status" | "utilization" | "network-utilization" | "connections" | "clock-skew" | "skew" | "ping-time" | "receive" | "avg" | "sum", params?: import("@gravity-ui/i18n").Params) => string;
1
+ declare const _default: (key: "missing" | "tablets" | "cpu" | "memory" | "version" | "database" | "max" | "min" | "ping" | "uptime" | "dc" | "load" | "send" | "node-id" | "host" | "node-name" | "rack" | "ram" | "pools" | "disk-usage" | "load-average" | "sessions" | "pdisks" | "field_memory-used" | "field_memory-limit" | "field_pile-name" | "system-state" | "connect-status" | "utilization" | "network-utilization" | "connections" | "clock-skew" | "skew" | "ping-time" | "receive" | "avg" | "sum", params?: import("@gravity-ui/i18n").Params) => string;
2
2
  export default _default;
@@ -1,13 +1,16 @@
1
1
  import { getClusterPath } from '../../routes';
2
2
  import { createDeveloperUIMonitoringPageHref } from '../../utils/developerUI/developerUI';
3
3
  export function calculateClusterPath(row, activeTab) {
4
- const { use_embedded_ui: useEmbeddedUi, preparedBackend: backend, name: clusterName, clusterDomain, settings, } = row;
4
+ const { use_embedded_ui: useEmbeddedUi, preparedBackend: backend, name: clusterName, clusterDomain, settings, clusterExternalName, } = row;
5
5
  if (useEmbeddedUi && backend) {
6
6
  return createDeveloperUIMonitoringPageHref(backend);
7
7
  }
8
8
  return getClusterPath({
9
9
  activeTab,
10
- environment: settings === null || settings === void 0 ? void 0 : settings.auth_service,
11
- }, { backend, clusterName }, { withBasename: true }, clusterDomain);
10
+ environment: clusterDomain ? undefined : settings === null || settings === void 0 ? void 0 : settings.auth_service,
11
+ }, {
12
+ backend: clusterDomain ? undefined : backend,
13
+ clusterName: clusterDomain && clusterExternalName ? clusterExternalName : clusterName,
14
+ }, { withBasename: true }, clusterDomain);
12
15
  }
13
16
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/containers/Clusters/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAC,mCAAmC,EAAC,MAAM,qCAAqC,CAAC;AAGxF,MAAM,UAAU,oBAAoB,CAAC,GAAoB,EAAE,SAAsB;IAC7E,MAAM,EACF,eAAe,EAAE,aAAa,EAC9B,eAAe,EAAE,OAAO,EACxB,IAAI,EAAE,WAAW,EACjB,aAAa,EACb,QAAQ,GACX,GAAG,GAAG,CAAC;IAER,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC;QAC3B,OAAO,mCAAmC,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,cAAc,CACjB;QACI,SAAS;QACT,WAAW,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY;KACtC,EACD,EAAC,OAAO,EAAE,WAAW,EAAC,EACtB,EAAC,YAAY,EAAE,IAAI,EAAC,EACpB,aAAa,CAChB,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/containers/Clusters/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAC,mCAAmC,EAAC,MAAM,qCAAqC,CAAC;AAGxF,MAAM,UAAU,oBAAoB,CAAC,GAAoB,EAAE,SAAsB;IAC7E,MAAM,EACF,eAAe,EAAE,aAAa,EAC9B,eAAe,EAAE,OAAO,EACxB,IAAI,EAAE,WAAW,EACjB,aAAa,EACb,QAAQ,EACR,mBAAmB,GACtB,GAAG,GAAG,CAAC;IAER,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC;QAC3B,OAAO,mCAAmC,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,cAAc,CACjB;QACI,SAAS;QACT,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY;KAClE,EACD;QACI,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO;QAC5C,WAAW,EAAE,aAAa,IAAI,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW;KACxF,EACD,EAAC,YAAY,EAAE,IAAI,EAAC,EACpB,aAAa,CAChB,CAAC;AACN,CAAC"}
@@ -1,14 +1,13 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { duration } from '@gravity-ui/date-utils';
3
2
  import { Ban, CircleStop } from '@gravity-ui/icons';
4
3
  import { ActionTooltip, Flex, Icon, Text } from '@gravity-ui/uikit';
5
4
  import { ButtonWithConfirmDialog } from '../../components/ButtonWithConfirmDialog/ButtonWithConfirmDialog';
6
5
  import { CellWithPopover } from '../../components/CellWithPopover/CellWithPopover';
7
6
  import { operationsApi } from '../../store/reducers/operations';
8
7
  import { EStatusCode } from '../../types/api/operations';
9
- import { EMPTY_DATA_PLACEHOLDER, HOUR_IN_SECONDS, SECOND_IN_MS } from '../../utils/constants';
8
+ import { EMPTY_DATA_PLACEHOLDER } from '../../utils/constants';
10
9
  import createToast from '../../utils/createToast';
11
- import { formatDateTime } from '../../utils/dataFormatters/dataFormatters';
10
+ import { formatDateTime, formatDurationMs } from '../../utils/dataFormatters/dataFormatters';
12
11
  import { parseProtobufTimestampToMs } from '../../utils/timeParsers';
13
12
  import { COLUMNS_NAMES, COLUMNS_TITLES } from './constants';
14
13
  import i18n from './i18n';
@@ -123,9 +122,8 @@ export function getColumns({ database, refreshTable, kind, }) {
123
122
  else {
124
123
  durationValue = Date.now() - createTime;
125
124
  }
126
- const durationFormatted = durationValue > HOUR_IN_SECONDS * SECOND_IN_MS
127
- ? duration(durationValue).format('hh:mm:ss')
128
- : duration(durationValue).format('mm:ss');
125
+ const safeDurationMs = durationValue < 0 ? 0 : durationValue;
126
+ const durationFormatted = formatDurationMs(safeDurationMs);
129
127
  return row.end_time
130
128
  ? durationFormatted
131
129
  : i18n('label_duration-ongoing', { value: durationFormatted });
@@ -1 +1 @@
1
- {"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/containers/Operations/columns.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/containers/Operations/columns.tsx"],"names":[],"mappings":"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"}
@@ -2,10 +2,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { useIsUserAllowedToMakeChanges } from '../../utils/hooks/useIsUserAllowedToMakeChanges';
3
3
  import { PaginatedStorageGroups } from './PaginatedStorageGroups';
4
4
  import { PaginatedStorageNodes } from './PaginatedStorageNodes';
5
- import { useStorageQueryParams } from './useStorageQueryParams';
5
+ import { useSaveStorageType, useStorageQueryParams } from './useStorageQueryParams';
6
6
  import { getStorageGroupsInitialEntitiesCount, getStorageNodesInitialEntitiesCount } from './utils';
7
7
  export const PaginatedStorage = (props) => {
8
8
  const { storageType } = useStorageQueryParams();
9
+ useSaveStorageType();
9
10
  const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
10
11
  const isNodes = storageType === 'nodes';
11
12
  // Hide storage node details for users with only viewer rights
@@ -1 +1 @@
1
- {"version":3,"file":"PaginatedStorage.js","sourceRoot":"","sources":["../../../src/containers/Storage/PaginatedStorage.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,iDAAiD,CAAC;AAE9F,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,oCAAoC,EAAE,mCAAmC,EAAC,MAAM,SAAS,CAAC;AAelG,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAA4B,EAAE,EAAE;IAC7D,MAAM,EAAC,WAAW,EAAC,GAAG,qBAAqB,EAAE,CAAC;IAC9C,MAAM,0BAA0B,GAAG,6BAA6B,EAAE,CAAC;IAEnE,MAAM,OAAO,GAAG,WAAW,KAAK,OAAO,CAAC;IAExC,8DAA8D;IAC9D,IAAI,OAAO,IAAI,0BAA0B,EAAE,CAAC;QACxC,OAAO,CACH,KAAC,qBAAqB,IAClB,oBAAoB,EAAE,mCAAmC,CAAC,KAAK,CAAC,WAAW,CAAC,KACxE,KAAK,GACX,CACL,CAAC;IACN,CAAC;IAED,OAAO,CACH,KAAC,sBAAsB,IACnB,oBAAoB,EAAE,oCAAoC,CAAC,KAAK,CAAC,WAAW,CAAC,KACzE,KAAK,GACX,CACL,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"PaginatedStorage.js","sourceRoot":"","sources":["../../../src/containers/Storage/PaginatedStorage.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,iDAAiD,CAAC;AAE9F,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAC,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAC,oCAAoC,EAAE,mCAAmC,EAAC,MAAM,SAAS,CAAC;AAelG,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAA4B,EAAE,EAAE;IAC7D,MAAM,EAAC,WAAW,EAAC,GAAG,qBAAqB,EAAE,CAAC;IAC9C,kBAAkB,EAAE,CAAC;IACrB,MAAM,0BAA0B,GAAG,6BAA6B,EAAE,CAAC;IAEnE,MAAM,OAAO,GAAG,WAAW,KAAK,OAAO,CAAC;IAExC,8DAA8D;IAC9D,IAAI,OAAO,IAAI,0BAA0B,EAAE,CAAC;QACxC,OAAO,CACH,KAAC,qBAAqB,IAClB,oBAAoB,EAAE,mCAAmC,CAAC,KAAK,CAAC,WAAW,CAAC,KACxE,KAAK,GACX,CACL,CAAC;IACN,CAAC;IAED,OAAO,CACH,KAAC,sBAAsB,IACnB,oBAAoB,EAAE,oCAAoC,CAAC,KAAK,CAAC,WAAW,CAAC,KACzE,KAAK,GACX,CACL,CAAC;AACN,CAAC,CAAC"}
@@ -1,2 +1,2 @@
1
- declare const _default: (key: "nodes" | "groups" | "controls_group-by-placeholder" | "controls_groups-search-placeholder" | "controls_nodes-search-placeholder" | "no-nodes" | "no-groups", params?: import("@gravity-ui/i18n").Params) => string;
1
+ declare const _default: (key: "groups" | "nodes" | "controls_group-by-placeholder" | "controls_groups-search-placeholder" | "controls_nodes-search-placeholder" | "no-nodes" | "no-groups", params?: import("@gravity-ui/i18n").Params) => string;
2
2
  export default _default;
@@ -1,8 +1,8 @@
1
1
  import type { StorageType, VisibleEntities } from '../../store/reducers/storage/types';
2
2
  import { NodesUptimeFilterValues } from '../../utils/nodes';
3
3
  export declare function useStorageQueryParams(): {
4
- storageType: "nodes" | "groups";
5
- visibleEntities: "space" | "missing" | "all";
4
+ storageType: "groups" | "nodes";
5
+ visibleEntities: "all" | "missing" | "space";
6
6
  groupsSearchValue: string;
7
7
  nodesSearchValue: string;
8
8
  nodesUptimeFilter: NodesUptimeFilterValues;
@@ -18,3 +18,4 @@ export declare function useStorageQueryParams(): {
18
18
  handleShowAllGroups: () => void;
19
19
  handleShowAllNodes: () => void;
20
20
  };
21
+ export declare function useSaveStorageType(): void;
@@ -1,6 +1,9 @@
1
1
  import React from 'react';
2
- import { StringParam, useQueryParams } from 'use-query-params';
2
+ import { StringParam, useQueryParam, useQueryParams } from 'use-query-params';
3
+ import { SETTING_KEYS } from '../../store/reducers/settings/constants';
4
+ import { STORAGE_TYPES } from '../../store/reducers/storage/constants';
3
5
  import { storageTypeSchema, visibleEntitiesSchema } from '../../store/reducers/storage/types';
6
+ import { useSetting } from '../../utils/hooks';
4
7
  import { NodesUptimeFilterValues, nodesUptimeFilterValuesSchema } from '../../utils/nodes';
5
8
  import { storageGroupsGroupByParamSchema } from './PaginatedStorageGroupsTable/columns/constants';
6
9
  import { storageNodesGroupByParamSchema } from './PaginatedStorageNodesTable/columns/constants';
@@ -17,6 +20,7 @@ export function useStorageQueryParams() {
17
20
  storageNodesGroupBy: StringParam,
18
21
  storageGroupsGroupBy: StringParam,
19
22
  });
23
+ const [_savedStorageType, setSavedStorageType] = useSetting(SETTING_KEYS.STORAGE_TYPE, STORAGE_TYPES.groups);
20
24
  const storageType = storageTypeSchema.parse(queryParams.type);
21
25
  const visibleEntities = visibleEntitiesSchema.parse(queryParams.visible);
22
26
  const groupsSearchValue = (_a = queryParams.groupsSearch) !== null && _a !== void 0 ? _a : '';
@@ -30,7 +34,7 @@ export function useStorageQueryParams() {
30
34
  patch[STORAGE_SEARCH_PARAM_BY_TYPE[storageType]] = queryParams.search;
31
35
  setQueryParams(patch, 'replaceIn');
32
36
  }
33
- }, [queryParams.search, storageType]);
37
+ }, [queryParams.search, storageType, setQueryParams]);
34
38
  const handleTextFilterGroupsChange = (value) => {
35
39
  setQueryParams({ groupsSearch: value || undefined }, 'replaceIn');
36
40
  };
@@ -40,9 +44,10 @@ export function useStorageQueryParams() {
40
44
  const handleVisibleEntitiesChange = (value) => {
41
45
  setQueryParams({ visible: value }, 'replaceIn');
42
46
  };
43
- const handleStorageTypeChange = (value) => {
47
+ const handleStorageTypeChange = React.useCallback((value) => {
44
48
  setQueryParams({ type: value }, 'replaceIn');
45
- };
49
+ setSavedStorageType(value);
50
+ }, [setQueryParams, setSavedStorageType]);
46
51
  const handleUptimeFilterChange = (value) => {
47
52
  setQueryParams({ uptimeFilter: value }, 'replaceIn');
48
53
  };
@@ -78,4 +83,14 @@ export function useStorageQueryParams() {
78
83
  handleShowAllNodes,
79
84
  };
80
85
  }
86
+ export function useSaveStorageType() {
87
+ const [queryStorageType, setQueryStorageType] = useQueryParam('type', StringParam);
88
+ const [savedStorageType] = useSetting(SETTING_KEYS.STORAGE_TYPE, STORAGE_TYPES.groups);
89
+ const normalizedStorageType = React.useMemo(() => storageTypeSchema.parse(queryStorageType !== null && queryStorageType !== void 0 ? queryStorageType : savedStorageType), [queryStorageType, savedStorageType]);
90
+ React.useEffect(() => {
91
+ if (normalizedStorageType !== queryStorageType) {
92
+ setQueryStorageType(normalizedStorageType);
93
+ }
94
+ }, [normalizedStorageType, queryStorageType, setQueryStorageType]);
95
+ }
81
96
  //# sourceMappingURL=useStorageQueryParams.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useStorageQueryParams.js","sourceRoot":"","sources":["../../../src/containers/Storage/useStorageQueryParams.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useStorageQueryParams.js","sourceRoot":"","sources":["../../../src/containers/Storage/useStorageQueryParams.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { SpeedMultiMeter } from '../../../../../components/SpeedMultiMeter';
3
3
  import { cn } from '../../../../../utils/cn';
4
- import { formatMsToUptime } from '../../../../../utils/dataFormatters/dataFormatters';
4
+ import { formatDurationMs } from '../../../../../utils/dataFormatters/dataFormatters';
5
5
  import './ConsumersTopicStats.scss';
6
6
  const b = cn('ydb-diagnostics-consumers-topic-stats');
7
7
  export const ConsumersTopicStats = ({ data }) => {
@@ -13,11 +13,11 @@ export const ConsumersTopicStats = ({ data }) => {
13
13
  },
14
14
  {
15
15
  label: 'Write lag',
16
- value: formatMsToUptime(partitionsWriteLag || 0),
16
+ value: formatDurationMs(partitionsWriteLag || 0),
17
17
  },
18
18
  {
19
19
  label: 'Write idle time',
20
- value: formatMsToUptime(partitionsIdleTime || 0),
20
+ value: formatDurationMs(partitionsIdleTime || 0),
21
21
  },
22
22
  ];
23
23
  return (_jsx("div", { className: b('wrapper'), children: values.map((value, index) => (_jsxs("div", { className: b('item'), children: [_jsx("div", { className: b('label'), children: value.label }), _jsx("div", { className: b('value'), children: value.value })] }, index))) }));
@@ -7,7 +7,7 @@ import { EMPTY_DATA_PLACEHOLDER } from '../../../../../lib';
7
7
  import { getTenantPath } from '../../../../../routes';
8
8
  import { TENANT_DIAGNOSTICS_TABS_IDS } from '../../../../../store/reducers/tenant/constants';
9
9
  import { cn } from '../../../../../utils/cn';
10
- import { formatMsToUptime } from '../../../../../utils/dataFormatters/dataFormatters';
10
+ import { formatDurationMs } from '../../../../../utils/dataFormatters/dataFormatters';
11
11
  import { TenantTabsGroups } from '../../../TenantPages';
12
12
  import { ReadLagsHeader } from '../Headers';
13
13
  import { CONSUMERS_COLUMNS_IDS, CONSUMERS_COLUMNS_TITILES, CONSUMERS_READ_LAGS_SUB_COLUMNS_IDS, CONSUMERS_READ_LAGS_SUB_COLUMNS_TITLES, } from '../utils/constants';
@@ -43,19 +43,19 @@ export const columns = [
43
43
  name: CONSUMERS_READ_LAGS_SUB_COLUMNS_IDS.WRITE_LAG,
44
44
  header: CONSUMERS_READ_LAGS_SUB_COLUMNS_TITLES[CONSUMERS_READ_LAGS_SUB_COLUMNS_IDS.WRITE_LAG],
45
45
  align: DataTable.RIGHT,
46
- render: ({ row }) => formatMsToUptime(row.writeLag),
46
+ render: ({ row }) => formatDurationMs(row.writeLag),
47
47
  },
48
48
  {
49
49
  name: CONSUMERS_READ_LAGS_SUB_COLUMNS_IDS.READ_LAG,
50
50
  header: CONSUMERS_READ_LAGS_SUB_COLUMNS_TITLES[CONSUMERS_READ_LAGS_SUB_COLUMNS_IDS.READ_LAG],
51
51
  align: DataTable.RIGHT,
52
- render: ({ row }) => formatMsToUptime(row.readLag),
52
+ render: ({ row }) => formatDurationMs(row.readLag),
53
53
  },
54
54
  {
55
55
  name: CONSUMERS_READ_LAGS_SUB_COLUMNS_IDS.READ_IDLE_TIME,
56
56
  header: CONSUMERS_READ_LAGS_SUB_COLUMNS_TITLES[CONSUMERS_READ_LAGS_SUB_COLUMNS_IDS.READ_IDLE_TIME],
57
57
  align: DataTable.RIGHT,
58
- render: ({ row }) => formatMsToUptime(row.readIdleTime),
58
+ render: ({ row }) => formatDurationMs(row.readIdleTime),
59
59
  },
60
60
  ],
61
61
  },
@@ -8,7 +8,7 @@ import { useTopicDataAvailable } from '../../../../../store/reducers/capabilitie
8
8
  import { TENANT_DIAGNOSTICS_TABS_IDS } from '../../../../../store/reducers/tenant/constants';
9
9
  import { cn } from '../../../../../utils/cn';
10
10
  import { EMPTY_DATA_PLACEHOLDER } from '../../../../../utils/constants';
11
- import { formatBytes, formatMsToUptime } from '../../../../../utils/dataFormatters/dataFormatters';
11
+ import { formatBytes, formatDurationMs } from '../../../../../utils/dataFormatters/dataFormatters';
12
12
  import { isNumeric } from '../../../../../utils/utils';
13
13
  import { useDiagnosticsPageLinkGetter } from '../../DiagnosticsPages';
14
14
  import { ReadLagsHeader, ReadSessionHeader, UncommitedMessagesHeader, UnreadMessagesHeader, WriteLagsHeader, } from '../Headers';
@@ -56,13 +56,13 @@ export const allColumns = [
56
56
  name: PARTITIONS_WRITE_LAGS_SUB_COLUMNS_IDS.PARTITION_WRITE_LAG,
57
57
  header: PARTITIONS_WRITE_LAGS_SUB_COLUMNS_TITLES[PARTITIONS_WRITE_LAGS_SUB_COLUMNS_IDS.PARTITION_WRITE_LAG],
58
58
  align: DataTable.RIGHT,
59
- render: ({ row }) => formatMsToUptime(row.partitionWriteLag),
59
+ render: ({ row }) => formatDurationMs(row.partitionWriteLag),
60
60
  },
61
61
  {
62
62
  name: PARTITIONS_WRITE_LAGS_SUB_COLUMNS_IDS.PARTITION_WRITE_IDLE_TIME,
63
63
  header: PARTITIONS_WRITE_LAGS_SUB_COLUMNS_TITLES[PARTITIONS_WRITE_LAGS_SUB_COLUMNS_IDS.PARTITION_WRITE_IDLE_TIME],
64
64
  align: DataTable.RIGHT,
65
- render: ({ row }) => formatMsToUptime(row.partitionWriteIdleTime),
65
+ render: ({ row }) => formatDurationMs(row.partitionWriteIdleTime),
66
66
  },
67
67
  ],
68
68
  },
@@ -75,19 +75,19 @@ export const allColumns = [
75
75
  name: PARTITIONS_READ_LAGS_SUB_COLUMNS_IDS.CONSUMER_WRITE_LAG,
76
76
  header: PARTITIONS_READ_LAGS_SUB_COLUMNS_TITLES[PARTITIONS_READ_LAGS_SUB_COLUMNS_IDS.CONSUMER_WRITE_LAG],
77
77
  align: DataTable.RIGHT,
78
- render: ({ row }) => formatMsToUptime(row.consumerWriteLag),
78
+ render: ({ row }) => formatDurationMs(row.consumerWriteLag),
79
79
  },
80
80
  {
81
81
  name: PARTITIONS_READ_LAGS_SUB_COLUMNS_IDS.CONSUMER_READ_LAG,
82
82
  header: PARTITIONS_READ_LAGS_SUB_COLUMNS_TITLES[PARTITIONS_READ_LAGS_SUB_COLUMNS_IDS.CONSUMER_READ_LAG],
83
83
  align: DataTable.RIGHT,
84
- render: ({ row }) => formatMsToUptime(row.consumerReadLag),
84
+ render: ({ row }) => formatDurationMs(row.consumerReadLag),
85
85
  },
86
86
  {
87
87
  name: PARTITIONS_READ_LAGS_SUB_COLUMNS_IDS.CONSUMER_READ_IDLE_TIME,
88
88
  header: PARTITIONS_READ_LAGS_SUB_COLUMNS_TITLES[PARTITIONS_READ_LAGS_SUB_COLUMNS_IDS.CONSUMER_READ_IDLE_TIME],
89
89
  align: DataTable.RIGHT,
90
- render: ({ row }) => formatMsToUptime(row.consumerReadIdleTime),
90
+ render: ({ row }) => formatDurationMs(row.consumerReadIdleTime),
91
91
  },
92
92
  ],
93
93
  },
@@ -49,6 +49,7 @@ export function parseLoggingUrls(logging) {
49
49
  const settingsSchema = z.object({
50
50
  use_meta_proxy: z.boolean().optional(),
51
51
  cluster_domain: z.string().optional(),
52
+ cluster_external_name: z.string().optional(),
52
53
  });
53
54
  export function parseSettingsField(settings) {
54
55
  if (settings && typeof settings === 'object') {
@@ -1 +1 @@
1
- {"version":3,"file":"parseFields.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/parseFields.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseFields.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/parseFields.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ export interface PreparedCluster extends Omit<MetaExtendedClusterInfo, 'settings
5
5
  preparedBackend?: string;
6
6
  settings?: MetaClusterSettings;
7
7
  clusterDomain?: string;
8
+ clusterExternalName?: string;
8
9
  }
9
10
  export interface ClustersFilters {
10
11
  status: string[];
@@ -28,6 +28,7 @@ export const prepareClustersData = (data) => {
28
28
  preparedBackend,
29
29
  settings: parsedSettings,
30
30
  clusterDomain,
31
+ clusterExternalName: parsedSettings === null || parsedSettings === void 0 ? void 0 : parsedSettings.cluster_external_name,
31
32
  };
32
33
  });
33
34
  };
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AACxE,OAAO,EACH,aAAa,EACb,eAAe,EACf,sBAAsB,GACzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAI1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAkB,EAAqB,EAAE;IACzE,MAAM,EAAC,QAAQ,GAAG,EAAE,EAAC,GAAG,IAAI,CAAC;IAE7B,IAAI,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAEjC,sCAAsC;IACtC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,QAAQ,GAAG,EAAE,EAAC,EAAE,EAAE;QACjC,gBAAgB,GAAG,aAAa,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,YAAY,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAEvD,+CAA+C;IAC/C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5D,gFAAgF;QAChF,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,MAAK,KAAK,CAAC;QACxF,MAAM,aAAa,GAAG,SAAS,CAAC,gBAAgB;YAC5C,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc;YAChC,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,eAAe,GACjB,OAAO,CAAC,QAAQ,IAAI,CAAC,YAAY;YAC7B,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC9C,CAAC,CAAC,SAAS,CAAC;QAEpB,OAAO;YACH,GAAG,OAAO;YACV,gBAAgB,EAAE,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC;YACxE,eAAe;YACf,QAAQ,EAAE,cAAc;YACxB,aAAa;SAChB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AACxE,OAAO,EACH,aAAa,EACb,eAAe,EACf,sBAAsB,GACzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAI1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAkB,EAAqB,EAAE;IACzE,MAAM,EAAC,QAAQ,GAAG,EAAE,EAAC,GAAG,IAAI,CAAC;IAE7B,IAAI,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAEjC,sCAAsC;IACtC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,QAAQ,GAAG,EAAE,EAAC,EAAE,EAAE;QACjC,gBAAgB,GAAG,aAAa,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,YAAY,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAEvD,+CAA+C;IAC/C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5D,gFAAgF;QAChF,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,MAAK,KAAK,CAAC;QACxF,MAAM,aAAa,GAAG,SAAS,CAAC,gBAAgB;YAC5C,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc;YAChC,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,eAAe,GACjB,OAAO,CAAC,QAAQ,IAAI,CAAC,YAAY;YAC7B,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC9C,CAAC,CAAC,SAAS,CAAC;QAEpB,OAAO;YACH,GAAG,OAAO;YACV,gBAAgB,EAAE,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC;YACxE,eAAe;YACf,QAAQ,EAAE,cAAc;YACxB,aAAa;YACb,mBAAmB,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,qBAAqB;SAC7D,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
@@ -32,6 +32,7 @@ export declare const SETTING_KEYS: {
32
32
  readonly QUERY_SETTINGS_BANNER_LAST_CLOSED: "querySettingsBannerLastClosed";
33
33
  readonly QUERY_EXECUTION_SETTINGS: "queryExecutionSettings";
34
34
  readonly ACL_SYNTAX: "aclSyntax";
35
+ readonly STORAGE_TYPE: "storageType";
35
36
  };
36
37
  export type SettingKey = ValueOf<typeof SETTING_KEYS>;
37
38
  /** User settings keys and their default values */
@@ -73,5 +74,6 @@ export declare const DEFAULT_USER_SETTINGS: {
73
74
  pragmas: string;
74
75
  };
75
76
  readonly aclSyntax: AclSyntax.YdbShort;
77
+ readonly storageType: "groups";
76
78
  };
77
79
  export declare const SETTINGS_OPTIONS: Record<string, SettingOptions>;
@@ -1,6 +1,7 @@
1
1
  import { AclSyntax } from '../../../utils/constants';
2
2
  import { Lang } from '../../../utils/i18n';
3
3
  import { DEFAULT_QUERY_SETTINGS, QUERY_ACTIONS } from '../../../utils/query';
4
+ import { STORAGE_TYPES } from '../storage/constants';
4
5
  import { TENANT_PAGES_IDS } from '../tenant/constants';
5
6
  export const SETTING_KEYS = {
6
7
  THEME: 'theme',
@@ -32,6 +33,7 @@ export const SETTING_KEYS = {
32
33
  QUERY_SETTINGS_BANNER_LAST_CLOSED: 'querySettingsBannerLastClosed',
33
34
  QUERY_EXECUTION_SETTINGS: 'queryExecutionSettings',
34
35
  ACL_SYNTAX: 'aclSyntax',
36
+ STORAGE_TYPE: 'storageType',
35
37
  };
36
38
  /** User settings keys and their default values */
37
39
  export const DEFAULT_USER_SETTINGS = {
@@ -64,6 +66,7 @@ export const DEFAULT_USER_SETTINGS = {
64
66
  [SETTING_KEYS.QUERY_SETTINGS_BANNER_LAST_CLOSED]: undefined,
65
67
  [SETTING_KEYS.QUERY_EXECUTION_SETTINGS]: DEFAULT_QUERY_SETTINGS,
66
68
  [SETTING_KEYS.ACL_SYNTAX]: AclSyntax.YdbShort,
69
+ [SETTING_KEYS.STORAGE_TYPE]: STORAGE_TYPES.groups,
67
70
  };
68
71
  export const SETTINGS_OPTIONS = {
69
72
  [SETTING_KEYS.THEME]: {
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/store/reducers/settings/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAC,IAAI,EAAC,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAC,sBAAsB,EAAE,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAIrD,MAAM,CAAC,MAAM,YAAY,GAAG;IACxB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,cAAc,EAAE,eAAe;IAC/B,iCAAiC,EAAE,8BAA8B;IACjE,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,0BAA0B;IAC/C,sBAAsB,EAAE,wBAAwB;IAChD,oBAAoB,EAAE,oBAAoB;IAC1C,yBAAyB,EAAE,yBAAyB;IACpD,oBAAoB,EAAE,oBAAoB;IAC1C,iBAAiB,EAAE,kBAAkB;IACrC,+BAA+B,EAAE,4BAA4B;IAC7D,mBAAmB,EAAE,oBAAoB;IACzC,qBAAqB,EAAE,qBAAqB;IAC5C,sBAAsB,EAAE,sBAAsB;IAC9C,kCAAkC,EAAE,gCAAgC;IACpE,wBAAwB,EAAE,0BAA0B;IACpD,wBAAwB,EAAE,wBAAwB;IAClD,qBAAqB,EAAE,qBAAqB;IAC5C,sBAAsB,EAAE,qBAAqB;IAC7C,qBAAqB,EAAE,uBAAuB;IAC9C,0BAA0B,EAAE,yBAAyB;IACrD,oBAAoB,EAAE,oBAAoB;IAC1C,2BAA2B,EAAE,0BAA0B;IACvD,6BAA6B,EAAE,+BAA+B;IAC9D,iCAAiC,EAAE,+BAA+B;IAClE,wBAAwB,EAAE,wBAAwB;IAClD,UAAU,EAAE,WAAW;CACjB,CAAC;AAIX,kDAAkD;AAClD,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACjC,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,QAAQ;IAC9B,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,EAAE;IAChC,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,KAAK;IACpC,CAAC,YAAY,CAAC,iCAAiC,CAAC,EAAE,IAAI;IACtD,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,EAAE;IAChC,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,EAAE;IAClC,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,gBAAgB,CAAC,KAAK;IAC1D,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,aAAa,CAAC,OAAO;IAC5D,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,IAAI;IACzC,CAAC,YAAY,CAAC,yBAAyB,CAAC,EAAE,EAAE;IAC5C,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,IAAI;IACzC,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,KAAK;IACvC,CAAC,YAAY,CAAC,+BAA+B,CAAC,EAAE,IAAI;IACpD,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,IAAI;IACxC,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,IAAI;IAC1C,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,IAAI;IAC3C,CAAC,YAAY,CAAC,kCAAkC,CAAC,EAAE,KAAK;IACxD,CAAC,YAAY,CAAC,wBAAwB,CAAC,EAAE,IAAI;IAC7C,CAAC,YAAY,CAAC,wBAAwB,CAAC,EAAE,IAAI;IAC7C,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,IAAI;IAC1C,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,KAAK;IAC5C,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,CAAC;IACvC,CAAC,YAAY,CAAC,0BAA0B,CAAC,EAAE,KAAK;IAChD,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,KAAK;IAC1C,CAAC,YAAY,CAAC,2BAA2B,CAAC,EAAE,KAAK;IACjD,CAAC,YAAY,CAAC,6BAA6B,CAAC,EAAE,SAAS;IACvD,CAAC,YAAY,CAAC,iCAAiC,CAAC,EAAE,SAAS;IAC3D,CAAC,YAAY,CAAC,wBAAwB,CAAC,EAAE,sBAAsB;IAC/D,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,QAAQ;CACD,CAAC;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAmC;IAC5D,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;QAClB,eAAe,EAAE,IAAI;KACxB;IACD,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAC1B,iBAAiB,EAAE,IAAI;KAC1B;IACD,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;QAC5B,iBAAiB,EAAE,IAAI;KAC1B;CACK,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/store/reducers/settings/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAC,IAAI,EAAC,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAC,sBAAsB,EAAE,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAIrD,MAAM,CAAC,MAAM,YAAY,GAAG;IACxB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,cAAc,EAAE,eAAe;IAC/B,iCAAiC,EAAE,8BAA8B;IACjE,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,0BAA0B;IAC/C,sBAAsB,EAAE,wBAAwB;IAChD,oBAAoB,EAAE,oBAAoB;IAC1C,yBAAyB,EAAE,yBAAyB;IACpD,oBAAoB,EAAE,oBAAoB;IAC1C,iBAAiB,EAAE,kBAAkB;IACrC,+BAA+B,EAAE,4BAA4B;IAC7D,mBAAmB,EAAE,oBAAoB;IACzC,qBAAqB,EAAE,qBAAqB;IAC5C,sBAAsB,EAAE,sBAAsB;IAC9C,kCAAkC,EAAE,gCAAgC;IACpE,wBAAwB,EAAE,0BAA0B;IACpD,wBAAwB,EAAE,wBAAwB;IAClD,qBAAqB,EAAE,qBAAqB;IAC5C,sBAAsB,EAAE,qBAAqB;IAC7C,qBAAqB,EAAE,uBAAuB;IAC9C,0BAA0B,EAAE,yBAAyB;IACrD,oBAAoB,EAAE,oBAAoB;IAC1C,2BAA2B,EAAE,0BAA0B;IACvD,6BAA6B,EAAE,+BAA+B;IAC9D,iCAAiC,EAAE,+BAA+B;IAClE,wBAAwB,EAAE,wBAAwB;IAClD,UAAU,EAAE,WAAW;IACvB,YAAY,EAAE,aAAa;CACrB,CAAC;AAIX,kDAAkD;AAClD,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACjC,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,QAAQ;IAC9B,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,EAAE;IAChC,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,KAAK;IACpC,CAAC,YAAY,CAAC,iCAAiC,CAAC,EAAE,IAAI;IACtD,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,EAAE;IAChC,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,EAAE;IAClC,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,gBAAgB,CAAC,KAAK;IAC1D,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,aAAa,CAAC,OAAO;IAC5D,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,IAAI;IACzC,CAAC,YAAY,CAAC,yBAAyB,CAAC,EAAE,EAAE;IAC5C,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,IAAI;IACzC,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,KAAK;IACvC,CAAC,YAAY,CAAC,+BAA+B,CAAC,EAAE,IAAI;IACpD,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,IAAI;IACxC,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,IAAI;IAC1C,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,IAAI;IAC3C,CAAC,YAAY,CAAC,kCAAkC,CAAC,EAAE,KAAK;IACxD,CAAC,YAAY,CAAC,wBAAwB,CAAC,EAAE,IAAI;IAC7C,CAAC,YAAY,CAAC,wBAAwB,CAAC,EAAE,IAAI;IAC7C,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,IAAI;IAC1C,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,KAAK;IAC5C,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,CAAC;IACvC,CAAC,YAAY,CAAC,0BAA0B,CAAC,EAAE,KAAK;IAChD,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,KAAK;IAC1C,CAAC,YAAY,CAAC,2BAA2B,CAAC,EAAE,KAAK;IACjD,CAAC,YAAY,CAAC,6BAA6B,CAAC,EAAE,SAAS;IACvD,CAAC,YAAY,CAAC,iCAAiC,CAAC,EAAE,SAAS;IAC3D,CAAC,YAAY,CAAC,wBAAwB,CAAC,EAAE,sBAAsB;IAC/D,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,QAAQ;IAC7C,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC,MAAM;CACL,CAAC;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAmC;IAC5D,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;QAClB,eAAe,EAAE,IAAI;KACxB;IACD,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAC1B,iBAAiB,EAAE,IAAI;KAC1B;IACD,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;QAC5B,iBAAiB,EAAE,IAAI;KAC1B;CACK,CAAC"}
@@ -82,4 +82,5 @@ export interface MetaClusterSettings {
82
82
  use_meta_proxy?: boolean;
83
83
  auth_service?: string;
84
84
  cluster_domain?: string;
85
+ cluster_external_name?: string;
85
86
  }
@@ -1,5 +1,5 @@
1
1
  import { UNBREAKABLE_GAP } from '../../constants';
2
- import { formatUptimeInSeconds, getDowntimeFromDateFormatted, getUptimeFromDateFormatted, } from '../dataFormatters';
2
+ import { formatDurationSeconds, getDowntimeFromDateFormatted, getUptimeFromDateFormatted, } from '../dataFormatters';
3
3
  describe('getUptimeFromDateFormatted', () => {
4
4
  test('should calculate and format uptime', () => {
5
5
  expect(getUptimeFromDateFormatted(3600000, 7200000)).toBe('1:00:00');
@@ -19,40 +19,40 @@ describe('getDowntimeFromDateFormatted', () => {
19
19
  expect(getDowntimeFromDateFormatted(3600000, 3599000)).toBe('0s');
20
20
  });
21
21
  });
22
- describe('formatUptimeInSeconds', () => {
22
+ describe('formatDurationSeconds', () => {
23
23
  const M = 60;
24
24
  const H = 60 * M;
25
25
  const D = 24 * H;
26
26
  test('should return days if value is more than 24h', () => {
27
- expect(formatUptimeInSeconds(24 * H)).toBe('1d' + UNBREAKABLE_GAP + '00:00:00');
28
- expect(formatUptimeInSeconds(D + H + M + 12)).toBe('1d' + UNBREAKABLE_GAP + '01:01:12');
27
+ expect(formatDurationSeconds(24 * H)).toBe('1d' + UNBREAKABLE_GAP + '00:00:00');
28
+ expect(formatDurationSeconds(D + H + M + 12)).toBe('1d' + UNBREAKABLE_GAP + '01:01:12');
29
29
  // 1 week
30
- expect(formatUptimeInSeconds(7 * D + H + M + 12)).toBe('7d' + UNBREAKABLE_GAP + '01:01:12');
30
+ expect(formatDurationSeconds(7 * D + H + M + 12)).toBe('7d' + UNBREAKABLE_GAP + '01:01:12');
31
31
  // 1 month
32
- expect(formatUptimeInSeconds(30 * D + 11 * H + 30 * M + 12)).toBe('30d' + UNBREAKABLE_GAP + '11:30:12');
33
- expect(formatUptimeInSeconds(1234 * D + 12 * H + 12 * M + 12)).toBe('1234d' + UNBREAKABLE_GAP + '12:12:12');
32
+ expect(formatDurationSeconds(30 * D + 11 * H + 30 * M + 12)).toBe('30d' + UNBREAKABLE_GAP + '11:30:12');
33
+ expect(formatDurationSeconds(1234 * D + 12 * H + 12 * M + 12)).toBe('1234d' + UNBREAKABLE_GAP + '12:12:12');
34
34
  });
35
35
  test('should return hours if value is less than 24h', () => {
36
- expect(formatUptimeInSeconds(H + M + 12)).toBe('1:01:12');
37
- expect(formatUptimeInSeconds(12 * H + 12 * M + 12)).toBe('12:12:12');
36
+ expect(formatDurationSeconds(H + M + 12)).toBe('1:01:12');
37
+ expect(formatDurationSeconds(12 * H + 12 * M + 12)).toBe('12:12:12');
38
38
  });
39
39
  test('should return minutes if value is less than hour', () => {
40
- expect(formatUptimeInSeconds(M + 12)).toBe('1:12');
41
- expect(formatUptimeInSeconds(12 * M + 2)).toBe('12:02');
40
+ expect(formatDurationSeconds(M + 12)).toBe('1:12');
41
+ expect(formatDurationSeconds(12 * M + 2)).toBe('12:02');
42
42
  });
43
43
  test('should return second if value is less than hour', () => {
44
- expect(formatUptimeInSeconds(12)).toBe('12s');
45
- expect(formatUptimeInSeconds(2)).toBe('2s');
44
+ expect(formatDurationSeconds(12)).toBe('12s');
45
+ expect(formatDurationSeconds(2)).toBe('2s');
46
46
  });
47
47
  test('should correctly process negative values', () => {
48
- expect(formatUptimeInSeconds(-0)).toBe('0s');
49
- expect(formatUptimeInSeconds(-12)).toBe('-12s');
50
- expect(formatUptimeInSeconds(-1 * (12 * M + 2))).toBe('-12:02');
51
- expect(formatUptimeInSeconds(-1 * (12 * H + 12 * M + 12))).toBe('-12:12:12');
52
- expect(formatUptimeInSeconds(-1 * (12 * D + 12 * H + 12 * M + 12))).toBe('-12d' + UNBREAKABLE_GAP + '12:12:12');
48
+ expect(formatDurationSeconds(-0)).toBe('0s');
49
+ expect(formatDurationSeconds(-12)).toBe('-12s');
50
+ expect(formatDurationSeconds(-1 * (12 * M + 2))).toBe('-12:02');
51
+ expect(formatDurationSeconds(-1 * (12 * H + 12 * M + 12))).toBe('-12:12:12');
52
+ expect(formatDurationSeconds(-1 * (12 * D + 12 * H + 12 * M + 12))).toBe('-12d' + UNBREAKABLE_GAP + '12:12:12');
53
53
  });
54
54
  test('should return empty placeholder on NaN', () => {
55
- expect(formatUptimeInSeconds(Number.NaN)).toBe(undefined);
55
+ expect(formatDurationSeconds(Number.NaN)).toBe(undefined);
56
56
  });
57
57
  });
58
- //# sourceMappingURL=formatUptime.test.js.map
58
+ //# sourceMappingURL=formatDuration.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"formatDuration.test.js","sourceRoot":"","sources":["../../../../src/utils/dataFormatters/__test__/formatDuration.test.ts"],"names":[],"mappings":"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"}
@@ -6,10 +6,10 @@ export declare const formatBps: (bytes?: string | number) => string;
6
6
  export declare const stringifyVdiskId: (id?: TVDiskID | TVSlotId) => string;
7
7
  /**
8
8
  * It works well only with positive values,
9
- * if you want to get negative formatted uptime, use some wrapper like getDowntimeFromDateFormatted
9
+ * if you want to get negative formatted duration, use some wrapper like getDowntimeFromDateFormatted
10
10
  */
11
- export declare function formatUptimeInSeconds(seconds: number): string | undefined;
12
- export declare const formatMsToUptime: (ms?: number) => string | undefined;
11
+ export declare function formatDurationSeconds(seconds: number): string | undefined;
12
+ export declare const formatDurationMs: (ms?: number) => string | undefined;
13
13
  export declare function getUptimeFromDateFormatted(dateFrom?: number | string, dateTo?: number | string): string | undefined;
14
14
  export declare function getDowntimeFromDateFormatted(dateFrom?: number | string, dateTo?: number | string): string | undefined;
15
15
  export declare function formatStorageValues(value?: number, total?: number, size?: BytesSizes, delimiter?: string, withValueLabel?: boolean): string[];
@@ -27,9 +27,9 @@ export const stringifyVdiskId = (id) => {
27
27
  };
28
28
  /**
29
29
  * It works well only with positive values,
30
- * if you want to get negative formatted uptime, use some wrapper like getDowntimeFromDateFormatted
30
+ * if you want to get negative formatted duration, use some wrapper like getDowntimeFromDateFormatted
31
31
  */
32
- export function formatUptimeInSeconds(seconds) {
32
+ export function formatDurationSeconds(seconds) {
33
33
  if (!isNumeric(seconds)) {
34
34
  return undefined;
35
35
  }
@@ -55,22 +55,22 @@ export function formatUptimeInSeconds(seconds) {
55
55
  }
56
56
  return sign + value;
57
57
  }
58
- export const formatMsToUptime = (ms) => {
59
- return formatUptimeInSeconds(Number(ms) / 1000);
58
+ export const formatDurationMs = (ms) => {
59
+ return formatDurationSeconds(Number(ms) / 1000);
60
60
  };
61
61
  export function getUptimeFromDateFormatted(dateFrom, dateTo) {
62
62
  let diff = calcTimeDiffInSec(dateFrom, dateTo);
63
63
  // Our time and server time could differ a little
64
64
  // Prevent wrong negative uptime values
65
65
  diff = diff < 0 ? 0 : diff;
66
- return formatUptimeInSeconds(diff);
66
+ return formatDurationSeconds(diff);
67
67
  }
68
68
  export function getDowntimeFromDateFormatted(dateFrom, dateTo) {
69
69
  let diff = calcTimeDiffInSec(dateFrom, dateTo);
70
70
  // Our time and server time could differ a little
71
71
  // Prevent wrong negative uptime values
72
72
  diff = diff < 0 ? 0 : diff;
73
- return formatUptimeInSeconds(-diff);
73
+ return formatDurationSeconds(-diff);
74
74
  }
75
75
  function calcTimeDiffInSec(dateFrom, dateTo = new Date().getTime()) {
76
76
  const diffMs = Number(dateTo) - Number(dateFrom);
package/package.json CHANGED
@@ -1,10 +1,14 @@
1
1
  {
2
2
  "name": "ydb-embedded-ui",
3
- "version": "12.24.1",
3
+ "version": "12.25.0",
4
4
  "files": [
5
5
  "dist"
6
6
  ],
7
7
  "main": "dist/lib.js",
8
+ "engines": {
9
+ "node": ">=22.0",
10
+ "npm": "^10.0.0"
11
+ },
8
12
  "repository": {
9
13
  "type": "git",
10
14
  "url": "git@github.com:ydb-platform/ydb-embedded-ui.git"
@@ -1 +0,0 @@
1
- {"version":3,"file":"formatUptime.test.js","sourceRoot":"","sources":["../../../../src/utils/dataFormatters/__test__/formatUptime.test.ts"],"names":[],"mappings":"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"}