[IMP] web: tree processor service

We create a new service tree_processor whose purpose is to ease the
processing of condition trees (~ domain). In that way, we are able to
simplify some code, notably treeFromDomain.

closes odoo#216038

Related: odoo/enterprise#88759
Signed-off-by: Michaël Mattiello (mcm) <[email protected]>

Author: Polymorphe57

addons/web/static/src/core/domain_selector/domain_selector.js

@@ -4,15 +4,16 @@ import { Domain } from "@web/core/domain";
 import { getDomainDisplayedOperators } from "@web/core/domain_selector/domain_selector_operator_editor";
 import { _t } from "@web/core/l10n/translation";
 import { ModelFieldSelector } from "@web/core/model_field_selector/model_field_selector";
-import { condition, formatValue } from "@web/core/tree_editor/condition_tree";
-import { constructTreeFromDomain } from "@web/core/tree_editor/construct_tree_from_domain";
+import {
+    areEqualTrees,
+    condition,
+    connector,
+    formatValue,
+} from "@web/core/tree_editor/condition_tree";
 import { domainFromTree } from "@web/core/tree_editor/domain_from_tree";
 import { TreeEditor } from "@web/core/tree_editor/tree_editor";
 import { getOperatorEditorInfo } from "@web/core/tree_editor/tree_editor_operator_editor";
-import { treeFromDomain } from "@web/core/tree_editor/tree_from_domain";
-import { useMakeGetFieldDef } from "@web/core/tree_editor/utils";
 import { useService } from "@web/core/utils/hooks";
-import { deepEqual } from "@web/core/utils/objects";
 import { getDefaultCondition } from "./utils";
 
 const ARCHIVED_CONDITION = condition("active", "in", [true, false]);
@@ -41,7 +42,7 @@ export class DomainSelector extends Component {
 
     setup() {
         this.fieldService = useService("field");
-        this.makeGetFieldDef = useMakeGetFieldDef(this.fieldService);
+        this.treeProcessor = useService("tree_processor");
 
         this.tree = null;
         this.showArchivedCheckbox = false;
@@ -66,23 +67,19 @@ export class DomainSelector extends Component {
             return;
         }
 
-        const getFieldDef = await this.makeGetFieldDef(
-            p.resModel,
-            constructTreeFromDomain(domain),
-            ["active"]
-        );
+        const [tree, { fieldDef: activeFieldDef }] = await Promise.all([
+            this.treeProcessor.treeFromDomain(p.resModel, domain, !p.isDebugMode),
+            this.fieldService.loadFieldInfo(p.resModel, "active"),
+        ]);
 
-        this.tree = treeFromDomain(domain, {
-            getFieldDef,
-            distributeNot: !p.isDebugMode,
-        });
+        this.tree = tree;
+        this.showArchivedCheckbox = this.getShowArchivedCheckBox(Boolean(activeFieldDef), p);
 
-        this.showArchivedCheckbox = this.getShowArchivedCheckBox(Boolean(getFieldDef("active")), p);
         this.includeArchived = false;
         if (this.showArchivedCheckbox) {
             if (this.tree.value === "&") {
                 this.tree.children = this.tree.children.filter((child) => {
-                    if (deepEqual(child, ARCHIVED_CONDITION)) {
+                    if (areEqualTrees(child, ARCHIVED_CONDITION)) {
                         this.includeArchived = true;
                         return false;
                     }
@@ -91,9 +88,9 @@ export class DomainSelector extends Component {
                 if (this.tree.children.length === 1) {
                     this.tree = this.tree.children[0];
                 }
-            } else if (deepEqual(this.tree, ARCHIVED_CONDITION)) {
+            } else if (areEqualTrees(this.tree, ARCHIVED_CONDITION)) {
                 this.includeArchived = true;
-                this.tree = treeFromDomain(`[]`);
+                this.tree = connector("&");
             }
         }
     }

addons/web/static/src/core/tree_editor/domain_contains_expressions.js

@@ -1,5 +1,5 @@
 import { Expression, isTree } from "./condition_tree";
-import { treeFromDomain } from "./tree_from_domain";
+import { constructTreeFromDomain } from "./construct_tree_from_domain";
 
 function treeContainsExpressions(tree) {
     if (tree.type === "condition") {
@@ -24,7 +24,7 @@ function treeContainsExpressions(tree) {
 export function domainContainsExpressions(domain) {
     let tree;
     try {
-        tree = treeFromDomain(domain);
+        tree = constructTreeFromDomain(domain);
     } catch {
         return null;
     }

addons/web/static/src/core/tree_editor/tree_editor.js

@@ -6,11 +6,7 @@ import {
     getDefaultValue,
     getValueEditorInfo,
 } from "@web/core/tree_editor/tree_editor_value_editors";
-import {
-    getResModel,
-    useMakeGetConditionDescription,
-    useMakeGetFieldDef,
-} from "@web/core/tree_editor/utils";
+import { getResModel } from "@web/core/tree_editor/utils";
 import { areEquivalentTrees } from "@web/core/tree_editor/virtual_operators";
 import { useService } from "@web/core/utils/hooks";
 import { shallowEqual } from "@web/core/utils/objects";
@@ -47,12 +43,7 @@ export class TreeEditor extends Component {
     setup() {
         this.isTree = isTree;
         this.fieldService = useService("field");
-        this.nameService = useService("name");
-        this.makeGetFieldDef = useMakeGetFieldDef(this.fieldService);
-        this.makeGetConditionDescription = useMakeGetConditionDescription(
-            this.fieldService,
-            this.nameService
-        );
+        this.treeProcessor = useService("tree_processor");
         onWillStart(() => this.onPropsUpdated(this.props));
         onWillUpdateProps((nextProps) => this.onPropsUpdated(nextProps));
     }
@@ -79,16 +70,15 @@ export class TreeEditor extends Component {
     async prepareInfo(props) {
         const [fieldDefs, getFieldDef] = await Promise.all([
             this.fieldService.loadFields(props.resModel),
-            this.makeGetFieldDef(props.resModel, this.tree),
+            this.treeProcessor.makeGetFieldDef(props.resModel, this.tree),
         ]);
         this.getFieldDef = getFieldDef;
         this.defaultCondition = props.getDefaultCondition(fieldDefs);
 
         if (props.readonly) {
-            this.getConditionDescription = await this.makeGetConditionDescription(
+            this.getConditionDescription = await this.treeProcessor.makeGetConditionDescription(
                 props.resModel,
-                this.tree,
-                this.getFieldDef
+                this.tree
             );
         }
     }