ydb-embedded-ui 3.4.5 → 4.0.0

package/dist/utils/query.ts

@@ -2,13 +2,10 @@ import {YQLType} from '../types';
 import type {
     AnyExecuteResponse,
     AnyExplainResponse,
-    AnyResponse,
-    CommonFields,
-    DeepExecuteResponse,
-    DeprecatedExecuteResponsePlain,
-    ExecuteClassicResponsePlain,
     ExecuteModernResponse,
     KeyValueRow,
+    ScanPlan,
+    ScriptPlan,
 } from '../types/api/query';
 import type {IQueryResult} from '../types/store/query';
 
@@ -47,119 +44,94 @@ export const getColumnType = (type: string) => {
         default:
             return undefined;
     }
-}
+};
 
+/** parse response result field from ArrayRow to KeyValueRow */
 const parseExecuteModernResponse = (data: ExecuteModernResponse): IQueryResult => {
     const {result, columns, ...restData} = data;
 
     return {
-        result: result && columns && result.map((row) => {
-            return row.reduce((newRow: KeyValueRow, cellData, columnIndex) => {
-                const {name} = columns[columnIndex];
-                newRow[name] = cellData;
-                return newRow;
-            }, {});
-        }),
+        result:
+            result &&
+            columns &&
+            result.map((row) => {
+                return row.reduce((newRow, cellData, columnIndex) => {
+                    const {name} = columns[columnIndex];
+                    newRow[name] = cellData;
+                    return newRow;
+                }, {} as KeyValueRow);
+            }),
         columns,
         ...restData,
     };
 };
 
-const parseDeprecatedExecuteResponseValue = (data?: DeprecatedExecuteResponsePlain | ExecuteClassicResponsePlain): KeyValueRow[] | undefined => {
-    if (!data) {
-        return undefined;
-    }
-
-    if (typeof data === 'string') {
-        try {
-            return JSON.parse(data);
-        } catch (e) {
-            return undefined;
-        }
-    }
-
-    if (Array.isArray(data)) {
-        return data;
-    }
-
-    // Plan is not a valid response in this case
-    return undefined;
+const isModern = (response: AnyExecuteResponse): response is ExecuteModernResponse =>
+    Boolean(
+        response &&
+            !Array.isArray(response) &&
+            Array.isArray((response as ExecuteModernResponse).result) &&
+            Array.isArray((response as ExecuteModernResponse).columns),
+    );
+
+type UnsupportedQueryResponseFormat =
+    | Array<unknown>
+    | string
+    | null
+    | undefined
+    | {result: string | Record<string, unknown>};
+
+const isUnsupportedType = (
+    data: AnyExecuteResponse | AnyExplainResponse | UnsupportedQueryResponseFormat,
+): data is UnsupportedQueryResponseFormat => {
+    return Boolean(
+        !data ||
+            typeof data !== 'object' ||
+            Array.isArray(data) ||
+            ('result' in data && !Array.isArray(data.result)),
+    );
 };
 
-const hasResult = (data: AnyExecuteResponse): data is DeepExecuteResponse => Boolean(
-    data && typeof data === 'object' && 'result' in data
-);
-
-const isModern = (response: AnyExecuteResponse): response is ExecuteModernResponse => Boolean(
-    response &&
-    !Array.isArray(response) &&
-    Array.isArray((response as ExecuteModernResponse).result) &&
-    Array.isArray((response as ExecuteModernResponse).columns)
-);
-
-const hasCommonFields = (data: AnyResponse): data is CommonFields => Boolean(
-    data && typeof data === 'object' && ('ast' in data || 'plan' in data || 'stats' in data)
-);
-
-// complex logic because of the variety of possible responses
-// after all backends are updated to the latest version, it can be simplified
-export const parseQueryAPIExecuteResponse = (data: AnyExecuteResponse): IQueryResult => {
-    if (!data) {
+export const parseQueryAPIExecuteResponse = (
+    data: AnyExecuteResponse | UnsupportedQueryResponseFormat,
+): IQueryResult => {
+    if (isUnsupportedType(data)) {
         return {};
     }
-
-    if (hasResult(data)) {
-        if (isModern(data)) {
-            return parseExecuteModernResponse(data);
-        }
-
-        return {
-            ...data,
-            result: parseDeprecatedExecuteResponseValue(data.result),
-        };
+    if (isModern(data)) {
+        return parseExecuteModernResponse(data);
     }
 
-    if (hasCommonFields(data)) {
-        return data;
-    }
-
-    return {
-        result: parseDeprecatedExecuteResponseValue(data),
-    };
+    return data;
 };
 
-// complex logic because of the variety of possible responses
-// after all backends are updated to the latest version, it can be simplified
-export const parseQueryAPIExplainResponse = (data: AnyExplainResponse): IQueryResult => {
-    if (!data) {
+export const parseQueryAPIExplainResponse = (
+    data: AnyExplainResponse | UnsupportedQueryResponseFormat,
+): IQueryResult => {
+    if (isUnsupportedType(data)) {
         return {};
     }
 
-    if ('ast' in data) {
-        return data;
-    }
+    return data;
+};
 
-    if ('result' in data) {
-        const {result, ...restData} = data;
+const isExplainScriptPlan = (plan: ScriptPlan | ScanPlan): plan is ScriptPlan =>
+    Boolean(plan && 'queries' in plan);
 
-        if ('ast' in data.result) {
-            return {
-                ast: result.ast,
-                ...restData,
-            };
+export const parseQueryExplainPlan = (plan: ScriptPlan | ScanPlan): ScanPlan => {
+    if (isExplainScriptPlan(plan)) {
+        if (!plan.queries || !plan.queries.length) {
+            return {meta: plan.meta};
         }
 
         return {
-            plan: data.result,
-            ...restData,
+            Plan: plan.queries[0].Plan,
+            tables: plan.queries[0].tables,
+            meta: plan.meta,
         };
     }
 
-    if (hasCommonFields(data)) {
-        return data;
-    }
-
-    return {plan: data};
+    return plan;
 };
 
 export const prepareQueryResponse = (data?: KeyValueRow[]) => {
@@ -186,5 +158,11 @@ export const prepareQueryResponse = (data?: KeyValueRow[]) => {
 };
 
 export function prepareQueryError(error: any) {
-    return error.data?.error?.message || error.message || error.data || error.statusText || JSON.stringify(error);
+    return (
+        error.data?.error?.message ||
+        error.message ||
+        error.data ||
+        error.statusText ||
+        JSON.stringify(error)
+    );
 }

package/dist/utils/timeParsers/formatDuration.ts

@@ -4,9 +4,10 @@ import i18n from './i18n';
 
 /**
  * Process time difference in ms and returns formated time.
- * Only two major values are returned (days & hours, hours & minutes, minutes & seconds, etc.)
+ * By default only two major values are returned (days & hours, hours & minutes, minutes & seconds, etc.).
+ * It can be altered with valuesCount arg
  */
-export const formatDurationToShortTimeFormat = (value: number) => {
+export const formatDurationToShortTimeFormat = (value: number, valuesCount: 1 | 2 = 2) => {
     const ms = value % 1000;
     let remain = Math.floor(value / 1000);
 
@@ -29,17 +30,34 @@ export const formatDurationToShortTimeFormat = (value: number) => {
         ms,
     };
 
-    if (days > 0) {
-        return i18n('daysHours', duration);
+    if (valuesCount === 2) {
+        if (days > 0) {
+            return i18n('daysHours', duration);
+        }
+        if (hours > 0) {
+            return i18n('hoursMin', duration);
+        }
+        if (minutes > 0) {
+            return i18n('minSec', duration);
+        }
+        if (seconds > 0) {
+            return i18n('secMs', duration);
+        }
     }
-    if (hours > 0) {
-        return i18n('hoursMin', duration);
-    }
-    if (minutes > 0) {
-        return i18n('minSec', duration);
-    }
-    if (seconds > 0) {
-        return i18n('secMs', duration);
+
+    if (valuesCount === 1) {
+        if (days > 0) {
+            return i18n('days', duration);
+        }
+        if (hours > 0) {
+            return i18n('hours', duration);
+        }
+        if (minutes > 0) {
+            return i18n('min', duration);
+        }
+        if (seconds > 0) {
+            return i18n('sec', duration);
+        }
     }
 
     return i18n('ms', duration);

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

@@ -1,7 +1,11 @@
 {
-  "daysHours": "{{days}}d {{hours}}h",
-  "hoursMin": "{{hours}}h {{minutes}}m",
-  "minSec": "{{minutes}}m {{seconds}}s",
-  "secMs": "{{seconds}}s {{ms}}ms",
-  "ms": "{{ms}}ms"
+  "daysHours": "{{days}}\u00a0d\u00a0{{hours}}\u00a0h",
+  "hoursMin": "{{hours}}\u00a0h\u00a0{{minutes}}\u00a0m",
+  "minSec": "{{minutes}}\u00a0m\u00a0{{seconds}}\u00a0s",
+  "secMs": "{{seconds}}\u00a0s\u00a0{{ms}}\u00a0ms",
+  "days": "{{days}}\u00a0d",
+  "hours": "{{hours}}\u00a0h",
+  "min": "{{minutes}}\u00a0m",
+  "sec": "{{seconds}}\u00a0s",
+  "ms": "{{ms}}\u00a0ms"
 }

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

@@ -1,7 +1,11 @@
 {
-  "daysHours": "{{days}}д {{hours}}ч",
-  "hoursMin": "{{hours}}ч {{minutes}}м",
-  "minSec": "{{minutes}}м {{seconds}}с",
-  "secMs": "{{seconds}}с {{ms}}мс",
-  "ms": "{{ms}}мс"
+  "daysHours": "{{days}}\u00a0д\u00a0{{hours}}\u00a0ч",
+  "hoursMin": "{{hours}}\u00a0ч\u00a0{{minutes}}\u00a0м",
+  "minSec": "{{minutes}}\u00a0м\u00a0{{seconds}}\u00a0с",
+  "secMs": "{{seconds}}\u00a0с\u00a0{{ms}}\u00a0мс",
+  "days": "{{days}}\u00a0д",
+  "hours": "{{hours}}\u00a0ч",
+  "min": "{{minutes}}\u00a0м",
+  "sec": "{{seconds}}\u00a0с",
+  "ms": "{{ms}}\u00a0мс"
 }

package/dist/utils/timeParsers/parsers.ts

@@ -1,5 +1,6 @@
 import type {IProtobufTimeObject} from '../../types/api/common';
 
+import {isNumeric} from '../utils';
 import {parseProtobufDurationToMs, parseProtobufTimestampToMs} from '.';
 
 export const parseLag = (value: string | IProtobufTimeObject | undefined) =>
@@ -16,3 +17,11 @@ export const parseTimestampToIdleTime = (value: string | IProtobufTimeObject | u
     // Usually it below 100ms, so it could be omitted
     return duration < 0 ? 0 : duration;
 };
+
+export const parseUsToMs = (value: string | number | undefined) => {
+    if (!value || !isNumeric(value)) {
+        return 0;
+    }
+
+    return Math.round(Number(value) / 1000);
+};

package/dist/utils/utils.js

@@ -1,11 +1,10 @@
 export function parseJson(value) {
     if (!value) {
-        return;
+        return undefined;
     }
     try {
         return JSON.parse(value);
     } catch (err) {
-        console.log(err);
         return value;
     }
 }

package/package.json

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