Make sure a default sort is persisted through tableUrlState (apache#4…

…3803)
eladkal · Nov 7, 2024 · 8060899 · 8060899
1 parent af0837c
commit 8060899
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/airflow/ui/src/components/DataTable/searchParams.test.ts b/airflow/ui/src/components/DataTable/searchParams.test.ts
@@ -37,6 +37,7 @@ describe("searchParams", () => {
       );
     });
   });
+
   describe("searchParamsToState", () => {
     it("can parse search params back to table state", () => {
       expect(
@@ -61,5 +62,23 @@ describe("searchParams", () => {
         ],
       });
     });
+
+    it("uses default sort correctly", () => {
+      expect(
+        searchParamsToState(new URLSearchParams("limit=20&offset=0"), {
+          pagination: {
+            pageIndex: 1,
+            pageSize: 5,
+          },
+          sorting: [{ desc: true, id: "when" }],
+        }),
+      ).toEqual({
+        pagination: {
+          pageIndex: 0,
+          pageSize: 20,
+        },
+        sorting: [{ desc: true, id: "when" }],
+      });
+    });
   });
 });
diff --git a/airflow/ui/src/components/DataTable/searchParams.ts b/airflow/ui/src/components/DataTable/searchParams.ts
@@ -94,7 +94,9 @@ export const searchParamsToState = (
     id: sort.replace("-", ""),
   }));
 
-  urlState = { ...urlState, sorting };
+  if (sorting.length) {
+    urlState = { ...urlState, sorting };
+  }
 
   return { ...defaultState, ...urlState };
 };