fixed caching of searches

keeps · Nov 8, 2024 · 166b5c1 · 166b5c1
1 parent 59f923d
commit 166b5c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/...m/databasepreservation/common/client/common/visualization/browse/DatabaseSearchPanel.java b/...m/databasepreservation/common/client/common/visualization/browse/DatabaseSearchPanel.java
@@ -56,8 +56,13 @@ public class DatabaseSearchPanel extends RightPanel implements ICollectionStatus
   private static Map<String, DatabaseSearchPanel> instances = new HashMap<>();
   private final CollectionStatus status;
 
+  public static DatabaseSearchPanel getInstance(ViewerDatabase database, CollectionStatus status) {
+    return DatabaseSearchPanel.getInstance(database, status, "");
+  }
+
   public static DatabaseSearchPanel getInstance(ViewerDatabase database, CollectionStatus status, String search) {
-    return instances.computeIfAbsent(database.getUuid(), k -> new DatabaseSearchPanel(database, status, search));
+    String key = database.getUuid() + search;
+    return instances.computeIfAbsent(key, k -> new DatabaseSearchPanel(database, status, search));
   }
 
   interface DatabaseSearchPanelUiBinder extends UiBinder<Widget, DatabaseSearchPanel> {

diff --git a/src/main/java/com/databasepreservation/desktop/client/main/MainPanelDesktop.java b/src/main/java/com/databasepreservation/desktop/client/main/MainPanelDesktop.java
@@ -154,7 +154,7 @@ public RightPanel load(ViewerDatabase database, CollectionStatus status) {
         setContent(databaseUUID, currentHistoryPath.get(0), currentHistoryPath.get(2), new RightPanelLoader() {
           @Override
           public RightPanel load(ViewerDatabase database, CollectionStatus status) {
-            return DatabaseSearchPanel.getInstance(database, status, "");
+            return DatabaseSearchPanel.getInstance(database, status);
           }
         });
       } else if (currentHistoryPath.size() == 4

diff --git a/src/main/java/com/databasepreservation/server/client/main/MainPanel.java b/src/main/java/com/databasepreservation/server/client/main/MainPanel.java
@@ -414,7 +414,7 @@ public RightPanel load(ViewerDatabase database, CollectionStatus status) {
                 new RightPanelLoader() {
                   @Override
                   public RightPanel load(ViewerDatabase database, CollectionStatus status) {
-                    return DatabaseSearchPanel.getInstance(database, status, "");
+                    return DatabaseSearchPanel.getInstance(database, status);
                   }
                 });
             } else if (currentHistoryPath.size() == 4