fix: ROOT-57: Annotation results filter does not return result, although matching criteria is met (#8086)

Co-authored-by: matt-bernstein <[email protected]>
Co-authored-by: Jo Booth <[email protected]>
Co-authored-by: Ricardo Cabral <[email protected]>

Author: 3 people

web/libs/datamanager/src/components/Filters/FilterLine/FilterOperation.jsx

@@ -66,8 +66,13 @@ export const FilterOperation = observer(({ filter, field, operator, value, disab
   }
   const operators = operatorList.map(({ key, label }) => {
     if (filter.filter.field.isAnnotationResultsFilterColumn) {
-      if (key === "contains") label = "includes all";
-      if (key === "not_contains") label = "does not include all";
+      if (filter.schema?.multiple ?? false) {
+        if (key === "contains") label = "includes all";
+        if (key === "not_contains") label = "does not include all";
+      } else {
+        if (key === "contains") label = "is";
+        if (key === "not_contains") label = "is not";
+      }
     }
     return { value: key, label };
   });
@@ -89,6 +94,7 @@ export const FilterOperation = observer(({ filter, field, operator, value, disab
           key={`${filter.filter.id}-${filter.filter.currentType}`}
           schema={filter.schema}
           filter={filter}
+          multiple={filter.schema?.multiple ?? false}
           value={value}
           onChange={onChange}
           size="small"

web/libs/datamanager/src/components/Filters/types/List.jsx

@@ -45,13 +45,13 @@ export const ListFilter = [
     key: "contains",
     label: "contains",
     valueType: "single",
-    input: (props) => <VariantSelect {...props} multiple />,
+    input: (props) => <VariantSelect {...props} multiple={props.schema?.multiple} />,
   },
   {
     key: "not_contains",
     label: "not contains",
     valueType: "single",
-    input: (props) => <VariantSelect {...props} multiple />,
+    input: (props) => <VariantSelect {...props} multiple={props.schema?.multiple} />,
   },
   // ... Common,
 ];

web/libs/datamanager/src/stores/Tabs/filter_utils.ts

@@ -25,6 +25,11 @@ const filterFormatters: Formatter = {
 
     return String(value);
   },
+  List: (_op, value) => {
+    // Ensure that List filter values are always serialized as arrays.
+    if (Array.isArray(value) || value === null || value === undefined) return value;
+    return [value];
+  },
 };
 
 export const normalizeFilterValue = (type: string, op: string, value: any) => {

web/libs/datamanager/src/stores/Tabs/tab_filter_type.js

@@ -24,6 +24,7 @@ export const FilterItemType = types.union({
 export const FilterValueList = types
   .model("FilterValueList", {
     items: types.array(FilterItemType),
+    multiple: types.maybeNull(types.boolean),
   })
   .views((self) => ({
     get value() {