Merge #131099

131099: cluster-ui: add table sort to v2 db page r=xinhaoz a=xinhaoz Add sort by table count now that the sort option is available on the api. We've also deleted sort options that don't apply for the db page. Epic: CRDB-37558 Release note: None Co-authored-by: Xin Hao Zhang <[email protected]>
cockroachdb · Sep 20, 2024 · 50cc596 · 50cc596
2 parents e1ea227 + aba8ade
commit 50cc596
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/pkg/ui/workspaces/cluster-ui/src/api/databases/getDatabaseMetadataApi.ts b/pkg/ui/workspaces/cluster-ui/src/api/databases/getDatabaseMetadataApi.ts
@@ -23,9 +23,7 @@ export enum DatabaseSortOptions {
   NAME = "name",
   REPLICATION_SIZE = "replicationSize",
   RANGES = "ranges",
-  LIVE_DATA = "liveData",
-  COLUMNS = "columns",
-  INDEXES = "indexes",
+  TABLE_COUNT = "tableCount",
   LAST_UPDATED = "lastUpdated",
 }
 

diff --git a/pkg/ui/workspaces/cluster-ui/src/databasesV2/index.tsx b/pkg/ui/workspaces/cluster-ui/src/databasesV2/index.tsx
@@ -64,7 +64,7 @@ const COLUMNS: TableColumnProps<DatabaseRow>[] = [
   },
   {
     title: DatabaseColName.TABLE_COUNT,
-    sorter: false,
+    sorter: true,
     render: (db: DatabaseRow) => {
       return db.tableCount;
     },

diff --git a/pkg/ui/workspaces/cluster-ui/src/databasesV2/utils.ts b/pkg/ui/workspaces/cluster-ui/src/databasesV2/utils.ts
@@ -27,7 +27,7 @@ export const getSortKeyFromColTitle = (
     case DatabaseColName.RANGE_COUNT:
       return DatabaseSortOptions.RANGES;
     case DatabaseColName.TABLE_COUNT:
-      return DatabaseSortOptions.LIVE_DATA;
+      return DatabaseSortOptions.TABLE_COUNT;
     default:
       throw new Error(`Unsupported sort column ${col}`);
   }
@@ -43,7 +43,7 @@ export const getColTitleFromSortKey = (
       return DatabaseColName.SIZE;
     case DatabaseSortOptions.RANGES:
       return DatabaseColName.RANGE_COUNT;
-    case DatabaseSortOptions.LIVE_DATA:
+    case DatabaseSortOptions.TABLE_COUNT:
       return DatabaseColName.TABLE_COUNT;
     default:
       return DatabaseColName.NAME;