ydb-embedded-ui 22.3.0 → 22.5.0

package/src/utils/timeParsers/formatDuration.ts

@@ -7,10 +7,15 @@ import i18n from './i18n';
  * Process time difference in ms and returns formated time.
  * By default only two major values are returned (days & hours, hours & minutes, minutes & seconds, etc.).
  * It can be altered with valuesCount arg
+ * Compact format omits milliseconds and spaces between numbers and unit labels.
  *
  * value - duration in ms
  */
-export const formatDurationToShortTimeFormat = (value: number, valuesCount: 1 | 2 = 2) => {
+export const formatDurationToShortTimeFormat = (
+    value: number,
+    valuesCount: 1 | 2 = 2,
+    {compact = false}: {compact?: boolean} = {},
+) => {
     const ms = value % 1000;
     let remain = Math.floor(value / 1000);
 
@@ -33,6 +38,22 @@ export const formatDurationToShortTimeFormat = (value: number, valuesCount: 1 |
         ms,
     };
 
+    if (compact) {
+        const units = [
+            {value: days, key: 'value_compact-days'},
+            {value: hours, key: 'value_compact-hours'},
+            {value: minutes, key: 'value_compact-minutes'},
+            {value: seconds, key: 'value_compact-seconds'},
+        ] as const;
+        const firstNonZeroUnit = units.findIndex((unit) => unit.value > 0);
+
+        return units
+            .slice(firstNonZeroUnit < 0 ? -1 : firstNonZeroUnit)
+            .slice(0, valuesCount)
+            .map(({key}) => i18n(key, duration))
+            .join(' ');
+    }
+
     if (valuesCount === 2) {
         if (days > 0) {
             return i18n('daysHours', duration);

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

@@ -7,5 +7,9 @@
   "hours": "{{hours}}\u00a0h",
   "min": "{{minutes}}\u00a0m",
   "sec": "{{seconds}}\u00a0s",
-  "ms": "{{ms}}\u00a0ms"
+  "ms": "{{ms}}\u00a0ms",
+  "value_compact-days": "{{days}}d",
+  "value_compact-hours": "{{hours}}h",
+  "value_compact-minutes": "{{minutes}}min",
+  "value_compact-seconds": "{{seconds}}s"
 }

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

@@ -7,5 +7,9 @@
   "hours": "{{hours}}\u00a0ч",
   "min": "{{minutes}}\u00a0м",
   "sec": "{{seconds}}\u00a0с",
-  "ms": "{{ms}}\u00a0мс"
+  "ms": "{{ms}}\u00a0мс",
+  "value_compact-days": "{{days}}д",
+  "value_compact-hours": "{{hours}}ч",
+  "value_compact-minutes": "{{minutes}}мин",
+  "value_compact-seconds": "{{seconds}}с"
 }

package/dist/components/VDiskInfo/getVDiskCapacityColumns.d.ts

@@ -1,11 +0,0 @@
-import type { PreparedVDisk } from '../../utils/disks/types';
-import type { YDBDefinitionListItem } from '../YDBDefinitionList/YDBDefinitionList';
-interface GetVDiskCapacityColumnsParams {
-    data?: PreparedVDisk;
-    isViewerUser?: boolean;
-}
-export declare function getVDiskCapacityColumns({ data, isViewerUser }: GetVDiskCapacityColumnsParams): {
-    leftColumn: YDBDefinitionListItem[];
-    rightColumn: YDBDefinitionListItem[];
-};
-export {};

package/dist/components/VDiskInfo/getVDiskCapacityColumns.js

@@ -1,52 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { isNil } from 'lodash';
-import { getPDiskPagePath } from '../../routes';
-import { getVDiskCapacityInfoItems, toDefinitionListItems, } from '../DiskCapacityInfo/DiskCapacityInfo';
-import { InternalLink } from '../InternalLink';
-import { vDiskInfoKeyset } from './i18n';
-export function getVDiskCapacityColumns({ data, isViewerUser }) {
-    const { Guid, VDiskState, VDiskSlotId, Kind, IncarnationGuid, InstanceGuid, StoragePoolName, PDiskId, NodeId, } = data || {};
-    const leftColumn = [];
-    const rightColumn = [];
-    if (!isNil(StoragePoolName)) {
-        leftColumn.push({ name: vDiskInfoKeyset('pool-name'), content: StoragePoolName });
-    }
-    if (!isNil(VDiskSlotId)) {
-        leftColumn.push({ name: vDiskInfoKeyset('slot-id'), content: VDiskSlotId });
-    }
-    if (!isNil(Kind)) {
-        leftColumn.push({ name: vDiskInfoKeyset('kind'), content: Kind });
-    }
-    const capacityItems = getVDiskCapacityInfoItems(data, { withRawUsage: true });
-    const groupSizeItem = capacityItems.find(({ id }) => id === 'group-size-in-units');
-    const runtimeCapacityItems = capacityItems.filter(({ id }) => id !== 'group-size-in-units');
-    if (groupSizeItem) {
-        leftColumn.push(...toDefinitionListItems([groupSizeItem]));
-    }
-    if (!isNil(Guid)) {
-        leftColumn.push({ name: vDiskInfoKeyset('guid'), content: Guid });
-    }
-    if (!isNil(IncarnationGuid)) {
-        leftColumn.push({ name: vDiskInfoKeyset('incarnation-guid'), content: IncarnationGuid });
-    }
-    if (!isNil(InstanceGuid)) {
-        leftColumn.push({ name: vDiskInfoKeyset('instance-guid'), content: InstanceGuid });
-    }
-    if (!isNil(PDiskId)) {
-        const pDiskPath = isViewerUser && !isNil(NodeId) ? getPDiskPagePath(PDiskId, NodeId) : undefined;
-        const content = pDiskPath ? _jsx(InternalLink, { to: pDiskPath, children: PDiskId }) : PDiskId;
-        leftColumn.push({
-            name: vDiskInfoKeyset('label_pdisk-id'),
-            content,
-        });
-    }
-    if (!isNil(VDiskState)) {
-        rightColumn.push({
-            name: vDiskInfoKeyset('state-status'),
-            content: VDiskState,
-        });
-    }
-    rightColumn.push(...toDefinitionListItems(runtimeCapacityItems));
-    return { leftColumn, rightColumn };
-}
-//# sourceMappingURL=getVDiskCapacityColumns.js.map

package/dist/components/VDiskInfo/getVDiskCapacityColumns.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getVDiskCapacityColumns.js","sourceRoot":"","sources":["../../../src/components/VDiskInfo/getVDiskCapacityColumns.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,EACH,yBAAyB,EACzB,qBAAqB,GACxB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;AAOvC,MAAM,UAAU,uBAAuB,CAAC,EAAC,IAAI,EAAE,YAAY,EAAgC;IAIvF,MAAM,EACF,IAAI,EACJ,UAAU,EACV,WAAW,EACX,IAAI,EACJ,eAAe,EACf,YAAY,EACZ,eAAe,EACf,OAAO,EACP,MAAM,GACT,GAAG,IAAI,IAAI,EAAE,CAAC;IACf,MAAM,UAAU,GAA4B,EAAE,CAAC;IAC/C,MAAM,WAAW,GAA4B,EAAE,CAAC;IAEhD,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;QAC1B,UAAU,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,eAAe,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,eAAe,EAAC,CAAC,CAAC;IACpF,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QACtB,UAAU,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,EAAC,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACf,UAAU,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,aAAa,GAAG,yBAAyB,CAAC,IAAI,EAAE,EAAC,YAAY,EAAE,IAAI,EAAC,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,KAAK,qBAAqB,CAAC,CAAC;IACjF,MAAM,oBAAoB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,KAAK,qBAAqB,CAAC,CAAC;IAE1F,IAAI,aAAa,EAAE,CAAC;QAChB,UAAU,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACf,UAAU,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;QAC1B,UAAU,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,eAAe,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,eAAe,EAAC,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;QACvB,UAAU,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,YAAY,EAAC,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAClB,MAAM,SAAS,GACX,YAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,KAAC,YAAY,IAAC,EAAE,EAAE,SAAS,YAAG,OAAO,GAAgB,CAAC,CAAC,CAAC,OAAO,CAAC;QAE5F,UAAU,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,eAAe,CAAC,gBAAgB,CAAC;YACvC,OAAO;SACV,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QACrB,WAAW,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,eAAe,CAAC,cAAc,CAAC;YACrC,OAAO,EAAE,UAAU;SACtB,CAAC,CAAC;IACP,CAAC;IACD,WAAW,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAEjE,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,CAAC;AACrC,CAAC"}

package/src/components/VDiskInfo/getVDiskCapacityColumns.tsx

@@ -1,83 +0,0 @@
-import {isNil} from 'lodash';
-
-import {getPDiskPagePath} from '../../routes';
-import type {PreparedVDisk} from '../../utils/disks/types';
-import {
-    getVDiskCapacityInfoItems,
-    toDefinitionListItems,
-} from '../DiskCapacityInfo/DiskCapacityInfo';
-import {InternalLink} from '../InternalLink';
-import type {YDBDefinitionListItem} from '../YDBDefinitionList/YDBDefinitionList';
-
-import {vDiskInfoKeyset} from './i18n';
-
-interface GetVDiskCapacityColumnsParams {
-    data?: PreparedVDisk;
-    isViewerUser?: boolean;
-}
-
-export function getVDiskCapacityColumns({data, isViewerUser}: GetVDiskCapacityColumnsParams): {
-    leftColumn: YDBDefinitionListItem[];
-    rightColumn: YDBDefinitionListItem[];
-} {
-    const {
-        Guid,
-        VDiskState,
-        VDiskSlotId,
-        Kind,
-        IncarnationGuid,
-        InstanceGuid,
-        StoragePoolName,
-        PDiskId,
-        NodeId,
-    } = data || {};
-    const leftColumn: YDBDefinitionListItem[] = [];
-    const rightColumn: YDBDefinitionListItem[] = [];
-
-    if (!isNil(StoragePoolName)) {
-        leftColumn.push({name: vDiskInfoKeyset('pool-name'), content: StoragePoolName});
-    }
-    if (!isNil(VDiskSlotId)) {
-        leftColumn.push({name: vDiskInfoKeyset('slot-id'), content: VDiskSlotId});
-    }
-    if (!isNil(Kind)) {
-        leftColumn.push({name: vDiskInfoKeyset('kind'), content: Kind});
-    }
-
-    const capacityItems = getVDiskCapacityInfoItems(data, {withRawUsage: true});
-    const groupSizeItem = capacityItems.find(({id}) => id === 'group-size-in-units');
-    const runtimeCapacityItems = capacityItems.filter(({id}) => id !== 'group-size-in-units');
-
-    if (groupSizeItem) {
-        leftColumn.push(...toDefinitionListItems([groupSizeItem]));
-    }
-    if (!isNil(Guid)) {
-        leftColumn.push({name: vDiskInfoKeyset('guid'), content: Guid});
-    }
-    if (!isNil(IncarnationGuid)) {
-        leftColumn.push({name: vDiskInfoKeyset('incarnation-guid'), content: IncarnationGuid});
-    }
-    if (!isNil(InstanceGuid)) {
-        leftColumn.push({name: vDiskInfoKeyset('instance-guid'), content: InstanceGuid});
-    }
-    if (!isNil(PDiskId)) {
-        const pDiskPath =
-            isViewerUser && !isNil(NodeId) ? getPDiskPagePath(PDiskId, NodeId) : undefined;
-        const content = pDiskPath ? <InternalLink to={pDiskPath}>{PDiskId}</InternalLink> : PDiskId;
-
-        leftColumn.push({
-            name: vDiskInfoKeyset('label_pdisk-id'),
-            content,
-        });
-    }
-
-    if (!isNil(VDiskState)) {
-        rightColumn.push({
-            name: vDiskInfoKeyset('state-status'),
-            content: VDiskState,
-        });
-    }
-    rightColumn.push(...toDefinitionListItems(runtimeCapacityItems));
-
-    return {leftColumn, rightColumn};
-}