ydb-embedded-ui 22.5.0 → 22.7.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 (145) hide show
  1. package/dist/components/AutoRefreshControl/StickyAutoRefreshControl.d.ts +2 -0
  2. package/dist/components/AutoRefreshControl/StickyAutoRefreshControl.js +9 -0
  3. package/dist/components/AutoRefreshControl/StickyAutoRefreshControl.js.map +1 -0
  4. package/dist/components/AutoRefreshControl/StickyAutoRefreshControl.scss +18 -0
  5. package/dist/components/HideUnavailableNodesSwitch/HideUnavailableNodesSwitch.d.ts +3 -0
  6. package/dist/components/HideUnavailableNodesSwitch/HideUnavailableNodesSwitch.js +12 -0
  7. package/dist/components/HideUnavailableNodesSwitch/HideUnavailableNodesSwitch.js.map +1 -0
  8. package/dist/components/HideUnavailableNodesSwitch/i18n/en.json +3 -0
  9. package/dist/components/HideUnavailableNodesSwitch/i18n/index.d.ts +2 -0
  10. package/dist/components/HideUnavailableNodesSwitch/i18n/index.js +6 -0
  11. package/dist/components/HideUnavailableNodesSwitch/i18n/index.js.map +1 -0
  12. package/dist/components/HideUnavailableNodesSwitch/i18n/ru.json +3 -0
  13. package/dist/components/PageMeta/PageMeta.d.ts +0 -2
  14. package/dist/components/PageMeta/PageMeta.js +1 -6
  15. package/dist/components/PageMeta/PageMeta.js.map +1 -1
  16. package/dist/components/TenantNameWrapper/TenantNameWrapper.js +3 -1
  17. package/dist/components/TenantNameWrapper/TenantNameWrapper.js.map +1 -1
  18. package/dist/components/TenantNameWrapper/utils.d.ts +4 -1
  19. package/dist/components/TenantNameWrapper/utils.js +9 -2
  20. package/dist/components/TenantNameWrapper/utils.js.map +1 -1
  21. package/dist/containers/Header/hooks/useSharedDatabasePath.js +14 -6
  22. package/dist/containers/Header/hooks/useSharedDatabasePath.js.map +1 -1
  23. package/dist/containers/Node/Node.js +4 -3
  24. package/dist/containers/Node/Node.js.map +1 -1
  25. package/dist/containers/Node/Node.scss +14 -2
  26. package/dist/containers/Nodes/NodesControls/NodesControls.js +2 -1
  27. package/dist/containers/Nodes/NodesControls/NodesControls.js.map +1 -1
  28. package/dist/containers/Nodes/NodesTable.js +4 -0
  29. package/dist/containers/Nodes/NodesTable.js.map +1 -1
  30. package/dist/containers/Nodes/PaginatedNodes/GroupedNodesComponent.js +6 -5
  31. package/dist/containers/Nodes/PaginatedNodes/GroupedNodesComponent.js.map +1 -1
  32. package/dist/containers/Nodes/PaginatedNodes/NodesComponent.js +10 -4
  33. package/dist/containers/Nodes/PaginatedNodes/NodesComponent.js.map +1 -1
  34. package/dist/containers/Nodes/getNodes.js +2 -1
  35. package/dist/containers/Nodes/getNodes.js.map +1 -1
  36. package/dist/containers/PDiskPage/PDiskPage.js +5 -14
  37. package/dist/containers/PDiskPage/PDiskPage.js.map +1 -1
  38. package/dist/containers/PDiskPage/PDiskPage.scss +11 -4
  39. package/dist/containers/PDiskPage/i18n/en.json +0 -1
  40. package/dist/containers/PDiskPage/i18n/index.d.ts +1 -1
  41. package/dist/containers/Storage/PaginatedStorageNodes/GroupedStorageNodesComponent.js +3 -0
  42. package/dist/containers/Storage/PaginatedStorageNodes/GroupedStorageNodesComponent.js.map +1 -1
  43. package/dist/containers/Storage/PaginatedStorageNodes/StorageNodesComponent.js +8 -1
  44. package/dist/containers/Storage/PaginatedStorageNodes/StorageNodesComponent.js.map +1 -1
  45. package/dist/containers/Storage/PaginatedStorageNodes/StorageNodesControls.js +2 -1
  46. package/dist/containers/Storage/PaginatedStorageNodes/StorageNodesControls.js.map +1 -1
  47. package/dist/containers/Storage/PaginatedStorageNodesTable/PaginatedStorageNodesTable.js +4 -0
  48. package/dist/containers/Storage/PaginatedStorageNodesTable/PaginatedStorageNodesTable.js.map +1 -1
  49. package/dist/containers/Storage/PaginatedStorageNodesTable/getNodes.js +2 -1
  50. package/dist/containers/Storage/PaginatedStorageNodesTable/getNodes.js.map +1 -1
  51. package/dist/containers/Storage/Storage.scss +4 -0
  52. package/dist/containers/StorageGroupPage/StorageGroupPage.js +4 -15
  53. package/dist/containers/StorageGroupPage/StorageGroupPage.js.map +1 -1
  54. package/dist/containers/StorageGroupPage/StorageGroupPage.scss +14 -9
  55. package/dist/containers/StorageGroupPage/i18n/en.json +0 -1
  56. package/dist/containers/StorageGroupPage/i18n/index.d.ts +1 -1
  57. package/dist/containers/Tablet/Tablet.js +3 -2
  58. package/dist/containers/Tablet/Tablet.js.map +1 -1
  59. package/dist/containers/Tablet/Tablet.scss +15 -1
  60. package/dist/containers/Tenants/TenantsTable.js +20 -6
  61. package/dist/containers/Tenants/TenantsTable.js.map +1 -1
  62. package/dist/containers/VDiskPage/VDiskPage.js +5 -14
  63. package/dist/containers/VDiskPage/VDiskPage.js.map +1 -1
  64. package/dist/containers/VDiskPage/VDiskPage.scss +23 -4
  65. package/dist/containers/VDiskPage/i18n/en.json +0 -1
  66. package/dist/containers/VDiskPage/i18n/index.d.ts +1 -1
  67. package/dist/store/reducers/capabilities/hooks.d.ts +1 -0
  68. package/dist/store/reducers/capabilities/hooks.js +3 -0
  69. package/dist/store/reducers/capabilities/hooks.js.map +1 -1
  70. package/dist/store/reducers/cluster/cluster.js +2 -2
  71. package/dist/store/reducers/cluster/cluster.js.map +1 -1
  72. package/dist/store/reducers/cluster/parseFields.js +1 -0
  73. package/dist/store/reducers/cluster/parseFields.js.map +1 -1
  74. package/dist/store/reducers/nodes/types.d.ts +1 -0
  75. package/dist/store/reducers/storage/types.d.ts +1 -0
  76. package/dist/store/reducers/tenant/tenant.js +6 -1
  77. package/dist/store/reducers/tenant/tenant.js.map +1 -1
  78. package/dist/store/reducers/tenants/types.d.ts +2 -0
  79. package/dist/store/reducers/tenants/utils.js +3 -0
  80. package/dist/store/reducers/tenants/utils.js.map +1 -1
  81. package/dist/types/api/capabilities.d.ts +1 -1
  82. package/dist/types/api/meta.d.ts +1 -0
  83. package/dist/types/api/nodes.d.ts +2 -0
  84. package/dist/utils/databaseId.d.ts +8 -0
  85. package/dist/utils/databaseId.js +10 -0
  86. package/dist/utils/databaseId.js.map +1 -0
  87. package/dist/utils/hooks/useDebouncedValue.js +12 -0
  88. package/dist/utils/hooks/useDebouncedValue.js.map +1 -1
  89. package/dist/utils/hooks/useHideUnavailableNodes.d.ts +5 -0
  90. package/dist/utils/hooks/useHideUnavailableNodes.js +21 -0
  91. package/dist/utils/hooks/useHideUnavailableNodes.js.map +1 -0
  92. package/package.json +1 -1
  93. package/src/components/AutoRefreshControl/StickyAutoRefreshControl.scss +18 -0
  94. package/src/components/AutoRefreshControl/StickyAutoRefreshControl.tsx +15 -0
  95. package/src/components/HideUnavailableNodesSwitch/HideUnavailableNodesSwitch.tsx +24 -0
  96. package/src/components/HideUnavailableNodesSwitch/i18n/en.json +3 -0
  97. package/src/components/HideUnavailableNodesSwitch/i18n/index.ts +7 -0
  98. package/src/components/HideUnavailableNodesSwitch/i18n/ru.json +3 -0
  99. package/src/components/PageMeta/PageMeta.tsx +0 -18
  100. package/src/components/TenantNameWrapper/TenantNameWrapper.tsx +3 -1
  101. package/src/components/TenantNameWrapper/utils.ts +13 -1
  102. package/src/containers/Header/hooks/useSharedDatabasePath.ts +16 -7
  103. package/src/containers/Node/Node.scss +14 -2
  104. package/src/containers/Node/Node.tsx +6 -6
  105. package/src/containers/Nodes/NodesControls/NodesControls.tsx +2 -1
  106. package/src/containers/Nodes/NodesTable.tsx +4 -0
  107. package/src/containers/Nodes/PaginatedNodes/GroupedNodesComponent.tsx +6 -5
  108. package/src/containers/Nodes/PaginatedNodes/NodesComponent.tsx +10 -4
  109. package/src/containers/Nodes/getNodes.ts +2 -0
  110. package/src/containers/PDiskPage/PDiskPage.scss +11 -4
  111. package/src/containers/PDiskPage/PDiskPage.tsx +4 -30
  112. package/src/containers/PDiskPage/i18n/en.json +0 -1
  113. package/src/containers/Storage/PaginatedStorageNodes/GroupedStorageNodesComponent.tsx +3 -0
  114. package/src/containers/Storage/PaginatedStorageNodes/StorageNodesComponent.tsx +8 -1
  115. package/src/containers/Storage/PaginatedStorageNodes/StorageNodesControls.tsx +2 -0
  116. package/src/containers/Storage/PaginatedStorageNodesTable/PaginatedStorageNodesTable.tsx +4 -0
  117. package/src/containers/Storage/PaginatedStorageNodesTable/getNodes.ts +2 -0
  118. package/src/containers/Storage/Storage.scss +4 -0
  119. package/src/containers/StorageGroupPage/StorageGroupPage.scss +14 -9
  120. package/src/containers/StorageGroupPage/StorageGroupPage.tsx +3 -32
  121. package/src/containers/StorageGroupPage/i18n/en.json +0 -1
  122. package/src/containers/Tablet/Tablet.scss +15 -1
  123. package/src/containers/Tablet/Tablet.tsx +21 -15
  124. package/src/containers/Tenants/TenantsTable.tsx +20 -7
  125. package/src/containers/VDiskPage/VDiskPage.scss +23 -4
  126. package/src/containers/VDiskPage/VDiskPage.tsx +4 -31
  127. package/src/containers/VDiskPage/i18n/en.json +0 -1
  128. package/src/store/reducers/capabilities/hooks.ts +4 -0
  129. package/src/store/reducers/cluster/cluster.ts +4 -2
  130. package/src/store/reducers/cluster/parseFields.ts +1 -0
  131. package/src/store/reducers/nodes/types.ts +1 -0
  132. package/src/store/reducers/storage/types.ts +1 -0
  133. package/src/store/reducers/tenant/tenant.ts +4 -1
  134. package/src/store/reducers/tenants/types.ts +2 -0
  135. package/src/store/reducers/tenants/utils.ts +3 -0
  136. package/src/types/api/capabilities.ts +1 -0
  137. package/src/types/api/meta.ts +1 -0
  138. package/src/types/api/nodes.ts +2 -0
  139. package/src/utils/databaseId.ts +27 -0
  140. package/src/utils/hooks/useDebouncedValue.ts +16 -0
  141. package/src/utils/hooks/useHideUnavailableNodes.ts +33 -0
  142. package/dist/containers/Nodes/useDebouncedSearch.d.ts +0 -2
  143. package/dist/containers/Nodes/useDebouncedSearch.js +0 -11
  144. package/dist/containers/Nodes/useDebouncedSearch.js.map +0 -1
  145. package/src/containers/Nodes/useDebouncedSearch.ts +0 -13
@@ -9,9 +9,9 @@ import type {NodesColumn} from '../../../components/nodesColumns/types';
9
9
  import {useViewerNodesHandlerHasGrouping} from '../../../store/reducers/capabilities/hooks';
10
10
  import type {PreparedStorageNode} from '../../../store/reducers/storage/types';
11
11
  import type {NodesGroupByField} from '../../../types/api/nodes';
12
+ import {useHideUnavailableNodes} from '../../../utils/hooks/useHideUnavailableNodes';
12
13
  import {useSelectedColumns} from '../../../utils/hooks/useSelectedColumns';
13
14
  import {NodesTable} from '../NodesTable';
14
- import {useDebouncedSearch} from '../useDebouncedSearch';
15
15
  import {useNodesPageQueryParams} from '../useNodesPageQueryParams';
16
16
 
17
17
  import {NodesControlsWithTableState} from './NodesControlsWithTableState';
@@ -47,8 +47,8 @@ export function NodesComponent({
47
47
  groupByParams,
48
48
  withPeerRoleFilter,
49
49
  );
50
- const searchFilter = useDebouncedSearch(searchValue);
51
50
  const viewerNodesHandlerHasGrouping = useViewerNodesHandlerHasGrouping();
51
+ const {hideUnavailable} = useHideUnavailableNodes();
52
52
 
53
53
  const {columnsToShow, columnsToSelect, setColumns} = useSelectedColumns(
54
54
  columns,
@@ -80,7 +80,7 @@ export function NodesComponent({
80
80
  path={path}
81
81
  database={database}
82
82
  databaseFullPath={databaseFullPath}
83
- searchValue={searchFilter}
83
+ searchValue={searchValue}
84
84
  withProblems={withProblems}
85
85
  uptimeFilter={uptimeFilter}
86
86
  peerRoleFilter={peerRoleFilter}
@@ -91,7 +91,13 @@ export function NodesComponent({
91
91
  }
92
92
  tableWrapperProps={{
93
93
  scrollContainerRef,
94
- scrollDependencies: [searchFilter, withProblems, uptimeFilter, peerRoleFilter],
94
+ scrollDependencies: [
95
+ searchValue,
96
+ withProblems,
97
+ uptimeFilter,
98
+ peerRoleFilter,
99
+ hideUnavailable,
100
+ ],
95
101
  }}
96
102
  />
97
103
  );
@@ -27,6 +27,7 @@ export const getNodes: FetchData<
27
27
  useMetaProxy,
28
28
  database,
29
29
  searchValue,
30
+ hideUnavailable,
30
31
  withProblems,
31
32
  uptimeFilter,
32
33
  peerRoleFilter,
@@ -53,6 +54,7 @@ export const getNodes: FetchData<
53
54
  path: schemePathParam,
54
55
  database,
55
56
  filter: searchValue?.trim(),
57
+ alive: hideUnavailable || undefined,
56
58
  problems_only: withProblems,
57
59
  uptime: getUptimeParamValue(uptimeFilter),
58
60
  filter_peer_role: peerRoleFilter,
@@ -1,15 +1,16 @@
1
1
  @use '../../styles//mixins.scss';
2
2
 
3
3
  .ydb-pdisk-page {
4
+ --sticky-tabs-height: 40px;
5
+ --data-table-start: var(--sticky-tabs-height);
4
6
  position: relative;
5
7
 
6
8
  overflow: auto;
7
9
  overflow-anchor: none;
8
10
 
9
11
  height: 100%;
10
- padding: 20px 20px 0;
12
+ padding: 0 20px;
11
13
 
12
- &__meta,
13
14
  &__title,
14
15
  &__storage-details,
15
16
  &__info,
@@ -32,8 +33,8 @@
32
33
  min-width: 0;
33
34
  }
34
35
 
35
- &__refresh-control {
36
- flex-shrink: 0;
36
+ &__title {
37
+ padding-right: 125px;
37
38
  }
38
39
 
39
40
  &__storage-details {
@@ -56,6 +57,12 @@
56
57
  }
57
58
 
58
59
  &__tabs {
60
+ z-index: 3;
61
+
62
+ height: var(--sticky-tabs-height);
63
+ padding-right: 125px;
64
+
65
+ @include mixins.sticky-top();
59
66
  @include mixins.tabs-wrapper-styles();
60
67
  }
61
68
  }
@@ -1,14 +1,13 @@
1
1
  import React from 'react';
2
2
 
3
- import {ArrowLeft, ArrowRotateLeft, Wrench} from '@gravity-ui/icons';
4
- import {Button, Flex, Icon, Tab, TabList, TabProvider, Text} from '@gravity-ui/uikit';
3
+ import {ArrowRotateLeft, Wrench} from '@gravity-ui/icons';
4
+ import {Flex, Icon, Tab, TabList, TabProvider, Text} from '@gravity-ui/uikit';
5
5
  import {skipToken} from '@reduxjs/toolkit/query';
6
6
  import {Helmet} from 'react-helmet-async';
7
- import {useHistory} from 'react-router-dom';
8
7
  import {StringParam, useQueryParams} from 'use-query-params';
9
8
  import {z} from 'zod';
10
9
 
11
- import {AutoRefreshControl} from '../../components/AutoRefreshControl/AutoRefreshControl';
10
+ import {StickyAutoRefreshControl} from '../../components/AutoRefreshControl/StickyAutoRefreshControl';
12
11
  import {ButtonWithConfirmDialog} from '../../components/ButtonWithConfirmDialog/ButtonWithConfirmDialog';
13
12
  import {CopyableValue} from '../../components/CopyableValue/CopyableValue';
14
13
  import {DiskStatusLabel, DiskTypeLabel} from '../../components/DiskStatus/DiskStatus';
@@ -70,8 +69,6 @@ const pDiskTabSchema = z.nativeEnum(PDISK_TABS_IDS).catch(PDISK_TABS_IDS.spaceDi
70
69
 
71
70
  export function PDiskPage() {
72
71
  const dispatch = useTypedDispatch();
73
- const history = useHistory();
74
- const showBackButton = history.length > 1;
75
72
  const hasDeveloperUi = useHasDeveloperUi();
76
73
 
77
74
  const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
@@ -144,26 +141,6 @@ export function PDiskPage() {
144
141
  );
145
142
  };
146
143
 
147
- const renderPageMeta = () => {
148
- if (!showBackButton) {
149
- return null;
150
- }
151
- return (
152
- <Flex
153
- className={pdiskPageCn('meta')}
154
- alignItems="center"
155
- justifyContent="space-between"
156
- gap={1}
157
- >
158
- <Button size="m" view="outlined" onClick={() => history.goBack()}>
159
- <Icon data={ArrowLeft} size={16} />
160
- {pDiskPageKeyset('action_back')}
161
- </Button>
162
- <AutoRefreshControl className={pdiskPageCn('refresh-control')} />
163
- </Flex>
164
- );
165
- };
166
-
167
144
  const renderPageTitle = () => {
168
145
  const statusLabels = [
169
146
  {id: 'state', label: getPDiskStateLabel(pDiskData?.State)},
@@ -199,9 +176,6 @@ export function PDiskPage() {
199
176
  <DiskTypeLabel type={pDiskData?.Type} size="s" />
200
177
  </Flex>
201
178
  </Flex>
202
- {!showBackButton && (
203
- <AutoRefreshControl className={pdiskPageCn('refresh-control')} />
204
- )}
205
179
  </Flex>
206
180
  );
207
181
  };
@@ -310,7 +284,7 @@ export function PDiskPage() {
310
284
  return (
311
285
  <div className={pdiskPageCn(null)} ref={containerRef}>
312
286
  {renderHelmet()}
313
- {renderPageMeta()}
287
+ <StickyAutoRefreshControl />
314
288
  {renderPageTitle()}
315
289
  {renderControls()}
316
290
  {renderError()}
@@ -2,7 +2,6 @@
2
2
  "fqdn": "FQDN",
3
3
  "pdisk": "PDisk",
4
4
  "node": "Node",
5
- "action_back": "Back",
6
5
  "action_open-in-developer-ui": "Open in Developer UI",
7
6
 
8
7
  "storage": "Storage",
@@ -7,6 +7,7 @@ import {NODES_COLUMNS_TO_DATA_FIELDS} from '../../../components/nodesColumns/con
7
7
  import {storageApi} from '../../../store/reducers/storage/storage';
8
8
  import type {NodesGroupByField, NodesRequiredField} from '../../../types/api/nodes';
9
9
  import {useAutoRefreshInterval} from '../../../utils/hooks';
10
+ import {useHideUnavailableNodes} from '../../../utils/hooks/useHideUnavailableNodes';
10
11
  import {NodesUptimeFilterValues} from '../../../utils/nodes';
11
12
  import {renderPaginatedTableErrorMessage} from '../../../utils/renderPaginatedTableErrorMessage';
12
13
  import {getRequiredDataFields} from '../../../utils/tableUtils/getRequiredDataFields';
@@ -105,6 +106,7 @@ export function GroupedStorageNodesComponent({
105
106
  scrollContainerRef,
106
107
  }: PaginatedStorageProps) {
107
108
  const [autoRefreshInterval] = useAutoRefreshInterval();
109
+ const {hideUnavailable} = useHideUnavailableNodes();
108
110
 
109
111
  const {nodesSearchValue, storageNodesGroupByParam, handleShowAllNodes} =
110
112
  useStorageQueryParams();
@@ -131,6 +133,7 @@ export function GroupedStorageNodesComponent({
131
133
  const {currentData, isFetching, error} = storageApi.useGetStorageNodesInfoQuery(
132
134
  {
133
135
  database,
136
+ alive: hideUnavailable || undefined,
134
137
  with: 'all',
135
138
  filter: nodesSearchValue.trim(),
136
139
  node_id: nodeId,
@@ -1,6 +1,7 @@
1
1
  import {PaginatedTableWithLayout} from '../../../components/PaginatedTable/PaginatedTableWithLayout';
2
2
  import {TableColumnSetup} from '../../../components/TableColumnSetup/TableColumnSetup';
3
3
  import {useViewerNodesHandlerHasGrouping} from '../../../store/reducers/capabilities/hooks';
4
+ import {useHideUnavailableNodes} from '../../../utils/hooks/useHideUnavailableNodes';
4
5
  import {renderPaginatedTableErrorMessage} from '../../../utils/renderPaginatedTableErrorMessage';
5
6
  import type {PaginatedStorageProps} from '../PaginatedStorage';
6
7
  import {PaginatedStorageNodesTable} from '../PaginatedStorageNodesTable/PaginatedStorageNodesTable';
@@ -22,6 +23,7 @@ export function StorageNodesComponent({
22
23
  useStorageQueryParams();
23
24
 
24
25
  const viewerNodesHandlerHasGrouping = useViewerNodesHandlerHasGrouping();
26
+ const {hideUnavailable} = useHideUnavailableNodes();
25
27
 
26
28
  const expertMode = useIsStorageExpertMode();
27
29
  const {handleDataFetched, columnsSettings, rowHeight} = useStorageColumnsSettings({
@@ -69,7 +71,12 @@ export function StorageNodesComponent({
69
71
  }
70
72
  tableWrapperProps={{
71
73
  scrollContainerRef,
72
- scrollDependencies: [nodesSearchValue, visibleEntities, nodesUptimeFilter],
74
+ scrollDependencies: [
75
+ nodesSearchValue,
76
+ visibleEntities,
77
+ nodesUptimeFilter,
78
+ hideUnavailable,
79
+ ],
73
80
  }}
74
81
  />
75
82
  );
@@ -4,6 +4,7 @@ import {ChartTreemap} from '@gravity-ui/icons';
4
4
  import {Button, Flex, Icon, Select, Text} from '@gravity-ui/uikit';
5
5
 
6
6
  import {EntitiesCount} from '../../../components/EntitiesCount/EntitiesCount';
7
+ import {HideUnavailableNodesSwitch} from '../../../components/HideUnavailableNodesSwitch/HideUnavailableNodesSwitch';
7
8
  import {usePaginatedTableState} from '../../../components/PaginatedTable/PaginatedTableContext';
8
9
  import {Search} from '../../../components/Search/Search';
9
10
  import {UptimeFilter} from '../../../components/UptimeFIlter';
@@ -127,6 +128,7 @@ export function StorageNodesControls({
127
128
  {i18n('controls_expert-mode')}
128
129
  </Button>
129
130
  ) : null}
131
+ <HideUnavailableNodesSwitch className={b('hide-unavailable')} />
130
132
  </Flex>
131
133
  {canUseStorageExpertMode && isStorageExpertMode ? (
132
134
  <StorageNodesExpertModePanel />
@@ -14,6 +14,7 @@ import {VISIBLE_ENTITIES} from '../../../store/reducers/storage/constants';
14
14
  import type {PreparedStorageNode, VisibleEntities} from '../../../store/reducers/storage/types';
15
15
  import type {NodesGroupByField} from '../../../types/api/nodes';
16
16
  import {cn} from '../../../utils/cn';
17
+ import {useHideUnavailableNodes} from '../../../utils/hooks/useHideUnavailableNodes';
17
18
  import {NodesUptimeFilterValues, isUnavailableNode} from '../../../utils/nodes';
18
19
  import {STORAGE_NODES_DEFAULT_ROW_HEIGHT} from '../PaginatedStorageNodes/nodeExpertModeLayout';
19
20
 
@@ -69,9 +70,11 @@ export const PaginatedStorageNodesTable = ({
69
70
  onDataFetched,
70
71
  }: PaginatedStorageNodesTableProps) => {
71
72
  const history = useHistory();
73
+ const {hideUnavailable} = useHideUnavailableNodes();
72
74
  const tableFilters = React.useMemo(() => {
73
75
  return {
74
76
  searchValue,
77
+ hideUnavailable,
75
78
  visibleEntities,
76
79
  nodesUptimeFilter,
77
80
  database,
@@ -81,6 +84,7 @@ export const PaginatedStorageNodesTable = ({
81
84
  filterGroupBy,
82
85
  };
83
86
  }, [
87
+ hideUnavailable,
84
88
  searchValue,
85
89
  visibleEntities,
86
90
  nodesUptimeFilter,
@@ -29,6 +29,7 @@ export const getStorageNodes: FetchData<
29
29
  } = params;
30
30
  const {
31
31
  searchValue,
32
+ hideUnavailable,
32
33
  nodesUptimeFilter,
33
34
  visibleEntities,
34
35
  database,
@@ -51,6 +52,7 @@ export const getStorageNodes: FetchData<
51
52
  offset,
52
53
  sort,
53
54
  filter: searchValue?.trim(),
55
+ alive: hideUnavailable || undefined,
54
56
  uptime: getUptimeParamValue(nodesUptimeFilter),
55
57
  with: visibleEntities,
56
58
  database,
@@ -1,6 +1,10 @@
1
1
  @use '../../styles/mixins.scss';
2
2
 
3
3
  .global-storage {
4
+ &__hide-unavailable {
5
+ margin-inline-start: var(--g-spacing-1);
6
+ }
7
+
4
8
  &__search {
5
9
  @include mixins.search();
6
10
  }
@@ -1,4 +1,8 @@
1
+ @use '../../styles/mixins.scss';
2
+
1
3
  .ydb-storage-group-page {
4
+ --sticky-tabs-height: 40px;
5
+ --data-table-start: var(--sticky-tabs-height);
2
6
  position: relative;
3
7
 
4
8
  overflow: auto;
@@ -15,16 +19,12 @@
15
19
  }
16
20
 
17
21
  &__summary {
18
- margin-top: var(--g-spacing-4);
19
22
  margin-bottom: var(--g-spacing-6);
20
23
  }
21
24
 
22
- &__meta {
23
- margin-bottom: var(--g-spacing-4);
24
- }
25
-
26
25
  &__title {
27
26
  margin-bottom: var(--g-spacing-4);
27
+ padding-right: 125px;
28
28
  }
29
29
 
30
30
  &__title-content {
@@ -33,11 +33,16 @@
33
33
  min-width: 0;
34
34
  }
35
35
 
36
- &__refresh-control {
37
- flex-shrink: 0;
38
- }
39
-
40
36
  &__storage-title {
37
+ z-index: 3;
38
+
39
+ display: flex;
40
+ align-items: center;
41
+
42
+ height: var(--sticky-tabs-height);
41
43
  margin: 0;
44
+ padding-right: 125px;
45
+
46
+ @include mixins.sticky-top();
42
47
  }
43
48
  }
@@ -1,13 +1,11 @@
1
1
  import React from 'react';
2
2
 
3
- import {ArrowLeft} from '@gravity-ui/icons';
4
- import {Button, Flex, Icon, Text} from '@gravity-ui/uikit';
3
+ import {Flex, Text} from '@gravity-ui/uikit';
5
4
  import {skipToken} from '@reduxjs/toolkit/query';
6
5
  import {Helmet} from 'react-helmet-async';
7
- import {useHistory} from 'react-router-dom';
8
6
  import {StringParam, useQueryParams} from 'use-query-params';
9
7
 
10
- import {AutoRefreshControl} from '../../components/AutoRefreshControl/AutoRefreshControl';
8
+ import {StickyAutoRefreshControl} from '../../components/AutoRefreshControl/StickyAutoRefreshControl';
11
9
  import {CopyableValue} from '../../components/CopyableValue/CopyableValue';
12
10
  import {ResponseError} from '../../components/Errors/ResponseError';
13
11
  import {InfoViewerSkeleton} from '../../components/InfoViewerSkeleton/InfoViewerSkeleton';
@@ -32,13 +30,10 @@ const storageGroupPageCn = cn('ydb-storage-group-page');
32
30
 
33
31
  export function StorageGroupPage() {
34
32
  const dispatch = useTypedDispatch();
35
- const history = useHistory();
36
33
  const database = useDatabaseFromQuery();
37
34
  const containerRef = React.useRef<HTMLDivElement>(null);
38
35
 
39
36
  const [{groupId}] = useQueryParams({groupId: StringParam});
40
- const showBackButton = Boolean(groupId) && history.length > 1;
41
- const showRefreshInTitle = Boolean(groupId) && !showBackButton;
42
37
 
43
38
  const [autoRefreshInterval] = useAutoRefreshInterval();
44
39
  const capabilitiesLoaded = useCapabilitiesLoaded();
@@ -75,27 +70,6 @@ export function StorageGroupPage() {
75
70
  );
76
71
  };
77
72
 
78
- const renderPageMeta = () => {
79
- if (!showBackButton) {
80
- return null;
81
- }
82
-
83
- return (
84
- <Flex
85
- className={storageGroupPageCn('meta')}
86
- alignItems="center"
87
- justifyContent="space-between"
88
- gap={2}
89
- >
90
- <Button view="outlined" onClick={() => history.goBack()}>
91
- <Icon data={ArrowLeft} />
92
- {storageGroupPageKeyset('action_back')}
93
- </Button>
94
- <AutoRefreshControl className={storageGroupPageCn('refresh-control')} />
95
- </Flex>
96
- );
97
- };
98
-
99
73
  const renderPageTitle = () => {
100
74
  return (
101
75
  <Flex
@@ -122,9 +96,6 @@ export function StorageGroupPage() {
122
96
  </CopyableValue>
123
97
  <StorageGroupStateLabel state={state} />
124
98
  </Flex>
125
- {showRefreshInTitle && (
126
- <AutoRefreshControl className={storageGroupPageCn('refresh-control')} />
127
- )}
128
99
  </Flex>
129
100
  );
130
101
  };
@@ -167,8 +138,8 @@ export function StorageGroupPage() {
167
138
  return (
168
139
  <div className={storageGroupPageCn(null)} ref={containerRef}>
169
140
  {renderHelmet()}
141
+ {groupId ? <StickyAutoRefreshControl /> : null}
170
142
  <div className={storageGroupPageCn('summary')}>
171
- {renderPageMeta()}
172
143
  {renderPageTitle()}
173
144
  {renderError()}
174
145
  {renderInfo()}
@@ -1,6 +1,5 @@
1
1
  {
2
2
  "storage-group": "Storage Group",
3
3
  "storage": "Storage",
4
- "action_back": "Back",
5
4
  "action_copy-group-id-from-title": "Copy Storage Group ID from page title"
6
5
  }
@@ -2,10 +2,24 @@
2
2
 
3
3
  .ydb-tablet-page {
4
4
  $_: &;
5
+ position: relative;
6
+
7
+ overflow: auto;
8
+
5
9
  height: 100%;
6
- padding: 20px;
10
+ padding: 0 20px 20px;
7
11
  @include mixins.body-2-typography();
8
12
 
13
+ &__content {
14
+ // The sticky refresh wrapper already supplies the initial 20px page inset.
15
+ min-height: calc(100% - 20px);
16
+ }
17
+
18
+ &__meta {
19
+ min-height: 28px;
20
+ padding-right: 121px;
21
+ }
22
+
9
23
  &__placeholder {
10
24
  display: flex;
11
25
  flex: 1 1 auto;
@@ -7,12 +7,13 @@ import {useParams} from 'react-router-dom';
7
7
  import {useQueryParams} from 'use-query-params';
8
8
  import {z} from 'zod';
9
9
 
10
+ import {StickyAutoRefreshControl} from '../../components/AutoRefreshControl/StickyAutoRefreshControl';
10
11
  import {EmptyStateWrapper} from '../../components/EmptyState';
11
12
  import {EntityPageTitle} from '../../components/EntityPageTitle/EntityPageTitle';
12
13
  import {ResponseError} from '../../components/Errors/ResponseError';
13
14
  import {InternalLink} from '../../components/InternalLink';
14
15
  import {LoaderWrapper} from '../../components/LoaderWrapper/LoaderWrapper';
15
- import {PageMetaWithAutorefresh} from '../../components/PageMeta/PageMeta';
16
+ import {PageMeta} from '../../components/PageMeta/PageMeta';
16
17
  import {tabletPageQueryParams, useTabletPagePath} from '../../routes';
17
18
  import {useTabletDevUiSecurePath} from '../../store/reducers/capabilities/hooks';
18
19
  import {setHeaderBreadcrumbs} from '../../store/reducers/header/header';
@@ -106,25 +107,30 @@ export function Tablet() {
106
107
  }
107
108
 
108
109
  return (
109
- <Flex gap={5} direction="column" className={b()}>
110
+ <div className={b()}>
110
111
  <Helmet>
111
112
  <title>{`${id} — ${i18n('tablet.header')} — ${
112
113
  databaseFullPath || queryClusterName || CLUSTER_DEFAULT_TITLE
113
114
  }`}</title>
114
115
  </Helmet>
115
- <PageMetaWithAutorefresh items={metaItems} />
116
- <LoaderWrapper loading={loading} size="l">
117
- {error ? <ResponseError error={error} /> : null}
118
- {currentData ? (
119
- <TabletContent
120
- id={id}
121
- tablet={tablet}
122
- history={history}
123
- database={database || databaseFullPath}
124
- />
125
- ) : null}
126
- </LoaderWrapper>
127
- </Flex>
116
+ <StickyAutoRefreshControl />
117
+ <Flex gap={5} direction="column" className={b('content')}>
118
+ <Flex alignItems="center" className={b('meta')}>
119
+ <PageMeta items={metaItems} />
120
+ </Flex>
121
+ <LoaderWrapper loading={loading} size="l">
122
+ {error ? <ResponseError error={error} /> : null}
123
+ {currentData ? (
124
+ <TabletContent
125
+ id={id}
126
+ tablet={tablet}
127
+ history={history}
128
+ database={database || databaseFullPath}
129
+ />
130
+ ) : null}
131
+ </LoaderWrapper>
132
+ </Flex>
133
+ </div>
128
134
  );
129
135
  }
130
136
 
@@ -140,14 +140,14 @@ const TenantsTableContent = ({
140
140
  {clusterName, environmentName, isMetaDatabasesAvailable},
141
141
  {pollingInterval: autoRefreshInterval},
142
142
  );
143
- const loading = isFetching && currentData === undefined;
144
143
 
145
144
  // Track sort state for scroll dependencies
146
145
  const [sortParams, setSortParams] = React.useState<SortOrder | SortOrder[] | undefined>();
147
146
 
148
147
  const isCreateDBAvailable = useEmMetaAvailable() && uiFactory.onCreateDB !== undefined;
149
148
 
150
- const {domain: domainRoot, settings} = useClusterBaseInfo();
149
+ const {domain: domainRoot, settings, isResolved: isClusterInfoResolved} = useClusterBaseInfo();
150
+ const loading = (isFetching && currentData === undefined) || !isClusterInfoResolved;
151
151
 
152
152
  const {search, withProblems, handleSearchChange, handleWithProblemsChange} =
153
153
  useTenantsQueryParams();
@@ -172,6 +172,8 @@ const TenantsTableContent = ({
172
172
  return filteredBySearch;
173
173
  }, [tenants, withProblems, search, showWithProblemsFilter]);
174
174
 
175
+ const useMetaProxySetting = settings?.use_meta_proxy;
176
+ const useDatabaseIdSetting = settings?.use_database_id;
175
177
  const tenantLinks = React.useMemo(
176
178
  () =>
177
179
  new Map(
@@ -181,18 +183,29 @@ const TenantsTableContent = ({
181
183
  tenant,
182
184
  additionalTenantsProps,
183
185
  externalLink: Boolean(environmentName),
184
- useDatabaseId:
185
- uiFactory.useDatabaseId && settings?.use_meta_proxy !== false,
186
+ useDatabaseId: uiFactory.useDatabaseId,
187
+ isMetaDatabasesAvailable,
188
+ settings: {
189
+ use_meta_proxy: useMetaProxySetting,
190
+ use_database_id: useDatabaseIdSetting,
191
+ },
186
192
  }),
187
193
  ]),
188
194
  ),
189
- [tenants, additionalTenantsProps, environmentName, settings?.use_meta_proxy],
195
+ [
196
+ tenants,
197
+ additionalTenantsProps,
198
+ environmentName,
199
+ isMetaDatabasesAvailable,
200
+ useMetaProxySetting,
201
+ useDatabaseIdSetting,
202
+ ],
190
203
  );
191
204
 
192
205
  const openTenant = React.useCallback(
193
206
  (tenant: PreparedTenant) => {
194
207
  const link = tenantLinks.get(tenant);
195
- if (!link) {
208
+ if (!isClusterInfoResolved || !link) {
196
209
  return;
197
210
  }
198
211
  if (link.isExternalLink) {
@@ -202,7 +215,7 @@ const TenantsTableContent = ({
202
215
 
203
216
  history.push(link.href);
204
217
  },
205
- [tenantLinks, history],
218
+ [tenantLinks, history, isClusterInfoResolved],
206
219
  );
207
220
 
208
221
  const renderCreateDBButton = () => {
@@ -1,4 +1,8 @@
1
+ @use '../../styles/mixins.scss';
2
+
1
3
  .ydb-vdisk-page {
4
+ --sticky-tabs-height: 40px;
5
+ --data-table-start: var(--sticky-tabs-height);
2
6
  --g-definition-list-item-gap: var(--g-spacing-3);
3
7
  position: relative;
4
8
 
@@ -6,9 +10,8 @@
6
10
  overflow-anchor: none;
7
11
 
8
12
  height: 100%;
9
- padding: 20px 20px 0;
13
+ padding: 0 20px;
10
14
 
11
- &__meta,
12
15
  &__title,
13
16
  &__controls,
14
17
  &__storage-details,
@@ -36,8 +39,8 @@
36
39
  min-width: 0;
37
40
  }
38
41
 
39
- &__refresh-control {
40
- flex-shrink: 0;
42
+ &__title {
43
+ padding-right: 125px;
41
44
  }
42
45
 
43
46
  &__controls {
@@ -53,5 +56,21 @@
53
56
 
54
57
  &__tablets-content {
55
58
  margin-top: var(--g-spacing-4);
59
+
60
+ .data-table__sticky_moving {
61
+ // Override the table's inline sticky offset.
62
+ top: var(--sticky-tabs-height) !important;
63
+ }
64
+ }
65
+
66
+ &__tabs {
67
+ z-index: 3;
68
+
69
+ height: var(--sticky-tabs-height);
70
+ margin-bottom: 0;
71
+ padding-right: 125px;
72
+
73
+ @include mixins.sticky-top();
74
+ @include mixins.tabs-wrapper-styles();
56
75
  }
57
76
  }