ydb-embedded-ui 6.10.3 → 6.12.0

package/dist/services/api.d.ts

@@ -13,8 +13,8 @@ import type { MetaClusters } from '../types/api/meta';
 import type { TNetInfo } from '../types/api/netInfo';
 import type { TNodesInfo } from '../types/api/nodes';
 import type { TEvNodesInfo } from '../types/api/nodesList';
-import type { TEvPDiskStateResponse } from '../types/api/pdisk';
-import type { Actions, ErrorResponse, ExplainActions, ExplainResponse, QueryAPIResponse, Schemas } from '../types/api/query';
+import type { TEvPDiskStateResponse, TPDiskInfoResponse } from '../types/api/pdisk';
+import type { Actions, ErrorResponse, QueryAPIResponse, Schemas } from '../types/api/query';
 import type { JsonRenderRequestParams, JsonRenderResponse } from '../types/api/render';
 import type { RestartPDiskResponse } from '../types/api/restartPDisk';
 import type { TEvDescribeSchemeResult } from '../types/api/schema';
@@ -30,57 +30,72 @@ import type { Nullable } from '../utils/typecheckers';
 type AxiosOptions = {
     concurrentId?: string;
     signal?: AbortSignal;
+    withRetries?: boolean;
 };
 export declare class YdbEmbeddedAPI extends AxiosWrapper {
+    DEFAULT_RETRIES_COUNT: number;
     constructor(options?: AxiosWrapperOptions);
     getPath(path: string): string;
     getClusterInfo(clusterName?: string, { concurrentId, signal }?: AxiosOptions): Promise<TClusterInfo>;
     getClusterNodes({ concurrentId, signal }?: AxiosOptions): Promise<TEvSystemStateResponse>;
     getNodeInfo(id?: string | number, { concurrentId, signal }?: AxiosOptions): Promise<TEvSystemStateResponse>;
     getTenants(clusterName?: string, { concurrentId, signal }?: AxiosOptions): Promise<TTenantInfo>;
-    getTenantInfo({ path }: {
+    getTenantInfo({ path, database }: {
         path: string;
+        database?: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<TTenantInfo>;
     getNodes({ visibleEntities, type, tablets, sortOrder, sortValue, ...params }: NodesApiRequestParams, { concurrentId, signal }?: AxiosOptions): Promise<TNodesInfo>;
     /** @deprecated use getNodes instead */
     getCompute({ sortOrder, sortValue, ...params }: ComputeApiRequestParams, { concurrentId, signal }?: AxiosOptions): Promise<TComputeInfo>;
     getStorageInfo({ tenant, visibleEntities, nodeId, poolName, groupId, sortOrder, sortValue, ...params }: StorageApiRequestParams, { concurrentId, signal }?: AxiosOptions): Promise<TStorageInfo>;
-    getPDiskInfo({ nodeId, pDiskId }: {
+    getNodeWhiteboardPDiskInfo({ nodeId, pDiskId }: {
         nodeId: string | number;
         pDiskId: string | number;
     }, { concurrentId, signal }?: AxiosOptions): Promise<TEvPDiskStateResponse>;
+    getPDiskInfo({ nodeId, pDiskId }: {
+        nodeId: string | number;
+        pDiskId: string | number;
+    }, { concurrentId, signal }?: AxiosOptions): Promise<TPDiskInfoResponse>;
     getVDiskInfo({ vDiskSlotId, pDiskId, nodeId, }: {
         vDiskSlotId: string | number;
         pDiskId: string | number;
         nodeId: string | number;
     }, { concurrentId, signal }?: AxiosOptions): Promise<TEvVDiskStateResponse>;
     getGroupInfo(groupId: string | number, { concurrentId, signal }?: AxiosOptions): Promise<TStorageInfo>;
-    getHostInfo({ concurrentId, signal }?: AxiosOptions): Promise<TEvSystemStateResponse>;
-    getTabletsInfo({ nodes, path }: {
+    getTabletsInfo({ nodes, path, database }: {
         nodes?: string[];
         path?: string;
+        database?: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<TEvTabletStateResponse>;
-    getSchema({ path }: {
+    getSchema({ path, database }: {
         path: string;
+        database: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<Nullable<TEvDescribeSchemeResult>>;
-    getDescribe({ path }: {
+    getDescribe({ path, database }: {
         path: string;
+        database: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<Nullable<TEvDescribeSchemeResult>>;
-    getSchemaAcl({ path }: {
+    getSchemaAcl({ path, database }: {
         path: string;
+        database: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<TMetaInfo>;
-    getHeatmapData({ path }: {
+    getHeatmapData({ path, database }: {
         path: string;
+        database: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<Nullable<TEvDescribeSchemeResult>>;
-    getNetwork(path: string, { concurrentId, signal }?: AxiosOptions): Promise<TNetInfo>;
-    getTopic({ path }: {
+    getNetwork({ path, database }: {
+        path: string;
+        database: string;
+    }, { concurrentId, signal }?: AxiosOptions): Promise<TNetInfo>;
+    getTopic({ path, database }: {
         path?: string;
+        database?: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<DescribeTopicResult>;
-    getConsumer({ path, consumer }: {
+    getConsumer({ path, consumer, database }: {
         path: string;
         consumer: string;
+        database?: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<DescribeConsumerResult>;
-    getPoolInfo(poolName: string, { concurrentId, signal }?: AxiosOptions): Promise<TStorageInfo>;
     getTablet({ id }: {
         id?: string;
     }, { concurrentId, signal }?: AxiosOptions): Promise<TEvTabletStateResponse>;
@@ -96,10 +111,12 @@ export declare class YdbEmbeddedAPI extends AxiosWrapper {
         stats?: string;
         schema?: Schema;
         syntax?: QuerySyntax;
-    }, { concurrentId, signal }?: AxiosOptions): Promise<ErrorResponse | QueryAPIResponse<Action, Schema>>;
-    getExplainQuery<Action extends ExplainActions>(query: string, database: string, action: Action, syntax?: QuerySyntax): Promise<ErrorResponse | ExplainResponse<Action>>;
-    getExplainQueryAst(query: string, database: string): Promise<import("../types/api/query").ExplainQueryResponse>;
-    getHotKeys(path: string, enableSampling: boolean, { concurrentId, signal }?: AxiosOptions): Promise<JsonHotKeysResponse>;
+    }, { concurrentId, signal, withRetries }?: AxiosOptions): Promise<ErrorResponse | QueryAPIResponse<Action, Schema>>;
+    getHotKeys({ path, database, enableSampling }: {
+        path: string;
+        database: string;
+        enableSampling: boolean;
+    }, { concurrentId, signal }?: AxiosOptions): Promise<JsonHotKeysResponse>;
     getHealthcheckInfo({ database, maxLevel }: {
         database: string;
         maxLevel?: number;
@@ -117,8 +134,6 @@ export declare class YdbEmbeddedAPI extends AxiosWrapper {
     resumeTablet(id?: string, hiveId?: string): Promise<string>;
     getTabletDescribe(tenantId: TDomainKey, { concurrentId, signal }?: AxiosOptions): Promise<Nullable<TEvDescribeSchemeResult>>;
     getChartData({ target, from, until, maxDataPoints, database }: JsonRenderRequestParams, { concurrentId, signal }?: AxiosOptions): Promise<JsonRenderResponse>;
-    /** @deprecated use localStorage instead */
-    postSetting(settingsApi: string, name: string, value: string): Promise<any>;
     authenticate(user: string, password: string): Promise<any>;
     logout(): Promise<any>;
     whoami(): Promise<TUserToken>;
@@ -131,7 +146,10 @@ export declare class YdbEmbeddedAPI extends AxiosWrapper {
     getClustersList(_?: never, { signal }?: {
         signal?: AbortSignal;
     }): Promise<MetaClusters>;
-    createSchemaDirectory(database: string, path: string, { signal }?: {
+    createSchemaDirectory({ database, path }: {
+        database: string;
+        path: string;
+    }, { signal }?: {
         signal?: AbortSignal;
     }): Promise<{
         test: string;

package/dist/services/api.js

@@ -10,8 +10,9 @@ import { settingsManager } from './settings';
 export class YdbEmbeddedAPI extends AxiosWrapper {
     constructor(options) {
         super(options);
+        this.DEFAULT_RETRIES_COUNT = 3;
         axiosRetry(this._axios, {
-            retries: 3,
+            retries: this.DEFAULT_RETRIES_COUNT,
             retryDelay: axiosRetry.exponentialDelay,
         });
         // Interceptor to process OIDC auth
@@ -51,16 +52,17 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             cluster_name: clusterName,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getTenantInfo({ path }, { concurrentId, signal } = {}) {
+    getTenantInfo({ path, database = path }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/tenantinfo'), {
+            database,
             path,
             tablets: true,
             storage: true,
-        }, { concurrentId: concurrentId || `getTenantInfo|${path}`, requestConfig: { signal } });
+        }, { concurrentId, requestConfig: { signal } });
     }
     getNodes({ visibleEntities, type = 'any', tablets = true, sortOrder, sortValue, ...params }, { concurrentId, signal } = {}) {
         const sort = prepareSortValue(sortValue, sortOrder);
-        return this.get(this.getPath('/viewer/json/nodes?enums=true'), { with: visibleEntities, type, tablets, sort, ...params }, { concurrentId, requestConfig: { signal } });
+        return this.get(this.getPath('/viewer/json/nodes?enums=true'), { with: visibleEntities, type, tablets, sort, database: params.tenant, ...params }, { concurrentId, requestConfig: { signal } });
     }
     /** @deprecated use getNodes instead */
     getCompute({ sortOrder, sortValue, ...params }, { concurrentId, signal } = {}) {
@@ -70,6 +72,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
     getStorageInfo({ tenant, visibleEntities, nodeId, poolName, groupId, sortOrder, sortValue, ...params }, { concurrentId, signal } = {}) {
         const sort = prepareSortValue(sortValue, sortOrder);
         return this.get(this.getPath(`/viewer/json/storage?enums=true`), {
+            database: tenant,
             tenant,
             node_id: nodeId,
             pool: poolName,
@@ -79,11 +82,17 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             ...params,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getPDiskInfo({ nodeId, pDiskId }, { concurrentId, signal } = {}) {
+    getNodeWhiteboardPDiskInfo({ nodeId, pDiskId }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/pdiskinfo?enums=true'), {
             filter: `(NodeId=${nodeId}${pDiskId ? `;PDiskId=${pDiskId}` : ''})`,
         }, { concurrentId, requestConfig: { signal } });
     }
+    getPDiskInfo({ nodeId, pDiskId }, { concurrentId, signal } = {}) {
+        return this.get(this.getPath('/pdisk/info'), {
+            node_id: nodeId,
+            pdisk_id: pDiskId,
+        }, { concurrentId, requestConfig: { signal } });
+    }
     getVDiskInfo({ vDiskSlotId, pDiskId, nodeId, }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/vdiskinfo?enums=true'), {
             node_id: nodeId,
@@ -95,19 +104,18 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             group_id: groupId,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getHostInfo({ concurrentId, signal } = {}) {
-        return this.get(this.getPath('/viewer/json/sysinfo?node_id=.&enums=true'), { concurrentId, requestConfig: { signal } });
-    }
-    getTabletsInfo({ nodes = [], path }, { concurrentId, signal } = {}) {
+    getTabletsInfo({ nodes = [], path, database }, { concurrentId, signal } = {}) {
         const filter = nodes.length > 0 && `(NodeId=[${nodes.join(',')}])`;
         return this.get(this.getPath('/viewer/json/tabletinfo'), {
+            database,
             filter,
             path,
             enums: true,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getSchema({ path }, { concurrentId, signal } = {}) {
+    getSchema({ path, database }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/describe'), {
+            database,
             path,
             enums: true,
             backup: false,
@@ -118,22 +126,25 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             subs: 1,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getDescribe({ path }, { concurrentId, signal } = {}) {
+    getDescribe({ path, database }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/describe'), {
+            database,
             path,
             enums: true,
             partition_stats: true,
             subs: 0,
         }, { concurrentId: concurrentId || `getDescribe|${path}`, requestConfig: { signal } });
     }
-    getSchemaAcl({ path }, { concurrentId, signal } = {}) {
+    getSchemaAcl({ path, database }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/acl'), {
+            database,
             path,
             merge_rules: true,
-        }, { concurrentId: concurrentId || `getSchemaAcl`, requestConfig: { signal } });
+        }, { concurrentId, requestConfig: { signal } });
     }
-    getHeatmapData({ path }, { concurrentId, signal } = {}) {
+    getHeatmapData({ path, database }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/describe'), {
+            database,
             path,
             enums: true,
             backup: false,
@@ -142,33 +153,30 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             partition_stats: true,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getNetwork(path, { concurrentId, signal } = {}) {
+    getNetwork({ path, database }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/netinfo'), {
             enums: true,
+            database,
             path,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getTopic({ path }, { concurrentId, signal } = {}) {
+    getTopic({ path, database }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/describe_topic'), {
             enums: true,
             include_stats: true,
+            database,
             path,
         }, { concurrentId, requestConfig: { signal } });
     }
-    getConsumer({ path, consumer }, { concurrentId, signal } = {}) {
+    getConsumer({ path, consumer, database }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/describe_consumer'), {
             enums: true,
             include_stats: true,
+            database,
             path,
             consumer,
         }, { concurrentId: concurrentId || 'getConsumer', requestConfig: { signal } });
     }
-    getPoolInfo(poolName, { concurrentId, signal } = {}) {
-        return this.get(this.getPath('/viewer/json/storage'), {
-            pool: poolName,
-            enums: true,
-        }, { concurrentId, requestConfig: { signal } });
-    }
     getTablet({ id }, { concurrentId, signal } = {}) {
         return this.get(this.getPath(`/viewer/json/tabletinfo?filter=(TabletId=${id})`), {
             enums: true,
@@ -203,7 +211,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             requestConfig: { signal },
         });
     }
-    sendQuery({ schema, ...params }, { concurrentId, signal } = {}) {
+    sendQuery({ schema, ...params }, { concurrentId, signal, withRetries } = {}) {
         // Time difference to ensure that timeout from ui will be shown rather than backend error
         const uiTimeout = 9 * 60 * 1000;
         const backendTimeout = 10 * 60 * 1000;
@@ -215,34 +223,21 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
         return this.post(this.getPath(`/viewer/json/query?timeout=${backendTimeout}&base64=${base64}${schema ? `&schema=${schema}` : ''}`), params, {}, {
             concurrentId,
             timeout: uiTimeout,
-            requestConfig: { signal },
+            requestConfig: {
+                signal,
+                'axios-retry': { retries: withRetries ? this.DEFAULT_RETRIES_COUNT : 0 },
+            },
         });
     }
-    getExplainQuery(query, database, action, syntax) {
-        return this.post(this.getPath('/viewer/json/query'), {
-            query,
-            database,
-            action: action || 'explain',
-            syntax,
-            timeout: 600000,
-        }, {});
-    }
-    getExplainQueryAst(query, database) {
-        return this.post(this.getPath('/viewer/json/query'), {
-            query,
-            database,
-            action: 'explain-ast',
-            timeout: 600000,
-        }, {});
-    }
-    getHotKeys(path, enableSampling, { concurrentId, signal } = {}) {
+    getHotKeys({ path, database, enableSampling }, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/hotkeys'), {
+            database,
             path,
             enable_sampling: enableSampling,
         }, { concurrentId: concurrentId || 'getHotKeys', requestConfig: { signal } });
     }
     getHealthcheckInfo({ database, maxLevel }, { concurrentId, signal } = {}) {
-        return this.get(this.getPath('/viewer/json/healthcheck?merge_records=true'), { tenant: database, max_level: maxLevel }, { concurrentId, requestConfig: { signal } });
+        return this.get(this.getPath('/viewer/json/healthcheck?merge_records=true'), { database, tenant: database, max_level: maxLevel }, { concurrentId, requestConfig: { signal } });
     }
     evictVDisk({ groupId, groupGeneration, failRealmIdx, failDomainIdx, vDiskIdx, }) {
         // BSC Id is constant for all ydb clusters
@@ -263,6 +258,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
                 // Automatic headers may not suit
                 Accept: 'application/json',
             },
+            requestConfig: { 'axios-retry': { retries: 0 } },
         });
     }
     restartPDisk(nodeId, pDiskId) {
@@ -275,16 +271,17 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
             },
+            requestConfig: { 'axios-retry': { retries: 0 } },
         });
     }
     killTablet(id) {
-        return this.get(this.getPath(`/tablets?KillTabletID=${id}`), {});
+        return this.get(this.getPath(`/tablets?KillTabletID=${id}`), {}, { requestConfig: { 'axios-retry': { retries: 0 } } });
     }
     stopTablet(id, hiveId) {
-        return this.get(this.getPath(`/tablets/app?TabletID=${hiveId}&page=StopTablet&tablet=${id}`), {});
+        return this.get(this.getPath(`/tablets/app?TabletID=${hiveId}&page=StopTablet&tablet=${id}`), {}, { requestConfig: { 'axios-retry': { retries: 0 } } });
     }
     resumeTablet(id, hiveId) {
-        return this.get(this.getPath(`/tablets/app?TabletID=${hiveId}&page=ResumeTablet&tablet=${id}`), {});
+        return this.get(this.getPath(`/tablets/app?TabletID=${hiveId}&page=ResumeTablet&tablet=${id}`), {}, { requestConfig: { 'axios-retry': { retries: 0 } } });
     }
     getTabletDescribe(tenantId, { concurrentId, signal } = {}) {
         return this.get(this.getPath('/viewer/json/describe'), {
@@ -302,14 +299,6 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             requestConfig: { signal },
         });
     }
-    /** @deprecated use localStorage instead */
-    postSetting(settingsApi, name, value) {
-        return this.request({
-            method: 'PATCH',
-            url: settingsApi,
-            data: { [name]: value },
-        });
-    }
     authenticate(user, password) {
         return this.post(this.getPath('/login'), {
             user,
@@ -333,7 +322,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             requestConfig: { signal },
         });
     }
-    createSchemaDirectory(database, path, { signal } = {}) {
+    createSchemaDirectory({ database, path }, { signal } = {}) {
         return this.post(this.getPath('/scheme/directory'), {}, {
             database,
             path,

package/dist/services/settings.d.ts

@@ -21,6 +21,7 @@ export declare const DEFAULT_USER_SETTINGS: {
     readonly isHotKeysHelpHidden: false;
     readonly "auto-refresh-interval": 0;
     readonly useDirectoryOperations: false;
+    readonly query_settings: false;
 };
 declare class SettingsManager {
     /**

package/dist/services/settings.js

@@ -1,5 +1,5 @@
 import { TENANT_PAGES_IDS } from '../store/reducers/tenant/constants';
-import { ASIDE_HEADER_COMPACT_KEY, AUTOCOMPLETE_ON_ENTER, AUTO_REFRESH_INTERVAL, BINARY_DATA_IN_PLAIN_TEXT_DISPLAY, ENABLE_AUTOCOMPLETE, INVERTED_DISKS_KEY, IS_HOTKEYS_HELP_HIDDEN_KEY, LANGUAGE_KEY, LAST_USED_QUERY_ACTION_KEY, PARTITIONS_HIDDEN_COLUMNS_KEY, QUERY_INITIAL_MODE_KEY, QUERY_USE_MULTI_SCHEMA_KEY, SAVED_QUERIES_KEY, TENANT_INITIAL_PAGE_KEY, THEME_KEY, USE_CLUSTER_BALANCER_AS_BACKEND_KEY, USE_DIRECTORY_OPERATIONS, USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY, USE_PAGINATED_TABLES_KEY, USE_SEPARATE_DISKS_PAGES_KEY, } from '../utils/constants';
+import { ASIDE_HEADER_COMPACT_KEY, AUTOCOMPLETE_ON_ENTER, AUTO_REFRESH_INTERVAL, BINARY_DATA_IN_PLAIN_TEXT_DISPLAY, ENABLE_AUTOCOMPLETE, INVERTED_DISKS_KEY, IS_HOTKEYS_HELP_HIDDEN_KEY, LANGUAGE_KEY, LAST_USED_QUERY_ACTION_KEY, PARTITIONS_HIDDEN_COLUMNS_KEY, QUERY_INITIAL_MODE_KEY, QUERY_SETTINGS, QUERY_USE_MULTI_SCHEMA_KEY, SAVED_QUERIES_KEY, TENANT_INITIAL_PAGE_KEY, THEME_KEY, USE_CLUSTER_BALANCER_AS_BACKEND_KEY, USE_DIRECTORY_OPERATIONS, USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY, USE_PAGINATED_TABLES_KEY, USE_SEPARATE_DISKS_PAGES_KEY, } from '../utils/constants';
 import { QUERY_ACTIONS, QUERY_MODES } from '../utils/query';
 import { parseJson } from '../utils/utils';
 /** User settings keys and their default values */
@@ -24,6 +24,7 @@ export const DEFAULT_USER_SETTINGS = {
     [IS_HOTKEYS_HELP_HIDDEN_KEY]: false,
     [AUTO_REFRESH_INTERVAL]: 0,
     [USE_DIRECTORY_OPERATIONS]: false,
+    [QUERY_SETTINGS]: false,
 };
 class SettingsManager {
     constructor() {

package/dist/store/configureStore.d.ts

@@ -6,7 +6,7 @@ export declare const customBackend: string | undefined;
 export declare const metaBackend: string | undefined;
 export declare function configureStore({ aRootReducer, singleClusterMode, api, }?: {
     aRootReducer?: Reducer<{
-        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All", "api">;
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All" | "PDiskData", "api">;
         singleClusterMode: boolean;
         cluster: import("./reducers/cluster/types").ClusterState;
         tenant: import("./reducers/tenant/types").TenantState;
@@ -37,7 +37,7 @@ export declare function configureStore({ aRootReducer, singleClusterMode, api, }
     } | {
         readonly type: "DISABLE_FULLSCREEN_MODE";
     } | Action<string>, Partial<{
-        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All", "api"> | undefined;
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All" | "PDiskData", "api"> | undefined;
         singleClusterMode: boolean | undefined;
         cluster: import("./reducers/cluster/types").ClusterState | undefined;
         tenant: import("./reducers/tenant/types").TenantState | undefined;
@@ -62,7 +62,7 @@ export declare function configureStore({ aRootReducer, singleClusterMode, api, }
 }): {
     history: History<unknown>;
     store: import("@reduxjs/toolkit").EnhancedStore<{
-        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All", "api">;
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All" | "PDiskData", "api">;
         singleClusterMode: boolean;
         cluster: import("./reducers/cluster/types").ClusterState;
         tenant: import("./reducers/tenant/types").TenantState;
@@ -94,7 +94,7 @@ export declare function configureStore({ aRootReducer, singleClusterMode, api, }
         readonly type: "DISABLE_FULLSCREEN_MODE";
     } | Action<string>, import("@reduxjs/toolkit").Tuple<[import("redux").StoreEnhancer<{
         dispatch: import("redux-thunk").ThunkDispatch<{
-            api: import("@reduxjs/toolkit/query").CombinedState<{}, "All", "api">;
+            api: import("@reduxjs/toolkit/query").CombinedState<{}, "All" | "PDiskData", "api">;
             singleClusterMode: boolean;
             cluster: import("./reducers/cluster/types").ClusterState;
             tenant: import("./reducers/tenant/types").TenantState;

package/dist/store/defaultStore.d.ts

@@ -1,5 +1,5 @@
 export declare const store: import("@reduxjs/toolkit").EnhancedStore<{
-    api: import("@reduxjs/toolkit/query").CombinedState<{}, "All", "api">;
+    api: import("@reduxjs/toolkit/query").CombinedState<{}, "All" | "PDiskData", "api">;
     singleClusterMode: boolean;
     cluster: import("./reducers/cluster/types").ClusterState;
     tenant: import("./reducers/tenant/types").TenantState;
@@ -31,7 +31,7 @@ export declare const store: import("@reduxjs/toolkit").EnhancedStore<{
     readonly type: "DISABLE_FULLSCREEN_MODE";
 } | import("redux").Action<string>, import("@reduxjs/toolkit").Tuple<[import("redux").StoreEnhancer<{
     dispatch: import("redux-thunk").ThunkDispatch<{
-        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All", "api">;
+        api: import("@reduxjs/toolkit/query").CombinedState<{}, "All" | "PDiskData", "api">;
         singleClusterMode: boolean;
         cluster: import("./reducers/cluster/types").ClusterState;
         tenant: import("./reducers/tenant/types").TenantState;

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

@@ -1,3 +1,3 @@
 import type { BaseQueryFn } from '@reduxjs/toolkit/query';
-export declare const api: import("@reduxjs/toolkit/query").Api<BaseQueryFn<void, typeof _NEVER, unknown, {}>, {}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+export declare const api: import("@reduxjs/toolkit/query").Api<BaseQueryFn<void, typeof _NEVER, unknown, {}>, {}, "api", "All" | "PDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
 export declare const _NEVER: unique symbol;

package/dist/store/reducers/api.js

@@ -7,7 +7,7 @@ export const api = createApi({
      */
     endpoints: () => ({}),
     invalidationBehavior: 'immediately',
-    tagTypes: ['All'],
+    tagTypes: ['All', 'PDiskData'],
 });
 export const _NEVER = Symbol();
 /**

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

@@ -5,8 +5,8 @@ export declare function updateDefaultClusterTab(tab: string): (dispatch: Dispatc
 declare const _default: import("redux").Reducer<ClusterState>;
 export default _default;
 export declare const clusterApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, {
-    getClusterInfo: import("@reduxjs/toolkit/query").QueryDefinition<string | undefined, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All", {
+    getClusterInfo: import("@reduxjs/toolkit/query").QueryDefinition<string | undefined, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData", {
         clusterData: TClusterInfo;
         groupsStats?: ClusterGroupsStats;
     }, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+}, "api", "All" | "PDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

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

@@ -1,5 +1,5 @@
 import type { PreparedNodeSystemState } from '../../../utils/nodes';
 export type PreparedClusterNode = PreparedNodeSystemState;
 export declare const clusterNodesApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, {
-    getClusterNodes: import("@reduxjs/toolkit/query").QueryDefinition<any, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All", PreparedNodeSystemState[] | undefined, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+    getClusterNodes: import("@reduxjs/toolkit/query").QueryDefinition<any, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData", PreparedNodeSystemState[] | undefined, "api">;
+}, "api", "All" | "PDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

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

@@ -3,5 +3,5 @@ declare const _default: import("redux").Reducer<ClustersFilters>;
 export default _default;
 export declare const changeClustersFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<Partial<ClustersFilters>, "clusters/changeClustersFilters">;
 export declare const clustersApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, {
-    getClustersList: import("@reduxjs/toolkit/query").QueryDefinition<any, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All", import("./types").PreparedCluster[] | undefined, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+    getClustersList: import("@reduxjs/toolkit/query").QueryDefinition<any, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData", import("./types").PreparedCluster[] | undefined, "api">;
+}, "api", "All" | "PDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

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

@@ -1,4 +1,7 @@
 import type { IDescribeData } from '../../types/store/describe';
 export declare const describeApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, {
-    getDescribe: import("@reduxjs/toolkit/query").QueryDefinition<string[], import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, "All", IDescribeData | undefined, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+    getDescribe: import("@reduxjs/toolkit/query").QueryDefinition<{
+        paths: string[];
+        database: string;
+    }, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, "All" | "PDiskData", IDescribeData | undefined, "api">;
+}, "api", "All" | "PDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

package/dist/store/reducers/describe.js

@@ -2,9 +2,9 @@ import { api } from './api';
 export const describeApi = api.injectEndpoints({
     endpoints: (build) => ({
         getDescribe: build.query({
-            queryFn: async (paths, { signal }) => {
+            queryFn: async ({ paths, database }, { signal }) => {
                 try {
-                    const response = await Promise.all(paths.map((p) => window.api.getDescribe({ path: p }, { signal })));
+                    const response = await Promise.all(paths.map((p) => window.api.getDescribe({ path: p, database }, { signal })));
                     const data = response.reduce((acc, item) => {
                         if (item === null || item === void 0 ? void 0 : item.Path) {
                             acc[item.Path] = item;

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

@@ -13,8 +13,8 @@ interface SendQueryParams extends QueryRequestParams {
     schema?: Schemas;
 }
 export declare const executeQueryApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, {
-    executeQuery: import("@reduxjs/toolkit/query").MutationDefinition<SendQueryParams, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, "All", IQueryResult, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+    executeQuery: import("@reduxjs/toolkit/query").MutationDefinition<SendQueryParams, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, "All" | "PDiskData", IQueryResult, "api">;
+}, "api", "All" | "PDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
 export declare const saveQueryToHistory: (queryText: string, mode: QueryMode) => {
     readonly type: "query/SAVE_QUERY_TO_HISTORY";
     readonly data: {

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

@@ -6,5 +6,5 @@ export declare const topQueriesApi: import("@reduxjs/toolkit/query").Api<import(
     getTopQueries: import("@reduxjs/toolkit/query").QueryDefinition<{
         database: string;
         filters?: TopQueriesFilters;
-    }, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All", import("../../../types/store/query").IQueryResult | undefined, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;
+    }, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("../api")._NEVER, unknown, {}>, "All" | "PDiskData", import("../../../types/store/query").IQueryResult | undefined, "api">;
+}, "api", "All" | "PDiskData", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

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

@@ -1,5 +1,5 @@
+import { isLikeRelative } from '@gravity-ui/date-utils';
 import { createSlice } from '@reduxjs/toolkit';
-import { HOUR_IN_SECONDS } from '../../../utils/constants';
 import { isQueryErrorResponse, parseQueryAPIExecuteResponse } from '../../../utils/query';
 import { api } from '../api';
 import { getFiltersConditions } from './utils';
@@ -29,39 +29,45 @@ SELECT
     Duration
 FROM \`${path}/.sys/top_queries_by_cpu_time_one_hour\`
 WHERE ${filterConditions || 'true'}
+ORDER BY CPUTimeUs DESC
 `;
 };
 export const topQueriesApi = api.injectEndpoints({
     endpoints: (build) => ({
         getTopQueries: build.query({
-            queryFn: async ({ database, filters }, { signal, dispatch }) => {
-                var _a, _b;
+            queryFn: async ({ database, filters }, { signal }) => {
+                const preparedFilters = {
+                    ...filters,
+                    from: (filters === null || filters === void 0 ? void 0 : filters.from) || 'now-1h',
+                    to: (filters === null || filters === void 0 ? void 0 : filters.to) || 'now',
+                };
                 try {
                     const response = await window.api.sendQuery({
                         schema: 'modern',
-                        query: getQueryText(database, filters),
+                        query: getQueryText(database, preparedFilters),
                         database,
                         action: 'execute-scan',
-                    }, { signal });
+                    }, { signal, withRetries: true });
                     if (isQueryErrorResponse(response)) {
                         return { error: response };
                     }
                     const data = parseQueryAPIExecuteResponse(response);
-                    // FIXME: do we really need this?
-                    if (!(filters === null || filters === void 0 ? void 0 : filters.from) && !(filters === null || filters === void 0 ? void 0 : filters.to)) {
-                        const intervalEnd = (_b = (_a = data === null || data === void 0 ? void 0 : data.result) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.IntervalEnd;
-                        if (intervalEnd) {
-                            const to = new Date(intervalEnd).getTime();
-                            const from = new Date(to - HOUR_IN_SECONDS * 1000).getTime();
-                            dispatch(setTopQueriesFilters({ from, to }));
-                        }
-                    }
                     return { data };
                 }
                 catch (error) {
                     return { error };
                 }
             },
+            forceRefetch: ({ currentArg }) => {
+                var _a, _b, _c, _d;
+                if (!((_a = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _a === void 0 ? void 0 : _a.from) ||
+                    !((_b = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _b === void 0 ? void 0 : _b.to) ||
+                    isLikeRelative((_c = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _c === void 0 ? void 0 : _c.from) ||
+                    isLikeRelative((_d = currentArg === null || currentArg === void 0 ? void 0 : currentArg.filters) === null || _d === void 0 ? void 0 : _d.to)) {
+                    return true;
+                }
+                return false;
+            },
         }),
     }),
     overrideExisting: 'throw',