From debf21e6b2f7d901b4779b803b4ffdd4f9a311df Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 23 Jun 2021 11:01:23 +1000
Subject: [PATCH] Saved filter bugs (#1524)

* Don't use default filter in VIEW persist state
* Reshuffle randomly sorted saved filters
---
 ui/v2.5/src/components/List/SavedFilterList.tsx | 2 ++
 ui/v2.5/src/hooks/ListHook.tsx                  | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/List/SavedFilterList.tsx b/ui/v2.5/src/components/List/SavedFilterList.tsx
index 68a5d7d0e..887eee360 100644
--- a/ui/v2.5/src/components/List/SavedFilterList.tsx
+++ b/ui/v2.5/src/components/List/SavedFilterList.tsx
@@ -165,6 +165,8 @@ export const SavedFilterList: React.FC<ISavedFilterListProps> = ({
     const newFilter = filter.clone();
     newFilter.currentPage = 1;
     newFilter.configureFromQueryParameters(JSON.parse(f.filter));
+    // #1507 - reset random seed when loaded
+    newFilter.randomSeed = -1;
 
     onSetFilter(newFilter);
   }
diff --git a/ui/v2.5/src/hooks/ListHook.tsx b/ui/v2.5/src/hooks/ListHook.tsx
index e5dc492f6..99a46b90e 100644
--- a/ui/v2.5/src/hooks/ListHook.tsx
+++ b/ui/v2.5/src/hooks/ListHook.tsx
@@ -627,11 +627,18 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
 
     // if default query is set and no search params are set, then
     // load the default query
-    if (!location.search && defaultFilter?.findDefaultFilter) {
+    // #1512 - use default query only if persistState is ALL
+    if (
+      options.persistState === PersistanceLevel.ALL &&
+      !location.search &&
+      defaultFilter?.findDefaultFilter
+    ) {
       newFilter.currentPage = 1;
       newFilter.configureFromQueryParameters(
         JSON.parse(defaultFilter.findDefaultFilter.filter)
       );
+      // #1507 - reset random seed when loaded
+      newFilter.randomSeed = -1;
       update = true;
     }