From 0b195b25e97985604e46c2eb003cc486f5a96efc Mon Sep 17 00:00:00 2001 From: mufazalov Date: Thu, 22 Jun 2023 18:24:46 +0300 Subject: [PATCH] fix(Storage): update columns --- .../Storage/StorageGroups/StorageGroups.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/containers/Storage/StorageGroups/StorageGroups.tsx b/src/containers/Storage/StorageGroups/StorageGroups.tsx index 764012d20..5d690d51a 100644 --- a/src/containers/Storage/StorageGroups/StorageGroups.tsx +++ b/src/containers/Storage/StorageGroups/StorageGroups.tsx @@ -74,8 +74,8 @@ function setSortOrder(visibleEntities: keyof typeof VisibleEntities): SortOrder switch (visibleEntities) { case VisibleEntities.All: { return { - columnId: TableColumnsIds.Missing, - order: DataTable.DESCENDING, + columnId: TableColumnsIds.PoolName, + order: DataTable.ASCENDING, }; } case VisibleEntities.Missing: { @@ -87,7 +87,7 @@ function setSortOrder(visibleEntities: keyof typeof VisibleEntities): SortOrder case VisibleEntities.Space: { return { columnId: TableColumnsIds.UsedSpaceFlag, - order: DataTable.ASCENDING, + order: DataTable.DESCENDING, }; } default: { @@ -295,6 +295,14 @@ function StorageGroups({ let columns = allColumns; + if (visibleEntities === VisibleEntities.All) { + columns = allColumns.filter((col) => { + return ( + col.name !== TableColumnsIds.Missing && col.name !== TableColumnsIds.UsedSpaceFlag + ); + }); + } + if (visibleEntities === VisibleEntities.Space) { columns = allColumns.filter((col) => col.name !== TableColumnsIds.Missing);