fix: add additional fields to grouping

Author: artemmufazalov

src/containers/Storage/StorageControls/StorageControls.tsx

@@ -87,7 +87,7 @@ export function StorageGroupsControls({
                     hasClear
                     placeholder={'-'}
                     label={i18n('controls_group-by-placeholder')}
-                    width={200}
+                    width={240}
                     defaultValue={
                         storageGroupsGroupByParam ? [storageGroupsGroupByParam] : undefined
                     }
@@ -165,7 +165,7 @@ export function StorageNodesControls({
                     hasClear
                     placeholder={'-'}
                     label={i18n('controls_group-by-placeholder')}
-                    width={200}
+                    width={240}
                     defaultValue={storageNodesGroupByParam ? [storageNodesGroupByParam] : undefined}
                     onUpdate={handleGroupBySelectUpdate}
                     options={STORAGE_NODES_GROUP_BY_OPTIONS}

src/containers/Storage/StorageGroups/columns/constants.ts

@@ -18,13 +18,16 @@ export const STORAGE_GROUPS_COLUMNS_IDS = {
     Used: 'Used',
     Limit: 'Limit',
     Usage: 'Usage',
+    DiskSpaceUsage: 'DiskSpaceUsage',
     DiskSpace: 'DiskSpace',
     Read: 'Read',
     Write: 'Write',
+    Latency: 'Latency',
     VDisks: 'VDisks',
     VDisksPDisks: 'VDisksPDisks',
     MissingDisks: 'MissingDisks',
     Degraded: 'Degraded',
+    State: 'State',
 } as const;
 
 type StorageGroupsColumnId = ValueOf<typeof STORAGE_GROUPS_COLUMNS_IDS>;
@@ -71,6 +74,9 @@ export const STORAGE_GROUPS_COLUMNS_TITLES = {
     get Usage() {
         return i18n('usage');
     },
+    get DiskSpaceUsage() {
+        return i18n('disk-space-usage');
+    },
     get DiskSpace() {
         return i18n('space');
     },
@@ -80,6 +86,9 @@ export const STORAGE_GROUPS_COLUMNS_TITLES = {
     get Write() {
         return i18n('write');
     },
+    get Latency() {
+        return i18n('latency');
+    },
     get VDisks() {
         return i18n('vdisks');
     },
@@ -92,6 +101,9 @@ export const STORAGE_GROUPS_COLUMNS_TITLES = {
     get MissingDisks() {
         return i18n('missing-disks');
     },
+    get State() {
+        return i18n('state');
+    },
 } as const satisfies Record<StorageGroupsColumnId, string>;
 
 const STORAGE_GROUPS_GROUP_BY_PARAMS = [
@@ -100,7 +112,10 @@ const STORAGE_GROUPS_GROUP_BY_PARAMS = [
     'Encryption',
     'Erasure',
     'Usage',
+    'DiskSpaceUsage',
+    'State',
     'MissingDisks',
+    'Latency',
 ] as const satisfies GroupsGroupByField[];
 
 export const STORAGE_GROUPS_GROUP_BY_OPTIONS: SelectOption[] = STORAGE_GROUPS_GROUP_BY_PARAMS.map(

src/containers/Storage/StorageGroups/columns/i18n/en.json

@@ -5,13 +5,16 @@
   "erasure": "Erasure",
   "degraded": "Degraded",
   "missing-disks": "Missing Disks",
+  "state": "State",
   "usage": "Usage",
+  "disk-space-usage": "Disk space usage",
   "group-id": "Group ID",
   "used": "Used",
   "limit": "Limit",
   "space": "Space",
   "read": "Read",
   "write": "Write",
+  "latency": "Latency",
   "vdisks": "VDisks",
   "vdisks-pdisks": "VDisks with PDisks"
 }

src/containers/Storage/StorageNodes/columns/constants.ts

@@ -14,9 +14,11 @@ export const STORAGE_NODES_COLUMNS_IDS = {
     Host: 'Host',
     DC: 'DC',
     Rack: 'Rack',
+    Version: 'Version',
     Uptime: 'Uptime',
     PDisks: 'PDisks',
     Missing: 'Missing',
+    DiskSpaceUsage: 'DiskSpaceUsage',
 } as const;
 
 type StorageNodesColumnId = ValueOf<typeof STORAGE_NODES_COLUMNS_IDS>;
@@ -46,6 +48,9 @@ export const STORAGE_NODES_COLUMNS_TITLES = {
     get Rack() {
         return i18n('rack');
     },
+    get Version() {
+        return i18n('version');
+    },
     get Uptime() {
         return i18n('uptime');
     },
@@ -55,14 +60,19 @@ export const STORAGE_NODES_COLUMNS_TITLES = {
     get Missing() {
         return i18n('missing');
     },
+    get DiskSpaceUsage() {
+        return i18n('disk-space-usage');
+    },
 } as const satisfies Record<StorageNodesColumnId, string>;
 
 const STORAGE_NODES_GROUP_BY_PARAMS = [
     'Host',
     'DC',
     'Rack',
+    'Version',
     'Uptime',
     'Missing',
+    'DiskSpaceUsage',
 ] as const satisfies NodesGroupByField[];
 
 export const STORAGE_NODES_GROUP_BY_OPTIONS: SelectOption[] = STORAGE_NODES_GROUP_BY_PARAMS.map(

src/containers/Storage/StorageNodes/columns/i18n/en.json

@@ -3,7 +3,9 @@
   "host": "Host",
   "dc": "DC",
   "rack": "Rack",
+  "version": "Version",
   "uptime": "Uptime",
   "missing": "Missing",
+  "disk-space-usage": "Disk space usage",
   "pdisks": "PDisks"
 }