@gisce/ooui 2.21.0-alpha.3 → 2.21.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "2.21.0-alpha.3",
+  "version": "2.21.0-rc.1",
   "engines": {
     "node": "20.5.0"
   },

package/src/Field.ts

@@ -1,6 +1,5 @@
 import Widget from "./Widget";
 import { replaceEntities, isTrue } from "./helpers/attributeParser";
-import { parseBoolAttribute } from "./helpers/nodeParser";
 
 class Field extends Widget {
   /**
@@ -118,35 +117,6 @@ class Field extends Widget {
     this._selectionValues = value;
   }
 
-  /**
-   * Base type of the field
-   */
-  _fieldType: string = "";
-  get fieldType(): string {
-    return this._fieldType;
-  }
-
-  _autoRefresh?: boolean = false;
-  get autoRefresh(): boolean {
-    return this._autoRefresh ?? false;
-  }
-
-  set autoRefresh(value: boolean) {
-    this._autoRefresh = value;
-  }
-
-  get readOnly(): boolean | undefined {
-    if (this.autoRefresh) {
-      return true;
-    } else {
-      return super.readOnly;
-    }
-  }
-
-  set readOnly(value: boolean | undefined) {
-    super.readOnly = value;
-  }
-
   constructor(props: any) {
     super(props);
 
@@ -158,10 +128,6 @@ class Field extends Widget {
         this._id = props.name;
       }
 
-      if (props.type) {
-        this._fieldType = props.fieldsWidgetType;
-      }
-
       if (props.activated) {
         this._activated = props.activated;
       }
@@ -202,9 +168,6 @@ class Field extends Widget {
       if (props.help_inline) {
         this.tooltipInline = isTrue(props.help_inline);
       }
-      if (props.autorefresh) {
-        this.autoRefresh = parseBoolAttribute(props.autorefresh);
-      }
     }
   }
 

package/src/Form.ts

@@ -120,14 +120,6 @@ class Form {
     this._invisibleFields = value;
   }
 
-  /**
-   * List of autorefreshable fields
-   */
-  _autorefreshableFields: string[] = [];
-  get autorefreshableFields(): string[] {
-    return this._autorefreshableFields;
-  }
-
   /**
    * Context for each field in the form
    */
@@ -174,11 +166,6 @@ class Form {
         this._contextForFields[unknownWidget._id] = widget._context;
       }
     });
-
-    // Also we store all the autorefreshables fields in a list
-    this._autorefreshableFields = allWidgets
-      .filter((widget) => widget instanceof Field && widget.autoRefresh)
-      .map((field) => (field as Field)._id);
   }
 
   parseNode({

package/src/Tree.ts

@@ -1,7 +1,7 @@
 import WidgetFactory from "./WidgetFactory";
 import Widget from "./Widget";
 import { replaceEntities } from "./helpers/attributeParser";
-import { parseBoolAttribute, ParsedNode } from "./helpers/nodeParser";
+import { ParsedNode } from "./helpers/nodeParser";
 import * as txml from "txml";
 import { parseContext } from "./helpers/contextParser";
 
@@ -67,14 +67,6 @@ class Tree {
     this._contextForFields = value;
   }
 
-  /**
-   * List of autorefreshable fields
-   */
-  _autorefreshableFields: string[] = [];
-  get autorefreshableFields(): string[] {
-    return this._autorefreshableFields;
-  }
-
   /**
    * Is infinite
    */
@@ -153,10 +145,6 @@ class Tree {
           const widget = widgetFactory.createWidget(widgetType, mergedAttrs);
           this._columns.push(widget);
         }
-
-        if (parseBoolAttribute(mergedAttrs.autorefresh)) {
-          this._autorefreshableFields.push(name);
-        }
       }
     });
   }

package/src/Widget.ts

@@ -1,5 +1,4 @@
 import { replaceEntities } from "./helpers/attributeParser";
-import { parseBoolAttribute } from "./helpers/nodeParser";
 
 abstract class Widget {
   /**
@@ -116,6 +115,14 @@ abstract class Widget {
     this._isFunction = value;
   }
 
+  /**
+   * Base type of the field
+   */
+  _fieldType: string = "";
+  get fieldType(): string {
+    return this._fieldType;
+  }
+
   constructor(props?: any) {
     this._colspan = Widget._defaultColspan;
     this._invisible = false;
@@ -125,7 +132,19 @@ abstract class Widget {
         this._colspan = +props.colspan;
       }
       if (props.readonly !== undefined) {
-        this._readOnly = parseBoolAttribute(props.readonly);
+        if (
+          props.readonly === "1" ||
+          props.readonly === 1 ||
+          props.readonly === true
+        ) {
+          this._readOnly = true;
+        } else if (
+          props.readonly === "0" ||
+          props.readonly === 0 ||
+          props.readonly === false
+        ) {
+          this._readOnly = false;
+        }
       }
       if (props.invisible) {
         if (
@@ -149,6 +168,9 @@ abstract class Widget {
           this._domain = replaceEntities(props.domain);
         }
       }
+      if (props.type) {
+        this._fieldType = props.fieldsWidgetType;
+      }
       if (props.widget_props) {
         if (typeof props.widget_props === "string") {
           try {

package/src/helpers/nodeParser.ts

@@ -5,13 +5,7 @@ type ParsedNode = {
 };
 
 const parseBoolAttribute = (attr: any): boolean => {
-  if (
-    attr === 1 ||
-    attr === "1" ||
-    attr === true ||
-    attr === "True" ||
-    attr === "true"
-  ) {
+  if (attr === 1 || attr === "1" || attr === true || attr === "True") {
     return true;
   } else {
     return false;

package/src/spec/Form.spec.ts

@@ -6015,54 +6015,4 @@ describe("A Form", () => {
     expect(field_char?.type).toBe("arrow_steps");
     expect(field_char?.id).toBe("field_char");
   });
-  it("a field with autorefresh evaluated in attrs should be present in form autorefreshable fields property", () => {
-    const fields = {
-      field_char: {
-        string: "Etapa",
-        type: "char",
-      },
-      state: {
-        readonly: true,
-        required: true,
-        selection: [
-          ["esborrany", "Borrador"],
-          ["validar", "Validar"],
-          ["pendent", "Pendiente"],
-          ["activa", "Activa"],
-          ["cancelada", "Cancelada"],
-          ["contracte", "Activación Contrato"],
-          ["novapolissa", "Creación nuevo contrato"],
-          ["modcontractual", "Modificación Contractual"],
-          ["impagament", "Impago"],
-          ["tall", "Corte"],
-          ["running", "En ejecución"],
-          ["baixa", "Baja"],
-          ["facturacio", "Facturación"],
-        ],
-        string: "Estado",
-        type: "selection",
-        views: {},
-      },
-    };
-
-    const xmlViewForm = `<?xml version="1.0"?>
-    <form string="Form1">
-    	<field name="field_char" widget="arrow_steps" colspan="4" nolabel="1" attrs="{'autorefresh':[('state', '=', 'running')]}" />
-    </form>`;
-
-    const form = new Form(fields);
-    form.parse(xmlViewForm, {
-      values: {
-        field_char: "test",
-        state: "running",
-      },
-    });
-
-    const field_char = form.findById("field_char") as Field;
-    expect(field_char).toBeDefined();
-    expect(field_char?.autoRefresh).toBeTruthy();
-    expect(field_char?.readOnly).toBeTruthy();
-    expect(form.autorefreshableFields.length).toBe(1);
-    expect(form.autorefreshableFields[0]).toBe("field_char");
-  });
 });

package/src/spec/Tree.spec.ts

@@ -377,23 +377,4 @@ describe("A Tree", () => {
     const nameWidget = tree.findById("name") as Char;
     expect(nameWidget.isFunction).toBeTruthy();
   });
-  it("Should parse autorefreshable fields", () => {
-    const tree = new Tree({
-      name: {
-        required: true,
-        select: true,
-        size: 128,
-        string: "Potència contractada (kW)",
-        type: "char",
-        views: {},
-      },
-    });
-    tree.parse(
-      `<tree string="Partners" colors="red:type=='updated'"><field name="name" sum="Pot&#232;ncia contractada (kW)" autorefresh="1"/></tree>`,
-    );
-
-    const nameWidget = tree.findById("name") as Char;
-    expect(nameWidget.autoRefresh).toBeTruthy();
-    expect(tree._autorefreshableFields.length).toBe(1);
-  });
 });

package/src/spec/Field.spec.ts

@@ -1,35 +0,0 @@
-import { describe, it, expect } from "vitest";
-import Field from "../Field";
-
-describe("Field", () => {
-  describe("with the autoRefresh property", () => {
-    it("should be false as default", () => {
-      const props = {};
-      const field = new Field(props);
-      expect(field.autoRefresh).toBe(false);
-    });
-    it("should work with text", () => {
-      const props = {
-        autorefresh: "1",
-      };
-      const field = new Field(props);
-      expect(field.autoRefresh).toBe(true);
-    });
-    describe("if autorefresh is not a valid boold", () => {
-      it("should return false", () => {
-        const props = {
-          autorefresh: "abc",
-        };
-        const field = new Field(props);
-        expect(field.autoRefresh).toBe(false);
-      });
-    });
-    it("should return true for readOnly if autoRefresh is set", () => {
-      const props = {
-        autorefresh: true,
-      };
-      const field = new Field(props);
-      expect(field.readOnly).toBe(true);
-    });
-  });
-});

package/src/spec/nodeParser.spec.ts

@@ -1,53 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { parseBoolAttribute } from "../helpers/nodeParser";
-
-describe("parseBoolAttribute", () => {
-  it("returns true for numeric 1", () => {
-    expect(parseBoolAttribute(1)).toBe(true);
-  });
-
-  it('returns true for string "1"', () => {
-    expect(parseBoolAttribute("1")).toBe(true);
-  });
-
-  it("returns true for boolean true", () => {
-    expect(parseBoolAttribute(true)).toBe(true);
-  });
-
-  it('returns true for string "True"', () => {
-    expect(parseBoolAttribute("True")).toBe(true);
-  });
-
-  it('returns true for string "true"', () => {
-    expect(parseBoolAttribute("true")).toBe(true);
-  });
-
-  it("returns false for numeric 0", () => {
-    expect(parseBoolAttribute(0)).toBe(false);
-  });
-
-  it('returns false for string "0"', () => {
-    expect(parseBoolAttribute("0")).toBe(false);
-  });
-
-  it("returns false for boolean false", () => {
-    expect(parseBoolAttribute(false)).toBe(false);
-  });
-
-  it('returns false for string "False"', () => {
-    expect(parseBoolAttribute("False")).toBe(false);
-  });
-
-  it("returns false for null", () => {
-    expect(parseBoolAttribute(null)).toBe(false);
-  });
-
-  it("returns false for undefined", () => {
-    expect(parseBoolAttribute(undefined)).toBe(false);
-  });
-
-  it("returns false for non-boolean strings", () => {
-    expect(parseBoolAttribute("yes")).toBe(false);
-    expect(parseBoolAttribute("no")).toBe(false);
-  });
-});