@gisce/ooui 2.29.0 → 2.30.0-alpha.1

package/package.json

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

package/src/Indicator.ts

@@ -1,4 +1,5 @@
 import Selection from "./Selection";
+import { replaceEntities } from "./helpers/attributeParser";
 
 class Indicator extends Selection {
   _nolabel: boolean = true;
@@ -30,6 +31,11 @@ class Indicator extends Selection {
     this._suffix = value;
   }
 
+  _color: string | undefined = undefined;
+  get color(): string | undefined {
+    return this._color;
+  }
+
   /**
    * Action id
    */
@@ -58,8 +64,9 @@ class Indicator extends Selection {
     this._suffix = "";
     if (this._parsedWidgetProps) {
       this._card = this._parsedWidgetProps.card || false;
-      this._icon = this._parsedWidgetProps.icon || "";
+      this._icon = replaceEntities(this._parsedWidgetProps.icon) || "";
       this._suffix = this._parsedWidgetProps.suffix || "";
+      this._color = replaceEntities(this._parsedWidgetProps.color) || "";
     }
     if (props) {
       if (props.action_id) {

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/Indicator.spec.ts

@@ -43,4 +43,20 @@ describe("An Indicator", () => {
     const widget = widgetFactory.createWidget("indicator", props);
     expect(widget.card).toBe(false);
   });
+  it("should allow conditions in icon widget props", () => {
+    const widgetFactory = new WidgetFactory();
+    const props = {
+      widget_props: "{'icon': 'alert-triange:value>10;wallet:value==0'}",
+    };
+    const widget = widgetFactory.createWidget("indicator", props);
+    expect(widget.icon).toBe("alert-triange:value>10;wallet:value==0");
+  });
+  it("should allow color in widget props", () => {
+    const widgetFactory = new WidgetFactory();
+    const props = {
+      widget_props: "{'color': 'red'}",
+    };
+    const widget = widgetFactory.createWidget("indicator", props);
+    expect(widget.color).toBe("red");
+  });
 });