fix(Storage): use media type for groups (#788)

Author: artemmufazalov

src/containers/Storage/StorageGroups/getStorageGroupsColumns.tsx

@@ -29,7 +29,7 @@ type StorageGroupsColumn = VirtualTableColumn<PreparedStorageGroup> &
 
 export const GROUPS_COLUMNS_IDS = {
     PoolName: 'PoolName',
-    Kind: 'Kind',
+    MediaType: 'MediaType',
     Erasure: 'Erasure',
     GroupId: 'GroupId',
     Used: 'Used',
@@ -64,14 +64,14 @@ const poolNameColumn: StorageGroupsColumn = {
     align: DataTable.LEFT,
 };
 
-const kindColumn: StorageGroupsColumn = {
-    name: GROUPS_COLUMNS_IDS.Kind,
+const typeColumn: StorageGroupsColumn = {
+    name: GROUPS_COLUMNS_IDS.MediaType,
     header: 'Type',
     width: 100,
     align: DataTable.LEFT,
     render: ({row}) => (
         <>
-            <Label>{row.Kind || '—'}</Label>
+            <Label>{row.MediaType || '—'}</Label>
             {'\u00a0'}
             {row.Encryption && (
                 <Popover
@@ -244,13 +244,13 @@ const getVdiscksColumn = (nodes?: NodesMap): StorageGroupsColumn => ({
 });
 
 export const getStorageTopGroupsColumns = (): StorageGroupsColumn[] => {
-    return [groupIdColumn, kindColumn, erasureColumn, usageColumn, usedColumn, limitColumn];
+    return [groupIdColumn, typeColumn, erasureColumn, usageColumn, usedColumn, limitColumn];
 };
 
 export const getPDiskStorageColumns = (nodes?: NodesMap): StorageGroupsColumn[] => {
     return [
         poolNameColumn,
-        kindColumn,
+        typeColumn,
         erasureColumn,
         degradedColumn,
         groupIdColumn,
@@ -263,7 +263,7 @@ export const getPDiskStorageColumns = (nodes?: NodesMap): StorageGroupsColumn[]
 const getStorageGroupsColumns = (nodes?: NodesMap): StorageGroupsColumn[] => {
     return [
         poolNameColumn,
-        kindColumn,
+        typeColumn,
         erasureColumn,
         degradedColumn,
         usageColumn,

src/store/reducers/pdisk/utils.ts

@@ -43,7 +43,7 @@ export function preparePDiskStorageResponse(
             });
 
             if (groupHasPDiskVDisks) {
-                preparedGroups.push(prepareStorageGroupData(group, pool.Name));
+                preparedGroups.push(prepareStorageGroupData(group, pool));
             }
         }),
     );

src/store/reducers/storage/types.ts

@@ -47,7 +47,7 @@ export interface PreparedStorageGroup extends TStorageGroupInfo {
     Used: number;
     Limit: number;
     Degraded: number;
-    Kind?: string;
+    MediaType?: string;
 
     UsedSpaceFlag: number;
 

src/store/reducers/storage/utils.ts

@@ -45,15 +45,17 @@ const prepareVDisk = (vDisk: TVDiskStateInfo, poolName: string | undefined) => {
 
 export const prepareStorageGroupData = (
     group: TStorageGroupInfo,
-    poolName?: string,
+    pool: TStoragePoolInfo,
 ): PreparedStorageGroup => {
     let missing = 0;
     let usedSpaceFlag = 0;
     let usedSpaceBytes = 0;
     let limitSizeBytes = 0;
     let readSpeedBytesPerSec = 0;
     let writeSpeedBytesPerSec = 0;
-    let mediaType = '';
+    let mediaType: string | undefined;
+
+    const {Name: poolName, MediaType: poolMediaType} = pool;
 
     if (group.VDisks) {
         for (const vDisk of group.VDisks) {
@@ -91,8 +93,7 @@ export const prepareStorageGroupData = (
             readSpeedBytesPerSec += Number(ReadThroughput) || 0;
             writeSpeedBytesPerSec += Number(WriteThroughput) || 0;
 
-            mediaType =
-                PDiskType && (PDiskType === mediaType || mediaType === '') ? PDiskType : 'Mixed';
+            mediaType = PDiskType && (PDiskType === mediaType || !mediaType) ? PDiskType : 'Mixed';
         }
     }
 
@@ -110,7 +111,7 @@ export const prepareStorageGroupData = (
         Limit: limitSizeBytes,
         Degraded: missing,
         UsedSpaceFlag: usedSpaceFlag,
-        Kind: mediaType || undefined,
+        MediaType: poolMediaType || mediaType || undefined,
     };
 };
 
@@ -125,6 +126,7 @@ export const prepareStorageGroupDataV2 = (group: TStorageGroupInfoV2): PreparedS
         Limit = 0,
         Degraded = 0,
         Kind,
+        MediaType,
     } = group;
 
     const UsedSpaceFlag = VDisks.reduce((acc, {DiskSpace}) => {
@@ -141,7 +143,7 @@ export const prepareStorageGroupDataV2 = (group: TStorageGroupInfoV2): PreparedS
         ...group,
         UsedSpaceFlag,
         PoolName,
-        Kind,
+        MediaType: MediaType || Kind,
         VDisks: vDisks,
         Usage: usage,
         Read: Number(Read),
@@ -162,7 +164,7 @@ export const prepareStorageGroups = (
     } else {
         StoragePools?.forEach((pool) => {
             pool.Groups?.forEach((group) => {
-                preparedGroups.push(prepareStorageGroupData(group, pool.Name));
+                preparedGroups.push(prepareStorageGroupData(group, pool));
             });
         });
     }

src/types/api/storage.ts

@@ -33,11 +33,13 @@ export interface TStoragePoolInfo {
     MaximumThroughput?: string;
     /** uint64 */
     MaximumSize?: string;
+    MediaType?: string;
 }
 
 export interface TStorageGroupInfoV2 extends TStorageGroupInfo {
     PoolName?: string;
     Kind?: string;
+    MediaType?: string;
 
     /** uint64 */
     Degraded?: string;

src/utils/storage.ts

@@ -20,6 +20,7 @@ export const getUsage = <T extends EntityWithUsage>(data: T, step = 1) => {
 export const STORAGE_SORT_VALUES = {
     PoolName: 'PoolName',
     Kind: 'Kind',
+    MediaType: 'MediaType',
     Erasure: 'Erasure',
     Degraded: 'Degraded',
     Usage: 'Usage',