Fix loading of job table state from local storage (#3072)

Signed-off-by: Noah Held <noahheld17@gmail.com>
armadaproject · Oct 26, 2023 · f395cc7 · f395cc7
1 parent bafbb8a
commit f395cc7
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/internal/lookout/ui/src/services/lookoutV2/JobsTablePreferencesService.ts b/internal/lookout/ui/src/services/lookoutV2/JobsTablePreferencesService.ts
@@ -62,7 +62,7 @@ type QueryStringJobFilter = {
 // Keys are shortened to keep URL size lower
 export interface QueryStringPrefs {
   // Grouped columns
-  g: string[] | [null]
+  g: string[]
   // Expanded rows
   e: string[]
   // Current page number
@@ -120,13 +120,9 @@ const columnMatchesFromQueryStringFilters = (f: QueryStringJobFilter[]): Record<
 }
 
 const fromQueryStringSafe = (serializedPrefs: Partial<QueryStringPrefs>): Partial<JobsTablePreferences> => {
-  const { e, page, ps, sort, f, sb } = serializedPrefs
-  let g = serializedPrefs.g
-  if (!(Array.isArray(g) && g.length > 0 && g.map((elem) => typeof elem === "string").reduce((a, b) => a && b, true))) {
-    g = []
-  }
+  const { g, e, page, ps, sort, f, sb } = serializedPrefs
   return {
-    ...(g && { groupedColumns: g as ColumnId[] }),
+    ...(g && Array.isArray(g) && g.every((a) => typeof a === "string") && { groupedColumns: g as ColumnId[] }),
     ...(e && { expandedState: Object.fromEntries(e.map((rowId) => [rowId, true])) }),
     ...(page !== undefined && { pageIndex: Number(page) }),
     ...(ps !== undefined && { pageSize: Number(ps) }),