ydb-embedded-ui 22.2.0 → 22.4.0

package/dist/utils/schema.js

@@ -1,13 +1,23 @@
+import { SYS_VIEW_TYPE_IDS } from '../types/api/schema/sysView';
+const SYS_VIEW_TYPE_NAMES_BY_ID = new Map(Object.keys(SYS_VIEW_TYPE_IDS).map((name) => [SYS_VIEW_TYPE_IDS[name], name]));
+/**
+ * Normalizes SysViewDescription.Type for display.
+ * YDB <= 26.3.1.x returns the enum name ("EVSlots"),
+ * YDB with ydb-platform/ydb#54332 returns the numeric value (13).
+ */
 export function prepareSystemViewType(type) {
-    if (!type) {
+    var _a;
+    if (type === undefined || type === null || type === '') {
         return undefined;
     }
+    // Ids unknown to this UI version are shown as-is instead of hiding the row
+    const name = typeof type === 'number' ? ((_a = SYS_VIEW_TYPE_NAMES_BY_ID.get(type)) !== null && _a !== void 0 ? _a : String(type)) : type;
     // System view type is enum, its format from backend is EType
     // We need to display only Type, remove redundant E
     // EStoragePools -> StoragePools, EStorageStats -> StorageStats
-    if (type.startsWith('E')) {
-        return type.slice(1);
+    if (name.startsWith('E')) {
+        return name.slice(1);
     }
-    return type;
+    return name;
 }
 //# sourceMappingURL=schema.js.map

package/dist/utils/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/utils/schema.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CAAC,IAAmB;IACrD,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,6DAA6D;IAC7D,mDAAmD;IACnD,+DAA+D;IAC/D,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAE9D,MAAM,yBAAyB,GAAG,IAAI,GAAG,CACpC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAoB,CAAC,GAAG,CAClD,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAU,CACrD,CACJ,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAA6B;;IAC/D,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QACrD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,2EAA2E;IAC3E,MAAM,IAAI,GACN,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAA,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE5F,6DAA6D;IAC7D,mDAAmD;IACnD,+DAA+D;IAC/D,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/dist/utils/storageMetrics.d.ts

@@ -11,8 +11,8 @@ export declare function getConsistentMetricBytesSize(values: Array<string | numb
 export declare function shouldUseMixedMetricBytesUnits(values: Array<string | number | undefined>, ratioThreshold?: number): boolean;
 export declare function getMetricBytesCommonSize(values: Array<string | number | undefined>, options?: FormatMetricBytesOptions): "b" | "kb" | "mb" | "gb" | "tb" | "pb" | undefined;
 export declare function formatMetricBytes(value?: string | number, size?: BytesSizes, options?: FormatMetricBytesOptions): string;
-export declare function formatMetricPercent(value?: unknown): string;
-export declare function formatStorageMetricPair(value?: string | number, capacity?: string | number): string;
+export declare function formatMetricPercent(value?: unknown, fixedDecimalPlaces?: number): string;
+export declare function formatStorageMetricPair(value?: string | number, capacity?: string | number, fixedDecimalPlaces?: number): string;
 export declare function formatNormalizedMetricPercent(value?: number): string;
 export declare function formatMetricCount(value?: unknown): string;
 export declare function formatMetricCountPair(value?: unknown, capacity?: unknown): string;

package/dist/utils/storageMetrics.js

@@ -1,6 +1,6 @@
-import { bytesSizes, getBytesSizeUnit, sizes } from './bytesParsers';
+import { bytesSizes, formatBytes, getBytesSizeUnit, sizes } from './bytesParsers';
 import { EMPTY_DATA_PLACEHOLDER, UNBREAKABLE_GAP } from './constants';
-import { formatNumber, formatPercent, formatStorageValuesToGb, } from './dataFormatters/dataFormatters';
+import { formatNumber, formatPercent, roundToDecimalPlaces } from './dataFormatters/dataFormatters';
 import { parseOptionalNonNegativeNumber } from './utils';
 const NEXT_SIZE_ROLLOVER_VALUE = 1000;
 const MIXED_UNIT_RATIO_THRESHOLD = 100;
@@ -95,28 +95,40 @@ export function formatMetricBytes(value, size, options = {}) {
         ? `${formatted}${UNBREAKABLE_GAP}${sizes[resolvedSize].label}`
         : EMPTY_DATA_PLACEHOLDER;
 }
-export function formatMetricPercent(value) {
+export function formatMetricPercent(value, fixedDecimalPlaces) {
     const numericValue = parseOptionalNonNegativeNumber(value);
     if (numericValue === undefined) {
         return EMPTY_DATA_PLACEHOLDER;
     }
-    const precision = Number.isInteger(numericValue) ? 0 : 1;
-    return formatPercent(numericValue / 100, precision) || EMPTY_DATA_PLACEHOLDER;
+    const precision = fixedDecimalPlaces !== null && fixedDecimalPlaces !== void 0 ? fixedDecimalPlaces : (Number.isInteger(numericValue) ? 0 : 1);
+    const fixed = fixedDecimalPlaces !== undefined && roundToDecimalPlaces(numericValue, precision) !== 0;
+    return formatPercent(numericValue / 100, precision, { fixed }) || EMPTY_DATA_PLACEHOLDER;
 }
-export function formatStorageMetricPair(value, capacity) {
+export function formatStorageMetricPair(value, capacity, fixedDecimalPlaces) {
     const parsedValue = parseOptionalNonNegativeNumber(value);
     const parsedCapacity = parseOptionalNonNegativeNumber(capacity);
-    if (parsedValue === undefined || parsedCapacity === undefined) {
+    if (parsedValue === undefined && parsedCapacity === undefined) {
         return EMPTY_DATA_PLACEHOLDER;
     }
-    return formatStorageValuesToGb(parsedValue, parsedCapacity).join(' / ');
+    return [
+        formatBytes({
+            value: parsedValue,
+            size: 'gb',
+            precision: 1,
+            withSizeLabel: parsedCapacity === undefined,
+            fixedDecimalPlaces,
+        }),
+        formatBytes({ value: parsedCapacity, size: 'gb', fixedDecimalPlaces }),
+    ]
+        .map((formattedValue) => formattedValue || EMPTY_DATA_PLACEHOLDER)
+        .join(' / ');
 }
 export function formatNormalizedMetricPercent(value) {
     const parsedValue = parseOptionalNonNegativeNumber(value);
     if (parsedValue === undefined) {
         return EMPTY_DATA_PLACEHOLDER;
     }
-    return formatPercent(parsedValue, 2, { fixed: true }) || EMPTY_DATA_PLACEHOLDER;
+    return formatMetricPercent(parsedValue * 100, 2);
 }
 export function formatMetricCount(value) {
     const parsedValue = parseOptionalNonNegativeNumber(value);
@@ -128,7 +140,7 @@ export function formatMetricCount(value) {
 export function formatMetricCountPair(value, capacity) {
     const formattedValue = formatMetricCount(value);
     const formattedCapacity = formatMetricCount(capacity);
-    if (formattedValue === EMPTY_DATA_PLACEHOLDER || formattedCapacity === EMPTY_DATA_PLACEHOLDER) {
+    if (formattedValue === EMPTY_DATA_PLACEHOLDER && formattedCapacity === EMPTY_DATA_PLACEHOLDER) {
         return EMPTY_DATA_PLACEHOLDER;
     }
     return `${formattedValue} / ${formattedCapacity}`;

package/dist/utils/storageMetrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"storageMetrics.js","sourceRoot":"","sources":["../../src/utils/storageMetrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storageMetrics.js","sourceRoot":"","sources":["../../src/utils/storageMetrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAC,sBAAsB,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AACpE,OAAO,EAAC,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAC,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAAC,8BAA8B,EAAC,MAAM,SAAS,CAAC;AASvD,MAAM,wBAAwB,GAAG,IAAI,CAAC;AACtC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAEvC,SAAS,sBAAsB,CAAC,IAAgB;IAC5C,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD,OAAO,UAAU,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,4CAA4C,CAAC,IAAgB,EAAE,cAAsB;IAC1F,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,cAAc,GAAG,CAAC,IAAI,cAAc,GAAG,EAAE,EAAE,CAAC;QAChF,OAAO,CAAC,CAAC;IACb,CAAC;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AAED,MAAM,UAAU,oCAAoC,CAChD,IAAgB,EAChB,cAAsB,EACtB,EACI,kBAAkB,GAAG,CAAC,EACtB,yBAAyB,GAAG,KAAK,EACjC,uBAAuB,GAAG,CAAC,MACD,EAAE;IAEhC,IAAI,yBAAyB,EAAE,CAAC;QAC5B,OAAO,4CAA4C,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,OAAO,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAC7D,CAAC;IAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAChB,OAAO,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,IAAI,KAAK,IAAI,IAAI,cAAc,GAAG,EAAE,EAAE,CAAC;QACvC,OAAO,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QACvB,OAAO,CAAC,CAAC;IACb,CAAC;IAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAChB,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;QAClE,CAAC;QACD,OAAO,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,cAAc,GAAG,EAAE,EAAE,CAAC;QACtB,OAAO,CAAC,CAAC;IACb,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAED,SAAS,4BAA4B,CACjC,YAAoB,EACpB,IAAgB,EAChB,OAAiC;IAEjC,MAAM,cAAc,GAAG,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IACxD,MAAM,aAAa,GAAG,oCAAoC,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAE1F,OAAO,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,YAAoB,EACpB,UAAoC,EAAE;IAEtC,IAAI,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAElD,OAAO,IAAI,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,4BAA4B,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAElF,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,wBAAwB,EAAE,CAAC;YAC5D,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,YAAY,GAAG,QAAQ,CAAC;IAC5B,CAAC;AACL,CAAC;AAED,MAAM,UAAU,4BAA4B,CACxC,MAA0C,EAC1C,UAAoC,EAAE;IAEtC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAS,CAAC,eAAe,EAAE,KAAK,EAAE,EAAE;QAC9D,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrD,OAAO,eAAe,CAAC;QAC3B,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IACnD,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,OAAO,yBAAyB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC1C,MAA0C,EAC1C,cAAc,GAAG,0BAA0B;IAE3C,MAAM,cAAc,GAAG,MAAM;SACxB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC7B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;IAE5D,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC;IAE7C,OAAO,QAAQ,GAAG,QAAQ,IAAI,cAAc,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,MAA0C,EAC1C,UAAoC,EAAE;IAEtC,OAAO,8BAA8B,CAAC,MAAM,CAAC;QACzC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,4BAA4B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC7B,KAAuB,EACvB,IAAiB,EACjB,UAAoC,EAAE;IAEtC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAEnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,KAAK,KAAK,IAAI,YAAY,GAAG,CAAC,CAAC,EAAE,CAAC;QAC1F,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,yBAAyB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,4BAA4B,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAElF,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAExC,OAAO,SAAS;QACZ,CAAC,CAAC,GAAG,SAAS,GAAG,eAAe,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE;QAC9D,CAAC,CAAC,sBAAsB,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAe,EAAE,kBAA2B;IAC5E,MAAM,YAAY,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAE3D,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,MAAM,SAAS,GAAG,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjF,MAAM,KAAK,GACP,kBAAkB,KAAK,SAAS,IAAI,oBAAoB,CAAC,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;IAE5F,OAAO,aAAa,CAAC,YAAY,GAAG,GAAG,EAAE,SAAS,EAAE,EAAC,KAAK,EAAC,CAAC,IAAI,sBAAsB,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,KAAuB,EACvB,QAA0B,EAC1B,kBAA2B;IAE3B,MAAM,WAAW,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC5D,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,OAAO;QACH,WAAW,CAAC;YACR,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,CAAC;YACZ,aAAa,EAAE,cAAc,KAAK,SAAS;YAC3C,kBAAkB;SACrB,CAAC;QACF,WAAW,CAAC,EAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,EAAC,CAAC;KACvE;SACI,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,IAAI,sBAAsB,CAAC;SACjE,IAAI,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,KAAc;IACxD,MAAM,WAAW,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAE1D,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,OAAO,mBAAmB,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAe;IAC7C,MAAM,WAAW,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAE1D,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,OAAO,YAAY,CAAC,WAAW,CAAC,IAAI,sBAAsB,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAe,EAAE,QAAkB;IACrE,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAEtD,IAAI,cAAc,KAAK,sBAAsB,IAAI,iBAAiB,KAAK,sBAAsB,EAAE,CAAC;QAC5F,OAAO,sBAAsB,CAAC;IAClC,CAAC;IAED,OAAO,GAAG,cAAc,MAAM,iBAAiB,EAAE,CAAC;AACtD,CAAC"}

package/dist/utils/timeParsers/formatDuration.d.ts

@@ -2,10 +2,13 @@
  * 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 declare const formatDurationToShortTimeFormat: (value: number, valuesCount?: 1 | 2) => string;
+export declare const formatDurationToShortTimeFormat: (value: number, valuesCount?: 1 | 2, { compact }?: {
+    compact?: boolean;
+}) => string;
 /**
  * Parse ms duration to string
  */

package/dist/utils/timeParsers/formatDuration.js

@@ -5,10 +5,11 @@ 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, valuesCount = 2) => {
+export const formatDurationToShortTimeFormat = (value, valuesCount = 2, { compact = false } = {}) => {
     const ms = value % 1000;
     let remain = Math.floor(value / 1000);
     const days = Math.floor(remain / DAY_IN_SECONDS);
@@ -25,6 +26,20 @@ export const formatDurationToShortTimeFormat = (value, valuesCount = 2) => {
         seconds,
         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' },
+        ];
+        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/dist/utils/timeParsers/formatDuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatDuration.js","sourceRoot":"","sources":["../../../src/utils/timeParsers/formatDuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAC,YAAY,EAAC,MAAM,kCAAkC,CAAC;AAE9D,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,KAAa,EAAE,cAAqB,CAAC,EAAE,EAAE;IACrF,MAAM,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC;IACxB,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;IACjD,MAAM,GAAG,MAAM,GAAG,cAAc,CAAC;IAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC;IACnD,MAAM,GAAG,MAAM,GAAG,eAAe,CAAC;IAElC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACxC,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC;IAErB,MAAM,OAAO,GAAG,MAAM,CAAC;IAEvB,MAAM,QAAQ,GAAG;QACb,IAAI;QACJ,KAAK;QACL,OAAO;QACP,OAAO;QACP,EAAE;KACL,CAAC;IAEF,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QACpB,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnC,CAAC;IACL,CAAC;IAED,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QACpB,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE;IACxC,OAAO,IAAI,CAAC,IAAI,EAAE,EAAC,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC;AACjD,CAAC,CAAC"}
+{"version":3,"file":"formatDuration.js","sourceRoot":"","sources":["../../../src/utils/timeParsers/formatDuration.ts"],"names":[],"mappings":"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"}

package/dist/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/dist/utils/timeParsers/i18n/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (key: "min" | "days" | "hours" | "ms" | "daysHours" | "hoursMin" | "minSec" | "secMs" | "sec", params?: import("@gravity-ui/i18n").Params) => string;
+declare const _default: (key: "min" | "days" | "hours" | "ms" | "daysHours" | "hoursMin" | "minSec" | "secMs" | "sec" | "value_compact-days" | "value_compact-hours" | "value_compact-minutes" | "value_compact-seconds", params?: import("@gravity-ui/i18n").Params) => string;
 export default _default;

package/dist/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "22.2.0",
+  "version": "22.4.0",
   "files": [
     "dist",
     "src"
@@ -38,7 +38,7 @@
     "@reduxjs/toolkit": "^2.8.2",
     "@tanstack/react-table": "^8.20.6",
     "@ydb-platform/monaco-ghost": "^0.6.1",
-    "axios": "^1.18.0",
+    "axios": "^1.20.0",
     "axios-retry": "^4.5.0",
     "colord": "^2.10.0",
     "copy-to-clipboard": "^3.3.3",

package/src/components/DiskCapacityInfo/DiskCapacityInfo.tsx

@@ -6,6 +6,7 @@ import type {PreparedStorageGroup} from '../../store/reducers/storage/types';
 import {isCapacityAlert} from '../../types/api/enums';
 import {getCapacityAlertTheme, normalizeCapacityAlert} from '../../utils/capacityAlerts';
 import {EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
+import type {DiskDetailItem} from '../../utils/disks/diskInfo/getDiskLocationItems';
 import type {PreparedPDisk, PreparedVDisk} from '../../utils/disks/types';
 import {
     formatMetricCountPair,
@@ -13,8 +14,11 @@ import {
     formatNormalizedMetricPercent,
     formatStorageMetricPair,
 } from '../../utils/storageMetrics';
+import {DiskCapacityAlertLabel} from '../DiskStatus/DiskStatus';
 import type {InfoViewerItem} from '../InfoViewer';
+import {pDiskInfoKeyset} from '../PDiskInfo/i18n';
 import {TitleWithHelpMark} from '../TitleWithHelpmark/TitleWithHelpmark';
+import {vDiskInfoKeyset} from '../VDiskInfo/i18n';
 import type {YDBDefinitionListItem} from '../YDBDefinitionList/YDBDefinitionList';
 import {
     CAPACITY_CONFIGURATION_HELP_TEXT,
@@ -51,7 +55,7 @@ export function getVDiskCapacityInfoItems(
     data: PreparedVDisk | undefined,
     {withRawUsage}: {withRawUsage: boolean},
 ): DiskCapacityInfoItem[] {
-    const sizeData = data?.WhiteboardSize ?? data;
+    const sizeData = data?.WhiteboardSize ?? data?.DisplaySize ?? data;
     const items: DiskCapacityInfoItem[] = [
         {
             id: 'size',
@@ -98,14 +102,28 @@ export function getVDiskCapacityInfoItems(
 
 export function getPDiskCapacityInfoItems(
     data: PreparedPDisk | undefined,
-    {withUsage, withCapacityAlert}: {withUsage: boolean; withCapacityAlert: boolean},
+    {
+        withUsage,
+        withCapacityAlert,
+        fixedDecimalPlaces,
+        useWhiteboardSize = true,
+    }: {
+        withUsage: boolean;
+        withCapacityAlert: boolean;
+        fixedDecimalPlaces?: number;
+        useWhiteboardSize?: boolean;
+    },
 ): DiskCapacityInfoItem[] {
-    const sizeData = data?.WhiteboardSize ?? data;
+    const sizeData = useWhiteboardSize ? (data?.WhiteboardSize ?? data) : data;
     const items: DiskCapacityInfoItem[] = [
         {
             id: 'space',
             title: i18n('field_space'),
-            value: formatStorageMetricPair(sizeData?.AllocatedSize, sizeData?.TotalSize),
+            value: formatStorageMetricPair(
+                sizeData?.AllocatedSize,
+                sizeData?.TotalSize,
+                fixedDecimalPlaces,
+            ),
         },
     ];
 
@@ -113,7 +131,7 @@ export function getPDiskCapacityInfoItems(
         items.push({
             id: 'pdisk-usage',
             title: CAPACITY_METRICS_COLUMN_TITLES.MaxPDiskUsage,
-            value: formatMetricPercent(data?.PDiskUsage),
+            value: formatMetricPercent(data?.PDiskUsage, fixedDecimalPlaces),
             note: CAPACITY_METRICS_HELP_TEXT.MaxPDiskUsage,
         });
     }
@@ -144,17 +162,96 @@ export function getPDiskCapacityInfoItems(
     return items;
 }
 
+export function getVDiskCapacityItems(
+    data: PreparedVDisk,
+    {capacityMetricsEnabled}: {capacityMetricsEnabled: boolean},
+): DiskDetailItem[] {
+    const size =
+        (capacityMetricsEnabled ? data.WhiteboardSize : undefined) ?? data.DisplaySize ?? data;
+    const items: DiskDetailItem[] = [
+        {
+            id: 'group-size-in-units',
+            name: vDiskInfoKeyset('field_group-size-in-units'),
+            content: formatCapacityUnitCount(data.GroupSizeInUnits),
+            note: CAPACITY_CONFIGURATION_HELP_TEXT.GroupSizeInUnits,
+        },
+        {
+            id: 'size',
+            name: vDiskInfoKeyset('size'),
+            content: formatStorageMetricPair(size.AllocatedSize, size.SizeLimit, 2),
+        },
+        {
+            id: 'capacity-alert',
+            name: vDiskInfoKeyset('field_capacity-alert'),
+            content: <DiskCapacityAlertLabel value={data.CapacityAlert} />,
+            note: CAPACITY_METRICS_HELP_TEXT.CapacityAlert,
+        },
+        {
+            id: 'vdisk-slot-usage',
+            name: CAPACITY_METRICS_COLUMN_TITLES.MaxVDiskSlotUsage,
+            content: formatMetricPercent(data.VDiskSlotUsage, 2),
+            note: CAPACITY_METRICS_HELP_TEXT.MaxVDiskSlotUsage,
+        },
+        {
+            id: 'vdisk-raw-usage',
+            name: CAPACITY_METRICS_COLUMN_TITLES.MaxVDiskRawUsage,
+            content: formatMetricPercent(data.VDiskRawUsage, 2),
+            note: CAPACITY_METRICS_HELP_TEXT.MaxVDiskRawUsage,
+        },
+    ];
+    return items.filter(({id}) => capacityMetricsEnabled || id === 'size');
+}
+
+export function getPDiskCapacityItems(
+    data: PreparedPDisk,
+    {useWhiteboardSize = true}: {useWhiteboardSize?: boolean} = {},
+): DiskDetailItem[] {
+    const fieldOrder = ['slot-size-in-units', 'space', 'capacity-alert', 'pdisk-usage', 'slots'];
+    const capacityItems = getPDiskCapacityInfoItems(data, {
+        withUsage: true,
+        withCapacityAlert: true,
+        fixedDecimalPlaces: 2,
+        useWhiteboardSize,
+    });
+    const items: DiskDetailItem[] = [];
+    for (const id of fieldOrder) {
+        const field = capacityItems.find((item) => item.id === id);
+        if (field) {
+            items.push({
+                id,
+                name: field.title,
+                content:
+                    id === 'capacity-alert' ? (
+                        <DiskCapacityAlertLabel value={data.PDiskCapacityAlert} />
+                    ) : (
+                        field.value
+                    ),
+                note: id === 'slots' ? pDiskInfoKeyset('context_slots') : field.note,
+            });
+        }
+    }
+    return items;
+}
+
 export function getStorageGroupCapacityInfoItems(
     data: PreparedStorageGroup | undefined,
 ): DiskCapacityInfoItem[] {
+    const capacityAlert = normalizeCapacityAlert(data?.CapacityAlert);
     return [
+        {
+            id: 'capacity-alert',
+            title: CAPACITY_METRICS_COLUMN_TITLES.CapacityAlert,
+            value: capacityAlert ? (
+                <DiskCapacityAlertLabel value={capacityAlert} />
+            ) : (
+                EMPTY_DATA_PLACEHOLDER
+            ),
+            note: CAPACITY_METRICS_HELP_TEXT.CapacityAlert,
+        },
         {
             id: 'vdisk-slot-usage',
             title: CAPACITY_METRICS_COLUMN_TITLES.MaxVDiskSlotUsage,
-            value: getAlertAwareUsageValue(
-                formatNormalizedMetricPercent(data?.MaxVDiskSlotUsage),
-                data?.CapacityAlert,
-            ),
+            value: formatNormalizedMetricPercent(data?.MaxVDiskSlotUsage),
             note: CAPACITY_METRICS_HELP_TEXT.MaxVDiskSlotUsage,
         },
         {
@@ -163,12 +260,6 @@ export function getStorageGroupCapacityInfoItems(
             value: formatNormalizedMetricPercent(data?.MaxVDiskRawUsage),
             note: CAPACITY_METRICS_HELP_TEXT.MaxVDiskRawUsage,
         },
-        {
-            id: 'capacity-alert',
-            title: CAPACITY_METRICS_COLUMN_TITLES.CapacityAlert,
-            value: getCapacityAlertValue(data?.CapacityAlert),
-            note: CAPACITY_METRICS_HELP_TEXT.CapacityAlert,
-        },
     ];
 }
 

package/src/components/DiskPopup/DiskPopup.scss

@@ -0,0 +1,203 @@
+.ydb-disk-popup {
+    --ydb-disk-popup-base-width: 368px;
+    --ydb-disk-popup-width-growth: 50px;
+
+    width: max-content;
+    min-width: min(var(--ydb-disk-popup-base-width), calc(100vw - 64px));
+    max-width: min(
+        calc(var(--ydb-disk-popup-base-width) + var(--ydb-disk-popup-width-growth)),
+        calc(100vw - 64px)
+    );
+
+    font-size: var(--g-text-body-1-font-size);
+    line-height: var(--g-text-body-1-line-height);
+    overflow-wrap: anywhere;
+
+    &_combined {
+        --ydb-disk-popup-base-width: 593px;
+        --ydb-disk-popup-width-growth: 120px;
+        --ydb-pdisk-log-size-progress-width: 50px;
+
+        display: grid;
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+
+    &__panel {
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        gap: var(--g-spacing-2);
+
+        min-width: 0;
+    }
+
+    &_combined &__panel:first-child {
+        padding-right: var(--g-spacing-3);
+
+        border-right: 1px solid var(--g-color-line-generic);
+    }
+
+    &_combined &__panel + &__panel {
+        padding-left: var(--g-spacing-3);
+    }
+
+    &__body,
+    &__footer {
+        display: flex;
+        flex-direction: column;
+        gap: var(--g-spacing-2);
+    }
+
+    // Only Compaction contributes to the intrinsic width; other sections fit the card.
+    &__body > :not(:has(.ydb-vdisk-popup__compaction)),
+    &__footer,
+    .g-definition-list__item:not(:has(.ydb-vdisk-popup__compaction)) {
+        contain: inline-size;
+    }
+
+    .ydb-vdisk-popup__compaction {
+        width: max-content;
+        max-width: 100%;
+    }
+
+    .g-definition-list__item:has(.ydb-vdisk-popup__compaction) {
+        .g-definition-list__term-container {
+            flex-shrink: 1;
+        }
+
+        .g-definition-list__definition {
+            flex-shrink: 0;
+        }
+    }
+
+    &__footer {
+        margin-top: auto;
+    }
+
+    &__id {
+        min-width: 0;
+        overflow-wrap: anywhere;
+    }
+
+    .g-definition-list {
+        --g-definition-list-item-gap: var(--g-spacing-1);
+    }
+
+    .g-definition-list__definition {
+        min-width: 0;
+        overflow-wrap: anywhere;
+    }
+
+    .g-definition-list__copy-container {
+        min-width: 0;
+        max-width: 100%;
+    }
+
+    .g-definition-list__dots {
+        flex-basis: 0;
+
+        min-width: 0;
+    }
+
+    .ydb-disk-status__tooltip {
+        min-width: 0;
+        max-width: 100%;
+    }
+
+    .ydb-disk-status__label {
+        min-width: 0;
+        max-width: 100%;
+        height: auto;
+        min-height: var(--_--height);
+
+        .g-label__text {
+            display: block;
+            overflow: visible;
+
+            min-width: 0;
+
+            text-align: start;
+            white-space: nowrap;
+        }
+
+        .g-label__content,
+        .g-label__value,
+        .g-label__key,
+        .g-label__separator {
+            display: inline;
+            overflow: visible;
+
+            text-overflow: clip;
+        }
+    }
+
+    .ydb-pdisk-log-size,
+    .ydb-vdisk-status__replication-progress {
+        flex-wrap: wrap;
+
+        max-width: 100%;
+
+        white-space: normal;
+    }
+
+    &__location {
+        contain: inline-size;
+
+        padding: var(--g-spacing-1) var(--g-spacing-2);
+
+        border-radius: var(--g-border-radius-m);
+        background-color: var(--g-color-base-generic);
+
+        .g-definition-list__dots {
+            display: none;
+        }
+
+        .g-definition-list__definition {
+            flex: 1;
+        }
+    }
+
+    &__text {
+        overflow: hidden;
+
+        min-width: 0;
+
+        cursor: default;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
+        &_with-left-trim {
+            text-align: end;
+            direction: rtl;
+
+            > span {
+                unicode-bidi: plaintext;
+            }
+        }
+    }
+
+    &__text-tooltip {
+        overflow-wrap: anywhere;
+    }
+
+    @media (max-width: 700px) {
+        &_combined {
+            --ydb-disk-popup-base-width: 368px;
+
+            grid-template-columns: minmax(0, 1fr);
+        }
+
+        &_combined &__panel:first-child {
+            padding-right: 0;
+            padding-bottom: var(--g-spacing-3);
+
+            border-right: none;
+            border-bottom: 1px solid var(--g-color-line-generic);
+        }
+
+        &_combined &__panel + &__panel {
+            padding-top: var(--g-spacing-3);
+            padding-left: 0;
+        }
+    }
+}