Merge pull request #77 from gisce/hotfix/adjust_domain_value_parser

Adjust domain value parser

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "main": "./dist/ooui.umd.js",
   "module": "./dist/ooui.es.js",
   "types": "./dist/index.d.ts",

src/Form.ts

@@ -209,20 +209,11 @@ class Form {
 
         let domain: string | undefined = undefined;
 
-        if (
-          tagAttributes["domain"] &&
-          tagAttributes["domain"] !== "" &&
-          tagAttributes["domain"] !== "[]"
-        ) {
+        if (checkIfDomainHasValue(tagAttributes["domain"])) {
           domain = tagAttributes["domain"];
         }
 
-        if (
-          this._fields[tagAttributes.name] &&
-          this._fields[tagAttributes.name].domain &&
-          this._fields[tagAttributes.name].domain !== "" &&
-          this._fields[tagAttributes.name].domain !== "[]"
-        ) {
+        if (checkIfDomainHasValue(this._fields[tagAttributes.name]?.domain)) {
           domain = this._fields[tagAttributes.name].domain;
         }
 
@@ -265,4 +256,15 @@ class Form {
   }
 }
 
+function checkIfDomainHasValue(domain: any) {
+  if (!domain) {
+    return false;
+  }
+  if (Array.isArray(domain) && domain.length > 0) {
+    return true;
+  } else if (typeof domain === "string" && domain !== "" && domain !== "[]") {
+    return true;
+  }
+  return false;
+}
 export default Form;

src/spec/Form.spec.ts

@@ -3171,4 +3171,25 @@ describe("A Form", () => {
     const field = form.findById("bank") as Field;
     expect(field.domain).toBeDefined();
   });
+
+  it("Should be able to parse domain in XML with domain as [] in fields", () => {
+    const arch = `<form>
+    <field name="llista_preu" domain="[('tarifes_atr_compatibles', '=', tarifa), ('type', '=', 'sale')]"/>
+        </form>`;
+    const fields = {
+      llista_preu: {
+        type: "many2one",
+        domain: [],
+      },
+    };
+    const form = new Form(fields);
+    form.parse(arch, {
+      values: {},
+    });
+    const field = form.findById("llista_preu") as Field;
+    expect(field.domain).toBeDefined();
+    expect(field.domain).toBe(
+      "[('tarifes_atr_compatibles', '=', tarifa), ('type', '=', 'sale')]"
+    );
+  });
 });