[IMP] spreadsheet: add operators for global filters

This commit introduces operators to global filters.
It's now possible to choose amount "in", "not in", "contains", etc.
depending on the filter type (relation, text)

closes odoo#215217

Task: 4797532
Related: odoo/enterprise#88160
Related: odoo/upgrade#7964
Signed-off-by: Lucas Lefèvre (lul) <[email protected]>

Author: LucasLefevre

addons/spreadsheet/static/src/@types/global_filter.d.ts

@@ -60,6 +60,58 @@ declare module "@spreadsheet" {
         | RelativeDateValue
         | DateRangeValue;
 
+    interface SetValue {
+        operator: "set" | "not_set";
+    }
+
+    interface RelationIdsValue {
+        operator: "in" | "not in" | "child_of";
+        ids: number[];
+    }
+
+    interface RelationContainsValue {
+        operator: "ilike" | "not ilike" | "starts_with" | "ends_with";
+        strings: string[];
+    }
+
+    interface CurrentUser {
+        operator: "in" | "not in";
+        ids: "current_user";
+    }
+
+    export type RelationValue = RelationIdsValue | SetValue | RelationContainsValue;
+    type RelationDefaultValue = RelationValue | CurrentUser;
+
+    interface NumericUnaryValue {
+        operator: "=" | "!=" | "<" | ">";
+        operand: number;
+    }
+
+    interface NumericRangeValue {
+        operator: "between" | "not_between";
+        min: number;
+        max: number;
+    }
+
+    export type NumericValue = NumericUnaryValue | NumericRangeValue | SetValue;
+
+    interface TextInValue {
+        operator: "in" | "not in";
+        strings: string[];
+    }
+
+    interface TextContainsValue {
+        operator: "ilike" | "not ilike" | "starts_with";
+        text: string;
+    }
+
+    export type TextValue = TextInValue | TextContainsValue | SetValue;
+
+    interface SelectionInValue {
+        operator: "in" | "not in";
+        selectionValues: string[];
+    }
+
     export interface FieldMatching {
         chain: string;
         type: string;
@@ -71,7 +123,7 @@ declare module "@spreadsheet" {
         id: string;
         label: string;
         rangesOfAllowedValues?: Range[];
-        defaultValue?: string[];
+        defaultValue?: TextValue;
     }
 
     export interface SelectionGlobalFilter {
@@ -80,7 +132,7 @@ declare module "@spreadsheet" {
         label: string;
         resModel: string;
         selectionField: string;
-        defaultValue?: string[];
+        defaultValue?: SelectionInValue;
     }
 
     export interface CmdTextGlobalFilter extends TextGlobalFilter {
@@ -100,15 +152,15 @@ declare module "@spreadsheet" {
         label: string;
         modelName: string;
         includeChildren: boolean;
-        defaultValue?: "current_user" | number[];
+        defaultValue?: RelationDefaultValue;
         domainOfAllowedValues?: DomainListRepr | string;
     }
 
     export interface BooleanGlobalFilter {
         type: "boolean";
         id: string;
         label: string;
-        defaultValue?: boolean[];
+        defaultValue?: SetValue;
     }
 
     export type GlobalFilter = TextGlobalFilter | DateGlobalFilter | RelationalGlobalFilter | BooleanGlobalFilter | SelectionGlobalFilter;

addons/spreadsheet/static/src/global_filters/components/boolean_multi_selector/boolean_multi_selector.js

@@ -11,8 +11,12 @@ import { Domain } from "@web/core/domain";
 import { user } from "@web/core/user";
 import { TextFilterValue } from "../filter_text_value/filter_text_value";
 import { getFields, ModelNotFoundError } from "@spreadsheet/data_sources/data_source";
-import { BooleanMultiSelector } from "../boolean_multi_selector/boolean_multi_selector";
 import { SelectionFilterValue } from "../selection_filter_value/selection_filter_value";
+import {
+    isTextualOperator,
+    isSetOperator,
+    getDefaultValue,
+} from "@spreadsheet/global_filters/helpers";
 
 const { ValidationMessages } = components;
 
@@ -22,7 +26,6 @@ export class FilterValue extends Component {
         TextFilterValue,
         DateFilterValue,
         MultiRecordSelector,
-        BooleanMultiSelector,
         SelectionFilterValue,
         ValidationMessages,
     };
@@ -57,6 +60,14 @@ export class FilterValue extends Component {
         });
     }
 
+    get isTextualOperator() {
+        return isTextualOperator(this.filterValue?.operator);
+    }
+
+    get isSetOperator() {
+        return isSetOperator(this.filterValue?.operator);
+    }
+
     get filter() {
         return this.props.filter;
     }
@@ -87,6 +98,10 @@ export class FilterValue extends Component {
         );
     }
 
+    getDefaultOperator() {
+        return getDefaultValue(this.filter.type).operator;
+    }
+
     onDateInput(id, value) {
         this.props.setGlobalFilterValue(id, value);
     }
@@ -96,7 +111,8 @@ export class FilterValue extends Component {
             this.clear(id);
             return;
         }
-        this.props.setGlobalFilterValue(id, value);
+        const operator = this.filterValue?.operator ?? this.getDefaultOperator();
+        this.props.setGlobalFilterValue(id, { operator, strings: value });
     }
 
     onBooleanInput(id, value) {
@@ -112,15 +128,20 @@ export class FilterValue extends Component {
             this.clear(id);
             return;
         }
-        this.props.setGlobalFilterValue(id, value);
+        const operator = this.filterValue?.operator ?? this.getDefaultOperator();
+        this.props.setGlobalFilterValue(id, { operator, selectionValues: value });
     }
 
     async onTagSelected(id, resIds) {
         if (!resIds.length) {
             // force clear, even automatic default values
             this.clear(id);
         } else {
-            this.props.setGlobalFilterValue(id, resIds);
+            const operator = this.filterValue?.operator ?? this.getDefaultOperator();
+            this.props.setGlobalFilterValue(
+                id,
+                { operator, ids: resIds },
+            );
         }
     }
 

addons/spreadsheet/static/src/global_filters/components/boolean_multi_selector/boolean_multi_selector.xml

@@ -2,43 +2,37 @@
 <templates>
     <t t-name="spreadsheet.FilterValue">
         <div class="o-filter-value d-flex align-items-start w-100" t-att-title="props.showTitle and filter.label">
-            <div t-if="filter.type === 'boolean'" class="w-100">
-                <BooleanMultiSelector
-                    selectedValues="filterValue || []"
-                    update="(value) => this.onBooleanInput(filter.id, value)"
-                />
-            </div>
-            <div t-if="filter.type === 'text'" class="w-100">
+            <div t-if="isSetOperator" class="w-100"></div>
+            <div t-elif="isTextualOperator || filter.type === 'text'" class="w-100">
                 <TextFilterValue
-                    value="filterValue"
+                    value="filterValue?.strings"
                     options="textAllowedValues"
                     onValueChanged="(value) => this.onTextInput(filter.id, value)"
                 />
             </div>
-            <div t-if="filter.type === 'selection'" class="w-100">
+            <div t-elif="filter.type === 'selection'" class="w-100">
                 <SelectionFilterValue
                     resModel="filter.resModel"
                     field="filter.selectionField"
-                    value="filterValue"
+                    value="filterValue?.selectionValues ?? []"
                     onValueChanged="(value) => this.onSelectionInput(filter.id, value)"
                 />
             </div>
-            <span t-if="filter.type === 'relation'" class="w-100">
+            <div t-elif="filter.type === 'date'" class="w-100">
+                <DateFilterValue value="filterValue"
+                                 update.bind="(value) => this.onDateInput(filter.id, value)"/>
+            </div>
+            <span t-elif="filter.type === 'relation'" class="w-100">
                 <MultiRecordSelector
                     t-if="isValid"
                     resModel="filter.modelName"
-                    resIds="filterValue || []"
+                    resIds="filterValue?.ids ?? []"
                     domain="relationalAllowedDomain"
                     update="(resIds) => this.onTagSelected(filter.id, resIds)" />
                 <ValidationMessages t-else="1"
                                     messages="[invalidModel]"
                                     msgType="'error'"/>
-
             </span>
-            <div t-if="filter.type === 'date'" class="w-100">
-                <DateFilterValue value="filterValue"
-                                 update.bind="(value) => this.onDateInput(filter.id, value)"/>
-            </div>
             <i t-if="props.showClear and getters.isGlobalFilterActive(filter.id)"
                 class="fa fa-times btn btn-link text-muted ms-1 mt-1"
                 title="Clear"