ydb-embedded-ui 6.31.0 → 6.32.0

package/dist/utils/disks/prepareDisks.js

@@ -2,49 +2,96 @@ import { stringifyVdiskId } from '../dataFormatters/dataFormatters';
 import { calculatePDiskSeverity } from './calculatePDiskSeverity';
 import { calculateVDiskSeverity } from './calculateVDiskSeverity';
 import { getPDiskType } from './getPDiskType';
-export function prepareVDiskData(vdiskState = {}) {
-    var _a, _b, _c, _d;
+import { getPDiskId, isFullVDiskData } from './helpers';
+export function prepareWhiteboardVDiskData(vDiskState = {}) {
+    var _a;
+    if (!isFullVDiskData(vDiskState)) {
+        const { NodeId, PDiskId, VSlotId } = vDiskState;
+        const StringifiedId = stringifyVdiskId({
+            NodeId,
+            PDiskId,
+            VSlotId,
+        });
+        return {
+            StringifiedId,
+            NodeId,
+            PDiskId,
+            // Replace VSlotId with VDiskSlotId to match with PreparedVDisk type
+            VDiskSlotId: VSlotId,
+        };
+    }
+    const { PDisk, PDiskId, VDiskId, NodeId, Donors, AvailableSize, AllocatedSize, ...restVDiskFields } = vDiskState;
     // Prepare PDisk only if it is present
-    const PDisk = vdiskState.PDisk
-        ? preparePDiskData({
-            ...vdiskState.PDisk,
-            NodeId: (_a = vdiskState.PDisk.NodeId) !== null && _a !== void 0 ? _a : vdiskState.NodeId,
-        })
+    const preparedPDisk = PDisk
+        ? prepareWhiteboardPDiskData({ ...PDisk, NodeId: (_a = PDisk === null || PDisk === void 0 ? void 0 : PDisk.NodeId) !== null && _a !== void 0 ? _a : NodeId })
         : undefined;
-    const PDiskId = (_b = vdiskState.PDiskId) !== null && _b !== void 0 ? _b : PDisk === null || PDisk === void 0 ? void 0 : PDisk.PDiskId;
-    const available = Number((_c = vdiskState.AvailableSize) !== null && _c !== void 0 ? _c : PDisk === null || PDisk === void 0 ? void 0 : PDisk.AvailableSize);
-    const allocated = Number(vdiskState.AllocatedSize);
-    const total = allocated + available;
-    const allocatedPercent = Math.round((allocated * 100) / total);
-    const Donors = (_d = vdiskState.Donors) === null || _d === void 0 ? void 0 : _d.map((donor) => {
-        return prepareVDiskData({ ...donor, DonorMode: true });
+    const actualPDiskId = PDiskId !== null && PDiskId !== void 0 ? PDiskId : preparedPDisk === null || preparedPDisk === void 0 ? void 0 : preparedPDisk.PDiskId;
+    const vDiskSizeFields = prepareVDiskSizeFields({
+        AvailableSize: AvailableSize !== null && AvailableSize !== void 0 ? AvailableSize : PDisk === null || PDisk === void 0 ? void 0 : PDisk.AvailableSize,
+        AllocatedSize: AllocatedSize,
+    });
+    const Severity = calculateVDiskSeverity(vDiskState);
+    const StringifiedId = stringifyVdiskId(VDiskId);
+    const preparedDonors = Donors === null || Donors === void 0 ? void 0 : Donors.map((donor) => {
+        return prepareWhiteboardVDiskData({ ...donor, DonorMode: true });
     });
-    const Severity = calculateVDiskSeverity(vdiskState);
-    const StringifiedId = stringifyVdiskId(vdiskState.VDiskId);
     return {
-        ...vdiskState,
-        PDisk,
-        PDiskId,
-        Donors,
+        ...restVDiskFields,
+        ...vDiskSizeFields,
+        VDiskId,
+        NodeId,
+        PDiskId: actualPDiskId,
+        PDisk: preparedPDisk,
+        Donors: preparedDonors,
         Severity,
         StringifiedId,
+    };
+}
+export function prepareWhiteboardPDiskData(pdiskState = {}) {
+    const { AvailableSize, TotalSize, Category, State, PDiskId, NodeId, EnforcedDynamicSlotSize, ...restPDiskFields } = pdiskState;
+    const StringifiedId = getPDiskId(PDiskId, NodeId);
+    const Type = getPDiskType(Category);
+    const pdiskPreparedSizeFields = preparePDiskSizeFields({
+        AvailableSize,
+        TotalSize,
+    });
+    const Severity = calculatePDiskSeverity({
+        State,
+        AllocatedPercent: pdiskPreparedSizeFields.AllocatedPercent,
+    });
+    return {
+        ...restPDiskFields,
+        ...pdiskPreparedSizeFields,
+        PDiskId,
+        NodeId,
+        StringifiedId,
+        Type,
+        Category,
+        State,
+        Severity,
+        SlotSize: EnforcedDynamicSlotSize,
+    };
+}
+export function prepareVDiskSizeFields({ AvailableSize, AllocatedSize, }) {
+    const available = Number(AvailableSize);
+    const allocated = Number(AllocatedSize);
+    const total = allocated + available;
+    const allocatedPercent = Math.round((allocated * 100) / total);
+    return {
+        AvailableSize: available,
+        AllocatedSize: allocated,
         TotalSize: total,
         AllocatedPercent: allocatedPercent,
     };
 }
-export function preparePDiskData(pdiskState = {}, bscPDiskInfo = {}) {
-    const { AvailableSize, TotalSize, Category } = pdiskState;
-    const Type = getPDiskType(Category);
+export function preparePDiskSizeFields({ AvailableSize, TotalSize, }) {
     const available = Number(AvailableSize);
     const total = Number(TotalSize);
     const allocated = total - available;
     const allocatedPercent = Math.round((allocated * 100) / total);
-    const Severity = calculatePDiskSeverity(pdiskState, allocatedPercent);
     return {
-        ...bscPDiskInfo,
-        ...pdiskState,
-        Type,
-        Severity,
+        AvailableSize: available,
+        TotalSize: total,
         AllocatedSize: allocated,
         AllocatedPercent: allocatedPercent,
     };

package/dist/utils/disks/prepareDisks.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareDisks.js","sourceRoot":"","sources":["../../../src/utils/disks/prepareDisks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAG5C,MAAM,UAAU,gBAAgB,CAAC,aAA8B,EAAE;;IAC7D,sCAAsC;IACtC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK;QAC1B,CAAC,CAAC,gBAAgB,CAAC;YACb,GAAG,UAAU,CAAC,KAAK;YACnB,MAAM,EAAE,MAAA,UAAU,CAAC,KAAK,CAAC,MAAM,mCAAI,UAAU,CAAC,MAAM;SACvD,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC;IAErD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAA,UAAU,CAAC,aAAa,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,SAAS,GAAG,SAAS,CAAC;IACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAE/D,MAAM,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,OAAO,gBAAgB,CAAC,EAAC,GAAG,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE3D,OAAO;QACH,GAAG,UAAU;QACb,KAAK;QACL,OAAO;QACP,MAAM;QACN,QAAQ;QACR,aAAa;QAEb,SAAS,EAAE,KAAK;QAChB,gBAAgB,EAAE,gBAAgB;KACrC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC5B,aAA8B,EAAE,EAChC,eAA2B,EAAE;IAE7B,MAAM,EAAC,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAC,GAAG,UAAU,CAAC;IAExD,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEpC,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;IACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAE/D,MAAM,QAAQ,GAAG,sBAAsB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAEtE,OAAO;QACH,GAAG,YAAY;QACf,GAAG,UAAU;QACb,IAAI;QACJ,QAAQ;QAER,aAAa,EAAE,SAAS;QACxB,gBAAgB,EAAE,gBAAgB;KACrC,CAAC;AACN,CAAC"}
+{"version":3,"file":"prepareDisks.js","sourceRoot":"","sources":["../../../src/utils/disks/prepareDisks.ts"],"names":[],"mappings":"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"}

package/dist/utils/disks/types.d.ts

@@ -2,18 +2,25 @@ import type { TPDiskInfo, TPDiskStateInfo } from '../../types/api/pdisk';
 import type { TVDiskStateInfo, TVSlotId } from '../../types/api/vdisk';
 import type { ValueOf } from '../../types/common';
 import type { PDISK_TYPES } from './getPDiskType';
-export type PreparedPDisk = TPDiskStateInfo & Omit<Partial<TPDiskInfo>, 'Type'> & {
+export type PreparedPDisk = Omit<TPDiskStateInfo, 'AvailableSize' | 'TotalSize' | 'EnforcedDynamicSlotSize'> & Omit<Partial<TPDiskInfo>, 'Type' | 'AvailableSize' | 'TotalSize'> & {
     Type?: PDiskType;
     Severity?: number;
+    StringifiedId?: string;
+    AvailableSize?: number;
+    TotalSize?: number;
     AllocatedSize?: number;
     AllocatedPercent?: number;
+    SlotSize?: string;
 };
-export interface PreparedVDisk extends TVDiskStateInfo {
+export interface PreparedVDisk extends Omit<TVDiskStateInfo, 'PDisk' | 'AvailableSize' | 'AllocatedSize' | 'Donors'> {
     PDisk?: PreparedPDisk;
     Severity?: number;
     StringifiedId?: string;
+    AvailableSize?: number;
     TotalSize?: number;
+    AllocatedSize?: number;
     AllocatedPercent?: number;
+    Donors?: PreparedVDisk[];
 }
 export type PDiskType = ValueOf<typeof PDISK_TYPES>;
 export interface UnavailableDonor extends TVSlotId {

package/dist/utils/storage.d.ts

@@ -4,6 +4,6 @@ interface EntityWithUsage {
     Limit: number;
 }
 export declare const getUsage: <T extends EntityWithUsage>(data: T, step?: number) => number;
-export declare const getSpaceUsageSeverity: (value: number) => "danger" | "warning" | "success" | undefined;
+export declare const getSpaceUsageSeverity: (value: number) => "success" | "warning" | "danger" | undefined;
 export declare const isSortableStorageProperty: (value: unknown) => value is StorageV2SortValue;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "6.31.0",
+  "version": "6.32.0",
   "files": [
     "dist"
   ],
@@ -76,7 +76,8 @@
     "typecheck": "tsc --noEmit",
     "prepare": "husky",
     "test:e2e:install": "npx playwright install --with-deps",
-    "test:e2e": "npx playwright test --config=playwright.config.ts"
+    "test:e2e": "npx playwright test --config=playwright.config.ts",
+    "test:e2e:local": "PLAYWRIGHT_BASE_URL=http://localhost:3000/ npm run test:e2e"
   },
   "lint-staged": {
     "*.{scss, css}": [

package/dist/containers/Nodes/i18n/ru.json

@@ -1,3 +0,0 @@
-{
-    "empty.default": "Нет узлов"
-}