ydb-embedded-ui 22.10.0 → 22.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/BridgeSyncStatusLabel/BridgeSyncStatusLabel.d.ts +12 -0
- package/dist/components/BridgeSyncStatusLabel/BridgeSyncStatusLabel.js +47 -0
- package/dist/components/BridgeSyncStatusLabel/BridgeSyncStatusLabel.js.map +1 -0
- package/dist/components/BridgeSyncStatusLabel/i18n/en.json +7 -0
- package/dist/components/BridgeSyncStatusLabel/i18n/index.d.ts +2 -0
- package/dist/components/BridgeSyncStatusLabel/i18n/index.js +4 -0
- package/dist/components/BridgeSyncStatusLabel/i18n/index.js.map +1 -0
- package/dist/components/BridgeSyncStatusLabel/index.d.ts +1 -0
- package/dist/components/BridgeSyncStatusLabel/index.js +2 -0
- package/dist/components/BridgeSyncStatusLabel/index.js.map +1 -0
- package/dist/components/EntityStatus/EntityStatus.d.ts +11 -2
- package/dist/components/EntityStatus/EntityStatus.js +6 -4
- package/dist/components/EntityStatus/EntityStatus.js.map +1 -1
- package/dist/components/EntityStatus/EntityStatus.scss +18 -0
- package/dist/components/StatusIconNew/StatusIcon.d.ts +3 -1
- package/dist/components/StatusIconNew/StatusIcon.js +4 -3
- package/dist/components/StatusIconNew/StatusIcon.js.map +1 -1
- package/dist/containers/Cluster/ClusterInfo/ClusterInfo.js +2 -1
- package/dist/containers/Cluster/ClusterInfo/ClusterInfo.js.map +1 -1
- package/dist/containers/Cluster/ClusterOverview/components/BridgeDatabasesSummary.d.ts +4 -0
- package/dist/containers/Cluster/ClusterOverview/components/BridgeDatabasesSummary.js +47 -0
- package/dist/containers/Cluster/ClusterOverview/components/BridgeDatabasesSummary.js.map +1 -0
- package/dist/containers/Cluster/ClusterOverview/components/BridgeInfoTable.d.ts +2 -1
- package/dist/containers/Cluster/ClusterOverview/components/BridgeInfoTable.js +53 -14
- package/dist/containers/Cluster/ClusterOverview/components/BridgeInfoTable.js.map +1 -1
- package/dist/containers/Cluster/ClusterOverview/components/BridgeInfoTable.scss +36 -23
- package/dist/containers/Cluster/ClusterOverview/components/bridgeInfo.d.ts +7 -0
- package/dist/containers/Cluster/ClusterOverview/components/bridgeInfo.js +24 -0
- package/dist/containers/Cluster/ClusterOverview/components/bridgeInfo.js.map +1 -0
- package/dist/containers/Cluster/i18n/en.json +13 -0
- package/dist/containers/Cluster/i18n/index.d.ts +1 -1
- package/dist/containers/Operations/useOperationsQueryParams.d.ts +1 -1
- package/dist/containers/Storage/PaginatedStorageGroups/PaginatedStorageGroups.js +5 -1
- package/dist/containers/Storage/PaginatedStorageGroups/PaginatedStorageGroups.js.map +1 -1
- package/dist/containers/Storage/PaginatedStorageGroups/StorageGroupsControls.js +10 -5
- package/dist/containers/Storage/PaginatedStorageGroups/StorageGroupsControls.js.map +1 -1
- package/dist/containers/Storage/PaginatedStorageGroups/useStorageGroupsBridgeGrouping.d.ts +4 -0
- package/dist/containers/Storage/PaginatedStorageGroups/useStorageGroupsBridgeGrouping.js +10 -0
- package/dist/containers/Storage/PaginatedStorageGroups/useStorageGroupsBridgeGrouping.js.map +1 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/StorageGroupSyncPopover.d.ts +5 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/StorageGroupSyncPopover.js +24 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/StorageGroupSyncPopover.js.map +1 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/StorageGroupSyncPopover.scss +12 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/i18n/en.json +4 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/i18n/index.d.ts +2 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/i18n/index.js +4 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/i18n/index.js.map +1 -0
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/columns.js +25 -2
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/columns.js.map +1 -1
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/constants.d.ts +6 -1
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/constants.js +34 -5
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/constants.js.map +1 -1
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/hooks.js +24 -14
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/hooks.js.map +1 -1
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/i18n/en.json +5 -1
- package/dist/containers/Storage/PaginatedStorageGroupsTable/columns/i18n/index.d.ts +1 -1
- package/dist/containers/Storage/StorageGroupSyncDetails/StorageGroupSyncDetails.d.ts +6 -0
- package/dist/containers/Storage/StorageGroupSyncDetails/StorageGroupSyncDetails.js +46 -0
- package/dist/containers/Storage/StorageGroupSyncDetails/StorageGroupSyncDetails.js.map +1 -0
- package/dist/containers/Storage/StorageGroupSyncDetails/StorageGroupSyncDetails.scss +78 -0
- package/dist/containers/Storage/StorageGroupSyncDetails/i18n/en.json +14 -0
- package/dist/containers/Storage/StorageGroupSyncDetails/i18n/index.d.ts +2 -0
- package/dist/containers/Storage/StorageGroupSyncDetails/i18n/index.js +5 -0
- package/dist/containers/Storage/StorageGroupSyncDetails/i18n/index.js.map +1 -0
- package/dist/containers/StorageGroupPage/StorageGroupPage.js +5 -3
- package/dist/containers/StorageGroupPage/StorageGroupPage.js.map +1 -1
- package/dist/containers/StorageGroupPage/StorageGroupPage.scss +18 -0
- package/dist/containers/StorageGroupPage/i18n/en.json +2 -0
- package/dist/containers/StorageGroupPage/i18n/index.d.ts +1 -1
- package/dist/containers/Tenant/ObjectSummary/ObjectSummary.js +2 -2
- package/dist/containers/Tenant/ObjectSummary/ObjectSummary.js.map +1 -1
- package/dist/containers/Tenant/ObjectSummary/i18n/en.json +4 -0
- package/dist/containers/Tenant/ObjectSummary/i18n/index.d.ts +1 -1
- package/dist/containers/Tenant/Query/NewSQL/NewSQL.js +1 -1
- package/dist/containers/Tenant/Query/NewSQL/NewSQL.js.map +1 -1
- package/dist/containers/Tenant/Query/QueryEditor/QueryEditor.js +3 -1
- package/dist/containers/Tenant/Query/QueryEditor/QueryEditor.js.map +1 -1
- package/dist/containers/Tenant/Query/QueryEditor/QueryEditor.scss +4 -0
- package/dist/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.scss +12 -2
- package/dist/containers/Tenant/Query/QueryResult/QueryResultViewer.js +1 -1
- package/dist/containers/Tenant/Query/QueryResult/QueryResultViewer.js.map +1 -1
- package/dist/containers/Tenant/Query/QueryResult/i18n/en.json +2 -0
- package/dist/containers/Tenant/Query/QueryResult/i18n/index.d.ts +1 -1
- package/dist/containers/Tenant/Query/QueryResult/utils.js +11 -5
- package/dist/containers/Tenant/Query/QueryResult/utils.js.map +1 -1
- package/dist/containers/Tenant/utils/paneVisibilityToggleHelpers.d.ts +3 -1
- package/dist/containers/Tenant/utils/paneVisibilityToggleHelpers.js +3 -3
- package/dist/containers/Tenant/utils/paneVisibilityToggleHelpers.js.map +1 -1
- package/dist/containers/Tenant/utils/schemaQueryTemplates.js +14 -11
- package/dist/containers/Tenant/utils/schemaQueryTemplates.js.map +1 -1
- package/dist/containers/Tenants/TenantsTable.js +7 -1
- package/dist/containers/Tenants/TenantsTable.js.map +1 -1
- package/dist/containers/Tenants/bridgeColumns.d.ts +3 -0
- package/dist/containers/Tenants/bridgeColumns.js +37 -0
- package/dist/containers/Tenants/bridgeColumns.js.map +1 -0
- package/dist/containers/Tenants/constants.d.ts +4 -0
- package/dist/containers/Tenants/constants.js +10 -0
- package/dist/containers/Tenants/constants.js.map +1 -1
- package/dist/containers/Tenants/i18n/en.json +5 -1
- package/dist/containers/Tenants/i18n/index.d.ts +1 -1
- package/dist/store/reducers/capabilities/hooks.d.ts +3 -0
- package/dist/store/reducers/capabilities/hooks.js +9 -0
- package/dist/store/reducers/capabilities/hooks.js.map +1 -1
- package/dist/store/reducers/query/api.js +8 -3
- package/dist/store/reducers/query/api.js.map +1 -1
- package/dist/store/reducers/query/streaming/reducers.js +1 -1
- package/dist/store/reducers/query/streaming/reducers.js.map +1 -1
- package/dist/store/reducers/query/types.d.ts +1 -0
- package/dist/store/reducers/storage/types.d.ts +2 -2
- package/dist/store/reducers/storage/types.js.map +1 -1
- package/dist/store/reducers/streamingQuery/streamingQuery.js +5 -2
- package/dist/store/reducers/streamingQuery/streamingQuery.js.map +1 -1
- package/dist/types/api/capabilities.d.ts +1 -1
- package/dist/types/api/cluster.d.ts +21 -0
- package/dist/types/api/cluster.js +8 -0
- package/dist/types/api/cluster.js.map +1 -1
- package/dist/types/api/storage.d.ts +25 -4
- package/dist/types/api/storage.js.map +1 -1
- package/dist/types/api/tenant.d.ts +3 -0
- package/dist/types/api/tenant.js.map +1 -1
- package/dist/utils/query.d.ts +1 -0
- package/dist/utils/query.js +3 -2
- package/dist/utils/query.js.map +1 -1
- package/package.json +1 -1
- package/src/components/BridgeSyncStatusLabel/BridgeSyncStatusLabel.tsx +77 -0
- package/src/components/BridgeSyncStatusLabel/i18n/en.json +7 -0
- package/src/components/BridgeSyncStatusLabel/i18n/index.ts +5 -0
- package/src/components/BridgeSyncStatusLabel/index.ts +1 -0
- package/src/components/EntityStatus/EntityStatus.scss +18 -0
- package/src/components/EntityStatus/EntityStatus.tsx +45 -13
- package/src/components/StatusIconNew/StatusIcon.tsx +6 -2
- package/src/containers/Cluster/ClusterInfo/ClusterInfo.tsx +2 -0
- package/src/containers/Cluster/ClusterOverview/components/BridgeDatabasesSummary.tsx +87 -0
- package/src/containers/Cluster/ClusterOverview/components/BridgeInfoTable.scss +36 -23
- package/src/containers/Cluster/ClusterOverview/components/BridgeInfoTable.tsx +165 -69
- package/src/containers/Cluster/ClusterOverview/components/bridgeInfo.ts +27 -0
- package/src/containers/Cluster/i18n/en.json +13 -0
- package/src/containers/Storage/PaginatedStorageGroups/PaginatedStorageGroups.tsx +6 -1
- package/src/containers/Storage/PaginatedStorageGroups/StorageGroupsControls.tsx +16 -7
- package/src/containers/Storage/PaginatedStorageGroups/useStorageGroupsBridgeGrouping.ts +13 -0
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/StorageGroupSyncPopover.scss +12 -0
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/StorageGroupSyncPopover.tsx +53 -0
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/i18n/en.json +4 -0
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/StorageGroupSyncPopover/i18n/index.ts +5 -0
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/columns.tsx +31 -2
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/constants.ts +36 -4
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/hooks.ts +29 -14
- package/src/containers/Storage/PaginatedStorageGroupsTable/columns/i18n/en.json +5 -1
- package/src/containers/Storage/StorageGroupSyncDetails/StorageGroupSyncDetails.scss +78 -0
- package/src/containers/Storage/StorageGroupSyncDetails/StorageGroupSyncDetails.tsx +199 -0
- package/src/containers/Storage/StorageGroupSyncDetails/i18n/en.json +14 -0
- package/src/containers/Storage/StorageGroupSyncDetails/i18n/index.ts +6 -0
- package/src/containers/StorageGroupPage/StorageGroupPage.scss +18 -0
- package/src/containers/StorageGroupPage/StorageGroupPage.tsx +27 -1
- package/src/containers/StorageGroupPage/i18n/en.json +2 -0
- package/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx +4 -0
- package/src/containers/Tenant/ObjectSummary/i18n/en.json +4 -0
- package/src/containers/Tenant/Query/NewSQL/NewSQL.tsx +1 -1
- package/src/containers/Tenant/Query/QueryEditor/QueryEditor.scss +4 -0
- package/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx +4 -1
- package/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.scss +12 -2
- package/src/containers/Tenant/Query/QueryResult/QueryResultViewer.tsx +2 -0
- package/src/containers/Tenant/Query/QueryResult/i18n/en.json +2 -0
- package/src/containers/Tenant/Query/QueryResult/utils.ts +13 -5
- package/src/containers/Tenant/utils/paneVisibilityToggleHelpers.tsx +8 -2
- package/src/containers/Tenant/utils/schemaQueryTemplates.ts +16 -11
- package/src/containers/Tenants/TenantsTable.tsx +11 -1
- package/src/containers/Tenants/bridgeColumns.tsx +50 -0
- package/src/containers/Tenants/constants.ts +10 -0
- package/src/containers/Tenants/i18n/en.json +6 -1
- package/src/store/reducers/capabilities/hooks.ts +12 -0
- package/src/store/reducers/query/api.ts +8 -2
- package/src/store/reducers/query/streaming/reducers.ts +1 -1
- package/src/store/reducers/query/types.ts +1 -0
- package/src/store/reducers/storage/types.ts +7 -2
- package/src/store/reducers/streamingQuery/streamingQuery.ts +6 -2
- package/src/types/api/capabilities.ts +1 -0
- package/src/types/api/cluster.ts +23 -0
- package/src/types/api/storage.ts +37 -1
- package/src/types/api/tenant.ts +3 -0
- package/src/utils/query.ts +4 -2
|
@@ -21,6 +21,8 @@ export const STORAGE_GROUPS_COLUMNS_IDS = {
|
|
|
21
21
|
GroupId: 'GroupId',
|
|
22
22
|
PoolName: 'PoolName',
|
|
23
23
|
PileName: 'PileName',
|
|
24
|
+
BridgeMode: 'BridgeMode',
|
|
25
|
+
BridgeSyncStatus: 'BridgeSyncStatus',
|
|
24
26
|
MediaType: 'MediaType',
|
|
25
27
|
Erasure: 'Erasure',
|
|
26
28
|
Used: 'Used',
|
|
@@ -92,7 +94,13 @@ export const STORAGE_GROUPS_COLUMNS_TITLES = {
|
|
|
92
94
|
return i18n('type');
|
|
93
95
|
},
|
|
94
96
|
get PileName() {
|
|
95
|
-
return i18n('pile
|
|
97
|
+
return i18n('field_bridge-pile');
|
|
98
|
+
},
|
|
99
|
+
get BridgeMode() {
|
|
100
|
+
return i18n('field_bridge-mode');
|
|
101
|
+
},
|
|
102
|
+
get BridgeSyncStatus() {
|
|
103
|
+
return i18n('field_bridge-sync-status');
|
|
96
104
|
},
|
|
97
105
|
get Erasure() {
|
|
98
106
|
return i18n('erasure');
|
|
@@ -185,7 +193,10 @@ const STORAGE_GROUPS_COLUMNS_GROUP_BY_TITLES = {
|
|
|
185
193
|
return i18n('pool-name');
|
|
186
194
|
},
|
|
187
195
|
get PileName() {
|
|
188
|
-
return i18n('pile
|
|
196
|
+
return i18n('field_bridge-pile');
|
|
197
|
+
},
|
|
198
|
+
get BridgeSyncStatus() {
|
|
199
|
+
return i18n('field_bridge-sync-status');
|
|
189
200
|
},
|
|
190
201
|
get Kind() {
|
|
191
202
|
return i18n('type');
|
|
@@ -213,6 +224,7 @@ const STORAGE_GROUPS_COLUMNS_GROUP_BY_TITLES = {
|
|
|
213
224
|
const STORAGE_GROUPS_GROUP_BY_PARAMS = [
|
|
214
225
|
'PoolName',
|
|
215
226
|
'PileName',
|
|
227
|
+
'BridgeSyncStatus',
|
|
216
228
|
'MediaType',
|
|
217
229
|
'Encryption',
|
|
218
230
|
'Erasure',
|
|
@@ -233,14 +245,21 @@ export const STORAGE_GROUPS_GROUP_BY_OPTIONS: SelectOption[] = STORAGE_GROUPS_GR
|
|
|
233
245
|
},
|
|
234
246
|
);
|
|
235
247
|
|
|
248
|
+
export const BRIDGE_STORAGE_GROUP_BY_FIELDS = ['PileName', 'BridgeSyncStatus'] as const;
|
|
249
|
+
|
|
236
250
|
export function getStorageGroupsGroupByOptions(
|
|
237
251
|
blobMetricsEnabled: boolean,
|
|
238
252
|
bridgeModeEnabled: boolean,
|
|
253
|
+
bridgeSyncGroupingAvailable = true,
|
|
239
254
|
) {
|
|
240
255
|
const skippedValues = new Set<string>();
|
|
241
256
|
|
|
242
257
|
if (!bridgeModeEnabled) {
|
|
243
|
-
skippedValues.add(
|
|
258
|
+
BRIDGE_STORAGE_GROUP_BY_FIELDS.forEach((field) => skippedValues.add(field));
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
if (!bridgeSyncGroupingAvailable) {
|
|
262
|
+
skippedValues.add('BridgeSyncStatus');
|
|
244
263
|
}
|
|
245
264
|
|
|
246
265
|
if (blobMetricsEnabled) {
|
|
@@ -268,6 +287,17 @@ export const GROUPS_COLUMNS_TO_DATA_FIELDS: Record<StorageGroupsColumnId, Groups
|
|
|
268
287
|
GroupId: ['GroupId'],
|
|
269
288
|
PoolName: ['PoolName'],
|
|
270
289
|
PileName: ['PileName'],
|
|
290
|
+
BridgeMode: ['BridgeMode'],
|
|
291
|
+
BridgeSyncStatus: [
|
|
292
|
+
'BridgeSyncStatus',
|
|
293
|
+
'BridgeMode',
|
|
294
|
+
'BridgeGroups',
|
|
295
|
+
'BridgeSyncLastError',
|
|
296
|
+
'BridgeSyncLastErrorTimestamp',
|
|
297
|
+
'BridgeSyncLastProgressTimestamp',
|
|
298
|
+
'BridgeSyncCopyBytesPerSecond',
|
|
299
|
+
'BridgeSyncRemainingBytes',
|
|
300
|
+
],
|
|
271
301
|
// We display MediaType and Encryption in one Type column
|
|
272
302
|
MediaType: ['MediaType', 'Encryption'],
|
|
273
303
|
Erasure: ['Erasure'],
|
|
@@ -299,7 +329,9 @@ const STORAGE_GROUPS_COLUMNS_TO_SORT_FIELDS: Record<
|
|
|
299
329
|
> = {
|
|
300
330
|
GroupId: 'GroupId',
|
|
301
331
|
PoolName: 'PoolName',
|
|
302
|
-
PileName:
|
|
332
|
+
PileName: 'PileName',
|
|
333
|
+
BridgeMode: undefined,
|
|
334
|
+
BridgeSyncStatus: 'BridgeSyncStatus',
|
|
303
335
|
MediaType: 'MediaType',
|
|
304
336
|
Erasure: 'Erasure',
|
|
305
337
|
Used: 'Used',
|
|
@@ -3,6 +3,8 @@ import React from 'react';
|
|
|
3
3
|
import {
|
|
4
4
|
useBlobStorageCapacityMetricsEnabled,
|
|
5
5
|
useBridgeModeEnabled,
|
|
6
|
+
useStorageGroupsHandlerHasBridgeMode,
|
|
7
|
+
useStorageGroupsHandlerHasBridgeSyncStatus,
|
|
6
8
|
} from '../../../../store/reducers/capabilities/hooks';
|
|
7
9
|
import {VISIBLE_ENTITIES} from '../../../../store/reducers/storage/constants';
|
|
8
10
|
import {VDisksGroupBy} from '../../../../utils/disks/groupBy';
|
|
@@ -42,8 +44,10 @@ export function useStorageGroupsSelectedColumns({
|
|
|
42
44
|
}: GetStorageGroupsColumnsParams) {
|
|
43
45
|
const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
|
|
44
46
|
const isViewerUser = useIsViewerUser();
|
|
45
|
-
const bridgeModeEnabled = useBridgeModeEnabled();
|
|
46
47
|
const blobMetricsEnabled = useBlobStorageCapacityMetricsEnabled();
|
|
48
|
+
const bridgeModeEnabled = useBridgeModeEnabled();
|
|
49
|
+
const handlerHasBridgeMode = useStorageGroupsHandlerHasBridgeMode();
|
|
50
|
+
const handlerHasBridgeSyncStatus = useStorageGroupsHandlerHasBridgeSyncStatus();
|
|
47
51
|
const isStorageExpertMode = useIsStorageExpertMode();
|
|
48
52
|
const vdisksGroupBy = useVDisksGroupByParam();
|
|
49
53
|
const pdisksGroupBy = usePDisksGroupByParam();
|
|
@@ -51,12 +55,25 @@ export function useStorageGroupsSelectedColumns({
|
|
|
51
55
|
const isAllVDisksLayout = isStorageExpertMode && vdisksGroupBy === VDisksGroupBy.All;
|
|
52
56
|
const isAllPDisksLayout = isStorageExpertMode && pdisksGroupBy === PDisksGroupBy.All;
|
|
53
57
|
|
|
54
|
-
const
|
|
55
|
-
|
|
58
|
+
const bridgeColumns = React.useMemo(
|
|
59
|
+
() => [
|
|
60
|
+
{
|
|
61
|
+
id: STORAGE_GROUPS_COLUMNS_IDS.BridgeMode,
|
|
62
|
+
available: bridgeModeEnabled && handlerHasBridgeMode,
|
|
63
|
+
},
|
|
64
|
+
{id: STORAGE_GROUPS_COLUMNS_IDS.PileName, available: bridgeModeEnabled},
|
|
65
|
+
{
|
|
66
|
+
id: STORAGE_GROUPS_COLUMNS_IDS.BridgeSyncStatus,
|
|
67
|
+
available: bridgeModeEnabled && handlerHasBridgeSyncStatus,
|
|
68
|
+
},
|
|
69
|
+
],
|
|
70
|
+
[bridgeModeEnabled, handlerHasBridgeMode, handlerHasBridgeSyncStatus],
|
|
71
|
+
);
|
|
56
72
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
73
|
+
const skippedColumnIds = React.useMemo(() => {
|
|
74
|
+
const skipped: StorageGroupsColumnId[] = bridgeColumns
|
|
75
|
+
.filter(({available}) => !available)
|
|
76
|
+
.map(({id}) => id);
|
|
60
77
|
|
|
61
78
|
if (!isUserAllowedToMakeChanges) {
|
|
62
79
|
skipped.push(...MONITORING_USER_COLUMNS_IDS);
|
|
@@ -67,7 +84,7 @@ export function useStorageGroupsSelectedColumns({
|
|
|
67
84
|
}
|
|
68
85
|
|
|
69
86
|
return skipped;
|
|
70
|
-
}, [
|
|
87
|
+
}, [bridgeColumns, isUserAllowedToMakeChanges, isViewerUser]);
|
|
71
88
|
|
|
72
89
|
const columns = React.useMemo(() => {
|
|
73
90
|
const allColumns = getStorageGroupsColumns({
|
|
@@ -104,13 +121,11 @@ export function useStorageGroupsSelectedColumns({
|
|
|
104
121
|
? [...DEFAULT_STORAGE_GROUPS_COLUMNS, STORAGE_GROUPS_COLUMNS_IDS.VDisksPDisks]
|
|
105
122
|
: DEFAULT_STORAGE_GROUPS_COLUMNS;
|
|
106
123
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
: [...defaultStorageGroupsColumns, STORAGE_GROUPS_COLUMNS_IDS.PileName];
|
|
113
|
-
}, [bridgeModeEnabled, isStorageExpertMode]);
|
|
124
|
+
return [
|
|
125
|
+
...defaultStorageGroupsColumns,
|
|
126
|
+
...bridgeColumns.filter(({available}) => available).map(({id}) => id),
|
|
127
|
+
];
|
|
128
|
+
}, [bridgeColumns, isStorageExpertMode]);
|
|
114
129
|
|
|
115
130
|
const selectedColumns = useSelectedColumns(
|
|
116
131
|
columns,
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"pool-name": "Pool Name",
|
|
3
|
-
"pile
|
|
3
|
+
"field_bridge-pile": "Bridge pile",
|
|
4
|
+
"field_bridge-mode": "Mode",
|
|
5
|
+
"field_bridge-sync-status": "Sync status",
|
|
6
|
+
"value_bridge": "Bridge",
|
|
7
|
+
"value_non-bridge": "Non-bridge",
|
|
4
8
|
"type": "Type",
|
|
5
9
|
"encryption": "Encryption",
|
|
6
10
|
"erasure": "Erasure",
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
.ydb-storage-group-sync-details {
|
|
2
|
+
min-width: 0;
|
|
3
|
+
|
|
4
|
+
&__metrics {
|
|
5
|
+
--g-definition-list-item-gap: var(--g-spacing-2);
|
|
6
|
+
|
|
7
|
+
[data-qa='storage-group-sync-stage'] > .g-definition-list__definition {
|
|
8
|
+
min-width: 0;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
&__section-title {
|
|
13
|
+
font-weight: 500;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
&__partners {
|
|
17
|
+
border-radius: var(--g-border-radius-m);
|
|
18
|
+
box-shadow: inset 0 0 0 1px var(--g-color-line-generic);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
& &__partner-cell {
|
|
22
|
+
box-sizing: border-box;
|
|
23
|
+
height: 32px;
|
|
24
|
+
padding: var(--g-spacing-1) var(--g-spacing-2);
|
|
25
|
+
|
|
26
|
+
&_id {
|
|
27
|
+
width: 1px;
|
|
28
|
+
|
|
29
|
+
white-space: nowrap;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
&_pile {
|
|
33
|
+
max-width: 0;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
& &__partner-id {
|
|
38
|
+
width: max-content;
|
|
39
|
+
min-width: calc(100px - 2 * var(--g-spacing-2));
|
|
40
|
+
max-width: calc(120px - 2 * var(--g-spacing-2));
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
&__message.g-alert {
|
|
44
|
+
padding: var(--g-spacing-3);
|
|
45
|
+
|
|
46
|
+
border-radius: var(--g-border-radius-m);
|
|
47
|
+
|
|
48
|
+
overflow-wrap: anywhere;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
&_layout_page {
|
|
52
|
+
align-items: flex-start;
|
|
53
|
+
|
|
54
|
+
.ydb-storage-group-sync-details__metrics {
|
|
55
|
+
width: 330px;
|
|
56
|
+
max-width: 100%;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
> .ydb-storage-group-sync-details__metrics {
|
|
60
|
+
flex: 1 1 auto;
|
|
61
|
+
|
|
62
|
+
min-width: 0;
|
|
63
|
+
max-width: min(400px, 100%);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
.ydb-storage-group-sync-details__partners-section {
|
|
67
|
+
width: 280px;
|
|
68
|
+
max-width: 100%;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
.ydb-storage-group-sync-details__message-section {
|
|
72
|
+
flex: 1 1 300px;
|
|
73
|
+
|
|
74
|
+
min-width: 0;
|
|
75
|
+
max-width: 476px;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
import {dateTimeParse} from '@gravity-ui/date-utils';
|
|
2
|
+
import {
|
|
3
|
+
Alert,
|
|
4
|
+
ClipboardButton,
|
|
5
|
+
DefinitionList,
|
|
6
|
+
Flex,
|
|
7
|
+
Table,
|
|
8
|
+
Text,
|
|
9
|
+
Tooltip,
|
|
10
|
+
} from '@gravity-ui/uikit';
|
|
11
|
+
import type {TableColumnConfig} from '@gravity-ui/uikit';
|
|
12
|
+
|
|
13
|
+
import {CellWithPopover} from '../../../components/CellWithPopover/CellWithPopover';
|
|
14
|
+
import {InternalLink} from '../../../components/InternalLink';
|
|
15
|
+
import {useStorageGroupPath} from '../../../routes';
|
|
16
|
+
import type {PreparedStorageGroup} from '../../../store/reducers/storage/types';
|
|
17
|
+
import type {TBridgeGroupLink} from '../../../types/api/storage';
|
|
18
|
+
import {cn} from '../../../utils/cn';
|
|
19
|
+
import {EMPTY_DATA_PLACEHOLDER} from '../../../utils/constants';
|
|
20
|
+
import {formatDateTime} from '../../../utils/dataFormatters/dataFormatters';
|
|
21
|
+
import {formatMetricBytes} from '../../../utils/storageMetrics';
|
|
22
|
+
import {parseUsToMs} from '../../../utils/timeParsers';
|
|
23
|
+
import {parseOptionalNonNegativeNumber} from '../../../utils/utils';
|
|
24
|
+
|
|
25
|
+
import i18n from './i18n';
|
|
26
|
+
|
|
27
|
+
import './StorageGroupSyncDetails.scss';
|
|
28
|
+
|
|
29
|
+
const b = cn('ydb-storage-group-sync-details');
|
|
30
|
+
|
|
31
|
+
export function StorageGroupSyncDetails({
|
|
32
|
+
group,
|
|
33
|
+
layout = 'popover',
|
|
34
|
+
}: {
|
|
35
|
+
group: PreparedStorageGroup;
|
|
36
|
+
layout?: 'popover' | 'page';
|
|
37
|
+
}) {
|
|
38
|
+
const isPage = layout === 'page';
|
|
39
|
+
const stage = group.BridgeSyncStage?.trim();
|
|
40
|
+
const getGroupPath = useStorageGroupPath();
|
|
41
|
+
const partners = (group.BridgeGroups ?? []).filter(
|
|
42
|
+
(partner) => partner.GroupId && partner.GroupId !== String(group.GroupId),
|
|
43
|
+
);
|
|
44
|
+
const remaining = parseOptionalNonNegativeNumber(group.BridgeSyncRemainingBytes);
|
|
45
|
+
const rate = parseOptionalNonNegativeNumber(group.BridgeSyncCopyBytesPerSecond);
|
|
46
|
+
const lastProgress = parseUsToMs(
|
|
47
|
+
parseOptionalNonNegativeNumber(group.BridgeSyncLastProgressTimestamp),
|
|
48
|
+
3,
|
|
49
|
+
);
|
|
50
|
+
const formattedLastProgress = formatDateTime(lastProgress);
|
|
51
|
+
const lastError = group.BridgeSyncLastError?.trim();
|
|
52
|
+
const reported = parseUsToMs(
|
|
53
|
+
parseOptionalNonNegativeNumber(group.BridgeSyncLastErrorTimestamp),
|
|
54
|
+
3,
|
|
55
|
+
);
|
|
56
|
+
const columns: TableColumnConfig<TBridgeGroupLink>[] = [
|
|
57
|
+
{
|
|
58
|
+
id: 'GroupId',
|
|
59
|
+
name: () => (
|
|
60
|
+
<Text variant="body-1" color="secondary">
|
|
61
|
+
{i18n('field_group-id')}
|
|
62
|
+
</Text>
|
|
63
|
+
),
|
|
64
|
+
className: b('partner-cell', {id: true}),
|
|
65
|
+
template: ({GroupId}) =>
|
|
66
|
+
GroupId ? (
|
|
67
|
+
<CellWithPopover
|
|
68
|
+
content={GroupId}
|
|
69
|
+
placement={['top', 'bottom']}
|
|
70
|
+
wrapperClassName={b('partner-id')}
|
|
71
|
+
fullWidth
|
|
72
|
+
>
|
|
73
|
+
<InternalLink to={getGroupPath(GroupId)}>{GroupId}</InternalLink>
|
|
74
|
+
</CellWithPopover>
|
|
75
|
+
) : (
|
|
76
|
+
EMPTY_DATA_PLACEHOLDER
|
|
77
|
+
),
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
id: 'PileName',
|
|
81
|
+
name: () => (
|
|
82
|
+
<Text variant="body-1" color="secondary">
|
|
83
|
+
{i18n('field_pile')}
|
|
84
|
+
</Text>
|
|
85
|
+
),
|
|
86
|
+
className: b('partner-cell', {pile: true}),
|
|
87
|
+
template: ({PileName}) => (
|
|
88
|
+
<CellWithPopover
|
|
89
|
+
content={PileName}
|
|
90
|
+
disabled={!PileName}
|
|
91
|
+
placement={['top', 'bottom']}
|
|
92
|
+
fullWidth
|
|
93
|
+
>
|
|
94
|
+
<span tabIndex={PileName ? 0 : undefined}>
|
|
95
|
+
{PileName || EMPTY_DATA_PLACEHOLDER}
|
|
96
|
+
</span>
|
|
97
|
+
</CellWithPopover>
|
|
98
|
+
),
|
|
99
|
+
},
|
|
100
|
+
];
|
|
101
|
+
|
|
102
|
+
return (
|
|
103
|
+
<Flex
|
|
104
|
+
className={b({layout})}
|
|
105
|
+
direction={isPage ? 'row' : 'column'}
|
|
106
|
+
gap={isPage ? 6 : 4}
|
|
107
|
+
wrap={isPage ? 'wrap' : 'nowrap'}
|
|
108
|
+
>
|
|
109
|
+
<DefinitionList nameMaxWidth={200} className={b('metrics')}>
|
|
110
|
+
{isPage && (
|
|
111
|
+
<DefinitionList.Item name={i18n('field_pile')}>
|
|
112
|
+
{group.PileName?.trim() || EMPTY_DATA_PLACEHOLDER}
|
|
113
|
+
</DefinitionList.Item>
|
|
114
|
+
)}
|
|
115
|
+
{isPage && (
|
|
116
|
+
<DefinitionList.Item name={i18n('field_stage')} qa="storage-group-sync-stage">
|
|
117
|
+
{stage ? (
|
|
118
|
+
<CellWithPopover
|
|
119
|
+
content={<Text wordBreak="break-all">{stage}</Text>}
|
|
120
|
+
placement={['top', 'bottom']}
|
|
121
|
+
fullWidth
|
|
122
|
+
>
|
|
123
|
+
<span tabIndex={0}>{stage}</span>
|
|
124
|
+
</CellWithPopover>
|
|
125
|
+
) : (
|
|
126
|
+
EMPTY_DATA_PLACEHOLDER
|
|
127
|
+
)}
|
|
128
|
+
</DefinitionList.Item>
|
|
129
|
+
)}
|
|
130
|
+
<DefinitionList.Item
|
|
131
|
+
name={i18n('field_remaining')}
|
|
132
|
+
note={i18n('context_remaining')}
|
|
133
|
+
>
|
|
134
|
+
{formatMetricBytes(remaining)}
|
|
135
|
+
</DefinitionList.Item>
|
|
136
|
+
<DefinitionList.Item name={i18n('field_rate')}>
|
|
137
|
+
{rate === undefined
|
|
138
|
+
? EMPTY_DATA_PLACEHOLDER
|
|
139
|
+
: i18n('value_rate', {size: formatMetricBytes(rate)})}
|
|
140
|
+
</DefinitionList.Item>
|
|
141
|
+
<DefinitionList.Item name={i18n('field_last-progress')}>
|
|
142
|
+
{formattedLastProgress ? (
|
|
143
|
+
<Tooltip content={formattedLastProgress}>
|
|
144
|
+
<span tabIndex={0}>{dateTimeParse(lastProgress)?.fromNow()}</span>
|
|
145
|
+
</Tooltip>
|
|
146
|
+
) : (
|
|
147
|
+
EMPTY_DATA_PLACEHOLDER
|
|
148
|
+
)}
|
|
149
|
+
</DefinitionList.Item>
|
|
150
|
+
</DefinitionList>
|
|
151
|
+
{partners.length > 0 && (
|
|
152
|
+
<Flex direction="column" gap={2} className={b('partners-section')}>
|
|
153
|
+
<Text variant="body-1" className={b('section-title')}>
|
|
154
|
+
{i18n('title_partners')} <Text color="hint">{partners.length}</Text>
|
|
155
|
+
</Text>
|
|
156
|
+
<Table
|
|
157
|
+
className={b('partners')}
|
|
158
|
+
width="max"
|
|
159
|
+
data={partners}
|
|
160
|
+
columns={columns}
|
|
161
|
+
getRowDescriptor={({GroupId}) => ({id: GroupId})}
|
|
162
|
+
/>
|
|
163
|
+
</Flex>
|
|
164
|
+
)}
|
|
165
|
+
{lastError && (
|
|
166
|
+
<Flex direction="column" gap={2} className={b('message-section')}>
|
|
167
|
+
<Text variant="body-1" className={b('section-title')}>
|
|
168
|
+
{i18n('title_message')}
|
|
169
|
+
</Text>
|
|
170
|
+
<DefinitionList nameMaxWidth={200} className={b('metrics')}>
|
|
171
|
+
<DefinitionList.Item name={i18n('field_reported')}>
|
|
172
|
+
<Text variant="inherit" whiteSpace="nowrap">
|
|
173
|
+
{formatDateTime(reported, {defaultValue: EMPTY_DATA_PLACEHOLDER})}
|
|
174
|
+
</Text>
|
|
175
|
+
</DefinitionList.Item>
|
|
176
|
+
</DefinitionList>
|
|
177
|
+
<Alert
|
|
178
|
+
theme="normal"
|
|
179
|
+
icon={null}
|
|
180
|
+
message={
|
|
181
|
+
<Flex alignItems="flex-start" gap={2}>
|
|
182
|
+
<Flex grow minWidth={0}>
|
|
183
|
+
{lastError}
|
|
184
|
+
</Flex>
|
|
185
|
+
<ClipboardButton
|
|
186
|
+
text={lastError}
|
|
187
|
+
aria-label={i18n('action_copy-error')}
|
|
188
|
+
view="flat-secondary"
|
|
189
|
+
size="s"
|
|
190
|
+
/>
|
|
191
|
+
</Flex>
|
|
192
|
+
}
|
|
193
|
+
className={b('message')}
|
|
194
|
+
/>
|
|
195
|
+
</Flex>
|
|
196
|
+
)}
|
|
197
|
+
</Flex>
|
|
198
|
+
);
|
|
199
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"field_remaining": "Data remaining",
|
|
3
|
+
"context_remaining": "Data still to be synchronised. This amount may increase as scanning discovers more data.",
|
|
4
|
+
"field_rate": "Sync rate",
|
|
5
|
+
"value_rate": "{{size}}/s",
|
|
6
|
+
"field_last-progress": "Last progress",
|
|
7
|
+
"title_partners": "Sync partners",
|
|
8
|
+
"field_group-id": "Group ID",
|
|
9
|
+
"field_pile": "Bridge pile",
|
|
10
|
+
"title_message": "Last sync message",
|
|
11
|
+
"action_copy-error": "Copy last sync message",
|
|
12
|
+
"field_reported": "Reported",
|
|
13
|
+
"field_stage": "Stage"
|
|
14
|
+
}
|
|
@@ -33,6 +33,24 @@
|
|
|
33
33
|
min-width: 0;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
+
&__sync {
|
|
37
|
+
margin-top: var(--g-spacing-4);
|
|
38
|
+
|
|
39
|
+
border: 1px solid var(--g-color-line-generic);
|
|
40
|
+
border-radius: var(--g-border-radius-xl);
|
|
41
|
+
|
|
42
|
+
.g-disclosure__trigger {
|
|
43
|
+
justify-content: space-between;
|
|
44
|
+
|
|
45
|
+
width: 100%;
|
|
46
|
+
padding: var(--g-spacing-3);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
&__sync-content {
|
|
51
|
+
padding: var(--g-spacing-1) var(--g-spacing-3) var(--g-spacing-3);
|
|
52
|
+
}
|
|
53
|
+
|
|
36
54
|
&__storage-title {
|
|
37
55
|
z-index: 3;
|
|
38
56
|
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
|
|
3
|
-
import {Flex, Text} from '@gravity-ui/uikit';
|
|
3
|
+
import {Disclosure, Flex, Label, Text} from '@gravity-ui/uikit';
|
|
4
4
|
import {skipToken} from '@reduxjs/toolkit/query';
|
|
5
5
|
import {Helmet} from 'react-helmet-async';
|
|
6
6
|
import {StringParam, useQueryParams} from 'use-query-params';
|
|
7
7
|
|
|
8
8
|
import {StickyAutoRefreshControl} from '../../components/AutoRefreshControl/StickyAutoRefreshControl';
|
|
9
|
+
import {BridgeSyncStatusLabel} from '../../components/BridgeSyncStatusLabel';
|
|
9
10
|
import {CopyableValue} from '../../components/CopyableValue/CopyableValue';
|
|
10
11
|
import {ResponseError} from '../../components/Errors/ResponseError';
|
|
11
12
|
import {InfoViewerSkeleton} from '../../components/InfoViewerSkeleton/InfoViewerSkeleton';
|
|
@@ -21,6 +22,7 @@ import {useDatabaseFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
|
|
|
21
22
|
import {useAppTitle} from '../App/AppTitleContext';
|
|
22
23
|
import {PaginatedStorage} from '../Storage/PaginatedStorage';
|
|
23
24
|
import {StorageGroupStateLabel} from '../Storage/StorageGroupStateLabel';
|
|
25
|
+
import {StorageGroupSyncDetails} from '../Storage/StorageGroupSyncDetails/StorageGroupSyncDetails';
|
|
24
26
|
|
|
25
27
|
import {storageGroupPageKeyset} from './i18n';
|
|
26
28
|
|
|
@@ -97,6 +99,11 @@ export function StorageGroupPage() {
|
|
|
97
99
|
state={storageGroupData?.State}
|
|
98
100
|
stateInfo={storageGroupData?.StateInfo}
|
|
99
101
|
/>
|
|
102
|
+
{storageGroupData?.BridgeMode === true && (
|
|
103
|
+
<Label theme="utility" size="s">
|
|
104
|
+
{storageGroupPageKeyset('label_bridge-mode')}
|
|
105
|
+
</Label>
|
|
106
|
+
)}
|
|
100
107
|
</Flex>
|
|
101
108
|
</Flex>
|
|
102
109
|
);
|
|
@@ -145,6 +152,25 @@ export function StorageGroupPage() {
|
|
|
145
152
|
{renderPageTitle()}
|
|
146
153
|
{renderError()}
|
|
147
154
|
{renderInfo()}
|
|
155
|
+
{storageGroupData?.BridgeMode === true && (
|
|
156
|
+
<Disclosure
|
|
157
|
+
key={groupId}
|
|
158
|
+
arrowPosition="end"
|
|
159
|
+
className={storageGroupPageCn('sync')}
|
|
160
|
+
summary={
|
|
161
|
+
<Flex alignItems="center" gap={2} wrap="wrap">
|
|
162
|
+
<Text variant="subheader-2">
|
|
163
|
+
{storageGroupPageKeyset('title_sync')}
|
|
164
|
+
</Text>
|
|
165
|
+
<BridgeSyncStatusLabel status={storageGroupData.BridgeSyncStatus} />
|
|
166
|
+
</Flex>
|
|
167
|
+
}
|
|
168
|
+
>
|
|
169
|
+
<div className={storageGroupPageCn('sync-content')}>
|
|
170
|
+
<StorageGroupSyncDetails group={storageGroupData} layout="page" />
|
|
171
|
+
</div>
|
|
172
|
+
</Disclosure>
|
|
173
|
+
)}
|
|
148
174
|
</div>
|
|
149
175
|
{renderStorage()}
|
|
150
176
|
</div>
|
|
@@ -460,6 +460,8 @@ export function ObjectSummary({
|
|
|
460
460
|
title={i18n('action_copySchemaPath')}
|
|
461
461
|
/>
|
|
462
462
|
<PaneVisibilityToggleButtons
|
|
463
|
+
collapseLabel={i18n('action_collapse-object-details')}
|
|
464
|
+
expandLabel={i18n('action_expand-object-details')}
|
|
463
465
|
onCollapse={onCollapseInfoHandler}
|
|
464
466
|
onExpand={onExpandInfoHandler}
|
|
465
467
|
isCollapsed={commonInfoVisibilityState.collapsed}
|
|
@@ -536,6 +538,8 @@ export function ObjectSummary({
|
|
|
536
538
|
<Flex className={b('actions')} gap={0.5}>
|
|
537
539
|
{!isCollapsed && <RefreshTreeButton />}
|
|
538
540
|
<PaneVisibilityToggleButtons
|
|
541
|
+
collapseLabel={i18n('action_collapse-navigation-panel')}
|
|
542
|
+
expandLabel={i18n('action_expand-navigation-panel')}
|
|
539
543
|
onCollapse={onCollapseSummary}
|
|
540
544
|
onExpand={onExpandSummary}
|
|
541
545
|
isCollapsed={isCollapsed}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"title_navigation": "Navigation",
|
|
3
|
+
"action_collapse-object-details": "Collapse object details",
|
|
4
|
+
"action_expand-object-details": "Expand object details",
|
|
5
|
+
"action_collapse-navigation-panel": "Collapse navigation panel",
|
|
6
|
+
"action_expand-navigation-panel": "Expand navigation panel",
|
|
3
7
|
"action_copySchemaPath": "Copy schema path",
|
|
4
8
|
"action_openInDiagnostics": "Open in Diagnostics"
|
|
5
9
|
}
|
|
@@ -278,7 +278,7 @@ export function NewSQL({database}: NewSQLProps) {
|
|
|
278
278
|
<DropdownMenu
|
|
279
279
|
items={items}
|
|
280
280
|
renderSwitcher={(props) => (
|
|
281
|
-
<Button {...props} view="
|
|
281
|
+
<Button {...props} view="normal" qa="new-sql-dropdown-switcher">
|
|
282
282
|
{i18n('button.new-sql')}
|
|
283
283
|
<Button.Icon>
|
|
284
284
|
<ChevronDown />
|
|
@@ -84,6 +84,8 @@ import './QueryEditor.scss';
|
|
|
84
84
|
const b = cn('query-editor');
|
|
85
85
|
|
|
86
86
|
const STOP_APPEAR_TIMEOUT = 400;
|
|
87
|
+
const MIN_EDITOR_HEIGHT = 160;
|
|
88
|
+
const MIN_RESULTS_HEIGHT = 52;
|
|
87
89
|
|
|
88
90
|
const initialTenantCommonInfoState = {
|
|
89
91
|
triggerExpand: false,
|
|
@@ -678,11 +680,12 @@ export default function QueryEditor({
|
|
|
678
680
|
defaultSizePaneKey={DEFAULT_SIZE_RESULT_PANE_KEY}
|
|
679
681
|
triggerCollapse={resultVisibilityState.triggerCollapse}
|
|
680
682
|
triggerExpand={resultVisibilityState.triggerExpand}
|
|
681
|
-
minSize={[
|
|
683
|
+
minSize={[MIN_EDITOR_HEIGHT, MIN_RESULTS_HEIGHT]}
|
|
682
684
|
collapsedSizes={[100, 0]}
|
|
683
685
|
onSplitStartDragAdditional={onSplitStartDragAdditional}
|
|
684
686
|
>
|
|
685
687
|
<div
|
|
688
|
+
style={{minHeight: MIN_EDITOR_HEIGHT}}
|
|
686
689
|
className={b('pane-wrapper', {
|
|
687
690
|
top: true,
|
|
688
691
|
loading: isMultiTabQueryEditorEnabled && !isEditorReady,
|