fix: change default tables columns, reorder columns

Author: artemmufazalov

src/containers/Nodes/columns/columns.tsx

@@ -25,13 +25,13 @@ export function getNodesColumns(params: GetNodesColumnsParams): Column<NodesPrep
         getNodeNameColumn<NodesPreparedEntity>(),
         getDataCenterColumn<NodesPreparedEntity>(),
         getRackColumn<NodesPreparedEntity>(),
-        getVersionColumn<NodesPreparedEntity>(),
         getUptimeColumn<NodesPreparedEntity>(),
-        getMemoryColumn<NodesPreparedEntity>(),
-        getRAMColumn<NodesPreparedEntity>(),
-        getPoolsColumn<NodesPreparedEntity>(),
         getCpuColumn<NodesPreparedEntity>(),
+        getPoolsColumn<NodesPreparedEntity>(),
+        getRAMColumn<NodesPreparedEntity>(),
+        getMemoryColumn<NodesPreparedEntity>(),
         getLoadAverageColumn<NodesPreparedEntity>(),
+        getVersionColumn<NodesPreparedEntity>(),
         getTabletsColumn<NodesPreparedEntity>(params),
     ];
 

src/containers/Nodes/columns/constants.ts

@@ -9,13 +9,10 @@ export const NODES_TABLE_SELECTED_COLUMNS_LS_KEY = 'nodesTableSelectedColumns';
 export const DEFAULT_NODES_COLUMNS: NodesColumnId[] = [
     'NodeId',
     'Host',
-    'DC',
-    'Rack',
-    'Version',
     'Uptime',
-    'Memory',
-    'Pools',
-    'LoadAverage',
+    'CPU',
+    'RAM',
+    'Version',
     'Tablets',
 ];
 

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

@@ -37,13 +37,8 @@ export type StorageGroupsColumnId = ValueOf<typeof STORAGE_GROUPS_COLUMNS_IDS>;
 export const DEFAULT_STORAGE_GROUPS_COLUMNS: StorageGroupsColumnId[] = [
     'GroupId',
     'PoolName',
-    'MediaType',
     'Erasure',
     'Used',
-    'Limit',
-    'Usage',
-    'Read',
-    'Write',
     'VDisks',
 ];
 

src/containers/Storage/StorageNodes/columns/columns.tsx

@@ -68,17 +68,17 @@ export const getStorageNodesColumns = ({
 
     const columns = [
         getNodeIdColumn<PreparedStorageNode>(),
-        getNodeNameColumn<PreparedStorageNode>(),
         getHostColumn<PreparedStorageNode>({getNodeRef, database}),
+        getNodeNameColumn<PreparedStorageNode>(),
         getDataCenterColumn<PreparedStorageNode>(),
         getRackColumn<PreparedStorageNode>(),
-        getVersionColumn<PreparedStorageNode>(),
-        getMemoryColumn<PreparedStorageNode>(),
-        getRAMColumn<PreparedStorageNode>(),
-        getPoolsColumn<PreparedStorageNode>(),
+        getUptimeColumn<PreparedStorageNode>(),
         getCpuColumn<PreparedStorageNode>(),
+        getPoolsColumn<PreparedStorageNode>(),
+        getRAMColumn<PreparedStorageNode>(),
+        getMemoryColumn<PreparedStorageNode>(),
         getDiskSpaceUsageColumn<PreparedStorageNode>(),
-        getUptimeColumn<PreparedStorageNode>(),
+        getVersionColumn<PreparedStorageNode>(),
         getMissingDisksColumn<PreparedStorageNode>(),
         getPDisksColumn({viewContext}),
     ];

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

@@ -11,10 +11,9 @@ export const STORAGE_NODES_SELECTED_COLUMNS_LS_KEY = 'storageNodesSelectedColumn
 export const DEFAULT_STORAGE_NODES_COLUMNS: NodesColumnId[] = [
     'NodeId',
     'Host',
-    'DC',
-    'Rack',
-    'Pools',
     'Uptime',
+    'CPU',
+    'RAM',
     'PDisks',
 ];
 export const REQUIRED_STORAGE_NODES_COLUMNS: NodesColumnId[] = ['NodeId'];