fix metadata filters (#415)

* fix metadata filters

* update other params to use json stringification

* update version

Author: BryonLewis

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dive-dsa",
-  "version": "1.11.27",
+  "version": "1.11.29",
   "author": {
     "name": "Kitware, Inc.",
     "email": "Bryon.Lewis@kitware.com"

client/platform/web-girder/api/divemetadata.service.ts

@@ -136,16 +136,24 @@ export interface MetadataResultItem {
     metadata: StringKeyObject;
 }
 
+function toJsonParam(value: unknown) {
+  return JSON.stringify(value ?? {});
+}
+
 function getMetadataFilterValues(folderId: string, keys?: string[]) {
+  const params: Record<string, string> = {};
+  if (keys !== undefined) {
+    params.keys = toJsonParam(keys);
+  }
   return girderRest.get<DIVEMetadataFilterValueResults>(`dive_metadata/${folderId}/metadata_keys`, {
-    params: { keys },
+    params,
   });
 }
 
 function filterDiveMetadata(folderId: string, filters: DIVEMetadataFilter, offset = 0, limit = 50, sort = 'filename', sortdir = 1) {
   return girderRest.get<DIVEMetadataResults>(`dive_metadata/${folderId}/filter`, {
     params: {
-      filters, offset, limit, sort, sortdir,
+      filters: toJsonParam(filters), offset, limit, sort, sortdir,
     },
   });
 }
@@ -178,7 +186,7 @@ async function getDiveDatasetMetadataRow(
 function createDiveMetadataClone(folder: string, filters: DIVEMetadataFilter, destFolder: string) {
   return girderRest.post<string>(`dive_metadata/${folder}/clone_filter`, null, {
     params: {
-      baseFolder: folder, filters, destFolder,
+      baseFolder: folder, filters: toJsonParam(filters), destFolder,
     },
   });
 }
@@ -206,7 +214,11 @@ function createDiveMetadataFolder(
 ) {
   return girderRest.post<createDiveMetadataResponse>(`dive_metadata/create_metadata_folder/${parentFolder}`, null, {
     params: {
-      name, rootFolderId, categoricalLimit, displayConfig, ffprobeMetadata,
+      name,
+      rootFolderId,
+      categoricalLimit,
+      displayConfig: toJsonParam(displayConfig),
+      ffprobeMetadata: toJsonParam(ffprobeMetadata),
     },
   });
 }
@@ -342,12 +354,17 @@ async function updateDiveMetadataOrder(folderId: string, order: string[], groups
 }
 
 async function runSlicerMetadataTask(rootId: string, taskId: string, filters: DIVEMetadataFilter, params: Record<string, XMLBaseValue>) {
-  return girderRest.post<JobResponse>(`dive_metadata/${rootId}/slicer-cli-task`, { taskId, filterParams: { filters, params } }, { params: { taskId, filterParams: { filters, params } } });
+  const filterParams = toJsonParam({ filters, params });
+  return girderRest.post<JobResponse>(
+    `dive_metadata/${rootId}/slicer-cli-task`,
+    { taskId, filterParams },
+    { params: { taskId, filterParams } },
+  );
 }
 
 async function exportDiveMetadata(folderId: string, filters: DIVEMetadataFilter, format: 'csv' | 'json', baseUrl?: string) {
   const response = await girderRest.post(`dive_metadata/${folderId}/export`, null, {
-    params: { format, filters, baseURL: baseUrl },
+    params: { format, filters: toJsonParam(filters), baseURL: baseUrl },
     responseType: 'blob',
   });
 

client/platform/web-girder/views/DIVEMetadata/DIVEMetadataFilter.vue

@@ -169,14 +169,18 @@ export default defineComponent({
             delete currentFilter.value.metadataFilters[key];
           }
         });
-        emit('updateFilters', { filter: currentFilter.value, sortVal: sortValue.value, sortDir: sortDir.value });
+        emit('updateFilters', {
+          filter: currentFilter.value, sortVal: sortValue.value, sortDir: sortDir.value, resetPage: true,
+        });
       }
     });
 
     watch([search, regEx], () => {
       currentFilter.value.search = search.value;
       currentFilter.value.searchRegEx = regEx.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 clearFilter = (key: string) => {
@@ -186,7 +190,9 @@ export default defineComponent({
       if (currentFilter.value.metadataFilters[key]) {
         delete currentFilter.value.metadataFilters[key];
       }
-      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 updateFilter = (key: string, { value, category, regEx } : {value: string | string[] | number | boolean | number[], category: MetadataFilterItem['category'], regEx?: boolean}) => {
       if (!currentFilter.value.metadataFilters) {
@@ -222,7 +228,9 @@ export default defineComponent({
     };
 
     watch([sortValue, sortDir], () => {
-      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 getDefaultValue = (key: string) => {
@@ -263,7 +271,9 @@ export default defineComponent({
     };
 
     const jobCompleted = () => {
-      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 showSlicerCLI = computed(() => {