Merge pull request #166 from gisce/fix-evaluate-many2one-on-attrs

evaluateFieldComparison use index 0 of many2one
gisce · Jan 22, 2025 · 4502c84 · 4502c84
2 parents 8ff865b + f65429e
commit 4502c84
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/helpers/attributeParser.ts b/src/helpers/attributeParser.ts
@@ -114,14 +114,18 @@ const evaluateFieldComparison = ({
   ) {
     result.modifiedExpectedValue = undefined;
   } else {
-    result.modifiedValueInObject =
-      result.modifiedValueInObject === undefined
-        ? false
-        : result.modifiedValueInObject;
-    result.modifiedValueInObject =
-      result.modifiedValueInObject === null
-        ? false
-        : result.modifiedValueInObject;
+    if (result.modifiedValueInObject === undefined) {
+      result.modifiedValueInObject = false;
+    } else if (
+      Array.isArray(result.modifiedValueInObject) &&
+      result.modifiedValueInObject[0] !== undefined
+    ) {
+      result.modifiedValueInObject = result.modifiedValueInObject[0];
+    }
+
+    if (result.modifiedValueInObject === null) {
+      result.modifiedValueInObject = false;
+    }
   }
 
   if (

diff --git a/src/spec/attributeParser.spec.ts b/src/spec/attributeParser.spec.ts
@@ -479,6 +479,20 @@ describe("An Attribute Parser", () => {
       });
       expect(evaluatedAttrs.invisible).toBeTruthy();
     });
+    it("should properly use the id of a many2one value", () => {
+      const tagAttributes = {
+        json_attrs:
+          '{"invisible":{"condition":"AND","rules":[{"field":"autoconsum_id","operator":"=","value":10}]}}',
+      };
+      const values = { autoconsum_id: [10, "Autoconsum"] };
+      const evaluatedAttrs = evaluateAttributes({
+        tagAttributes,
+        values,
+        fields,
+        fallbackMode: false,
+      });
+      expect(evaluatedAttrs.invisible).toBeTruthy();
+    });
     it("should properly parse a many2one attribute with undefined value", () => {
       const tagAttributes = {
         json_attrs: