fix: use both BSC and Whiteboard for disks

ydb-platform · Nov 1, 2024 · 4f08ff4 · 4f08ff4
1 parent 3287f99
commit 4f08ff4
Show file tree

Hide file tree

Showing 20 changed files with 976 additions and 163 deletions.
diff --git a/src/components/PDiskPopup/PDiskPopup.tsx b/src/components/PDiskPopup/PDiskPopup.tsx
@@ -6,7 +6,6 @@ import {EFlag} from '../../types/api/enums';
 import {valueIsDefined} from '../../utils';
 import {EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
 import {createPDiskDeveloperUILink} from '../../utils/developerUI/developerUI';
-import {getPDiskId} from '../../utils/disks/helpers';
 import type {PreparedPDisk} from '../../utils/disks/types';
 import {useTypedSelector} from '../../utils/hooks';
 import {bytesToGB} from '../../utils/utils';
@@ -21,12 +20,23 @@ export const preparePDiskData = (
     nodeHost?: string,
     withDeveloperUILink?: boolean,
 ) => {
-    const {AvailableSize, TotalSize, State, PDiskId, NodeId, Path, Realtime, Type, Device} = data;
+    const {
+        AvailableSize,
+        TotalSize,
+        State,
+        PDiskId,
+        NodeId,
+        StringifiedId,
+        Path,
+        Realtime,
+        Type,
+        Device,
+    } = data;
 
     const pdiskData: InfoViewerItem[] = [
         {
             label: 'PDisk',
-            value: getPDiskId(NodeId, PDiskId) ?? EMPTY_DATA_PLACEHOLDER,
+            value: StringifiedId ?? EMPTY_DATA_PLACEHOLDER,
         },
         {label: 'State', value: State || 'not available'},
         {label: 'Type', value: Type || 'unknown'},
@@ -44,10 +54,12 @@ export const preparePDiskData = (
         pdiskData.push({label: 'Path', value: Path});
     }
 
-    pdiskData.push({
-        label: 'Available',
-        value: `${bytesToGB(AvailableSize)} of ${bytesToGB(TotalSize)}`,
-    });
+    if (!isNaN(Number(TotalSize))) {
+        pdiskData.push({
+            label: 'Available',
+            value: `${bytesToGB(AvailableSize)} of ${bytesToGB(TotalSize)}`,
+        });
+    }
 
     if (Realtime && errorColors.includes(Realtime)) {
         pdiskData.push({label: 'Realtime', value: Realtime});

diff --git a/src/components/VDiskPopup/VDiskPopup.tsx b/src/components/VDiskPopup/VDiskPopup.tsx
@@ -8,7 +8,6 @@ import {EFlag} from '../../types/api/enums';
 import {valueIsDefined} from '../../utils';
 import {cn} from '../../utils/cn';
 import {EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
-import {stringifyVdiskId} from '../../utils/dataFormatters/dataFormatters';
 import {createVDiskDeveloperUILink} from '../../utils/developerUI/developerUI';
 import {isFullVDiskData} from '../../utils/disks/helpers';
 import type {PreparedVDisk, UnavailableDonor} from '../../utils/disks/types';
@@ -203,22 +202,9 @@ export const VDiskPopup = ({data}: VDiskPopupProps) => {
     if ('Donors' in data && data.Donors) {
         const donors = data.Donors;
         for (const donor of donors) {
-            const isFullDonorData = isFullVDiskData(donor);
             donorsInfo.push({
                 label: 'VDisk',
-                value: (
-                    <InternalLink to={getVDiskLink(donor)}>
-                        {stringifyVdiskId(
-                            isFullDonorData
-                                ? donor.VDiskId
-                                : {
-                                      NodeId: donor.NodeId,
-                                      PDiskId: donor.PDiskId,
-                                      VSlotId: donor.VSlotId,
-                                  },
-                        )}
-                    </InternalLink>
-                ),
+                value: <InternalLink to={getVDiskLink(donor)}>{donor.StringifiedId}</InternalLink>,
             });
         }
     }

diff --git a/src/containers/Storage/Disks/Disks.tsx b/src/containers/Storage/Disks/Disks.tsx
@@ -5,7 +5,6 @@ import {Flex, useLayoutContext} from '@gravity-ui/uikit';
 import {VDisk} from '../../../components/VDisk/VDisk';
 import {valueIsDefined} from '../../../utils';
 import {cn} from '../../../utils/cn';
-import {getPDiskId} from '../../../utils/disks/helpers';
 import type {PreparedVDisk} from '../../../utils/disks/types';
 import {PDisk} from '../PDisk';
 import type {StorageViewContext} from '../types';
@@ -54,7 +53,7 @@ export function Disks({vDisks = [], viewContext}: DisksProps) {
             <div className={b('pdisks-wrapper')}>
                 {vDisks?.map((vDisk) => (
                     <PDiskItem
-                        key={getPDiskId(vDisk.NodeId, vDisk?.PDisk?.PDiskId)}
+                        key={vDisk?.PDisk?.StringifiedId}
                         vDisk={vDisk}
                         highlightedVDisk={highlightedVDisk}
                         setHighlightedVDisk={setHighlightedVDisk}

diff --git a/src/store/reducers/node/selectors.ts b/src/store/reducers/node/selectors.ts
@@ -1,7 +1,7 @@
 import {createSelector} from '@reduxjs/toolkit';
 
 import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
-import {preparePDiskData, prepareVDiskData} from '../../../utils/disks/prepareDisks';
+import {prepareWhiteboardVDiskData} from '../../../utils/disks/prepareDisks';
 import type {RootState} from '../../defaultStore';
 
 import {nodeApi} from './node';
@@ -29,14 +29,13 @@ export const selectNodeStructure = createSelector(
             const groups = pool.Groups;
             groups?.forEach((group) => {
                 const vDisks = group.VDisks?.filter((el) => el.NodeId === nodeId).map(
-                    prepareVDiskData,
+                    prepareWhiteboardVDiskData,
                 );
                 vDisks?.forEach((vd) => {
                     const vDiskId = stringifyVdiskId(vd.VDiskId);
-                    const preparedPDisk = preparePDiskData(vd.PDisk);
-                    const pDiskId = preparedPDisk.PDiskId;
+                    const pDiskId = vd.PDisk?.PDiskId;
                     if (!structure[String(pDiskId)]) {
-                        structure[String(pDiskId)] = {vDisks: {}, ...preparedPDisk};
+                        structure[String(pDiskId)] = {vDisks: {}, ...vd.PDisk};
                     }
                     structure[String(pDiskId)].vDisks[vDiskId] = {
                         ...vd,

diff --git a/src/store/reducers/node/types.ts b/src/store/reducers/node/types.ts
@@ -1,14 +1,13 @@
-import type {TVDiskStateInfo} from '../../../types/api/vdisk';
-import type {PreparedPDisk} from '../../../utils/disks/types';
+import type {PreparedPDisk, PreparedVDisk} from '../../../utils/disks/types';
 import type {PreparedNodeSystemState} from '../../../utils/nodes';
 
 interface RawStructurePDisk extends PreparedPDisk {
-    vDisks: Record<string, TVDiskStateInfo>;
+    vDisks: Record<string, PreparedVDisk>;
 }
 
 export type RawNodeStructure = Record<string, RawStructurePDisk>;
 
-export interface PreparedStructureVDisk extends TVDiskStateInfo {
+export interface PreparedStructureVDisk extends PreparedVDisk {
     id: string;
     order: number;
 }

diff --git a/src/store/reducers/pdisk/utils.ts b/src/store/reducers/pdisk/utils.ts
@@ -1,7 +1,10 @@
 import type {TPDiskInfoResponse} from '../../../types/api/pdisk';
 import type {TEvSystemStateResponse} from '../../../types/api/systemState';
 import {getArray, valueIsDefined} from '../../../utils';
-import {preparePDiskData, prepareVDiskData} from '../../../utils/disks/prepareDisks';
+import {
+    prepareWhiteboardPDiskData,
+    prepareWhiteboardVDiskData,
+} from '../../../utils/disks/prepareDisks';
 import {prepareNodeSystemState} from '../../../utils/nodes';
 
 import type {PDiskData, SlotItem} from './types';
@@ -18,7 +21,10 @@ export function preparePDiskDataResponse([pdiskResponse = {}, nodeResponse]: [
     const {PDisk: WhiteboardPDiskData = {}, VDisks: WhiteboardVDisksData = []} = Whiteboard;
     const {PDisk: BSCPDiskData = {}} = BSC;
 
-    const preparedPDisk = preparePDiskData(WhiteboardPDiskData, BSCPDiskData);
+    const preparedPDisk = prepareWhiteboardPDiskData({
+        ...BSCPDiskData,
+        ...WhiteboardPDiskData,
+    });
 
     const NodeId = preparedPDisk.NodeId ?? preparedNode.NodeId;
 
@@ -48,7 +54,9 @@ export function preparePDiskDataResponse([pdiskResponse = {}, nodeResponse]: [
         };
     }
 
-    const preparedVDisks = WhiteboardVDisksData.map((disk) => prepareVDiskData({...disk, NodeId}));
+    const preparedVDisks = WhiteboardVDisksData.map((disk) =>
+        prepareWhiteboardVDiskData({...disk, NodeId}),
+    );
     preparedVDisks.sort((disk1, disk2) => Number(disk2.VDiskSlotId) - Number(disk1.VDiskSlotId));
 
     const vdisksSlots: SlotItem<'vDisk'>[] = preparedVDisks.map((preparedVDisk) => {