@gisce/ooui 0.2.5 → 0.2.8

package/dist/Graph.d.ts

@@ -4,6 +4,12 @@ declare class Graph {
     get string(): string | null;
     _type?: GraphType;
     get type(): GraphType | undefined;
+    _color: string | null;
+    get color(): string | null;
+    _icon: string | null;
+    get icon(): string | null;
+    _totalDomain: string | null;
+    get totalDomain(): string | null;
     constructor(xml: string);
 }
 export default Graph;

package/dist/Graph.js

@@ -1,10 +1,16 @@
 var Graph = /** @class */ (function () {
     function Graph(xml) {
         this._string = null;
+        this._color = null;
+        this._icon = null;
+        this._totalDomain = null;
         var parser = new DOMParser();
         var view = parser.parseFromString(xml, "text/xml");
         this._string = view.documentElement.getAttribute("string");
         var type = view.documentElement.getAttribute("type");
+        this._color = view.documentElement.getAttribute("color");
+        this._icon = view.documentElement.getAttribute("icon");
+        this._totalDomain = view.documentElement.getAttribute("totalDomain");
         if (type === "indicator") {
             this._type = "indicator";
         }
@@ -23,6 +29,27 @@ var Graph = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(Graph.prototype, "color", {
+        get: function () {
+            return this._color;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Graph.prototype, "icon", {
+        get: function () {
+            return this._icon;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Graph.prototype, "totalDomain", {
+        get: function () {
+            return this._totalDomain;
+        },
+        enumerable: false,
+        configurable: true
+    });
     return Graph;
 }());
 export default Graph;

package/dist/Graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"Graph.js","sourceRoot":"","sources":["../src/Graph.ts"],"names":[],"mappings":"AAEA;IAWE,eAAY,GAAW;QAVvB,YAAO,GAAkB,IAAI,CAAC;QAW5B,IAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC/B,IAAM,IAAI,GAAa,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAEvD,IAAI,IAAI,KAAK,WAAW,EAAE;YACxB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC;SAC1B;IACH,CAAC;IAlBD,sBAAI,yBAAM;aAAV;YACE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;;;OAAA;IAGD,sBAAI,uBAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAYH,YAAC;AAAD,CAAC,AArBD,IAqBC;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Graph.js","sourceRoot":"","sources":["../src/Graph.ts"],"names":[],"mappings":"AAEA;IA0BE,eAAY,GAAW;QAzBvB,YAAO,GAAkB,IAAI,CAAC;QAU9B,WAAM,GAAkB,IAAI,CAAC;QAK7B,UAAK,GAAkB,IAAI,CAAC;QAK5B,iBAAY,GAAkB,IAAI,CAAC;QAMjC,IAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC/B,IAAM,IAAI,GAAa,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAEvD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAErE,IAAI,IAAI,KAAK,WAAW,EAAE;YACxB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC;SAC1B;IACH,CAAC;IArCD,sBAAI,yBAAM;aAAV;YACE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;;;OAAA;IAGD,sBAAI,uBAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,wBAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAGD,sBAAI,uBAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,8BAAW;aAAf;YACE,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;;;OAAA;IAgBH,YAAC;AAAD,CAAC,AAxCD,IAwCC;AAED,eAAe,KAAK,CAAC"}

package/dist/helpers/fieldParser.js

@@ -1,12 +1,7 @@
 export function getValueForField(_a) {
-    var values = _a.values, fieldName = _a.fieldName, fields = _a.fields;
-    if (!fields) {
-        return false;
-    }
-    if (!fields[fieldName]) {
-        return values[fieldName] || false;
-    }
-    var fieldType = fields[fieldName].type;
+    var _b;
+    var _c = _a.values, values = _c === void 0 ? {} : _c, fieldName = _a.fieldName, _d = _a.fields, fields = _d === void 0 ? {} : _d;
+    var fieldType = ((_b = fields[fieldName]) === null || _b === void 0 ? void 0 : _b.type) || "passthrough";
     if (fieldType === "many2one") {
         return values[fieldName] ? values[fieldName][0] || null : false;
     }
@@ -14,7 +9,15 @@ export function getValueForField(_a) {
         return values[fieldName].map(function (item) { return item.id; });
     }
     else {
-        return values[fieldName];
+        if (values === null || values === void 0 ? void 0 : values[fieldName]) {
+            return values === null || values === void 0 ? void 0 : values[fieldName];
+        }
+        if (fieldName.indexOf("'") !== -1) {
+            return fieldName;
+        }
+        else {
+            return parseInt(fieldName);
+        }
     }
 }
 //# sourceMappingURL=fieldParser.js.map

package/dist/helpers/fieldParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"fieldParser.js","sourceRoot":"","sources":["../../src/helpers/fieldParser.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAAC,EAQhC;QAPC,MAAM,YAAA,EACN,SAAS,eAAA,EACT,MAAM,YAAA;IAMN,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QACtB,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC;KACnC;IAED,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;IAEzC,IAAI,SAAS,KAAK,UAAU,EAAE;QAC5B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;KACjE;SAAM,IAAI,SAAS,KAAK,UAAU,IAAI,SAAS,KAAK,WAAW,EAAE;QAChE,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAC,IAAS,IAAK,OAAA,IAAI,CAAC,EAAE,EAAP,CAAO,CAAC,CAAC;KACtD;SAAM;QACL,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;KAC1B;AACH,CAAC"}
+{"version":3,"file":"fieldParser.js","sourceRoot":"","sources":["../../src/helpers/fieldParser.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAAC,EAQhC;;QAPC,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA,EACX,SAAS,eAAA,EACT,cAAW,EAAX,MAAM,mBAAG,EAAE,KAAA;IAMX,IAAM,SAAS,GAAG,OAAA,MAAM,CAAC,SAAS,CAAC,0CAAE,IAAI,KAAI,aAAa,CAAC;IAE3D,IAAI,SAAS,KAAK,UAAU,EAAE;QAC5B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;KACjE;SAAM,IAAI,SAAS,KAAK,UAAU,IAAI,SAAS,KAAK,WAAW,EAAE;QAChE,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAC,IAAS,IAAK,OAAA,IAAI,CAAC,EAAE,EAAP,CAAO,CAAC,CAAC;KACtD;SAAM;QACL,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,SAAS,GAAG;YACvB,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,SAAS,EAAE;SAC5B;QAED,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YACjC,OAAO,SAAS,CAAC;SAClB;aAAM;YACL,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC;SAC5B;KACF;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "0.2.5",
+  "version": "0.2.8",
   "dependencies": {},
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Graph.ts

@@ -11,12 +11,31 @@ class Graph {
     return this._type;
   }
 
+  _color: string | null = null;
+  get color(): string | null {
+    return this._color;
+  }
+
+  _icon: string | null = null;
+  get icon(): string | null {
+    return this._icon;
+  }
+
+  _totalDomain: string | null = null;
+  get totalDomain(): string | null {
+    return this._totalDomain;
+  }
+
   constructor(xml: string) {
     const parser = new DOMParser();
     const view: Document = parser.parseFromString(xml, "text/xml");
     this._string = view.documentElement.getAttribute("string");
     const type = view.documentElement.getAttribute("type");
 
+    this._color = view.documentElement.getAttribute("color");
+    this._icon = view.documentElement.getAttribute("icon");
+    this._totalDomain = view.documentElement.getAttribute("totalDomain");
+
     if (type === "indicator") {
       this._type = "indicator";
     }

package/src/helpers/fieldParser.ts

@@ -1,27 +1,27 @@
 export function getValueForField({
-  values,
+  values = {},
   fieldName,
-  fields,
+  fields = {},
 }: {
   values: any;
   fieldName: string;
   fields: any;
 }) {
-  if (!fields) {
-    return false;
-  }
-
-  if (!fields[fieldName]) {
-    return values[fieldName] || false;
-  }
-
-  const fieldType = fields[fieldName].type;
+  const fieldType = fields[fieldName]?.type || "passthrough";
 
   if (fieldType === "many2one") {
     return values[fieldName] ? values[fieldName][0] || null : false;
   } else if (fieldType === "one2many" || fieldType === "many2many") {
     return values[fieldName].map((item: any) => item.id);
   } else {
-    return values[fieldName];
+    if (values?.[fieldName]) {
+      return values?.[fieldName];
+    }
+
+    if (fieldName.indexOf("'") !== -1) {
+      return fieldName;
+    } else {
+      return parseInt(fieldName);
+    }
   }
 }

package/src/spec/Graph.spec.ts

@@ -3,12 +3,14 @@ import Graph from "../Graph";
 describe("A Graph", () => {
   it("should parse a basic XML title and type indicator", () => {
     const xml = `<?xml version="1.0"?>
-    <graph string="My indicator" type="indicator" />
+    <graph string="My indicator" type="indicator" color="red:debt>0;green:debt==0" icon="slack" />
     `;
 
     const graph = new Graph(xml);
 
     expect(graph.string).toBe("My indicator");
     expect(graph.type).toBe("indicator");
+    expect(graph.color).toBe("red:debt>0;green:debt==0");
+    expect(graph.icon).toBe("slack");
   });
 });

package/src/spec/contextParser.spec.ts

@@ -53,5 +53,23 @@ describe("A Context Parser", () => {
       expect(parsedContext!["active_test"]).toBeDefined();
       expect(parsedContext!["active_test"]).toBeFalsy();
     });
+
+    it("should properly parse a boolean context", () => {
+      const str = "{'active_test': True}";
+
+      const parsedContext = parseContext({ context: str });
+
+      expect(parsedContext!["active_test"]).toBeDefined();
+      expect(parsedContext!["active_test"]).toBeTruthy();
+    });
+
+    it("should properly parse a number context", () => {
+      const str = "{'active_id': 3}";
+
+      const parsedContext = parseContext({ context: str });
+
+      expect(parsedContext!["active_id"]).toBeDefined();
+      expect(parsedContext!["active_id"]).toBe(3);
+    });
   });
 });