ydb-embedded-ui 12.12.0 → 12.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/store/reducers/cluster/cluster.d.ts +1 -1
- package/dist/store/reducers/cluster/cluster.js +2 -1
- package/dist/store/reducers/cluster/cluster.js.map +1 -1
- package/dist/store/reducers/cluster/parseFields.d.ts +2 -1
- package/dist/store/reducers/cluster/parseFields.js +15 -0
- package/dist/store/reducers/cluster/parseFields.js.map +1 -1
- package/dist/store/reducers/clusters/utils.js +4 -2
- package/dist/store/reducers/clusters/utils.js.map +1 -1
- package/dist/types/api/meta.d.ts +1 -2
- package/package.json +1 -1
|
@@ -21,6 +21,7 @@ export declare function useClusterBaseInfo(): {
|
|
|
21
21
|
traceView: import("../../../types/api/meta").MetaClusterTraceView | undefined;
|
|
22
22
|
cores: import("../../../types/api/meta").MetaClusterCoresUrl | undefined;
|
|
23
23
|
logging: import("../../../types/api/meta").MetaClusterLogsUrls | undefined;
|
|
24
|
+
settings: import("../../../types/api/meta").MetaClusterSettings | undefined;
|
|
24
25
|
owner?: string;
|
|
25
26
|
location?: string;
|
|
26
27
|
image?: string;
|
|
@@ -35,7 +36,6 @@ export declare function useClusterBaseInfo(): {
|
|
|
35
36
|
use_embedded_ui?: boolean;
|
|
36
37
|
trace_view?: string | import("../../../types/api/meta").MetaClusterTraceView;
|
|
37
38
|
trace_check?: string | import("../../../types/api/meta").MetaClusterTraceCheck;
|
|
38
|
-
settings?: import("../../../types/api/meta").MetaClusterSettings;
|
|
39
39
|
};
|
|
40
40
|
export type ClusterInfo = ReturnType<typeof useClusterBaseInfo> & Record<string, unknown>;
|
|
41
41
|
export declare const selectClusterTitle: ((state: {
|
|
@@ -8,7 +8,7 @@ import { useIsViewerUser } from '../../../utils/hooks/useIsUserAllowedToMakeChan
|
|
|
8
8
|
import { isQueryErrorResponse } from '../../../utils/query';
|
|
9
9
|
import { api } from '../api';
|
|
10
10
|
import { selectNodesMap } from '../nodesList';
|
|
11
|
-
import { parseCoresUrl, parseLoggingUrls, parseTraceField } from './parseFields';
|
|
11
|
+
import { parseCoresUrl, parseLoggingUrls, parseSettingsField, parseTraceField } from './parseFields';
|
|
12
12
|
import { createSelectClusterGroupsQuery, getGroupStatsFromClusterInfo, normalizeDomain, parseGroupsStatsQueryResponse, } from './utils';
|
|
13
13
|
export const INITIAL_DEFAULT_CLUSTER_TAB = clusterTabsIds.tenants;
|
|
14
14
|
const defaultClusterTabLS = localStorage.getItem(DEFAULT_CLUSTER_TAB_KEY);
|
|
@@ -132,6 +132,7 @@ export function useClusterBaseInfo() {
|
|
|
132
132
|
traceView: parseTraceField(data.trace_view),
|
|
133
133
|
cores: parseCoresUrl(data.cores),
|
|
134
134
|
logging: parseLoggingUrls(data.logging),
|
|
135
|
+
settings: parseSettingsField(data.settings),
|
|
135
136
|
};
|
|
136
137
|
}
|
|
137
138
|
const createClusterInfoSelector = createSelector((clusterName) => clusterName, (clusterName) => clusterApi.endpoints.getClusterInfo.select(clusterName));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/cluster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAC,qBAAqB,EAAE,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAC,uBAAuB,EAAC,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAC,eAAe,EAAC,MAAM,oDAAoD,CAAC;AACnF,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/cluster.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { MetaBaseClusterInfo, MetaClusterCoresUrl, MetaClusterLogsUrls, MetaClusterTraceView } from '../../../types/api/meta';
|
|
1
|
+
import type { MetaBaseClusterInfo, MetaClusterCoresUrl, MetaClusterLogsUrls, MetaClusterSettings, MetaClusterTraceView } from '../../../types/api/meta';
|
|
2
2
|
export declare function parseTraceField(traceView: MetaBaseClusterInfo['trace_view']): MetaClusterTraceView | undefined;
|
|
3
3
|
export declare function parseCoresUrl(cores: MetaBaseClusterInfo['cores']): MetaClusterCoresUrl | undefined;
|
|
4
4
|
export declare function parseLoggingUrls(logging: MetaBaseClusterInfo['logging']): MetaClusterLogsUrls | undefined;
|
|
5
|
+
export declare function parseSettingsField(settings: MetaBaseClusterInfo['settings']): MetaClusterSettings | undefined;
|
|
@@ -46,4 +46,19 @@ export function parseLoggingUrls(logging) {
|
|
|
46
46
|
}
|
|
47
47
|
return undefined;
|
|
48
48
|
}
|
|
49
|
+
const settingsSchema = z.object({
|
|
50
|
+
use_meta_proxy: z.boolean().optional(),
|
|
51
|
+
});
|
|
52
|
+
export function parseSettingsField(settings) {
|
|
53
|
+
if (settings && typeof settings === 'object') {
|
|
54
|
+
return settings;
|
|
55
|
+
}
|
|
56
|
+
try {
|
|
57
|
+
return settings ? settingsSchema.parse(JSON.parse(settings)) : undefined;
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
console.error('Error parsing settings field:', e);
|
|
61
|
+
}
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
49
64
|
//# sourceMappingURL=parseFields.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseFields.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/parseFields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"parseFields.js","sourceRoot":"","sources":["../../../../src/store/reducers/cluster/parseFields.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { uiFactory } from '../../../uiFactory/uiFactory';
|
|
2
2
|
import { prepareBackendFromBalancer } from '../../../utils/parseBalancer';
|
|
3
3
|
import { getVersionMap, getVersionsData, prepareClusterVersions, } from '../../../utils/versions/clusterVersionColors';
|
|
4
|
+
import { parseSettingsField } from '../cluster/parseFields';
|
|
4
5
|
export const prepareClustersData = (data) => {
|
|
5
6
|
const { clusters = [] } = data;
|
|
6
7
|
let allMinorVersions = new Map();
|
|
@@ -12,9 +13,9 @@ export const prepareClustersData = (data) => {
|
|
|
12
13
|
const versionsData = getVersionsData(allMinorVersions);
|
|
13
14
|
// Apply color map to every cluster in the list
|
|
14
15
|
return clusters.map((cluster) => {
|
|
15
|
-
|
|
16
|
+
const parsedSettings = parseSettingsField(cluster.settings);
|
|
16
17
|
// If no backend is provided, it will be automatically generated by API instance
|
|
17
|
-
const useMetaProxy = uiFactory.useMetaProxy && (
|
|
18
|
+
const useMetaProxy = uiFactory.useMetaProxy && (parsedSettings === null || parsedSettings === void 0 ? void 0 : parsedSettings.use_meta_proxy) !== false;
|
|
18
19
|
const preparedBackend = cluster.balancer && !useMetaProxy
|
|
19
20
|
? prepareBackendFromBalancer(cluster.balancer)
|
|
20
21
|
: undefined;
|
|
@@ -22,6 +23,7 @@ export const prepareClustersData = (data) => {
|
|
|
22
23
|
...cluster,
|
|
23
24
|
preparedVersions: prepareClusterVersions(cluster.versions, versionsData),
|
|
24
25
|
preparedBackend,
|
|
26
|
+
settings: parsedSettings,
|
|
25
27
|
};
|
|
26
28
|
});
|
|
27
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AACxE,OAAO,EACH,aAAa,EACb,eAAe,EACf,sBAAsB,GACzB,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AACxE,OAAO,EACH,aAAa,EACb,eAAe,EACf,sBAAsB,GACzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAI1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAkB,EAAqB,EAAE;IACzE,MAAM,EAAC,QAAQ,GAAG,EAAE,EAAC,GAAG,IAAI,CAAC;IAE7B,IAAI,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAEjC,sCAAsC;IACtC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,QAAQ,GAAG,EAAE,EAAC,EAAE,EAAE;QACjC,gBAAgB,GAAG,aAAa,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,YAAY,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAEvD,+CAA+C;IAC/C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5D,gFAAgF;QAChF,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,MAAK,KAAK,CAAC;QACxF,MAAM,eAAe,GACjB,OAAO,CAAC,QAAQ,IAAI,CAAC,YAAY;YAC7B,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC9C,CAAC,CAAC,SAAS,CAAC;QAEpB,OAAO;YACH,GAAG,OAAO;YACV,gBAAgB,EAAE,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC;YACxE,eAAe;YACf,QAAQ,EAAE,cAAc;SAC3B,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
|
package/dist/types/api/meta.d.ts
CHANGED
|
@@ -41,7 +41,7 @@ export interface MetaBaseClusterInfo {
|
|
|
41
41
|
logging?: string | MetaClusterLogsUrls;
|
|
42
42
|
trace_view?: string | MetaClusterTraceView;
|
|
43
43
|
trace_check?: string | MetaClusterTraceCheck;
|
|
44
|
-
settings?: MetaClusterSettings;
|
|
44
|
+
settings?: string | MetaClusterSettings;
|
|
45
45
|
}
|
|
46
46
|
export interface MetaGeneralClusterInfo extends MetaBaseClusterInfo {
|
|
47
47
|
cluster?: MetaViewerClusterInfo;
|
|
@@ -80,5 +80,4 @@ export interface MetaClusterTraceCheck {
|
|
|
80
80
|
}
|
|
81
81
|
export interface MetaClusterSettings {
|
|
82
82
|
use_meta_proxy?: boolean;
|
|
83
|
-
proxy?: unknown;
|
|
84
83
|
}
|