ydb-embedded-ui 4.15.1 → 4.16.1

package/dist/services/api.ts

@@ -28,6 +28,7 @@ import type {DescribeTopicResult} from '../types/api/topic';
 import type {TEvPDiskStateResponse} from '../types/api/pdisk';
 import type {TEvVDiskStateResponse} from '../types/api/vdisk';
 import type {TUserToken} from '../types/api/whoami';
+import type {QuerySyntax} from '../types/store/query';
 import type {ComputeApiRequestParams, NodesApiRequestParams} from '../store/reducers/nodes/types';
 import type {StorageApiRequestParams} from '../store/reducers/storage/types';
 
@@ -75,12 +76,16 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             cluster_name: clusterName,
         });
     }
-    getTenantInfo({path}: {path: string}) {
-        return this.get<TTenantInfo>(this.getPath('/viewer/json/tenantinfo'), {
-            path,
-            tablets: true,
-            storage: true,
-        });
+    getTenantInfo({path}: {path: string}, {concurrentId}: AxiosOptions = {}) {
+        return this.get<TTenantInfo>(
+            this.getPath('/viewer/json/tenantinfo'),
+            {
+                path,
+                tablets: true,
+                storage: true,
+            },
+            {concurrentId: concurrentId || `getTenantInfo|${path}`},
+        );
     }
     getNodes(
         {
@@ -281,17 +286,15 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
     }
     sendQuery<Action extends Actions, Schema extends Schemas = undefined>(
         {
-            query,
-            database,
-            action,
-            stats,
             schema,
+            ...params
         }: {
             query?: string;
             database?: string;
             action?: Action;
             stats?: string;
             schema?: Schema;
+            syntax?: QuerySyntax;
         },
         {concurrentId}: AxiosOptions = {},
     ) {
@@ -303,12 +306,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             this.getPath(
                 `/viewer/json/query?timeout=${backendTimeout}${schema ? `&schema=${schema}` : ''}`,
             ),
-            {
-                query,
-                database,
-                action,
-                stats,
-            },
+            params,
             {},
             {
                 concurrentId,
@@ -320,6 +318,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
         query: string,
         database: string,
         action: Action,
+        syntax?: QuerySyntax,
     ) {
         return this.post<ExplainResponse<Action>>(
             this.getPath('/viewer/json/query'),
@@ -327,6 +326,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
                 query,
                 database,
                 action: action || 'explain',
+                syntax,
                 timeout: 600000,
             },
             {},

package/dist/store/reducers/executeQuery.ts

@@ -4,12 +4,14 @@ import type {ExecuteActions} from '../../types/api/query';
 import type {
     ExecuteQueryAction,
     ExecuteQueryState,
+    ExecuteQueryStateSlice,
     MonacoHotKeyAction,
+    QueryInHistory,
 } from '../../types/store/executeQuery';
-import type {QueryRequestParams, QueryMode} from '../../types/store/query';
+import type {QueryRequestParams, QueryMode, QuerySyntax} from '../../types/store/query';
 import {getValueFromLS, parseJson} from '../../utils/utils';
 import {QUERIES_HISTORY_KEY} from '../../utils/constants';
-import {parseQueryAPIExecuteResponse} from '../../utils/query';
+import {QUERY_MODES, QUERY_SYNTAX, parseQueryAPIExecuteResponse} from '../../utils/query';
 import {parseQueryError} from '../../utils/error';
 import '../../services/api';
 
@@ -87,8 +89,12 @@ const executeQuery: Reducer<ExecuteQueryState, ExecuteQueryAction> = (
         }
 
         case SAVE_QUERY_TO_HISTORY: {
-            const query = action.data;
-            const newQueries = [...state.history.queries, query].slice(
+            const queryText = action.data.queryText;
+
+            // Do not save explicit yql syntax value for easier further support (use yql by default)
+            const syntax = action.data.mode === QUERY_MODES.pg ? QUERY_SYNTAX.pg : undefined;
+
+            const newQueries = [...state.history.queries, {queryText, syntax}].slice(
                 state.history.queries.length >= MAXIMUM_QUERIES_IN_HISTORY ? 1 : 0,
             );
             window.localStorage.setItem(QUERIES_HISTORY_KEY, JSON.stringify(newQueries));
@@ -151,7 +157,15 @@ interface SendQueryParams extends QueryRequestParams {
 }
 
 export const sendExecuteQuery = ({query, database, mode}: SendQueryParams) => {
-    const action: ExecuteActions = mode ? `execute-${mode}` : 'execute';
+    let action: ExecuteActions = 'execute';
+    let syntax: QuerySyntax = QUERY_SYNTAX.yql;
+
+    if (mode === 'pg') {
+        action = 'execute-query';
+        syntax = QUERY_SYNTAX.pg;
+    } else if (mode) {
+        action = `execute-${mode}`;
+    }
 
     return createApiRequest({
         request: window.api.sendQuery({
@@ -159,6 +173,7 @@ export const sendExecuteQuery = ({query, database, mode}: SendQueryParams) => {
             query,
             database,
             action,
+            syntax,
             stats: 'profile',
         }),
         actions: SEND_QUERY,
@@ -166,10 +181,10 @@ export const sendExecuteQuery = ({query, database, mode}: SendQueryParams) => {
     });
 };
 
-export const saveQueryToHistory = (query: string) => {
+export const saveQueryToHistory = (queryText: string, mode: QueryMode) => {
     return {
         type: SAVE_QUERY_TO_HISTORY,
-        data: query,
+        data: {queryText, mode},
     } as const;
 };
 
@@ -206,4 +221,15 @@ export const setTenantPath = (value: string) => {
     } as const;
 };
 
+export const selectQueriesHistory = (state: ExecuteQueryStateSlice): QueryInHistory[] => {
+    return state.executeQuery.history.queries.map((rawQuery) => {
+        if (typeof rawQuery === 'string') {
+            return {
+                queryText: rawQuery,
+            };
+        }
+        return rawQuery;
+    });
+};
+
 export default executeQuery;

package/dist/store/reducers/explainQuery.ts

@@ -9,10 +9,10 @@ import type {
     ExplainQueryState,
     PreparedExplainResponse,
 } from '../../types/store/explainQuery';
-import type {QueryRequestParams, QueryMode} from '../../types/store/query';
+import type {QueryRequestParams, QueryMode, QuerySyntax} from '../../types/store/query';
 
 import {preparePlan} from '../../utils/prepareQueryExplain';
-import {parseQueryAPIExplainResponse, parseQueryExplainPlan} from '../../utils/query';
+import {QUERY_SYNTAX, parseQueryAPIExplainResponse, parseQueryExplainPlan} from '../../utils/query';
 import {parseQueryError} from '../../utils/error';
 
 import {createRequestActionTypes, createApiRequest} from '../utils';
@@ -103,10 +103,18 @@ interface ExplainQueryParams extends QueryRequestParams {
 }
 
 export const getExplainQuery = ({query, database, mode}: ExplainQueryParams) => {
-    const action: ExplainActions = mode ? `explain-${mode}` : 'explain';
+    let action: ExplainActions = 'explain';
+    let syntax: QuerySyntax = QUERY_SYNTAX.yql;
+
+    if (mode === 'pg') {
+        action = 'explain-query';
+        syntax = QUERY_SYNTAX.pg;
+    } else if (mode) {
+        action = `explain-${mode}`;
+    }
 
     return createApiRequest({
-        request: window.api.getExplainQuery(query, database, action),
+        request: window.api.getExplainQuery(query, database, action, syntax),
         actions: GET_EXPLAIN_QUERY,
         dataHandler: (response): PreparedExplainResponse => {
             const {plan: rawPlan, ast} = parseQueryAPIExplainResponse(response);

package/dist/store/reducers/healthcheckInfo.ts

@@ -1,17 +1,16 @@
 import _flow from 'lodash/fp/flow';
 import _sortBy from 'lodash/fp/sortBy';
 import _uniqBy from 'lodash/fp/uniqBy';
-import _omit from 'lodash/omit';
 import {createSelector, Selector} from 'reselect';
 import {Reducer} from 'redux';
 
-import {
-    IHealthcheckInfoState,
+import type {
+    IHealthCheckInfoAction,
     IHealthcheckInfoRootStateSlice,
+    IHealthcheckInfoState,
     IIssuesTree,
-    IHealthCheckInfoAction,
 } from '../../types/store/healthcheck';
-import {IssueLog, StatusFlag} from '../../types/api/healthcheck';
+import type {IssueLog, StatusFlag} from '../../types/api/healthcheck';
 
 import '../../services/api';
 import {createRequestActionTypes, createApiRequest} from '../utils';
@@ -49,6 +48,8 @@ const healthcheckInfo: Reducer<IHealthcheckInfoState, IHealthCheckInfoAction> =
                 ...state,
                 error: action.error,
                 loading: false,
+                wasLoaded: true,
+                data: undefined,
             };
         }
 
@@ -110,6 +111,24 @@ const getInvertedConsequencesTree = ({
         : [];
 };
 
+const getIssuesStatistics = (data: IssueLog[]): [StatusFlag, number][] => {
+    const issuesMap = {} as Record<StatusFlag, number>;
+
+    for (const issue of data) {
+        if (!issuesMap[issue.status]) {
+            issuesMap[issue.status] = 0;
+        }
+        issuesMap[issue.status]++;
+    }
+
+    return (Object.entries(issuesMap) as [StatusFlag, number][]).sort(([aStatus], [bStatus]) => {
+        const bPriority = mapStatusToPriority[bStatus] || 0;
+        const aPriority = mapStatusToPriority[aStatus] || 0;
+
+        return aPriority - bPriority;
+    });
+};
+
 const getIssuesLog = (state: IHealthcheckInfoRootStateSlice) =>
     state.healthcheckInfo.data?.issue_log;
 
@@ -121,13 +140,10 @@ export const selectIssuesTrees: Selector<IHealthcheckInfoRootStateSlice, IIssues
         return getInvertedConsequencesTree({data, roots});
     });
 
-export const selectIssuesTreeById: Selector<
+export const selectIssuesStatistics: Selector<
     IHealthcheckInfoRootStateSlice,
-    IIssuesTree | undefined,
-    [string | undefined]
-> = createSelector([selectIssuesTrees, (_, id: string | undefined) => id], (issuesTrees = [], id) =>
-    issuesTrees.find((issuesTree) => issuesTree.id === id),
-);
+    [StatusFlag, number][]
+> = createSelector(getIssuesLog, (issues = []) => getIssuesStatistics(issues));
 
 export function getHealthcheckInfo(database: string) {
     return createApiRequest({

package/dist/store/reducers/settings/settings.ts

@@ -14,10 +14,12 @@ import {
     CLUSTER_INFO_HIDDEN_KEY,
     LAST_USED_QUERY_ACTION_KEY,
     USE_BACKEND_PARAMS_FOR_TABLES_KEY,
+    LANGUAGE_KEY,
 } from '../../../utils/constants';
 import '../../../services/api';
-import {getValueFromLS, parseJson} from '../../../utils/utils';
+import {parseJson} from '../../../utils/utils';
 import {QUERY_ACTIONS, QUERY_MODES} from '../../../utils/query';
+import {readSavedSettingsValue, systemSettings, userSettings} from '../../../utils/settings';
 
 import {TENANT_PAGES_IDS} from '../tenant/constants';
 
@@ -38,20 +40,12 @@ export const ProblemFilterValues = {
     PROBLEMS: 'With problems',
 } as const;
 
-const userSettings = window.userSettings || {};
-const systemSettings = window.systemSettings || {};
-
-export function readSavedSettingsValue(key: string, defaultValue?: string) {
-    const savedValue = window.web_version ? userSettings[key] : getValueFromLS(key);
-
-    return savedValue ?? defaultValue;
-}
-
 export const initialState = {
     problemFilter: ProblemFilterValues.ALL,
     userSettings: {
         ...userSettings,
         [THEME_KEY]: readSavedSettingsValue(THEME_KEY, 'system'),
+        [LANGUAGE_KEY]: readSavedSettingsValue(LANGUAGE_KEY),
         [INVERTED_DISKS_KEY]: readSavedSettingsValue(INVERTED_DISKS_KEY, 'false'),
         [USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY]: readSavedSettingsValue(
             USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY,

package/dist/store/reducers/tenant/tenant.ts

@@ -20,6 +20,7 @@ const SET_QUERY_TAB = 'tenant/SET_QUERY_TAB';
 const SET_DIAGNOSTICS_TAB = 'tenant/SET_DIAGNOSTICS_TAB';
 const SET_SUMMARY_TAB = 'tenant/SET_SUMMARY_TAB';
 const CLEAR_TENANT = 'tenant/CLEAR_TENANT';
+const SET_DATA_WAS_NOT_LOADED = 'tenant/SET_DATA_WAS_NOT_LOADED';
 
 const initialState = {loading: false, wasLoaded: false};
 
@@ -43,6 +44,10 @@ const tenantReducer: Reducer<TenantState, TenantAction> = (state = initialState,
         }
 
         case FETCH_TENANT.FAILURE: {
+            if (action.error?.isCancelled) {
+                return state;
+            }
+
             return {
                 ...state,
                 error: action.error,
@@ -84,6 +89,13 @@ const tenantReducer: Reducer<TenantState, TenantAction> = (state = initialState,
             };
         }
 
+        case SET_DATA_WAS_NOT_LOADED: {
+            return {
+                ...state,
+                wasLoaded: false,
+            };
+        }
+
         default:
             return state;
     }
@@ -91,7 +103,7 @@ const tenantReducer: Reducer<TenantState, TenantAction> = (state = initialState,
 
 export const getTenantInfo = ({path}: {path: string}) => {
     return createApiRequest({
-        request: window.api.getTenantInfo({path}),
+        request: window.api.getTenantInfo({path}, {concurrentId: 'getTenantInfo'}),
         actions: FETCH_TENANT,
         dataHandler: (tenantData): TTenant | undefined => {
             return tenantData.TenantInfo?.[0];
@@ -131,4 +143,10 @@ export function setSummaryTab(tab: TenantSummaryTab) {
     } as const;
 }
 
+export const setDataWasNotLoaded = () => {
+    return {
+        type: SET_DATA_WAS_NOT_LOADED,
+    } as const;
+};
+
 export default tenantReducer;

package/dist/store/reducers/tenant/types.ts

@@ -16,6 +16,7 @@ import {
     setQueryTab,
     setSummaryTab,
     setTenantPage,
+    setDataWasNotLoaded,
 } from './tenant';
 
 export type TenantPage = ValueOf<typeof TENANT_PAGES_IDS>;
@@ -41,4 +42,5 @@ export type TenantAction =
     | ReturnType<typeof setTenantPage>
     | ReturnType<typeof setQueryTab>
     | ReturnType<typeof setDiagnosticsTab>
-    | ReturnType<typeof setSummaryTab>;
+    | ReturnType<typeof setSummaryTab>
+    | ReturnType<typeof setDataWasNotLoaded>;

package/dist/store/reducers/tenants/selectors.ts

@@ -24,7 +24,7 @@ const filterTenantsByProblems = (tenants: PreparedTenant[], problemFilter: Probl
 const filteredTenantsBySearch = (tenants: PreparedTenant[], searchQuery: string) => {
     return tenants.filter((item) => {
         const re = new RegExp(escapeRegExp(searchQuery), 'i');
-        return re.test(item.Name) || re.test(item.controlPlaneName);
+        return re.test(item.Name || '') || re.test(item.controlPlaneName);
     });
 };
 

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

@@ -2,8 +2,8 @@ import type {TTenant} from '../../../types/api/tenant';
 import {isNumeric} from '../../../utils/utils';
 
 const getControlPlaneValue = (tenant: TTenant) => {
-    const parts = tenant.Name.split('/');
-    const defaultValue = parts.length ? parts[parts.length - 1] : '—';
+    const parts = tenant.Name?.split('/');
+    const defaultValue = parts?.length ? parts[parts.length - 1] : '—';
     const controlPlaneName = tenant.ControlPlane?.name;
 
     return controlPlaneName ?? defaultValue;

package/dist/types/additionalProps.ts

@@ -2,6 +2,7 @@ import type {ReactNode} from 'react';
 
 import type {InfoViewerItem} from '../components/InfoViewer';
 import type {ETenantType} from './api/tenant';
+import type {TSystemStateInfo} from './api/nodes';
 import type {VersionToColorMap} from './versions';
 
 export interface AdditionalVersionsProps {
@@ -20,5 +21,11 @@ export interface AdditionalClusterProps {
 
 export interface AdditionalTenantsProps {
     prepareTenantBackend?: (backend: string | undefined) => string | undefined;
-    getMonitoringLink?: (name: string, type: ETenantType) => ReactNode;
+    getMonitoringLink?: (name?: string, type?: ETenantType) => ReactNode;
+}
+
+export type NodeAddress = Pick<TSystemStateInfo, 'Host' | 'Endpoints'>;
+
+export interface AdditionalNodesProps extends Record<string, unknown> {
+    getNodeRef?: (node?: NodeAddress) => string | null;
 }

package/dist/types/api/tenant.ts

@@ -22,38 +22,38 @@ export interface TTenantInfo {
 }
 
 export interface TTenant {
-    Name: string;
-    Id: string;
-    Type: ETenantType;
-    State: State;
+    Name?: string;
+    Id?: string;
+    Type?: ETenantType;
+    State?: State;
     StateStats?: THiveDomainStatsStateCount[];
-    Metrics: TMetrics;
+    Metrics?: TMetrics;
     NodeIds?: number[];
-    AliveNodes: number;
-    Resources: TTenantResources;
+    AliveNodes?: number;
+    Resources?: TTenantResources;
     /** uint64 */
-    CreateTime: string;
-    Owner: string;
+    CreateTime?: string;
+    Owner?: string;
     Users?: string[];
     PoolStats?: TPoolStats[];
-    UserAttributes: Record<string, string>;
-    Overall: EFlag;
+    UserAttributes?: Record<string, string>;
+    Overall?: EFlag;
     SystemTablets?: TTabletStateInfo[];
-    ResourceId: string;
+    ResourceId?: string;
     Tablets?: TTabletStateInfo[];
     /** uint64 */
-    StorageAllocatedSize: string;
+    StorageAllocatedSize?: string;
     /** uint64 */
-    StorageMinAvailableSize: string;
+    StorageMinAvailableSize?: string;
     Nodes?: TSystemStateInfo[];
     /** uint64 */
-    MemoryUsed: string;
+    MemoryUsed?: string;
     /** uint64 */
-    MemoryLimit: string;
+    MemoryLimit?: string;
     /** double */
-    CoresUsed: number;
+    CoresUsed?: number;
     /** uint64 */
-    StorageGroups: string;
+    StorageGroups?: string;
 
     MonitoringEndpoint?: string; // additional
     ControlPlane?: ControlPlane; // additional
@@ -139,11 +139,10 @@ enum State {
     'CONFIGURING' = 'CONFIGURING',
 }
 
-enum ETabletVolatileState {
+export enum ETabletVolatileState {
     'TABLET_VOLATILE_STATE_UNKNOWN' = 'TABLET_VOLATILE_STATE_UNKNOWN',
     'TABLET_VOLATILE_STATE_STOPPED' = 'TABLET_VOLATILE_STATE_STOPPED',
     'TABLET_VOLATILE_STATE_BOOTING' = 'TABLET_VOLATILE_STATE_BOOTING',
     'TABLET_VOLATILE_STATE_STARTING' = 'TABLET_VOLATILE_STATE_STARTING',
     'TABLET_VOLATILE_STATE_RUNNING' = 'TABLET_VOLATILE_STATE_RUNNING',
-    '_TABLET_VOLATILE_STATE_BLOCKED' = '_TABLET_VOLATILE_STATE_BLOCKED',
 }

package/dist/types/store/executeQuery.ts

@@ -14,11 +14,17 @@ import type {IQueryResult, QueryError, QueryErrorResponse} from './query';
 
 export type MonacoHotKeyAction = ValueOf<typeof MONACO_HOT_KEY_ACTIONS>;
 
+export interface QueryInHistory {
+    queryText: string;
+    syntax?: string;
+}
+
 export interface ExecuteQueryState {
     loading: boolean;
     input: string;
     history: {
-        queries: string[];
+        // String type for backward compatibility
+        queries: (QueryInHistory | string)[];
         currentIndex: number;
     };
     monacoHotKey: null | MonacoHotKeyAction;
@@ -38,3 +44,7 @@ export type ExecuteQueryAction =
     | ReturnType<typeof saveQueryToHistory>
     | ReturnType<typeof setMonacoHotKey>
     | ReturnType<typeof setTenantPath>;
+
+export interface ExecuteQueryStateSlice {
+    executeQuery: ExecuteQueryState;
+}

package/dist/types/store/query.ts

@@ -1,4 +1,4 @@
-import {QUERY_ACTIONS, QUERY_MODES} from '../../utils/query';
+import {QUERY_ACTIONS, QUERY_MODES, QUERY_SYNTAX} from '../../utils/query';
 
 import type {IResponseError, NetworkError} from '../api/error';
 import type {
@@ -29,6 +29,7 @@ export type QueryError = NetworkError | QueryErrorResponse;
 
 export type QueryAction = ValueOf<typeof QUERY_ACTIONS>;
 export type QueryMode = ValueOf<typeof QUERY_MODES>;
+export type QuerySyntax = ValueOf<typeof QUERY_SYNTAX>;
 
 export interface SavedQuery {
     name: string;

package/dist/utils/autofetcher.ts

@@ -1,4 +1,11 @@
 export class AutoFetcher {
+    static DEFAULT_TIMEOUT = 30000;
+    static MIN_TIMEOUT = 30000;
+    timeout: number;
+    active: boolean;
+    timer: undefined | ReturnType<typeof setTimeout>;
+    launchCounter: number;
+
     constructor() {
         this.timeout = AutoFetcher.DEFAULT_TIMEOUT;
         this.active = true;
@@ -52,11 +59,4 @@ export class AutoFetcher {
         this.launchCounter++;
         this.active = true;
     }
-
-    static DEFAULT_TIMEOUT = 30000;
-    static MIN_TIMEOUT = 30000;
-    timeout: number;
-    active: boolean;
-    timer: undefined | ReturnType<typeof setTimeout>;
-    launchCounter: number;
 }

package/dist/utils/constants.ts

@@ -25,7 +25,6 @@ export const TABLET_STATES = {
     TABLET_VOLATILE_STATE_BOOTING: 'booting',
     TABLET_VOLATILE_STATE_STARTING: 'starting',
     TABLET_VOLATILE_STATE_RUNNING: 'running',
-    TABLET_VOLATILE_STATE_BLOCKED: 'blocked',
 };
 
 export const TABLET_COLORS = {
@@ -81,9 +80,11 @@ export const COLORS_PRIORITY = {
 // ==== Titles ====
 export const DEVELOPER_UI_TITLE = 'Developer UI';
 export const CLUSTER_DEFAULT_TITLE = 'Cluster';
+export const TENANT_DEFAULT_TITLE = 'Database';
 
 // ==== Settings ====
 export const THEME_KEY = 'theme';
+export const LANGUAGE_KEY = 'language';
 export const INVERTED_DISKS_KEY = 'invertedDisks';
 export const USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY = 'useNodesEndpointInDiagnostics';
 export const ENABLE_ADDITIONAL_QUERY_MODES = 'enableAdditionalQueryModes';

package/dist/utils/hooks/i18n/en.json

@@ -1,3 +1,3 @@
 {
-  "useQueryModes.queryModeCannotBeSet": "Query mode \"{{mode}}\" cannot be set. You need to turn in additional query modes in settings to enable it"
+  "useQueryModes.queryModeCannotBeSet": "Query mode '{{mode}}' cannot be set. You need to turn in additional query modes in settings to enable it"
 }

package/dist/utils/hooks/i18n/ru.json

@@ -1,3 +1,3 @@
 {
-  "useQueryModes.queryModeCannotBeSet": "Режим выполнения запроса \"{{mode}}\" недоступен. Вам необходимо включить дополнительные режимы выполнения запросов в настройках"
+  "useQueryModes.queryModeCannotBeSet": "Режим выполнения запроса '{{mode}}' недоступен. Вам необходимо включить дополнительные режимы выполнения запросов в настройках"
 }

package/dist/utils/hooks/useQueryModes.ts

@@ -1,6 +1,6 @@
 import type {QueryMode} from '../../types/store/query';
 import {ENABLE_ADDITIONAL_QUERY_MODES, QUERY_INITIAL_MODE_KEY} from '../constants';
-import {isNewQueryMode} from '../query';
+import {QUERY_MODES_TITLES, isNewQueryMode} from '../query';
 import createToast from '../createToast';
 import {useSetting} from './useSetting';
 import i18n from './i18n';
@@ -18,7 +18,9 @@ export const useQueryModes = (): [QueryMode, SetQueryModeIfAvailable] => {
         if (isNewQueryMode(value) && !enableAdditionalQueryModes) {
             createToast({
                 name: 'QueryModeCannotBeSet',
-                title: errorMessage ?? i18n('useQueryModes.queryModeCannotBeSet', {mode: value}),
+                title:
+                    errorMessage ??
+                    i18n('useQueryModes.queryModeCannotBeSet', {mode: QUERY_MODES_TITLES[value]}),
                 type: 'error',
             });
 

package/dist/utils/i18n/i18n.ts

@@ -2,15 +2,21 @@ import {I18N} from '@gravity-ui/i18n';
 import {configure as configureUiKit} from '@gravity-ui/uikit';
 import {configure as configureYdbUiComponents} from 'ydb-ui-components';
 
+import {LANGUAGE_KEY} from '../constants';
+import {readSavedSettingsValue} from '../settings';
+
 enum Lang {
     En = 'en',
     Ru = 'ru',
 }
 
+const defaultLang = Lang.En;
+const currentLang = readSavedSettingsValue(LANGUAGE_KEY, defaultLang);
+
 const i18n = new I18N();
 
-i18n.setLang(Lang.En);
-configureYdbUiComponents({lang: Lang.En});
-configureUiKit({lang: Lang.En});
+i18n.setLang(currentLang);
+configureYdbUiComponents({lang: currentLang});
+configureUiKit({lang: currentLang});
 
-export {i18n, Lang};
+export {i18n, Lang, currentLang, defaultLang};

package/dist/utils/nodes.ts

@@ -18,12 +18,6 @@ export const NodesUptimeFilterTitles = {
 export const isUnavailableNode = (node: NodesPreparedEntity | TSystemStateInfo) =>
     !node.SystemState || node.SystemState === EFlag.Grey;
 
-export type NodeAddress = Pick<TSystemStateInfo, 'Host' | 'Endpoints'>;
-
-export interface AdditionalNodesInfo extends Record<string, unknown> {
-    getNodeRef?: (node?: NodeAddress) => string | null;
-}
-
 export const prepareNodesMap = (nodesList?: TNodeInfo[]) => {
     return nodesList?.reduce<NodesMap>((nodesMap, node) => {
         if (node.Id && node.Host) {