fix(useDataGridRemote): use sortParamName or filterParamName instead …

…of .sort and .filter
vivid-planet · Oct 4, 2023 · 46cf5a8 · 46cf5a8
1 parent 5000aac
commit 46cf5a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/clean-rats-drop.md b/.changeset/clean-rats-drop.md
@@ -0,0 +1,5 @@
+---
+"@comet/admin": patch
+---
+
+Fix an issue that caused `useDataGridRemote()` to ignore its URL params when `queryParamsPrefix` was set
diff --git a/packages/admin/admin/src/dataGrid/useDataGridRemote.tsx b/packages/admin/admin/src/dataGrid/useDataGridRemote.tsx
@@ -34,7 +34,7 @@ export function useDataGridRemote({
     };
 
     const sortModel =
-        (!parsedSearch.sort
+        (!parsedSearch[sortParamName]
             ? undefined
             : !Array.isArray(parsedSearch[sortParamName])
             ? parsedSearch[sortParamName] === "none"
@@ -59,7 +59,7 @@ export function useDataGridRemote({
         [history, location, parsedSearch, sortParamName],
     );
 
-    const filterModel = parsedSearch.filter ? JSON.parse(parsedSearch[filterParamName] as string) : { items: [] };
+    const filterModel = parsedSearch[filterParamName] ? JSON.parse(parsedSearch[filterParamName] as string) : { items: [] };
     const handleFilterChange = React.useCallback(
         (filterModel: GridFilterModel) => {
             history.replace({ ...location, search: queryString.stringify({ ...parsedSearch, [filterParamName]: JSON.stringify(filterModel) }) });