@redsift/table 12.5.5 → 12.5.6-muiv8-alpha.2

package/_internal/StatefulDataGrid2.js

@@ -1570,15 +1570,22 @@ const getFilterModelFromString = (searchString, columns) => {
   }
   let logicOperator = GridLogicOperator.And;
   let quickFilterValues = [];
+  // Whether the URL carries explicit filter metadata (`_logicOperator` /
+  // `_quickFilterValues`). Distinguishes an explicit empty filter (which the
+  // grid serialises with `_logicOperator`) from a URL that has no filter params
+  // at all, so the latter can fall through to localStorage. (ODM-3149)
+  let hasFilterMeta = false;
   const searchParams = new URLSearchParams();
   for (const [key, value] of new URLSearchParams(searchString)) {
     if (key.startsWith('_') && !['_logicOperator', '_sortColumn', '_pinnedColumnsLeft', '_pinnedColumnsRight', '_columnVisibility', '_pagination', '_quickFilterValues', '_columnOrder', '_rowGrouping', '_aggregation', '_pivot', '_density', '_filters'].includes(key)) {
       searchParams.set(key, value);
     }
     if (key === '_logicOperator') {
+      hasFilterMeta = true;
       logicOperator = value === GridLogicOperator.And || value === GridLogicOperator.Or ? value : GridLogicOperator.And;
     }
     if (key === '_quickFilterValues') {
+      hasFilterMeta = true;
       try {
         quickFilterValues = JSON.parse(decodeURIComponent(value));
       } catch {
@@ -1633,6 +1640,16 @@ const getFilterModelFromString = (searchString, columns) => {
   if (isInvalid) {
     return 'invalid';
   }
+
+  // The URL carries no filter signal at all — no logic operator, no quick filter,
+  // and no valid filter items (e.g. a bare `?period=30` written by another URL
+  // owner before the grid mounts). This is NOT an explicit empty filter, so
+  // return 'invalid' to let the caller fall through to localStorage instead of
+  // returning an empty model that would overwrite the user's persisted filters
+  // (and clobber localStorage on the way out). (ODM-3149)
+  if (items.length === 0 && !hasFilterMeta) {
+    return 'invalid';
+  }
   return {
     items,
     logicOperator,
@@ -1709,7 +1726,19 @@ const getSortingFromString = (searchString, columns) => {
   }
   const searchParams = new URLSearchParams(searchString);
   const value = searchParams.get('_sortColumn');
-  if (value === '' || value === null || value === '[]') {
+
+  // `_sortColumn` absent entirely → the URL is not expressing sort state (e.g. it
+  // only carries a foreign param such as `?period=30` written by another URL
+  // owner before the grid mounts). Return 'invalid' so the caller falls through
+  // to localStorage instead of returning an empty model that would clobber the
+  // user's persisted sort. (ODM-3149)
+  if (value === null) {
+    return 'invalid';
+  }
+
+  // Explicit empty sort (`_sortColumn=` / `_sortColumn=[]`, written when the user
+  // clears sorting) → respect it.
+  if (value === '' || value === '[]') {
     return [];
   }
   const fields = columns.map(column => column.field);