From 46cf5a8b42e63d42f69adbef18bae5c6602cc076 Mon Sep 17 00:00:00 2001
From: Thomas Dax <thomas.dax@vivid-planet.com>
Date: Tue, 3 Oct 2023 10:48:21 +0200
Subject: [PATCH] fix(useDataGridRemote): use sortParamName or filterParamName
 instead of .sort and .filter

---
 .changeset/clean-rats-drop.md                           | 5 +++++
 packages/admin/admin/src/dataGrid/useDataGridRemote.tsx | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/clean-rats-drop.md

diff --git a/.changeset/clean-rats-drop.md b/.changeset/clean-rats-drop.md
new file mode 100644
index 0000000000..cdfb4a8ec6
--- /dev/null
+++ 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
index 8c612a9d6e..90df4d54d9 100644
--- 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) }) });