ydb-embedded-ui 5.2.0 → 5.2.1

package/dist/components/FullNodeViewer/FullNodeViewer.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import cn from 'bem-cn-lite';
 import { LOAD_AVERAGE_TIME_INTERVALS } from '../../utils/constants';
-import { calcUptime } from '../../utils/dataFormatters/dataFormatters';
 import InfoViewer from '../InfoViewer/InfoViewer';
 import { ProgressViewer } from '../ProgressViewer/ProgressViewer';
 import { PoolUsage } from '../PoolUsage/PoolUsage';
@@ -18,7 +17,7 @@ export const FullNodeViewer = ({ node, className }) => {
     if ((_b = node === null || node === void 0 ? void 0 : node.Tenants) === null || _b === void 0 ? void 0 : _b.length) {
         commonInfo.push({ label: 'Database', value: node.Tenants[0] });
     }
-    commonInfo.push({ label: 'Version', value: node === null || node === void 0 ? void 0 : node.Version }, { label: 'Uptime', value: calcUptime(node === null || node === void 0 ? void 0 : node.StartTime) }, { label: 'DC', value: (node === null || node === void 0 ? void 0 : node.DataCenterDescription) || (node === null || node === void 0 ? void 0 : node.DC) }, { label: 'Rack', value: node === null || node === void 0 ? void 0 : node.Rack });
+    commonInfo.push({ label: 'Version', value: node === null || node === void 0 ? void 0 : node.Version }, { label: 'Uptime', value: node === null || node === void 0 ? void 0 : node.Uptime }, { label: 'DC', value: (node === null || node === void 0 ? void 0 : node.DataCenterDescription) || (node === null || node === void 0 ? void 0 : node.DC) }, { label: 'Rack', value: node === null || node === void 0 ? void 0 : node.Rack });
     const averageInfo = (_c = node === null || node === void 0 ? void 0 : node.LoadAverage) === null || _c === void 0 ? void 0 : _c.map((load, loadIndex) => ({
         label: LOAD_AVERAGE_TIME_INTERVALS[loadIndex],
         value: (_jsx(ProgressViewer, { value: load, percents: true, colorizeProgress: true, capacity: 100 })),

package/dist/containers/Cluster/Cluster.scss

@@ -10,6 +10,9 @@
     @include flex-container();
 
     &__header {
+        position: sticky;
+        left: 0;
+
         padding: 20px 0;
     }
 

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

@@ -17,6 +17,7 @@ import { Preview } from '../Preview/Preview';
 import { ExecuteResult } from '../ExecuteResult/ExecuteResult';
 import { ExplainResult } from '../ExplainResult/ExplainResult';
 import { QueryEditorControls } from '../QueryEditorControls/QueryEditorControls';
+import i18n from '../i18n';
 import './QueryEditor.scss';
 const EDITOR_OPTIONS = {
     automaticLayout: true,
@@ -196,7 +197,7 @@ function QueryEditor(props) {
         editor.focus();
         editor.addAction({
             id: 'sendQuery',
-            label: 'Send query',
+            label: i18n('action.send-query'),
             keybindings: [
                 // eslint-disable-next-line no-bitwise
                 monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter,
@@ -220,7 +221,7 @@ function QueryEditor(props) {
         });
         editor.addAction({
             id: 'sendSelectedQuery',
-            label: 'Send selected query',
+            label: i18n('action.send-selected-query'),
             keybindings: [
                 // eslint-disable-next-line no-bitwise
                 monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.Enter,
@@ -232,7 +233,7 @@ function QueryEditor(props) {
         });
         editor.addAction({
             id: 'previous-query',
-            label: 'Previous query',
+            label: i18n('action.previous-query'),
             keybindings: [
                 // eslint-disable-next-line no-bitwise
                 monaco.KeyMod.CtrlCmd | monaco.KeyCode.UpArrow,
@@ -245,7 +246,7 @@ function QueryEditor(props) {
         });
         editor.addAction({
             id: 'next-query',
-            label: 'Next query',
+            label: i18n('action.next-query'),
             keybindings: [
                 // eslint-disable-next-line no-bitwise
                 monaco.KeyMod.CtrlCmd | monaco.KeyCode.DownArrow,

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

@@ -17,5 +17,9 @@
     "method-description.data": "DML queries for changing and fetching data in serialization mode.\nAPI call: table.executeDataQuery",
     "method-description.query": "Any query. An experimental API call supposed to replace all existing methods.\nAPI Call: query.ExecuteScript",
     "method-description.pg": "Queries in postgresql syntax.\nAPI call: query.ExecuteScript",
-    "query-duration.description": "Duration of server-side query execution"
+    "query-duration.description": "Duration of server-side query execution",
+    "action.send-query": "Send query",
+    "action.send-selected-query": "Send selected query",
+    "action.previous-query": "Previous query in history",
+    "action.next-query": "Next query in history"
 }

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

@@ -1,2 +1,2 @@
-declare const _default: (key: string, params?: import("@gravity-ui/i18n").Params | undefined) => string;
+declare const _default: (key: "controls.query-mode-selector_type" | "tabs.newQuery" | "tabs.history" | "tabs.saved" | "history.empty" | "saved.empty" | "delete-dialog.header" | "delete-dialog.question" | "delete-dialog.delete" | "delete-dialog.cancel" | "preview.title" | "preview.not-available" | "preview.close" | "method-description.script" | "method-description.scan" | "method-description.data" | "method-description.query" | "method-description.pg" | "query-duration.description" | "action.send-query" | "action.send-selected-query" | "action.previous-query" | "action.next-query", params?: import("@gravity-ui/i18n").Params | undefined) => string;
 export default _default;

package/dist/containers/Tenant/Query/i18n/index.js

@@ -1,7 +1,4 @@
-import { i18n, Lang } from '../../../../utils/i18n';
+import { registerKeysets } from '../../../../utils/i18n';
 import en from './en.json';
-import ru from './ru.json';
 const COMPONENT = 'ydb-query-editor';
-i18n.registerKeyset(Lang.En, COMPONENT, en);
-i18n.registerKeyset(Lang.Ru, COMPONENT, ru);
-export default i18n.keyset(COMPONENT);
+export default registerKeysets(COMPONENT, { en });

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

@@ -1,8 +1,8 @@
 import type { IResponseError } from '../../../types/api/error';
-import type { TSystemStateInfo } from '../../../types/api/nodes';
 import type { TPDiskStateInfo } from '../../../types/api/pdisk';
 import type { TStorageInfo } from '../../../types/api/storage';
 import type { TVDiskStateInfo } from '../../../types/api/vdisk';
+import type { PreparedNodeSystemState } from '../../../utils/nodes';
 import type { ApiRequestAction } from '../../utils';
 import { FETCH_NODE, FETCH_NODE_STRUCTURE, resetNode } from './node';
 interface RawStructurePDisk extends TPDiskStateInfo {
@@ -17,9 +17,7 @@ export interface PreparedStructurePDisk extends TPDiskStateInfo {
     vDisks: PreparedStructureVDisk[];
 }
 export declare type PreparedNodeStructure = Record<string, PreparedStructurePDisk>;
-export interface PreparedNode extends TSystemStateInfo {
-    DC?: string;
-    Rack?: string;
+export interface PreparedNode extends Partial<PreparedNodeSystemState> {
 }
 export interface NodeState {
     data: PreparedNode;

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

@@ -1,8 +1,9 @@
+import { prepareNodeSystemState } from '../../../utils/nodes';
 export const prepareNodeData = (data) => {
-    var _a, _b, _c;
+    var _a;
     if (!((_a = data.SystemStateInfo) === null || _a === void 0 ? void 0 : _a.length)) {
         return {};
     }
     const nodeData = data.SystemStateInfo[0];
-    return Object.assign(Object.assign({}, nodeData), { DC: (_b = nodeData.Location) === null || _b === void 0 ? void 0 : _b.DataCenter, Rack: (_c = nodeData.Location) === null || _c === void 0 ? void 0 : _c.Rack });
+    return prepareNodeSystemState(nodeData);
 };

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

@@ -1,5 +1,6 @@
 import { calcUptime } from '../../../utils/dataFormatters/dataFormatters';
 import { generateEvaluator } from '../../../utils/generateEvaluator';
+import { prepareNodeSystemState } from '../../../utils/nodes';
 const prepareComputeNode = (node, tenantName) => {
     var _a;
     return Object.assign(Object.assign({}, node), { 
@@ -36,10 +37,10 @@ export const prepareComputeNodesData = (data) => {
 export const prepareNodesData = (data) => {
     const rawNodes = data.Nodes || [];
     const preparedNodes = rawNodes.map((node) => {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d;
         // 0 limit means that limit is not set, so it should be undefined
         const sharedCacheLimit = Number((_a = node.SystemState.SharedCacheStats) === null || _a === void 0 ? void 0 : _a.LimitBytes) || undefined;
-        return Object.assign(Object.assign({}, node.SystemState), { Tablets: node.Tablets, NodeId: node.NodeId, Uptime: calcUptime((_b = node.SystemState) === null || _b === void 0 ? void 0 : _b.StartTime), TenantName: (_d = (_c = node.SystemState) === null || _c === void 0 ? void 0 : _c.Tenants) === null || _d === void 0 ? void 0 : _d[0], DC: (_e = node.SystemState.Location) === null || _e === void 0 ? void 0 : _e.DataCenter, Rack: (_f = node.SystemState.Location) === null || _f === void 0 ? void 0 : _f.Rack, SharedCacheUsed: (_g = node.SystemState.SharedCacheStats) === null || _g === void 0 ? void 0 : _g.UsedBytes, SharedCacheLimit: sharedCacheLimit });
+        return Object.assign(Object.assign({}, prepareNodeSystemState(node.SystemState)), { Tablets: node.Tablets, NodeId: node.NodeId, TenantName: (_c = (_b = node.SystemState) === null || _b === void 0 ? void 0 : _b.Tenants) === null || _c === void 0 ? void 0 : _c[0], SharedCacheUsed: (_d = node.SystemState.SharedCacheStats) === null || _d === void 0 ? void 0 : _d.UsedBytes, SharedCacheLimit: sharedCacheLimit });
     });
     return {
         Nodes: preparedNodes,

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

@@ -3,7 +3,7 @@ import { TPDiskState } from '../../../types/api/pdisk';
 import { EFlag } from '../../../types/api/enums';
 import { getPDiskType } from '../../../utils/pdisk';
 import { getUsage } from '../../../utils/storage';
-import { calcUptime } from '../../../utils/dataFormatters/dataFormatters';
+import { prepareNodeSystemState } from '../../../utils/nodes';
 // ==== Constants  ====
 const FLAGS_POINTS = {
     [EFlag.Green]: 1,
@@ -85,24 +85,11 @@ export const prepareStorageGroups = (StorageGroups, StoragePools) => {
 };
 // ==== Prepare nodes ====
 const prepareStorageNodeData = (node) => {
-    var _a, _b, _c, _d;
-    const systemState = (_a = node.SystemState) !== null && _a !== void 0 ? _a : {};
-    const missing = ((_b = node.PDisks) === null || _b === void 0 ? void 0 : _b.filter((pDisk) => {
+    var _a;
+    const missing = ((_a = node.PDisks) === null || _a === void 0 ? void 0 : _a.filter((pDisk) => {
         return pDisk.State !== TPDiskState.Normal;
     }).length) || 0;
-    return {
-        NodeId: node.NodeId,
-        SystemState: systemState.SystemState,
-        DC: (_c = systemState.Location) === null || _c === void 0 ? void 0 : _c.DataCenter,
-        Rack: (_d = systemState.Location) === null || _d === void 0 ? void 0 : _d.Rack,
-        Host: systemState.Host,
-        Endpoints: systemState.Endpoints,
-        Uptime: calcUptime(systemState.StartTime),
-        StartTime: systemState.StartTime,
-        PDisks: node.PDisks,
-        VDisks: node.VDisks,
-        Missing: missing,
-    };
+    return Object.assign(Object.assign({}, prepareNodeSystemState(node.SystemState)), { NodeId: node.NodeId, PDisks: node.PDisks, VDisks: node.VDisks, Missing: missing });
 };
 // ==== Prepare responses ====
 export const prepareStorageNodesResponse = (data) => {

package/dist/utils/nodes.d.ts

@@ -14,6 +14,12 @@ export declare const NodesUptimeFilterTitles: {
 };
 export declare const isUnavailableNode: (node: NodesPreparedEntity | TSystemStateInfo) => boolean;
 export declare const prepareNodesMap: (nodesList?: TNodeInfo[] | undefined) => NodesMap | undefined;
+export interface PreparedNodeSystemState extends TSystemStateInfo {
+    Rack?: string;
+    DC?: string;
+    Uptime: string;
+}
+export declare const prepareNodeSystemState: (systemState?: TSystemStateInfo) => PreparedNodeSystemState;
 export declare const getProblemParamValue: (problemFilter: ProblemFilterValue | undefined) => boolean;
 export declare const getUptimeParamValue: (nodesUptimeFilter: NodesUptimeFilterValues | undefined) => number | undefined;
 /**

package/dist/utils/nodes.js

@@ -1,5 +1,6 @@
 import { ProblemFilterValues } from '../store/reducers/settings/settings';
 import { EFlag } from '../types/api/enums';
+import { calcUptime } from './dataFormatters/dataFormatters';
 import { HOUR_IN_SECONDS } from './constants';
 export var NodesUptimeFilterValues;
 (function (NodesUptimeFilterValues) {
@@ -19,6 +20,16 @@ export const prepareNodesMap = (nodesList) => {
         return nodesMap;
     }, new Map());
 };
+export const prepareNodeSystemState = (systemState = {}) => {
+    var _a, _b;
+    // There is no Rack in Location field for din nodes
+    const Rack = ((_a = systemState.Location) === null || _a === void 0 ? void 0 : _a.Rack) || systemState.Rack;
+    const DC = ((_b = systemState.Location) === null || _b === void 0 ? void 0 : _b.DataCenter) || systemState.DataCenter;
+    const Uptime = calcUptime(systemState.StartTime);
+    return Object.assign(Object.assign({}, systemState), { Rack,
+        DC,
+        Uptime });
+};
 export const getProblemParamValue = (problemFilter) => {
     return problemFilter === ProblemFilterValues.PROBLEMS;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "files": [
     "dist"
   ],

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

@@ -1,21 +0,0 @@
-{
-    "controls.query-mode-selector_type": "Тип запроса:",
-    "tabs.newQuery": "Запрос",
-    "tabs.history": "История",
-    "tabs.saved": "Сохраненные",
-    "history.empty": "История пуста",
-    "saved.empty": "Нет сохраненных запросов",
-    "delete-dialog.header": "Удалить запрос",
-    "delete-dialog.question": "Вы уверены что хотите удалить запрос",
-    "delete-dialog.delete": "Удалить",
-    "delete-dialog.cancel": "Отменить",
-    "preview.title": "Предпросмотр",
-    "preview.not-available": "Предпросмотр недоступен",
-    "preview.close": "Закрыть предпросмотр",
-    "method-description.script": "Для скриптов, совмещающих DDL и DML-конструкции.\nAPI call: schema.scripting",
-    "method-description.scan": "Только читающие запросы, потенциально читающие много данных.\nAPI call: table.ExecuteScan",
-    "method-description.data": "DML-запросы для изменения и выборки данных в режиме изоляции Serializable.\nAPI call: table.executeDataQuery",
-    "method-description.query": "Любые запросы. Экспериментальный перспективный метод, который в будущем заменит все остальные.\nAPI call: query.ExecuteScript",
-    "method-description.pg": "Запросы в синтаксисе postgresql.\nAPI call: query.ExecuteScript",
-    "query-duration.description": "Время выполнения запроса на стороне сервера"
-}