reset page when changing metadata filter (#194)

* reset page when changing metadata filter * increment version
DigitalSlideArchive · Oct 11, 2024 · 5960f68 · 5960f68
1 parent adec9d6
commit 5960f68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dive-dsa",
-  "version": "1.10.20",
+  "version": "1.10.21",
   "author": {
     "name": "Kitware, Inc.",
     "email": "[email protected]"

diff --git a/client/platform/web-girder/views/DIVEMetadataFilter.vue b/client/platform/web-girder/views/DIVEMetadataFilter.vue
@@ -171,7 +171,9 @@ export default defineComponent({
           value,
         };
       }
-      emit('updateFilters', { filter: currentFilter.value, sortVal: sortValue.value, sortDir: sortDir.value });
+      emit('updateFilters', {
+        filter: currentFilter.value, sortVal: sortValue.value, sortDir: sortDir.value, resetPage: true,
+      });
     };
 
     const changePage = async (page: number) => {

diff --git a/client/platform/web-girder/views/DIVEMetadataSearch.vue b/client/platform/web-girder/views/DIVEMetadataSearch.vue
@@ -100,10 +100,14 @@ export default defineComponent({
     const storedSortVal = ref('filename');
     const storedSortDir = ref(1);
 
-    const updateFilter = async ({ filter, sortVal, sortDir }: { filter?: DIVEMetadataFilter, sortVal?: string, sortDir?: number }) => {
-      if (filter?.metadataFilters && Object.keys(filter.metadataFilters).length) {
-        filters.value = filter;
+    const updateFilter = async ({
+      filter, sortVal, sortDir, resetPage,
+    }: { filter?: DIVEMetadataFilter, sortVal?: string, sortDir?: number, resetPage? : boolean }) => {
+      if (resetPage) {
         currentPage.value = 0;
+      }
+      if (filter) {
+        filters.value = filter;
         currentFilter.value = filter;
       }
       if (sortVal) {