diff --git a/src/containers/Nodes/columns/columns.tsx b/src/containers/Nodes/columns/columns.tsx index 0a91ca043..b8a225914 100644 --- a/src/containers/Nodes/columns/columns.tsx +++ b/src/containers/Nodes/columns/columns.tsx @@ -25,13 +25,13 @@ export function getNodesColumns(params: GetNodesColumnsParams): Column(), getDataCenterColumn(), getRackColumn(), - getVersionColumn(), getUptimeColumn(), - getMemoryColumn(), - getRAMColumn(), - getPoolsColumn(), getCpuColumn(), + getPoolsColumn(), + getRAMColumn(), + getMemoryColumn(), getLoadAverageColumn(), + getVersionColumn(), getTabletsColumn(params), ]; diff --git a/src/containers/Nodes/columns/constants.ts b/src/containers/Nodes/columns/constants.ts index 3b152d196..4a7746e2d 100644 --- a/src/containers/Nodes/columns/constants.ts +++ b/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', ]; diff --git a/src/containers/Storage/StorageGroups/columns/constants.ts b/src/containers/Storage/StorageGroups/columns/constants.ts index 888a0b155..9623110bf 100644 --- a/src/containers/Storage/StorageGroups/columns/constants.ts +++ b/src/containers/Storage/StorageGroups/columns/constants.ts @@ -37,13 +37,8 @@ export type StorageGroupsColumnId = ValueOf; export const DEFAULT_STORAGE_GROUPS_COLUMNS: StorageGroupsColumnId[] = [ 'GroupId', 'PoolName', - 'MediaType', 'Erasure', 'Used', - 'Limit', - 'Usage', - 'Read', - 'Write', 'VDisks', ]; diff --git a/src/containers/Storage/StorageNodes/columns/columns.tsx b/src/containers/Storage/StorageNodes/columns/columns.tsx index d695b37fa..4b01c62c2 100644 --- a/src/containers/Storage/StorageNodes/columns/columns.tsx +++ b/src/containers/Storage/StorageNodes/columns/columns.tsx @@ -68,17 +68,17 @@ export const getStorageNodesColumns = ({ const columns = [ getNodeIdColumn(), - getNodeNameColumn(), getHostColumn({getNodeRef, database}), + getNodeNameColumn(), getDataCenterColumn(), getRackColumn(), - getVersionColumn(), - getMemoryColumn(), - getRAMColumn(), - getPoolsColumn(), + getUptimeColumn(), getCpuColumn(), + getPoolsColumn(), + getRAMColumn(), + getMemoryColumn(), getDiskSpaceUsageColumn(), - getUptimeColumn(), + getVersionColumn(), getMissingDisksColumn(), getPDisksColumn({viewContext}), ]; diff --git a/src/containers/Storage/StorageNodes/columns/constants.ts b/src/containers/Storage/StorageNodes/columns/constants.ts index 6c51bd11d..4bcfb19c5 100644 --- a/src/containers/Storage/StorageNodes/columns/constants.ts +++ b/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']; diff --git a/tests/suites/nodes/nodes.test.ts b/tests/suites/nodes/nodes.test.ts index 5edee7f27..58086ed48 100644 --- a/tests/suites/nodes/nodes.test.ts +++ b/tests/suites/nodes/nodes.test.ts @@ -123,8 +123,10 @@ test.describe('Test Nodes Paginated Table', async () => { expect(rowData).toHaveProperty('Host'); expect(rowData).toHaveProperty('Uptime'); - expect(rowData).toHaveProperty('Detailed Memory'); - expect(rowData).toHaveProperty('Pools'); + expect(rowData).toHaveProperty('CPU'); + expect(rowData).toHaveProperty('RAM'); + expect(rowData).toHaveProperty('Version'); + expect(rowData).toHaveProperty('Tablets'); }); test('Column values can be retrieved correctly', async ({page}) => { diff --git a/tests/suites/storage/storage.test.ts b/tests/suites/storage/storage.test.ts index 8c930c49e..95e64efa4 100644 --- a/tests/suites/storage/storage.test.ts +++ b/tests/suites/storage/storage.test.ts @@ -105,10 +105,11 @@ test.describe('Test Storage Paginated Table', async () => { const rowData = await storageTable.getRowData(0); + expect(rowData).toHaveProperty('Group ID'); expect(rowData).toHaveProperty('Pool Name'); - expect(rowData).toHaveProperty('Type'); expect(rowData).toHaveProperty('Erasure'); - expect(rowData).toHaveProperty('Usage'); + expect(rowData).toHaveProperty('Used'); + expect(rowData).toHaveProperty('VDisks'); }); test('Column values can be retrieved correctly', async ({page}) => { @@ -117,12 +118,12 @@ test.describe('Test Storage Paginated Table', async () => { await paginatedTable.waitForTableToLoad(); await paginatedTable.waitForTableData(); - const typeValues = await paginatedTable.getColumnValues('Type'); + const poolValues = await paginatedTable.getColumnValues('Pool Name'); const erasureValues = await paginatedTable.getColumnValues('Erasure'); - expect(typeValues.length).toBeGreaterThan(0); + expect(poolValues.length).toBeGreaterThan(0); expect(erasureValues.length).toBeGreaterThan(0); - expect(typeValues.length).toBe(erasureValues.length); + expect(poolValues.length).toBe(erasureValues.length); }); test('Clicking on Group ID header sorts the table', async ({page}) => {