ydb-embedded-ui 22.6.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.
- package/dist/components/TenantNameWrapper/TenantNameWrapper.js +3 -1
- package/dist/components/TenantNameWrapper/TenantNameWrapper.js.map +1 -1
- package/dist/components/TenantNameWrapper/utils.d.ts +4 -1
- package/dist/components/TenantNameWrapper/utils.js +9 -2
- package/dist/components/TenantNameWrapper/utils.js.map +1 -1
- package/dist/containers/Header/hooks/useSharedDatabasePath.js +14 -6
- package/dist/containers/Header/hooks/useSharedDatabasePath.js.map +1 -1
- package/dist/containers/Nodes/NodesControls/NodesControls.js +1 -1
- package/dist/containers/Nodes/NodesControls/NodesControls.js.map +1 -1
- package/dist/containers/Nodes/PaginatedNodes/GroupedNodesComponent.js +3 -5
- package/dist/containers/Nodes/PaginatedNodes/GroupedNodesComponent.js.map +1 -1
- package/dist/containers/Nodes/PaginatedNodes/NodesComponent.js +2 -4
- package/dist/containers/Nodes/PaginatedNodes/NodesComponent.js.map +1 -1
- package/dist/containers/Tenants/TenantsTable.js +20 -6
- package/dist/containers/Tenants/TenantsTable.js.map +1 -1
- package/dist/store/reducers/cluster/cluster.js +2 -2
- package/dist/store/reducers/cluster/cluster.js.map +1 -1
- package/dist/store/reducers/cluster/parseFields.js +1 -0
- package/dist/store/reducers/cluster/parseFields.js.map +1 -1
- package/dist/store/reducers/tenant/tenant.js +6 -1
- package/dist/store/reducers/tenant/tenant.js.map +1 -1
- package/dist/store/reducers/tenants/types.d.ts +2 -0
- package/dist/store/reducers/tenants/utils.js +3 -0
- package/dist/store/reducers/tenants/utils.js.map +1 -1
- package/dist/types/api/meta.d.ts +1 -0
- package/dist/utils/databaseId.d.ts +8 -0
- package/dist/utils/databaseId.js +10 -0
- package/dist/utils/databaseId.js.map +1 -0
- package/dist/utils/hooks/useDebouncedValue.js +12 -0
- package/dist/utils/hooks/useDebouncedValue.js.map +1 -1
- package/package.json +1 -1
- package/src/components/TenantNameWrapper/TenantNameWrapper.tsx +3 -1
- package/src/components/TenantNameWrapper/utils.ts +13 -1
- package/src/containers/Header/hooks/useSharedDatabasePath.ts +16 -7
- package/src/containers/Nodes/NodesControls/NodesControls.tsx +0 -1
- package/src/containers/Nodes/PaginatedNodes/GroupedNodesComponent.tsx +3 -5
- package/src/containers/Nodes/PaginatedNodes/NodesComponent.tsx +2 -4
- package/src/containers/Tenants/TenantsTable.tsx +20 -7
- package/src/store/reducers/cluster/cluster.ts +4 -2
- package/src/store/reducers/cluster/parseFields.ts +1 -0
- package/src/store/reducers/tenant/tenant.ts +4 -1
- package/src/store/reducers/tenants/types.ts +2 -0
- package/src/store/reducers/tenants/utils.ts +3 -0
- package/src/types/api/meta.ts +1 -0
- package/src/utils/databaseId.ts +27 -0
- package/src/utils/hooks/useDebouncedValue.ts +16 -0
- package/dist/containers/Nodes/useDebouncedSearch.d.ts +0 -2
- package/dist/containers/Nodes/useDebouncedSearch.js +0 -11
- package/dist/containers/Nodes/useDebouncedSearch.js.map +0 -1
- package/src/containers/Nodes/useDebouncedSearch.ts +0 -13
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/types/api/meta.d.ts
CHANGED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { MetaClusterSettings } from '../types/api/meta';
|
|
2
|
+
import type { TTenant } from '../types/api/tenant';
|
|
3
|
+
export declare function getDatabaseNavigationId(database: Pick<TTenant, 'Name' | 'Id' | 'ControlPlane'>, { settings, useDatabaseId, isMetaDatabasesAvailable, backend, }?: {
|
|
4
|
+
settings?: MetaClusterSettings;
|
|
5
|
+
useDatabaseId?: boolean;
|
|
6
|
+
isMetaDatabasesAvailable?: boolean;
|
|
7
|
+
backend?: string;
|
|
8
|
+
}): string | undefined;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export function getDatabaseNavigationId(database, { settings, useDatabaseId, isMetaDatabasesAvailable, backend, } = {}) {
|
|
2
|
+
var _a;
|
|
3
|
+
if (backend || (settings === null || settings === void 0 ? void 0 : settings.use_database_id) === false || (settings === null || settings === void 0 ? void 0 : settings.use_meta_proxy) === false) {
|
|
4
|
+
return database.Name;
|
|
5
|
+
}
|
|
6
|
+
return ((isMetaDatabasesAvailable && ((_a = database.ControlPlane) === null || _a === void 0 ? void 0 : _a.id)) ||
|
|
7
|
+
(useDatabaseId && database.Id) ||
|
|
8
|
+
database.Name);
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=databaseId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"databaseId.js","sourceRoot":"","sources":["../../src/utils/databaseId.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,uBAAuB,CACnC,QAAuD,EACvD,EACI,QAAQ,EACR,aAAa,EACb,wBAAwB,EACxB,OAAO,MAMP,EAAE;;IAEN,IAAI,OAAO,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,MAAK,KAAK,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,cAAc,MAAK,KAAK,EAAE,CAAC;QACvF,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,OAAO,CACH,CAAC,wBAAwB,KAAI,MAAA,QAAQ,CAAC,YAAY,0CAAE,EAAE,CAAA,CAAC;QACvD,CAAC,aAAa,IAAI,QAAQ,CAAC,EAAE,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAChB,CAAC;AACN,CAAC"}
|
|
@@ -2,7 +2,16 @@ import React from 'react';
|
|
|
2
2
|
export function useDebouncedValue({ value, onUpdate, debounce = 200, }) {
|
|
3
3
|
const [currentValue, setCurrentValue] = React.useState(value);
|
|
4
4
|
const timer = React.useRef();
|
|
5
|
+
const submittedValue = React.useRef();
|
|
5
6
|
React.useEffect(() => {
|
|
7
|
+
const isAcknowledgement = submittedValue.current === value;
|
|
8
|
+
submittedValue.current = undefined;
|
|
9
|
+
// Preserve a newer pending edit when the parent acknowledges an earlier one.
|
|
10
|
+
if (isAcknowledgement && timer.current !== undefined) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
window.clearTimeout(timer.current);
|
|
14
|
+
timer.current = undefined;
|
|
6
15
|
setCurrentValue((prevValue) => {
|
|
7
16
|
if (prevValue !== value) {
|
|
8
17
|
return value;
|
|
@@ -10,10 +19,13 @@ export function useDebouncedValue({ value, onUpdate, debounce = 200, }) {
|
|
|
10
19
|
return prevValue;
|
|
11
20
|
});
|
|
12
21
|
}, [value]);
|
|
22
|
+
React.useEffect(() => () => window.clearTimeout(timer.current), []);
|
|
13
23
|
const handleUpdate = (newValue) => {
|
|
14
24
|
setCurrentValue(newValue);
|
|
15
25
|
window.clearTimeout(timer.current);
|
|
16
26
|
timer.current = window.setTimeout(() => {
|
|
27
|
+
timer.current = undefined;
|
|
28
|
+
submittedValue.current = newValue;
|
|
17
29
|
onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate(newValue);
|
|
18
30
|
}, debounce);
|
|
19
31
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDebouncedValue.js","sourceRoot":"","sources":["../../../src/utils/hooks/useDebouncedValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,UAAU,iBAAiB,CAAmC,EAChE,KAAK,EACL,QAAQ,EACR,QAAQ,GAAG,GAAG,GAKjB;IACG,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAI,KAAK,CAAC,CAAC;IAEjE,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"useDebouncedValue.js","sourceRoot":"","sources":["../../../src/utils/hooks/useDebouncedValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,UAAU,iBAAiB,CAAmC,EAChE,KAAK,EACL,QAAQ,EACR,QAAQ,GAAG,GAAG,GAKjB;IACG,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAI,KAAK,CAAC,CAAC;IAEjE,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAU,CAAC;IACrC,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,EAAK,CAAC;IAEzC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,KAAK,KAAK,CAAC;QAC3D,cAAc,CAAC,OAAO,GAAG,SAAS,CAAC;QAEnC,6EAA6E;QAC7E,IAAI,iBAAiB,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACnD,OAAO;QACX,CAAC;QAED,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;QAE1B,eAAe,CAAC,CAAC,SAAS,EAAE,EAAE;YAC1B,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;gBACtB,OAAO,KAAK,CAAC;YACjB,CAAC;YAED,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAEpE,MAAM,YAAY,GAAG,CAAC,QAAW,EAAE,EAAE;QACjC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAE1B,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YACnC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;YAC1B,cAAc,CAAC,OAAO,GAAG,QAAQ,CAAC;YAClC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,CAAC,CAAC;QACzB,CAAC,EAAE,QAAQ,CAAC,CAAC;IACjB,CAAC,CAAC;IACF,OAAO,CAAC,YAAY,EAAE,YAAY,CAAU,CAAC;AACjD,CAAC"}
|
package/package.json
CHANGED
|
@@ -61,7 +61,9 @@ export function TenantNameWrapper({
|
|
|
61
61
|
tenant,
|
|
62
62
|
additionalTenantsProps,
|
|
63
63
|
externalLink,
|
|
64
|
-
useDatabaseId: uiFactory.useDatabaseId
|
|
64
|
+
useDatabaseId: uiFactory.useDatabaseId,
|
|
65
|
+
isMetaDatabasesAvailable: emMetaAvailable,
|
|
66
|
+
settings,
|
|
65
67
|
});
|
|
66
68
|
const useMetaProxy = uiFactory.useMetaProxy && settings?.use_meta_proxy !== false;
|
|
67
69
|
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import {getTenantPath} from '../../routes';
|
|
2
|
+
import {backend as activeBackend} from '../../store';
|
|
2
3
|
import type {PreparedTenant} from '../../store/reducers/tenants/types';
|
|
3
4
|
import type {AdditionalTenantsProps} from '../../types/additionalProps';
|
|
5
|
+
import type {MetaClusterSettings} from '../../types/api/meta';
|
|
6
|
+
import {getDatabaseNavigationId} from '../../utils/databaseId';
|
|
4
7
|
|
|
5
8
|
export function getTenantBackend(
|
|
6
9
|
tenant: Pick<PreparedTenant, 'NodeIds'> & Partial<Pick<PreparedTenant, 'sharedNodeIds'>>,
|
|
@@ -24,15 +27,24 @@ export function getTenantLink({
|
|
|
24
27
|
additionalTenantsProps,
|
|
25
28
|
externalLink,
|
|
26
29
|
useDatabaseId,
|
|
30
|
+
isMetaDatabasesAvailable,
|
|
31
|
+
settings,
|
|
27
32
|
}: {
|
|
28
33
|
tenant: PreparedTenant;
|
|
29
34
|
additionalTenantsProps?: AdditionalTenantsProps;
|
|
30
35
|
externalLink?: boolean;
|
|
31
36
|
useDatabaseId?: boolean;
|
|
37
|
+
isMetaDatabasesAvailable?: boolean;
|
|
38
|
+
settings?: MetaClusterSettings;
|
|
32
39
|
}) {
|
|
33
40
|
const backend = getTenantBackend(tenant, additionalTenantsProps);
|
|
34
41
|
const isExternalLink = Boolean(externalLink || backend);
|
|
35
|
-
const database =
|
|
42
|
+
const database = getDatabaseNavigationId(tenant, {
|
|
43
|
+
useDatabaseId,
|
|
44
|
+
isMetaDatabasesAvailable,
|
|
45
|
+
settings,
|
|
46
|
+
backend: backend ?? activeBackend,
|
|
47
|
+
});
|
|
36
48
|
|
|
37
49
|
return {
|
|
38
50
|
database,
|
|
@@ -10,6 +10,7 @@ import {tenantsApi} from '../../../store/reducers/tenants/tenants';
|
|
|
10
10
|
import type {PreparedTenant, SharedDatabaseTarget} from '../../../store/reducers/tenants/types';
|
|
11
11
|
import type {AdditionalTenantsProps} from '../../../types/additionalProps';
|
|
12
12
|
import {uiFactory} from '../../../uiFactory/uiFactory';
|
|
13
|
+
import {getDatabaseNavigationId} from '../../../utils/databaseId';
|
|
13
14
|
import {useDatabasesV2} from '../../../utils/hooks/useDatabasesV2';
|
|
14
15
|
import {useIsUserAllowedToMakeChanges} from '../../../utils/hooks/useIsUserAllowedToMakeChanges';
|
|
15
16
|
|
|
@@ -24,21 +25,18 @@ interface SharedDatabaseNameResolutionParams {
|
|
|
24
25
|
databaseData?: PreparedTenant;
|
|
25
26
|
isClusterBaseInfoResolved: boolean;
|
|
26
27
|
isViewerUser?: boolean;
|
|
27
|
-
useDatabaseId?: boolean;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
function canResolveSharedDatabaseName({
|
|
31
31
|
databaseData,
|
|
32
32
|
isClusterBaseInfoResolved,
|
|
33
33
|
isViewerUser,
|
|
34
|
-
useDatabaseId,
|
|
35
34
|
}: SharedDatabaseNameResolutionParams) {
|
|
36
35
|
return Boolean(
|
|
37
36
|
isViewerUser &&
|
|
38
37
|
isClusterBaseInfoResolved &&
|
|
39
38
|
databaseData?.Type === 'Serverless' &&
|
|
40
39
|
databaseData.ResourceId &&
|
|
41
|
-
!useDatabaseId &&
|
|
42
40
|
!databaseData.sharedTenantName,
|
|
43
41
|
);
|
|
44
42
|
}
|
|
@@ -116,7 +114,6 @@ export function useSharedDatabasePath({
|
|
|
116
114
|
const isMonitoringAllowed = useIsUserAllowedToMakeChanges();
|
|
117
115
|
const isClusterBaseInfoAvailable = isClusterBaseInfoResolved && !isClusterBaseInfoError;
|
|
118
116
|
|
|
119
|
-
const useDatabaseId = uiFactory.useDatabaseId && settings?.use_meta_proxy !== false;
|
|
120
117
|
const needSharedDatabaseNodeIds = shouldResolveSharedDatabaseNodeIds(
|
|
121
118
|
balancer,
|
|
122
119
|
settings,
|
|
@@ -126,7 +123,6 @@ export function useSharedDatabasePath({
|
|
|
126
123
|
databaseData,
|
|
127
124
|
isClusterBaseInfoResolved: isClusterBaseInfoAvailable,
|
|
128
125
|
isViewerUser,
|
|
129
|
-
useDatabaseId,
|
|
130
126
|
});
|
|
131
127
|
|
|
132
128
|
const shouldResolveSharedDatabaseFromViewer =
|
|
@@ -162,6 +158,7 @@ export function useSharedDatabasePath({
|
|
|
162
158
|
return {
|
|
163
159
|
name: databaseData.sharedTenantName,
|
|
164
160
|
nodeIds: databaseData.sharedNodeIds,
|
|
161
|
+
controlPlane: databaseData.sharedControlPlane,
|
|
165
162
|
};
|
|
166
163
|
}
|
|
167
164
|
|
|
@@ -173,18 +170,30 @@ export function useSharedDatabasePath({
|
|
|
173
170
|
const sharedDatabaseName = sharedDatabase?.Name?.trim();
|
|
174
171
|
|
|
175
172
|
return sharedDatabaseName
|
|
176
|
-
? {
|
|
173
|
+
? {
|
|
174
|
+
name: sharedDatabaseName,
|
|
175
|
+
nodeIds: sharedDatabase?.NodeIds,
|
|
176
|
+
controlPlane: sharedDatabase?.ControlPlane,
|
|
177
|
+
}
|
|
177
178
|
: undefined;
|
|
178
179
|
}, [
|
|
179
180
|
databaseData?.ResourceId,
|
|
180
181
|
databaseData?.sharedNodeIds,
|
|
182
|
+
databaseData?.sharedControlPlane,
|
|
181
183
|
databaseData?.sharedTenantName,
|
|
182
184
|
databases,
|
|
183
185
|
sharedDatabaseFromViewer,
|
|
184
186
|
]);
|
|
185
187
|
|
|
186
|
-
const sharedDatabase = useDatabaseId ? databaseData?.ResourceId : sharedDatabaseTarget?.name;
|
|
187
188
|
const backend = getSharedDatabaseBackend(sharedDatabaseTarget, prepareTenantBackend);
|
|
189
|
+
const sharedDatabase = getDatabaseNavigationId(
|
|
190
|
+
{
|
|
191
|
+
Name: sharedDatabaseTarget?.name,
|
|
192
|
+
Id: databaseData?.ResourceId,
|
|
193
|
+
ControlPlane: sharedDatabaseTarget?.controlPlane,
|
|
194
|
+
},
|
|
195
|
+
{settings, useDatabaseId: uiFactory.useDatabaseId, isMetaDatabasesAvailable, backend},
|
|
196
|
+
);
|
|
188
197
|
|
|
189
198
|
return {
|
|
190
199
|
isSharedDatabaseLoading:
|
|
@@ -23,7 +23,6 @@ import {NodesControls} from '../NodesControls/NodesControls';
|
|
|
23
23
|
import {NodesTable} from '../NodesTable';
|
|
24
24
|
import i18n from '../i18n';
|
|
25
25
|
import {b} from '../shared';
|
|
26
|
-
import {useDebouncedSearch} from '../useDebouncedSearch';
|
|
27
26
|
import {useNodesPageQueryParams} from '../useNodesPageQueryParams';
|
|
28
27
|
|
|
29
28
|
interface NodeGroupProps {
|
|
@@ -125,7 +124,6 @@ export function GroupedNodesComponent({
|
|
|
125
124
|
groupByParams,
|
|
126
125
|
withPeerRoleFilter,
|
|
127
126
|
);
|
|
128
|
-
const searchFilter = useDebouncedSearch(searchValue);
|
|
129
127
|
const useMetaProxy = useClusterWithProxy();
|
|
130
128
|
const [autoRefreshInterval] = useAutoRefreshInterval();
|
|
131
129
|
const {hideUnavailable} = useHideUnavailableNodes();
|
|
@@ -150,7 +148,7 @@ export function GroupedNodesComponent({
|
|
|
150
148
|
path: schemaPathParam,
|
|
151
149
|
database,
|
|
152
150
|
alive: hideUnavailable || undefined,
|
|
153
|
-
filter:
|
|
151
|
+
filter: searchValue.trim(),
|
|
154
152
|
filter_peer_role: peerRoleFilter,
|
|
155
153
|
group: groupByParam,
|
|
156
154
|
limit: 0,
|
|
@@ -190,7 +188,7 @@ export function GroupedNodesComponent({
|
|
|
190
188
|
path={path}
|
|
191
189
|
databaseFullPath={databaseFullPath}
|
|
192
190
|
database={database}
|
|
193
|
-
searchValue={
|
|
191
|
+
searchValue={searchValue}
|
|
194
192
|
peerRoleFilter={peerRoleFilter}
|
|
195
193
|
groupByParam={groupByParam}
|
|
196
194
|
columns={columnsToShow}
|
|
@@ -230,7 +228,7 @@ export function GroupedNodesComponent({
|
|
|
230
228
|
table={renderGroups()}
|
|
231
229
|
tableWrapperProps={{
|
|
232
230
|
scrollContainerRef,
|
|
233
|
-
scrollDependencies: [
|
|
231
|
+
scrollDependencies: [searchValue, groupByParam, tableGroups, peerRoleFilter],
|
|
234
232
|
loading: isLoading,
|
|
235
233
|
className: b('groups-wrapper'),
|
|
236
234
|
}}
|
|
@@ -12,7 +12,6 @@ import type {NodesGroupByField} from '../../../types/api/nodes';
|
|
|
12
12
|
import {useHideUnavailableNodes} from '../../../utils/hooks/useHideUnavailableNodes';
|
|
13
13
|
import {useSelectedColumns} from '../../../utils/hooks/useSelectedColumns';
|
|
14
14
|
import {NodesTable} from '../NodesTable';
|
|
15
|
-
import {useDebouncedSearch} from '../useDebouncedSearch';
|
|
16
15
|
import {useNodesPageQueryParams} from '../useNodesPageQueryParams';
|
|
17
16
|
|
|
18
17
|
import {NodesControlsWithTableState} from './NodesControlsWithTableState';
|
|
@@ -48,7 +47,6 @@ export function NodesComponent({
|
|
|
48
47
|
groupByParams,
|
|
49
48
|
withPeerRoleFilter,
|
|
50
49
|
);
|
|
51
|
-
const searchFilter = useDebouncedSearch(searchValue);
|
|
52
50
|
const viewerNodesHandlerHasGrouping = useViewerNodesHandlerHasGrouping();
|
|
53
51
|
const {hideUnavailable} = useHideUnavailableNodes();
|
|
54
52
|
|
|
@@ -82,7 +80,7 @@ export function NodesComponent({
|
|
|
82
80
|
path={path}
|
|
83
81
|
database={database}
|
|
84
82
|
databaseFullPath={databaseFullPath}
|
|
85
|
-
searchValue={
|
|
83
|
+
searchValue={searchValue}
|
|
86
84
|
withProblems={withProblems}
|
|
87
85
|
uptimeFilter={uptimeFilter}
|
|
88
86
|
peerRoleFilter={peerRoleFilter}
|
|
@@ -94,7 +92,7 @@ export function NodesComponent({
|
|
|
94
92
|
tableWrapperProps={{
|
|
95
93
|
scrollContainerRef,
|
|
96
94
|
scrollDependencies: [
|
|
97
|
-
|
|
95
|
+
searchValue,
|
|
98
96
|
withProblems,
|
|
99
97
|
uptimeFilter,
|
|
100
98
|
peerRoleFilter,
|
|
@@ -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
|
-
|
|
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
|
-
[
|
|
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 = () => {
|
|
@@ -142,11 +142,13 @@ export function useClusterBaseInfo() {
|
|
|
142
142
|
const clusterNameFromQuery = useClusterNameFromQuery();
|
|
143
143
|
const isViewerUser = useIsViewerUser();
|
|
144
144
|
|
|
145
|
-
const shouldFetchClusterBaseInfo = Boolean(
|
|
145
|
+
const shouldFetchClusterBaseInfo = Boolean(
|
|
146
|
+
window.api.meta && clusterNameFromQuery && isViewerUser,
|
|
147
|
+
);
|
|
146
148
|
const {currentData, isSuccess, isError} = clusterApi.useGetClusterBaseInfoQuery(
|
|
147
149
|
clusterNameFromQuery || skipToken,
|
|
148
150
|
{
|
|
149
|
-
skip: !
|
|
151
|
+
skip: !shouldFetchClusterBaseInfo,
|
|
150
152
|
},
|
|
151
153
|
);
|
|
152
154
|
|
|
@@ -120,6 +120,7 @@ export function parseLoggingUrls(
|
|
|
120
120
|
const settingsSchema = z.object({
|
|
121
121
|
unavailable: z.boolean().optional().catch(undefined),
|
|
122
122
|
use_meta_proxy: z.boolean().optional(),
|
|
123
|
+
use_database_id: z.boolean().optional(),
|
|
123
124
|
cluster_domain: z.string().optional(),
|
|
124
125
|
cluster_external_name: z.string().optional(),
|
|
125
126
|
});
|
|
@@ -81,7 +81,10 @@ export const tenantApi = api.injectEndpoints({
|
|
|
81
81
|
// previous meta versions do not support filtering databases by name
|
|
82
82
|
const data =
|
|
83
83
|
databases.find(
|
|
84
|
-
(tenant) =>
|
|
84
|
+
(tenant) =>
|
|
85
|
+
tenant.Name === database ||
|
|
86
|
+
tenant.Id === database ||
|
|
87
|
+
tenant.ControlPlane?.id === database,
|
|
85
88
|
) ?? databases[0];
|
|
86
89
|
if (!data) {
|
|
87
90
|
return {error: {code: 'EMPTY_TENANT_INFO'}};
|
|
@@ -6,6 +6,7 @@ import type {METRIC_STATUS} from './contants';
|
|
|
6
6
|
export interface PreparedTenant extends TTenant {
|
|
7
7
|
sharedTenantName: string | undefined;
|
|
8
8
|
sharedNodeIds: number[] | undefined;
|
|
9
|
+
sharedControlPlane?: TTenant['ControlPlane'];
|
|
9
10
|
controlPlaneName: string;
|
|
10
11
|
cpu: number | undefined;
|
|
11
12
|
memory: number | undefined;
|
|
@@ -17,6 +18,7 @@ export interface PreparedTenant extends TTenant {
|
|
|
17
18
|
export interface SharedDatabaseTarget {
|
|
18
19
|
name: string;
|
|
19
20
|
nodeIds?: number[];
|
|
21
|
+
controlPlane?: TTenant['ControlPlane'];
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
export type MetricStatus = ValueOf<typeof METRIC_STATUS>;
|
|
@@ -377,6 +377,9 @@ export const prepareTenants = (tenants: TTenant[]): PreparedTenant[] => {
|
|
|
377
377
|
|
|
378
378
|
sharedTenantName,
|
|
379
379
|
sharedNodeIds,
|
|
380
|
+
...(sharedDatabase?.ControlPlane
|
|
381
|
+
? {sharedControlPlane: sharedDatabase.ControlPlane}
|
|
382
|
+
: {}),
|
|
380
383
|
controlPlaneName,
|
|
381
384
|
cpu,
|
|
382
385
|
memory,
|
package/src/types/api/meta.ts
CHANGED
|
@@ -107,6 +107,7 @@ export interface MetaClusterTraceCheck {
|
|
|
107
107
|
export interface MetaClusterSettings {
|
|
108
108
|
unavailable?: boolean;
|
|
109
109
|
use_meta_proxy?: boolean;
|
|
110
|
+
use_database_id?: boolean;
|
|
110
111
|
auth_service?: string;
|
|
111
112
|
cluster_domain?: string;
|
|
112
113
|
cluster_external_name?: string;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type {MetaClusterSettings} from '../types/api/meta';
|
|
2
|
+
import type {TTenant} from '../types/api/tenant';
|
|
3
|
+
|
|
4
|
+
export function getDatabaseNavigationId(
|
|
5
|
+
database: Pick<TTenant, 'Name' | 'Id' | 'ControlPlane'>,
|
|
6
|
+
{
|
|
7
|
+
settings,
|
|
8
|
+
useDatabaseId,
|
|
9
|
+
isMetaDatabasesAvailable,
|
|
10
|
+
backend,
|
|
11
|
+
}: {
|
|
12
|
+
settings?: MetaClusterSettings;
|
|
13
|
+
useDatabaseId?: boolean;
|
|
14
|
+
isMetaDatabasesAvailable?: boolean;
|
|
15
|
+
backend?: string;
|
|
16
|
+
} = {},
|
|
17
|
+
) {
|
|
18
|
+
if (backend || settings?.use_database_id === false || settings?.use_meta_proxy === false) {
|
|
19
|
+
return database.Name;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
return (
|
|
23
|
+
(isMetaDatabasesAvailable && database.ControlPlane?.id) ||
|
|
24
|
+
(useDatabaseId && database.Id) ||
|
|
25
|
+
database.Name
|
|
26
|
+
);
|
|
27
|
+
}
|
|
@@ -12,8 +12,20 @@ export function useDebouncedValue<T extends string | number | null>({
|
|
|
12
12
|
const [currentValue, setCurrentValue] = React.useState<T>(value);
|
|
13
13
|
|
|
14
14
|
const timer = React.useRef<number>();
|
|
15
|
+
const submittedValue = React.useRef<T>();
|
|
15
16
|
|
|
16
17
|
React.useEffect(() => {
|
|
18
|
+
const isAcknowledgement = submittedValue.current === value;
|
|
19
|
+
submittedValue.current = undefined;
|
|
20
|
+
|
|
21
|
+
// Preserve a newer pending edit when the parent acknowledges an earlier one.
|
|
22
|
+
if (isAcknowledgement && timer.current !== undefined) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
window.clearTimeout(timer.current);
|
|
27
|
+
timer.current = undefined;
|
|
28
|
+
|
|
17
29
|
setCurrentValue((prevValue) => {
|
|
18
30
|
if (prevValue !== value) {
|
|
19
31
|
return value;
|
|
@@ -23,11 +35,15 @@ export function useDebouncedValue<T extends string | number | null>({
|
|
|
23
35
|
});
|
|
24
36
|
}, [value]);
|
|
25
37
|
|
|
38
|
+
React.useEffect(() => () => window.clearTimeout(timer.current), []);
|
|
39
|
+
|
|
26
40
|
const handleUpdate = (newValue: T) => {
|
|
27
41
|
setCurrentValue(newValue);
|
|
28
42
|
|
|
29
43
|
window.clearTimeout(timer.current);
|
|
30
44
|
timer.current = window.setTimeout(() => {
|
|
45
|
+
timer.current = undefined;
|
|
46
|
+
submittedValue.current = newValue;
|
|
31
47
|
onUpdate?.(newValue);
|
|
32
48
|
}, debounce);
|
|
33
49
|
};
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
/** Debounce the table filter, never the input or its URL value. */
|
|
3
|
-
export function useDebouncedSearch(searchValue) {
|
|
4
|
-
const [debouncedSearch, setDebouncedSearch] = React.useState(searchValue);
|
|
5
|
-
React.useEffect(() => {
|
|
6
|
-
const timer = window.setTimeout(() => setDebouncedSearch(searchValue), 200);
|
|
7
|
-
return () => window.clearTimeout(timer);
|
|
8
|
-
}, [searchValue]);
|
|
9
|
-
return debouncedSearch;
|
|
10
|
-
}
|
|
11
|
-
//# sourceMappingURL=useDebouncedSearch.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useDebouncedSearch.js","sourceRoot":"","sources":["../../../src/containers/Nodes/useDebouncedSearch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,mEAAmE;AACnE,MAAM,UAAU,kBAAkB,CAAC,WAAmB;IAClD,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE1E,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC;QAC5E,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO,eAAe,CAAC;AAC3B,CAAC"}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
|
|
3
|
-
/** Debounce the table filter, never the input or its URL value. */
|
|
4
|
-
export function useDebouncedSearch(searchValue: string) {
|
|
5
|
-
const [debouncedSearch, setDebouncedSearch] = React.useState(searchValue);
|
|
6
|
-
|
|
7
|
-
React.useEffect(() => {
|
|
8
|
-
const timer = window.setTimeout(() => setDebouncedSearch(searchValue), 200);
|
|
9
|
-
return () => window.clearTimeout(timer);
|
|
10
|
-
}, [searchValue]);
|
|
11
|
-
|
|
12
|
-
return debouncedSearch;
|
|
13
|
-
}
|