@gisce/ooui 2.27.1 → 2.28.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "2.27.1",
+  "version": "2.28.0-alpha.2",
   "engines": {
     "node": "20.5.0"
   },

package/src/Label.ts

@@ -1,4 +1,5 @@
 import Field from "./Field";
+import { parseBoolAttribute } from "./helpers/nodeParser";
 
 type LabelType = "secondary" | "success" | "warning" | "danger" | "default";
 type LabelSize = 1 | 2 | 3 | 4 | 5 | undefined;
@@ -52,6 +53,10 @@ class Label extends Field {
     this._labelSize = value;
   }
 
+  get humanDate(): boolean {
+    return parseBoolAttribute(this._parsedWidgetProps?.human_date ?? false);
+  }
+
   /**
    * Id of the field that this label goes with. Null if it's an independent label
    */

package/src/helpers/attributeParser.ts

@@ -278,15 +278,6 @@ const evaluateAttributes = ({
   fallbackMode?: boolean;
 }) => {
   let finalTagAttributes = {};
-  let oldTagAttributes = {};
-  if (tagAttributes.attrs) {
-    oldTagAttributes = parseAttributes({
-      attrs: tagAttributes.attrs,
-      values,
-      fields,
-      widgetType,
-    });
-  }
 
   if (tagAttributes.json_attrs) {
     try {
@@ -298,13 +289,23 @@ const evaluateAttributes = ({
       });
     } catch (error) {
       if (fallbackMode && tagAttributes.attrs) {
-        finalTagAttributes = oldTagAttributes;
+        finalTagAttributes = parseAttributes({
+          attrs: tagAttributes.attrs,
+          values,
+          fields,
+          widgetType,
+        });
       } else {
         throw error;
       }
     }
   } else if (tagAttributes.attrs) {
-    finalTagAttributes = oldTagAttributes;
+    finalTagAttributes = parseAttributes({
+      attrs: tagAttributes.attrs,
+      values,
+      fields,
+      widgetType,
+    });
   }
 
   return {

package/src/spec/Label.spec.ts

@@ -91,4 +91,43 @@ describe("A Label", () => {
       });
     });
   });
+  describe("Human date", () => {
+    it("should have humanDate to false by default", () => {
+      const widgetFactory = new WidgetFactory();
+      const props = {
+        name: "field_label",
+        string: "Default",
+        widget_props: "{}",
+      };
+      const widget = widgetFactory.createWidget("label", props);
+      expect(widget.humanDate).toBe(false);
+    });
+    it("should parse human_date from widget props", () => {
+      const widgetFactory = new WidgetFactory();
+
+      expect(
+        widgetFactory.createWidget("label", {
+          name: "field_label",
+          string: "Default",
+          widget_props: "{'human_date': true}",
+        }).humanDate,
+      ).toBe(true);
+
+      expect(
+        widgetFactory.createWidget("label", {
+          name: "field_label",
+          string: "Default",
+          widget_props: "{'human_date': false}",
+        }).humanDate,
+      ).toBe(false);
+
+      expect(
+        widgetFactory.createWidget("label", {
+          name: "field_label",
+          string: "Default",
+          widget_props: "{'human_date': '1'}",
+        }).humanDate,
+      ).toBe(true);
+    });
+  });
 });