ydb-embedded-ui 8.20.1 → 8.22.0

package/dist/containers/Tenant/Query/QueryEditor/keybindings.js

@@ -9,6 +9,7 @@ export function getKeyBindings(monaco) {
         selectNextQuery: ctrlKey | KeyCode.DownArrow,
         saveQuery: ctrlKey | KeyCode.KeyS,
         saveSelectedQuery: ctrlKey | KeyMod.Shift | KeyCode.KeyS,
+        shortcutsHotkey: ctrlKey | KeyCode.KeyK,
     };
 }
 //# sourceMappingURL=keybindings.js.map

package/dist/containers/Tenant/Query/QueryEditor/keybindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"keybindings.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/QueryEditor/keybindings.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,MAAqB;IAChD,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,MAAM,CAAC;IAEjC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAE/B,+BAA+B;IAC/B,OAAO;QACH,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK;QAClC,iBAAiB,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK;QAChE,mBAAmB,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO;QAC9C,eAAe,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS;QAC5C,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI;QACjC,iBAAiB,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI;KAC3D,CAAC;AACN,CAAC"}
+{"version":3,"file":"keybindings.js","sourceRoot":"","sources":["../../../../../src/containers/Tenant/Query/QueryEditor/keybindings.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,MAAqB;IAChD,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,MAAM,CAAC;IAEjC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAE/B,+BAA+B;IAC/B,OAAO;QACH,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK;QAClC,iBAAiB,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK;QAChE,mBAAmB,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO;QAC9C,eAAe,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS;QAC5C,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI;QACjC,iBAAiB,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI;QACxD,eAAe,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI;KAC1C,CAAC;AACN,CAAC"}

package/dist/containers/Tenant/Query/i18n/en.json

@@ -42,6 +42,7 @@
     "action.stop": "Stop",
     "action.run": "Run",
     "action.explain": "Explain",
+    "action.open-shortcuts": "Open Keyboard Shortcuts Panel",
     "filter.text.placeholder": "Search by query text...",
     "gear.tooltip": "Query execution settings have been changed for ",
     "banner.query-settings.message": "Query was executed with modified settings: ",

package/dist/containers/Tenant/Query/i18n/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (key: "filter.text.placeholder" | "controls.query-mode-selector_type" | "tabs.newQuery" | "tabs.history" | "tabs.saved" | "history.empty" | "history.empty-search" | "saved.empty" | "delete-dialog.header" | "delete-dialog.question" | "delete-dialog.delete" | "delete-dialog.cancel" | "preview.title" | "preview.not-available" | "preview.close" | "preview.truncated" | "method-description.script" | "method-description.scan" | "method-description.data" | "method-description.query" | "method-description.pg" | "transaction-mode-description.serializable" | "transaction-mode-description.onlinero" | "transaction-mode-description.stalero" | "transaction-mode-description.snapshot" | "transaction-mode-description.implicit" | "tracing-level-description.basic" | "tracing-level-description.detailed" | "tracing-level-description.diagnostic" | "tracing-level-description.off" | "tracing-level-description.toplevel" | "tracing-level-description.trace" | "statistics-mode-description.none" | "statistics-mode-description.basic" | "statistics-mode-description.full" | "statistics-mode-description.profile" | "action.send-query" | "action.send-selected-query" | "action.previous-query" | "action.next-query" | "action.save-query" | "action.stop" | "action.run" | "action.explain" | "gear.tooltip" | "banner.query-settings.message" | "banner.query-stopped.message" | "banner.query-stopped.never-show" | "toaster.stop-error" | "history.queryText" | "history.endTime" | "history.duration", params?: import("@gravity-ui/i18n").Params) => string;
+declare const _default: (key: "filter.text.placeholder" | "controls.query-mode-selector_type" | "tabs.newQuery" | "tabs.history" | "tabs.saved" | "history.empty" | "history.empty-search" | "saved.empty" | "delete-dialog.header" | "delete-dialog.question" | "delete-dialog.delete" | "delete-dialog.cancel" | "preview.title" | "preview.not-available" | "preview.close" | "preview.truncated" | "method-description.script" | "method-description.scan" | "method-description.data" | "method-description.query" | "method-description.pg" | "transaction-mode-description.serializable" | "transaction-mode-description.onlinero" | "transaction-mode-description.stalero" | "transaction-mode-description.snapshot" | "transaction-mode-description.implicit" | "tracing-level-description.basic" | "tracing-level-description.detailed" | "tracing-level-description.diagnostic" | "tracing-level-description.off" | "tracing-level-description.toplevel" | "tracing-level-description.trace" | "statistics-mode-description.none" | "statistics-mode-description.basic" | "statistics-mode-description.full" | "statistics-mode-description.profile" | "action.send-query" | "action.send-selected-query" | "action.previous-query" | "action.next-query" | "action.save-query" | "action.stop" | "action.run" | "action.explain" | "action.open-shortcuts" | "gear.tooltip" | "banner.query-settings.message" | "banner.query-stopped.message" | "banner.query-stopped.never-show" | "toaster.stop-error" | "history.queryText" | "history.endTime" | "history.duration", params?: import("@gravity-ui/i18n").Params) => string;
 export default _default;

package/dist/store/reducers/clusters/types.d.ts

@@ -2,6 +2,7 @@ import type { MetaExtendedClusterInfo } from '../../../types/api/meta';
 import type { ExtendedMetaClusterVersion } from '../../../utils/clusterVersionColors';
 export interface PreparedCluster extends MetaExtendedClusterInfo {
     preparedVersions: ExtendedMetaClusterVersion[];
+    preparedBackend?: string;
 }
 export interface ClusterDataAggregation {
     NodesTotal: number;

package/dist/store/reducers/clusters/utils.js

@@ -1,4 +1,5 @@
 import { getVersionColors, getVersionMap, prepareClusterVersions, } from '../../../utils/clusterVersionColors';
+import { prepareBackendFromBalancer } from '../../../utils/parseBalancer';
 export const prepareClustersData = (data) => {
     const { clusters = [] } = data;
     let allMinorVersions = new Map();
@@ -12,6 +13,9 @@ export const prepareClustersData = (data) => {
     return clusters.map((cluster) => ({
         ...cluster,
         preparedVersions: prepareClusterVersions(cluster.versions, versionToColor),
+        preparedBackend: cluster.balancer
+            ? prepareBackendFromBalancer(cluster.balancer)
+            : undefined,
     }));
 };
 //# sourceMappingURL=utils.js.map

package/dist/store/reducers/clusters/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,sBAAsB,GACzB,MAAM,qCAAqC,CAAC;AAI7C,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,cAAc,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IAE1D,+CAA+C;IAC/C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC9B,GAAG,OAAO;QACV,gBAAgB,EAAE,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC;KAC7E,CAAC,CAAC,CAAC;AACR,CAAC,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/clusters/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,sBAAsB,GACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AAIxE,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,cAAc,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IAE1D,+CAA+C;IAC/C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC9B,GAAG,OAAO;QACV,gBAAgB,EAAE,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC;QAC1E,eAAe,EAAE,OAAO,CAAC,QAAQ;YAC7B,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC9C,CAAC,CAAC,SAAS;KAClB,CAAC,CAAC,CAAC;AACR,CAAC,CAAC"}

package/dist/store/reducers/executeTopQueries/constants.d.ts

@@ -0,0 +1,18 @@
+export declare const TOP_QUERIES_TABLES: {
+    CPU_TIME: {
+        ONE_HOUR: string;
+        ONE_MINUTE: string;
+    };
+    DURATION: {
+        ONE_HOUR: string;
+        ONE_MINUTE: string;
+    };
+    READ_BYTES: {
+        ONE_HOUR: string;
+        ONE_MINUTE: string;
+    };
+    REQUEST_UNITS: {
+        ONE_HOUR: string;
+        ONE_MINUTE: string;
+    };
+};

package/dist/store/reducers/executeTopQueries/constants.js

@@ -0,0 +1,20 @@
+// Define table names as constants
+export const TOP_QUERIES_TABLES = {
+    CPU_TIME: {
+        ONE_HOUR: '.sys/top_queries_by_cpu_time_one_hour',
+        ONE_MINUTE: '.sys/top_queries_by_cpu_time_one_minute',
+    },
+    DURATION: {
+        ONE_HOUR: '.sys/top_queries_by_duration_one_hour',
+        ONE_MINUTE: '.sys/top_queries_by_duration_one_minute',
+    },
+    READ_BYTES: {
+        ONE_HOUR: '.sys/top_queries_by_read_bytes_one_hour',
+        ONE_MINUTE: '.sys/top_queries_by_read_bytes_one_minute',
+    },
+    REQUEST_UNITS: {
+        ONE_HOUR: '.sys/top_queries_by_request_units_one_hour',
+        ONE_MINUTE: '.sys/top_queries_by_request_units_one_minute',
+    },
+};
+//# sourceMappingURL=constants.js.map

package/dist/store/reducers/executeTopQueries/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/store/reducers/executeTopQueries/constants.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,QAAQ,EAAE;QACN,QAAQ,EAAE,uCAAuC;QACjD,UAAU,EAAE,yCAAyC;KACxD;IACD,QAAQ,EAAE;QACN,QAAQ,EAAE,uCAAuC;QACjD,UAAU,EAAE,yCAAyC;KACxD;IACD,UAAU,EAAE;QACR,QAAQ,EAAE,yCAAyC;QACnD,UAAU,EAAE,2CAA2C;KAC1D;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,4CAA4C;QACtD,UAAU,EAAE,8CAA8C;KAC7D;CACJ,CAAC"}

package/dist/store/reducers/executeTopQueries/executeTopQueries.d.ts

@@ -1,14 +1,18 @@
 import type { SortOrder } from '@gravity-ui/react-data-table';
-import type { TopQueriesFilters } from './types';
+import type { TimeFrame, TopQueriesFilters } from './types';
 export declare const setTopQueriesFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<TopQueriesFilters, "executeTopQueries/setTopQueriesFilters">;
 declare const _default: import("redux").Reducer<TopQueriesFilters>;
 export default _default;
-interface TopQueriesRequestParams {
+interface QueriesRequestParams {
     database: string;
     filters?: TopQueriesFilters;
     sortOrder?: SortOrder[];
+    limit?: number;
 }
+type TopQueriesRequestParams = QueriesRequestParams & {
+    timeFrame: TimeFrame;
+};
 export declare const topQueriesApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, {
     getTopQueries: import("@reduxjs/toolkit/query").QueryDefinition<TopQueriesRequestParams, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData" | "PreviewData" | "SchemaTree" | "StorageData" | "Tablet" | "UserData" | "VDiskData", import("../../../types/store/query").IQueryResult | undefined, "api">;
-    getRunningQueries: import("@reduxjs/toolkit/query").QueryDefinition<TopQueriesRequestParams, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData" | "PreviewData" | "SchemaTree" | "StorageData" | "Tablet" | "UserData" | "VDiskData", import("../../../types/store/query").IQueryResult | undefined, "api">;
+    getRunningQueries: import("@reduxjs/toolkit/query").QueryDefinition<QueriesRequestParams, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData" | "PreviewData" | "SchemaTree" | "StorageData" | "Tablet" | "UserData" | "VDiskData", import("../../../types/store/query").IQueryResult | undefined, "api">;
 }, "api", "All" | "PDiskData" | "PreviewData" | "SchemaTree" | "StorageData" | "Tablet" | "UserData" | "VDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

package/dist/store/reducers/executeTopQueries/executeTopQueries.js

@@ -4,6 +4,7 @@ import { QUERY_TECHNICAL_MARK } from '../../../utils/constants';
 import { prepareOrderByFromTableSort } from '../../../utils/hooks/useTableSort';
 import { isQueryErrorResponse, parseQueryAPIResponse } from '../../../utils/query';
 import { api } from '../api';
+import { TOP_QUERIES_TABLES } from './constants';
 import { getFiltersConditions } from './utils';
 const initialState = {};
 const slice = createSlice({
@@ -17,26 +18,46 @@ const slice = createSlice({
 });
 export const { setTopQueriesFilters } = slice.actions;
 export default slice.reducer;
-const getQueryText = (filters, sortOrder) => {
-    const filterConditions = getFiltersConditions(filters);
+const getQueryText = (timeFrame, filters, sortOrder, limit) => {
     const orderBy = prepareOrderByFromTableSort(sortOrder);
+    // Determine the metric type based on sort field
+    let metricType = TOP_QUERIES_TABLES.CPU_TIME; // Default to CPU_TIME
+    if (sortOrder && sortOrder.length > 0) {
+        const primarySortField = sortOrder[0].columnId;
+        if (primarySortField === 'Duration') {
+            metricType = TOP_QUERIES_TABLES.DURATION;
+        }
+        else if (primarySortField === 'ReadBytes') {
+            metricType = TOP_QUERIES_TABLES.READ_BYTES;
+        }
+        else if (primarySortField === 'RequestUnits') {
+            metricType = TOP_QUERIES_TABLES.REQUEST_UNITS;
+        }
+        else if (primarySortField === 'CPUTime') {
+            metricType = TOP_QUERIES_TABLES.CPU_TIME;
+        }
+    }
+    // Select the appropriate table based on timeFrame filter
+    const tableName = timeFrame === 'minute' ? metricType.ONE_MINUTE : metricType.ONE_HOUR;
+    const filterConditions = getFiltersConditions(tableName, filters);
     return `${QUERY_TECHNICAL_MARK}
-SELECT
-    CPUTime as CPUTimeUs,
-    QueryText,
-    IntervalEnd,
-    EndTime,
-    ReadRows,
-    ReadBytes,
-    UserSID,
-    Duration
-FROM \`.sys/top_queries_by_cpu_time_one_hour\`
+    SELECT
+        CPUTime as CPUTimeUs,
+        QueryText,
+        IntervalEnd,
+        EndTime,
+        ReadRows,
+        ReadBytes,
+        UserSID,
+        Duration,
+        RequestUnits
+FROM \`${tableName}\`
 WHERE ${filterConditions || 'true'} AND QueryText NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
 ${orderBy}
-LIMIT 100
+LIMIT ${limit || 100}
 `;
 };
-function getRunningQueriesText(filters, sortOrder) {
+function getRunningQueriesText(filters, sortOrder, limit) {
     const filterConditions = (filters === null || filters === void 0 ? void 0 : filters.text)
         ? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
         : '';
@@ -49,21 +70,21 @@ SELECT
     ApplicationName
 FROM \`.sys/query_sessions\`
 WHERE ${filterConditions || 'true'} AND Query NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
-${orderBy}
-LIMIT 100`;
+AND QueryStartAt is not null ${orderBy}
+LIMIT ${limit || 100}`;
 }
 export const topQueriesApi = api.injectEndpoints({
     endpoints: (build) => ({
         getTopQueries: build.query({
-            queryFn: async ({ database, filters, sortOrder }, { signal }) => {
+            queryFn: async ({ database, filters, sortOrder, timeFrame, limit }, { signal }) => {
                 const preparedFilters = {
                     ...filters,
-                    from: (filters === null || filters === void 0 ? void 0 : filters.from) || 'now-1h',
+                    from: (filters === null || filters === void 0 ? void 0 : filters.from) || 'now-6h',
                     to: (filters === null || filters === void 0 ? void 0 : filters.to) || 'now',
                 };
                 try {
                     const response = await window.api.viewer.sendQuery({
-                        query: getQueryText(preparedFilters, sortOrder),
+                        query: getQueryText(timeFrame, preparedFilters, sortOrder, limit),
                         database,
                         action: 'execute-scan',
                     }, { signal, withRetries: true });
@@ -90,10 +111,10 @@ export const topQueriesApi = api.injectEndpoints({
             providesTags: ['All'],
         }),
         getRunningQueries: build.query({
-            queryFn: async ({ database, filters, sortOrder }, { signal }) => {
+            queryFn: async ({ database, filters, sortOrder, limit }, { signal }) => {
                 try {
                     const response = await window.api.viewer.sendQuery({
-                        query: getRunningQueriesText(filters, sortOrder),
+                        query: getRunningQueriesText(filters, sortOrder, limit),
                         database,
                         action: 'execute-scan',
                     }, { signal, withRetries: true });

package/dist/store/reducers/executeTopQueries/executeTopQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeTopQueries.js","sourceRoot":"","sources":["../../../../src/store/reducers/executeTopQueries/executeTopQueries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executeTopQueries.js","sourceRoot":"","sources":["../../../../src/store/reducers/executeTopQueries/executeTopQueries.ts"],"names":[],"mappings":"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"}

package/dist/store/reducers/executeTopQueries/types.d.ts

@@ -1,3 +1,4 @@
+export type TimeFrame = 'minute' | 'hour';
 export interface TopQueriesFilters {
     /** ms from epoch */
     from?: string;

package/dist/store/reducers/executeTopQueries/utils.d.ts

@@ -1,2 +1,2 @@
 import type { TopQueriesFilters } from './types';
-export declare function getFiltersConditions(filters?: TopQueriesFilters): string;
+export declare function getFiltersConditions(tableName: string, filters?: TopQueriesFilters): string;

package/dist/store/reducers/executeTopQueries/utils.js

@@ -1,12 +1,12 @@
 import { dateTimeParse } from '@gravity-ui/date-utils';
 const endTimeColumn = 'EndTime';
 const intervalEndColumn = 'IntervalEnd';
-const getMaxIntervalSubquery = () => `(
+const getMaxIntervalSubquery = (tableName) => `(
     SELECT
         MAX(${intervalEndColumn})
-    FROM \`.sys/top_queries_by_cpu_time_one_hour\`
+    FROM \`${tableName}\`
 )`;
-export function getFiltersConditions(filters) {
+export function getFiltersConditions(tableName, filters) {
     var _a, _b;
     const conditions = [];
     const to = (_a = dateTimeParse(Number(filters === null || filters === void 0 ? void 0 : filters.to) || (filters === null || filters === void 0 ? void 0 : filters.to))) === null || _a === void 0 ? void 0 : _a.valueOf();
@@ -25,7 +25,7 @@ export function getFiltersConditions(filters) {
     }
     // If there is no filters, return queries, that were executed in the last hour
     if (!from && !to) {
-        conditions.push(`${intervalEndColumn} IN ${getMaxIntervalSubquery()}`);
+        conditions.push(`${intervalEndColumn} IN ${getMaxIntervalSubquery(tableName)}`);
     }
     if (filters === null || filters === void 0 ? void 0 : filters.text) {
         conditions.push(`(QueryText ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%')`);

package/dist/store/reducers/executeTopQueries/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/executeTopQueries/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAIrD,MAAM,aAAa,GAAG,SAAS,CAAC;AAChC,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAExC,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC;;cAEvB,iBAAiB;;EAE7B,CAAC;AAEH,MAAM,UAAU,oBAAoB,CAAC,OAA2B;;IAC5D,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,EAAE,GAAG,MAAA,aAAa,CAAC,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAA,CAAC,0CAAE,OAAO,EAAE,CAAC;IACxE,MAAM,IAAI,GAAG,MAAA,aAAa,CAAC,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAA,CAAC,0CAAE,OAAO,EAAE,CAAC;IAE9E,IAAI,IAAI,IAAI,EAAE,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACP,yCAAyC;QACzC,sGAAsG;QACtG,MAAM,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QACpC,UAAU,CAAC,IAAI,CAAC,GAAG,aAAa,IAAI,EAAE,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC3F,CAAC;IAED,IAAI,EAAE,EAAE,CAAC;QACL,UAAU,CAAC,IAAI,CAAC,GAAG,aAAa,kBAAkB,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC;IAED,8EAA8E;IAC9E,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACf,UAAU,CAAC,IAAI,CAAC,GAAG,iBAAiB,OAAO,sBAAsB,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QAChB,UAAU,CAAC,IAAI,CACX,sBAAsB,OAAO,CAAC,IAAI,yBAAyB,OAAO,CAAC,IAAI,KAAK,CAC/E,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/executeTopQueries/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAIrD,MAAM,aAAa,GAAG,SAAS,CAAC;AAChC,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAExC,MAAM,sBAAsB,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC;;cAExC,iBAAiB;aAClB,SAAS;EACpB,CAAC;AAEH,MAAM,UAAU,oBAAoB,CAAC,SAAiB,EAAE,OAA2B;;IAC/E,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,EAAE,GAAG,MAAA,aAAa,CAAC,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAA,CAAC,0CAAE,OAAO,EAAE,CAAC;IACxE,MAAM,IAAI,GAAG,MAAA,aAAa,CAAC,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAA,CAAC,0CAAE,OAAO,EAAE,CAAC;IAE9E,IAAI,IAAI,IAAI,EAAE,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACP,yCAAyC;QACzC,sGAAsG;QACtG,MAAM,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QACpC,UAAU,CAAC,IAAI,CAAC,GAAG,aAAa,IAAI,EAAE,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC3F,CAAC;IAED,IAAI,EAAE,EAAE,CAAC;QACL,UAAU,CAAC,IAAI,CAAC,GAAG,aAAa,kBAAkB,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC;IAED,8EAA8E;IAC9E,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACf,UAAU,CAAC,IAAI,CAAC,GAAG,iBAAiB,OAAO,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE,CAAC;QAChB,UAAU,CAAC,IAAI,CACX,sBAAsB,OAAO,CAAC,IAAI,yBAAyB,OAAO,CAAC,IAAI,KAAK,CAC/E,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC"}

package/dist/store/reducers/overview/overview.js

@@ -34,6 +34,10 @@ export const overviewApi = api.injectEndpoints({
                     return { error };
                 }
             },
+            serializeQueryArgs: ({ queryArgs }) => {
+                const { database, path } = queryArgs;
+                return { database, path };
+            },
             keepUnusedDataFor: 0,
             providesTags: ['All', 'SchemaTree'],
         }),

package/dist/store/reducers/overview/overview.js.map

@@ -1 +1 @@
-{"version":3,"file":"overview.js","sourceRoot":"","sources":["../../../../src/store/reducers/overview/overview.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"overview.js","sourceRoot":"","sources":["../../../../src/store/reducers/overview/overview.ts"],"names":[],"mappings":"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"}

package/dist/store/reducers/tenants/tenants.js

@@ -16,15 +16,14 @@ export default slice.reducer;
 export const tenantsApi = api.injectEndpoints({
     endpoints: (build) => ({
         getTenantsInfo: build.query({
-            queryFn: async ({ clusterName }, { signal, getState }) => {
+            queryFn: async ({ clusterName }, { signal }) => {
                 try {
                     const response = window.api.meta
                         ? await window.api.meta.getTenants(clusterName, { signal })
                         : await window.api.viewer.getTenants(clusterName, { signal });
                     let data;
                     if (Array.isArray(response.TenantInfo)) {
-                        const { singleClusterMode } = getState();
-                        data = prepareTenants(response.TenantInfo, singleClusterMode);
+                        data = prepareTenants(response.TenantInfo);
                     }
                     else {
                         data = [];

package/dist/store/reducers/tenants/tenants.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/tenants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAG3B,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAC;AAEvC,MAAM,YAAY,GAAiB,EAAC,WAAW,EAAE,EAAE,EAAC,CAAC;AAErD,MAAM,KAAK,GAAG,WAAW,CAAC;IACtB,IAAI,EAAE,SAAS;IACf,YAAY;IACZ,QAAQ,EAAE;QACN,cAAc,EAAE,CAAC,KAAK,EAAE,MAA6B,EAAE,EAAE;YACrD,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC;QACvC,CAAC;KACJ;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAC,cAAc,EAAC,GAAG,KAAK,CAAC,OAAO,CAAC;AAC9C,eAAe,KAAK,CAAC,OAAO,CAAC;AAE7B,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC;IAC1C,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC;YACxB,OAAO,EAAE,KAAK,EAAE,EAAC,WAAW,EAAyB,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE,EAAE;gBACzE,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI;wBAC5B,CAAC,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,EAAC,MAAM,EAAC,CAAC;wBACzD,CAAC,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;oBAChE,IAAI,IAAsB,CAAC;oBAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;wBACrC,MAAM,EAAC,iBAAiB,EAAC,GAAG,QAAQ,EAAe,CAAC;wBACpD,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;oBAClE,CAAC;yBAAM,CAAC;wBACJ,IAAI,GAAG,EAAE,CAAC;oBACd,CAAC;oBACD,OAAO,EAAC,IAAI,EAAC,CAAC;gBAClB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,EAAC,KAAK,EAAC,CAAC;gBACnB,CAAC;YACL,CAAC;YACD,YAAY,EAAE,CAAC,KAAK,CAAC;SACxB,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,OAAO;CAC5B,CAAC,CAAC"}
+{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/tenants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAG7C,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAG3B,OAAO,EAAC,cAAc,EAAC,MAAM,SAAS,CAAC;AAEvC,MAAM,YAAY,GAAiB,EAAC,WAAW,EAAE,EAAE,EAAC,CAAC;AAErD,MAAM,KAAK,GAAG,WAAW,CAAC;IACtB,IAAI,EAAE,SAAS;IACf,YAAY;IACZ,QAAQ,EAAE;QACN,cAAc,EAAE,CAAC,KAAK,EAAE,MAA6B,EAAE,EAAE;YACrD,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC;QACvC,CAAC;KACJ;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAC,cAAc,EAAC,GAAG,KAAK,CAAC,OAAO,CAAC;AAC9C,eAAe,KAAK,CAAC,OAAO,CAAC;AAE7B,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC;IAC1C,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC;YACxB,OAAO,EAAE,KAAK,EAAE,EAAC,WAAW,EAAyB,EAAE,EAAC,MAAM,EAAC,EAAE,EAAE;gBAC/D,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI;wBAC5B,CAAC,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,EAAC,MAAM,EAAC,CAAC;wBACzD,CAAC,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;oBAChE,IAAI,IAAsB,CAAC;oBAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;wBACrC,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC/C,CAAC;yBAAM,CAAC;wBACJ,IAAI,GAAG,EAAE,CAAC;oBACd,CAAC;oBACD,OAAO,EAAC,IAAI,EAAC,CAAC;gBAClB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,EAAC,KAAK,EAAC,CAAC;gBACnB,CAAC;YACL,CAAC;YACD,YAAY,EAAE,CAAC,KAAK,CAAC;SACxB,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,OAAO;CAC5B,CAAC,CAAC"}

package/dist/store/reducers/tenants/types.d.ts

@@ -2,7 +2,6 @@ import type { TTenant } from '../../../types/api/tenant';
 import type { ValueOf } from '../../../types/common';
 import type { METRIC_STATUS } from './contants';
 export interface PreparedTenant extends TTenant {
-    backend: string | undefined;
     sharedTenantName: string | undefined;
     sharedNodeIds: number[] | undefined;
     controlPlaneName: string;

package/dist/store/reducers/tenants/utils.d.ts

@@ -23,6 +23,6 @@ export declare const calculateTenantMetrics: (tenant?: TTenant) => {
     blobStorageStats: TenantStorageStats[];
     tabletStorageStats: TenantStorageStats[] | undefined;
 };
-export declare const prepareTenants: (tenants: TTenant[], useNodeAsBackend: boolean) => PreparedTenant[];
+export declare const prepareTenants: (tenants: TTenant[]) => PreparedTenant[];
 export declare function getMetricStatusFromUsage(usage?: number): "Unspecified" | "Good" | "Warning" | "Danger";
 export declare const normalizeProgress: (progress: number) => number;

package/dist/store/reducers/tenants/utils.js

@@ -9,14 +9,6 @@ const getControlPlaneValue = (tenant) => {
     const controlPlaneName = (_b = tenant.ControlPlane) === null || _b === void 0 ? void 0 : _b.name;
     return controlPlaneName !== null && controlPlaneName !== void 0 ? controlPlaneName : defaultValue;
 };
-const getTenantBackend = (tenant) => {
-    var _a;
-    const node = tenant.Nodes ? tenant.Nodes[0] : {};
-    const address = node.Host && node.Endpoints
-        ? (_a = node.Endpoints.find((endpoint) => endpoint.Name === 'http-mon')) === null || _a === void 0 ? void 0 : _a.Address
-        : undefined;
-    return node.Host ? `${node.Host}${address ? address : ''}` : undefined;
-};
 const calculatePoolsStats = (poolsStats) => {
     if (!poolsStats) {
         return undefined;
@@ -125,9 +117,8 @@ const calculateTenantEntities = (tenant) => {
     const groupsCount = isNumeric(StorageGroups) ? Number(StorageGroups) : 0;
     return { nodesCount, groupsCount };
 };
-export const prepareTenants = (tenants, useNodeAsBackend) => {
+export const prepareTenants = (tenants) => {
     return tenants.map((tenant) => {
-        const backend = useNodeAsBackend ? getTenantBackend(tenant) : undefined;
         const sharedDatabase = tenants.find((item) => item.Id === tenant.ResourceId);
         const sharedTenantName = sharedDatabase === null || sharedDatabase === void 0 ? void 0 : sharedDatabase.Name;
         const sharedNodeIds = sharedDatabase === null || sharedDatabase === void 0 ? void 0 : sharedDatabase.NodeIds;
@@ -136,7 +127,6 @@ export const prepareTenants = (tenants, useNodeAsBackend) => {
         const { nodesCount, groupsCount } = calculateTenantEntities(tenant);
         return {
             ...tenant,
-            backend,
             sharedTenantName,
             sharedNodeIds,
             controlPlaneName,

package/dist/store/reducers/tenants/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/store/reducers/tenants/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,EAAC,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAC,wBAAwB,EAAE,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAGzC,MAAM,oBAAoB,GAAG,CAAC,MAAe,EAAE,EAAE;;IAC7C,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACnE,MAAM,gBAAgB,GAAG,MAAA,MAAM,CAAC,YAAY,0CAAE,IAAI,CAAC;IAEnD,OAAO,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,YAAY,CAAC;AAC5C,CAAC,CAAC;AAYF,MAAM,mBAAmB,GAAG,CACxB,UAAoC,EACN,EAAE;IAChC,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,UAAU;SACZ,GAAG,CAA+B,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;YAE3B,+DAA+D;YAC/D,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC;QAC9D,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,KAAK,EAA6B,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,SAAkB,EAAE,EAAE,EAAE;IAC3D,MAAM,EACF,SAAS,EACT,UAAU,EACV,oBAAoB,EACpB,WAAW,EACX,qBAAqB,EACrB,SAAS,EACT,OAAO,GAAG,EAAE,EACZ,cAAc,GAAG,EAAE,EACnB,YAAY,EACZ,UAAU,GACb,GAAG,MAAM,CAAC;IAEX,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,OAAS,IAAI,CAAC,CAAC;IAE/C,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,MAAM,gBAAgB,GAAG,SAAS,CAAC,qBAAqB,CAAC;QACrD,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC;QAC/B,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,oBAAoB,CAAC;QACrE,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC;QAC7C,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,UAAU,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAElD,IAAI,gBAAsC,CAAC;IAC3C,IAAI,kBAAoD,CAAC;IAEzD,IAAI,YAAY,EAAE,CAAC;QACf,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,KAAK,CAAC;YAElC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAE5B,OAAO;gBACH,IAAI,EAAE,IAAI;gBACV,IAAI;gBACJ,KAAK;gBACL,KAAK,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC;aACrC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;SAAM,CAAC;QACJ,gBAAgB,GAAG;YACf;gBACI,IAAI,EAAE,KAAK,CAAC,GAAG;gBACf,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,gBAAgB;gBACvB,KAAK,EAAE,cAAc,CAAC,WAAW,EAAE,gBAAgB,CAAC;aACvD;SACJ,CAAC;IACN,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACb,kBAAkB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,KAAK,CAAC;YAElC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAE5B,OAAO;gBACH,IAAI,EAAE,IAAI;gBACV,IAAI;gBACJ,KAAK;gBACL,KAAK,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC;aACrC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;SAAM,IAAI,kBAAkB,EAAE,CAAC;QAC5B,kBAAkB,GAAG;YACjB;gBACI,IAAI,EAAE,KAAK,CAAC,GAAG;gBACf,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,kBAAkB;gBACzB,KAAK,EAAE,cAAc,CAAC,aAAa,EAAE,kBAAkB,CAAC;aAC3D;SACJ,CAAC;IACN,CAAC;IAED,MAAM,WAAW,GAAwB;QACrC;YACI,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC;SAC7C;KACJ,CAAC;IAEF,OAAO;QACH,MAAM;QACN,WAAW;QACX,aAAa;QACb,WAAW;QACX,gBAAgB;QAChB,kBAAkB;QAElB,GAAG;QACH,UAAU;QACV,WAAW;QACX,gBAAgB;QAChB,kBAAkB;KACrB,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,MAAe,EAAE,EAAE;;IAChD,MAAM,EAAC,aAAa,EAAE,OAAO,EAAC,GAAG,MAAM,CAAC;IAExC,MAAM,UAAU,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,mCAAI,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzE,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAkB,EAAoB,EAAE;IACnE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1B,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,gBAAgB,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC;QAC9C,MAAM,aAAa,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,CAAC;QAC9C,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,EAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAClE,MAAM,EAAC,UAAU,EAAE,WAAW,EAAC,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAElE,OAAO;YACH,GAAG,MAAM;YAET,gBAAgB;YAChB,aAAa;YACb,gBAAgB;YAChB,GAAG;YACH,MAAM;YACN,OAAO,EAAE,WAAW;YACpB,UAAU;YACV,WAAW;SACd,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,SAAS,cAAc,CAAC,SAAkB,EAAE,UAAmB;IAC3D,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;QAC1B,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,UAAU,CAAC;IAC1C,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAc;IACnD,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;IAED,IAAI,KAAK,GAAG,wBAAwB,EAAE,CAAC;QACnC,OAAO,aAAa,CAAC,MAAM,CAAC;IAChC,CAAC;IACD,IAAI,KAAK,GAAG,yBAAyB,EAAE,CAAC;QACpC,OAAO,aAAa,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAClD,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC;IACf,CAAC;IACD,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAChB,OAAO,CAAC,CAAC;IACb,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC"}

package/dist/store/reducers/viewSchema/viewSchema.js

@@ -24,6 +24,10 @@ export const viewSchemaApi = api.injectEndpoints({
                     return { error: error };
                 }
             },
+            serializeQueryArgs: ({ queryArgs }) => {
+                const { database, path } = queryArgs;
+                return { database, path };
+            },
             providesTags: ['All', 'SchemaTree'],
         }),
     }),

package/dist/store/reducers/viewSchema/viewSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewSchema.js","sourceRoot":"","sources":["../../../../src/store/reducers/viewSchema/viewSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAE3B,SAAS,qBAAqB,CAAC,IAAY;IACvC,OAAO,mBAAmB,IAAI,YAAY,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC,eAAe,CAAC;IAC7C,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC;YACvB,OAAO,EAAE,KAAK,EAAE,EACZ,QAAQ,EACR,IAAI,EACJ,OAAO,GAKV,EAAE,EAAE;;gBACD,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAC9C;wBACI,KAAK,EAAE,qBAAqB,CAAC,IAAI,CAAC;wBAClC,QAAQ;wBACR,MAAM,EAAE,cAAc;wBACtB,OAAO;qBACV,EACD,EAAC,WAAW,EAAE,IAAI,EAAC,CACtB,CAAC;oBAEF,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACjC,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;oBAC7B,CAAC;oBAED,OAAO,EAAC,IAAI,EAAE,CAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAG,CAAC,CAAC,0CAAE,OAAO,KAAI,EAAE,EAAC,CAAC;gBACxD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC;gBAC1B,CAAC;YACL,CAAC;YACD,YAAY,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC;SACtC,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,OAAO;CAC5B,CAAC,CAAC"}
+{"version":3,"file":"viewSchema.js","sourceRoot":"","sources":["../../../../src/store/reducers/viewSchema/viewSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAE3B,SAAS,qBAAqB,CAAC,IAAY;IACvC,OAAO,mBAAmB,IAAI,YAAY,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC,eAAe,CAAC;IAC7C,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC;YACvB,OAAO,EAAE,KAAK,EAAE,EACZ,QAAQ,EACR,IAAI,EACJ,OAAO,GAKV,EAAE,EAAE;;gBACD,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAC9C;wBACI,KAAK,EAAE,qBAAqB,CAAC,IAAI,CAAC;wBAClC,QAAQ;wBACR,MAAM,EAAE,cAAc;wBACtB,OAAO;qBACV,EACD,EAAC,WAAW,EAAE,IAAI,EAAC,CACtB,CAAC;oBAEF,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACjC,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;oBAC7B,CAAC;oBAED,OAAO,EAAC,IAAI,EAAE,CAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAG,CAAC,CAAC,0CAAE,OAAO,KAAI,EAAE,EAAC,CAAC;gBACxD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC;gBAC1B,CAAC;YACL,CAAC;YACD,kBAAkB,EAAE,CAAC,EAAC,SAAS,EAAC,EAAE,EAAE;gBAChC,MAAM,EAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,SAAS,CAAC;gBACnC,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;YAC5B,CAAC;YACD,YAAY,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC;SACtC,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,OAAO;CAC5B,CAAC,CAAC"}

package/dist/types/additionalProps.d.ts

@@ -10,7 +10,7 @@ export interface AdditionalClusterProps {
     links?: ClusterLink[];
 }
 export interface AdditionalTenantsProps {
-    prepareTenantBackend?: (backend: string | NodeAddress | undefined) => string | undefined;
+    prepareTenantBackend?: (nodeId?: string | number) => string | undefined;
     getMonitoringLink?: (name?: string, type?: ETenantType) => string | null;
     getLogsLink?: (name?: string) => string | null;
 }

package/dist/types/api/tenant.d.ts

@@ -1,5 +1,5 @@
 import type { EFlag } from './enums';
-import type { TMemoryStats, TPoolStats, TSystemStateInfo } from './nodes';
+import type { TMemoryStats, TPoolStats } from './nodes';
 import type { TTabletStateInfo } from './tablet';
 /**
  * endpoint: /viewer/json/tenants
@@ -42,7 +42,6 @@ export interface TTenant {
     StorageAllocatedSize?: string;
     /** uint64 */
     StorageMinAvailableSize?: string;
-    Nodes?: TSystemStateInfo[];
     /** uint64 */
     MemoryUsed?: string;
     /** uint64 */
@@ -52,7 +51,6 @@ export interface TTenant {
     CoresUsed?: number;
     /** uint64 */
     StorageGroups?: string;
-    MonitoringEndpoint?: string;
     ControlPlane?: ControlPlane;
     StorageAllocatedLimit?: string;
     DatabaseQuotas?: DatabaseQuotas;

package/dist/types/api/tenant.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../src/types/api/tenant.ts"],"names":[],"mappings":"AA6IA,MAAM,CAAN,IAAY,KAOX;AAPD,WAAY,KAAK;IACb,gDAAyC,CAAA;IACzC,8BAAuB,CAAA;IACvB,4BAAqB,CAAA;IACrB,8BAAuB,CAAA;IACvB,gDAAyC,CAAA;IACzC,oCAA6B,CAAA;AACjC,CAAC,EAPW,KAAK,KAAL,KAAK,QAOhB;AAED,MAAM,CAAN,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAC5B,uFAAiE,CAAA;IACjE,uFAAiE,CAAA;IACjE,uFAAiE,CAAA;IACjE,yFAAmE,CAAA;IACnE,uFAAiE,CAAA;AACrE,CAAC,EANW,oBAAoB,KAApB,oBAAoB,QAM/B;AAuBD,MAAM,CAAN,IAAY,KAIX;AAJD,WAAY,KAAK;IACb,sBAAa,CAAA;IACb,oBAAW,CAAA;IACX,oBAAW,CAAA;AACf,CAAC,EAJW,KAAK,KAAL,KAAK,QAIhB"}
+{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../src/types/api/tenant.ts"],"names":[],"mappings":"AA2IA,MAAM,CAAN,IAAY,KAOX;AAPD,WAAY,KAAK;IACb,gDAAyC,CAAA;IACzC,8BAAuB,CAAA;IACvB,4BAAqB,CAAA;IACrB,8BAAuB,CAAA;IACvB,gDAAyC,CAAA;IACzC,oCAA6B,CAAA;AACjC,CAAC,EAPW,KAAK,KAAL,KAAK,QAOhB;AAED,MAAM,CAAN,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAC5B,uFAAiE,CAAA;IACjE,uFAAiE,CAAA;IACjE,uFAAiE,CAAA;IACjE,yFAAmE,CAAA;IACnE,uFAAiE,CAAA;AACrE,CAAC,EANW,oBAAoB,KAApB,oBAAoB,QAM/B;AAuBD,MAAM,CAAN,IAAY,KAIX;AAJD,WAAY,KAAK;IACb,sBAAa,CAAA;IACb,oBAAW,CAAA;IACX,oBAAW,CAAA;AACf,CAAC,EAJW,KAAK,KAAL,KAAK,QAIhB"}

package/dist/utils/__test__/parseBalancer.test.js

@@ -1,4 +1,4 @@
-import { getCleanBalancerValue, parseBalancer, removePort, removeProtocol, removeViewerPathname, } from '../parseBalancer';
+import { getCleanBalancerValue, parseBalancer, prepareBackendFromBalancer, removePort, removeProtocol, removeViewerPathname, } from '../parseBalancer';
 describe('parseBalancer', () => {
     test('should parse balancer with viewer proxy', () => {
         const rawValue = 'https://viewer.ydb.ru:443/ydb-testing-0000.search.ydb.net:8765/viewer/json';
@@ -46,11 +46,15 @@ describe('removeViewerPathname', () => {
     });
 });
 describe('removeProtocol', () => {
-    test('should remove protocol', () => {
+    test('should remove protocol from start', () => {
         const initialValue = 'https://ydb-testing-0000.search.net:8765/viewer/json';
         const result = 'ydb-testing-0000.search.net:8765/viewer/json';
         expect(removeProtocol(initialValue)).toBe(result);
     });
+    test('should not remove protocol string in the middle', () => {
+        const initialValue = 'proxy/host/https:ydb-testing-0000.search.net';
+        expect(removeProtocol(initialValue)).toBe(initialValue);
+    });
 });
 describe('removePort', () => {
     test('should remove port', () => {
@@ -66,4 +70,58 @@ describe('getCleanBalancerValue', () => {
         expect(getCleanBalancerValue(initialValue)).toBe(result);
     });
 });
+describe('prepareBackendFromBalancer', () => {
+    const windowSpy = jest.spyOn(window, 'window', 'get');
+    afterEach(() => {
+        windowSpy.mockClear();
+    });
+    afterAll(() => {
+        windowSpy.mockRestore();
+    });
+    test('should not change full balancer value - only remove viewer pathname', () => {
+        const initialValue = 'https://ydb-testing-0000.search.net:8765/viewer/json';
+        const result = 'https://ydb-testing-0000.search.net:8765';
+        expect(prepareBackendFromBalancer(initialValue)).toBe(result);
+    });
+    test('should add meta backend for relative balancer value', () => {
+        const initialValue = '/proxy/host/ydb-testing-0000.search.net/viewer/json';
+        const result = 'https://my-host.ru/proxy/host/ydb-testing-0000.search.net';
+        windowSpy.mockImplementation(() => {
+            return {
+                meta_backend: 'https://my-host.ru',
+            };
+        });
+        expect(prepareBackendFromBalancer(initialValue)).toBe(result);
+    });
+    test('should add relative meta backend for relative balancer value', () => {
+        const initialValue = '/proxy/host/ydb-testing-0000.search.net/viewer/json';
+        const result = '/meta/proxy/host/ydb-testing-0000.search.net';
+        windowSpy.mockImplementation(() => {
+            return {
+                meta_backend: '/meta',
+            };
+        });
+        expect(prepareBackendFromBalancer(initialValue)).toBe(result);
+    });
+    test('should not add empty meta backend for relative balancer value', () => {
+        const initialValue = '/proxy/host/ydb-testing-0000.search.net/viewer/json';
+        const result = '/proxy/host/ydb-testing-0000.search.net';
+        windowSpy.mockImplementation(() => {
+            return {
+                meta_backend: '',
+            };
+        });
+        expect(prepareBackendFromBalancer(initialValue)).toBe(result);
+    });
+    test('should not add undefined meta backend for relative balancer value', () => {
+        const initialValue = '/proxy/host/ydb-testing-0000.search.net/viewer/json';
+        const result = '/proxy/host/ydb-testing-0000.search.net';
+        windowSpy.mockImplementation(() => {
+            return {
+                meta_backend: undefined,
+            };
+        });
+        expect(prepareBackendFromBalancer(initialValue)).toBe(result);
+    });
+});
 //# sourceMappingURL=parseBalancer.test.js.map