@gisce/ooui 0.1.2 → 0.1.3

package/dist/Timeline.js

@@ -18,15 +18,9 @@ var Timeline = /** @class */ (function (_super) {
         var _this = _super.call(this, props) || this;
         _this._titleField = "";
         _this._summaryField = "";
-        if (props === null || props === void 0 ? void 0 : props.widget_props) {
-            try {
-                var parsedWidgetProps = JSON.parse(props.widget_props.replace(/'/g, '"'));
-                _this._titleField = parsedWidgetProps.titleField;
-                _this._summaryField = parsedWidgetProps.summaryField;
-            }
-            catch (err) {
-                throw new Error("Timeline - error parsing widget_props: " + JSON.stringify(err));
-            }
+        if (_this._parsedWidgetProps) {
+            _this._titleField = _this._parsedWidgetProps.titleField;
+            _this._summaryField = _this.parsedWidgetProps.summaryField;
         }
         return _this;
     }

package/dist/Timeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"Timeline.js","sourceRoot":"","sources":["../src/Timeline.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC;IAAuB,4BAAQ;IAuB7B,kBAAY,KAAU;QAAtB,YACE,kBAAM,KAAK,CAAC,SAcb;QAbC,KAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,KAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QAExB,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,EAAE;YAEvB,IAAI;gBACF,IAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC5E,KAAI,CAAC,WAAW,GAAG,iBAAiB,CAAC,UAAU,CAAC;gBAChD,KAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC,YAAY,CAAC;aACrD;YAAC,OAAM,GAAG,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,4CAA0C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAG,CAAC,CAAC;aAClF;SACF;;IACH,CAAC;IAjCD,sBAAI,gCAAU;aAAd;YACE,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;aACD,UAAe,KAAa;YAC1B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3B,CAAC;;;OAHA;IASD,sBAAI,kCAAY;aAAhB;YACE,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;aACD,UAAiB,KAAa;YAC5B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC7B,CAAC;;;OAHA;IAqBH,eAAC;AAAD,CAAC,AAvCD,CAAuB,QAAQ,GAuC9B;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"Timeline.js","sourceRoot":"","sources":["../src/Timeline.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC;IAAuB,4BAAQ;IAuB7B,kBAAY,KAAU;QAAtB,YACE,kBAAM,KAAK,CAAC,SAOb;QANC,KAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,KAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,KAAI,CAAC,kBAAkB,EAAE;YAC3B,KAAI,CAAC,WAAW,GAAG,KAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;YACtD,KAAI,CAAC,aAAa,GAAG,KAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC;SAC1D;;IACH,CAAC;IA1BD,sBAAI,gCAAU;aAAd;YACE,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;aACD,UAAe,KAAa;YAC1B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3B,CAAC;;;OAHA;IASD,sBAAI,kCAAY;aAAhB;YACE,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;aACD,UAAiB,KAAa;YAC5B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC7B,CAAC;;;OAHA;IAcH,eAAC;AAAD,CAAC,AAhCD,CAAuB,QAAQ,GAgC9B;AAED,eAAe,QAAQ,CAAC"}

package/dist/Widget.d.ts

@@ -41,6 +41,9 @@ declare abstract class Widget {
     _domain?: string;
     get domain(): string | undefined;
     set domain(value: string | undefined);
+    _parsedWidgetProps: any;
+    get parsedWidgetProps(): any;
+    set parsedWidgetProps(value: any);
     constructor(props?: any);
     abstract findById(id: string): Widget | null;
 }

package/dist/Widget.js

@@ -34,6 +34,14 @@ var Widget = /** @class */ (function () {
             if (props.domain && typeof props.domain === "string") {
                 this._domain = props.domain;
             }
+            if (props.widget_props) {
+                try {
+                    this._parsedWidgetProps = JSON.parse(props.widget_props.replace(/'/g, '"'));
+                }
+                catch (err) {
+                    throw new Error('Error parsing widget_props');
+                }
+            }
         }
     }
     Object.defineProperty(Widget, "defaultColspan", {
@@ -106,6 +114,16 @@ var Widget = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(Widget.prototype, "parsedWidgetProps", {
+        get: function () {
+            return this._parsedWidgetProps;
+        },
+        set: function (value) {
+            this._parsedWidgetProps = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Default colspan
      */

package/dist/Widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"Widget.js","sourceRoot":"","sources":["../src/Widget.ts"],"names":[],"mappings":"AAAA;IA8EE,gBAAY,KAAW;QAjCvB;;WAEG;QACH,UAAK,GAAW,EAAE,CAAC;QA+BjB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,eAAe,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAExB,IAAI,KAAK,EAAE;YACT,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;aAChC;YACD,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,IACE,KAAK,CAAC,QAAQ,KAAK,GAAG;oBACtB,KAAK,CAAC,QAAQ,KAAK,CAAC;oBACpB,KAAK,CAAC,QAAQ,KAAK,IAAI,EACvB;oBACA,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;iBACvB;aACF;YACD,IAAI,KAAK,CAAC,SAAS,EAAE;gBACnB,IACE,KAAK,CAAC,SAAS,KAAK,CAAC;oBACrB,KAAK,CAAC,SAAS,KAAK,GAAG;oBACvB,KAAK,CAAC,SAAS,KAAK,IAAI,EACxB;oBACA,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;iBACxB;aACF;YACD,IAAI,KAAK,CAAC,IAAI,EAAE;gBACd,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;aACzB;YACD,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC;aAC/B;YACD,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE;gBACpD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC;aAC7B;SACF;IACH,CAAC;IA9GD,sBAAW,wBAAc;aAAzB;YACE,OAAO,MAAM,CAAC,eAAe,CAAC;QAChC,CAAC;aACD,UAA0B,KAAK;YAC7B,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;QACjC,CAAC;;;OAHA;IASD,sBAAI,4BAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;aACD,UAAa,KAAc;YACzB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACzB,CAAC;;;OAHA;IASD,sBAAI,2BAAO;aAAX;YACE,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;aACD,UAAY,KAAa;YACvB,IAAI,CAAC,QAAQ,GAAG,CAAC,KAAK,CAAC;QACzB,CAAC;;;OAHA;IASD,sBAAI,6BAAS;aAAb;YACE,OAAO,IAAI,CAAC,UAAU,CAAC;QACzB,CAAC;aACD,UAAc,KAAc;YAC1B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAC1B,CAAC;;;OAHA;IASD,sBAAI,wBAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;aACD,UAAS,KAAa;YACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,CAAC;;;OAHA;IASD,sBAAI,2BAAO;aAAX;YACE,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;aACD,UAAY,KAAU;YACpB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxB,CAAC;;;OAHA;IASD,sBAAI,0BAAM;aAAV;YACE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;aACD,UAAW,KAAyB;YAClC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACvB,CAAC;;;OAHA;IAxED;;OAEG;IACI,sBAAe,GAAW,CAAC,CAAC;IAkHrC,aAAC;CAAA,AAtHD,IAsHC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Widget.js","sourceRoot":"","sources":["../src/Widget.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/Timeline.ts

@@ -27,16 +27,9 @@ class Timeline extends One2many {
     super(props);
     this._titleField = "";
     this._summaryField = "";
-
-    if (props?.widget_props) {
-
-      try {
-        const parsedWidgetProps = JSON.parse(props.widget_props.replace(/'/g, '"'));
-        this._titleField = parsedWidgetProps.titleField;
-        this._summaryField = parsedWidgetProps.summaryField;
-      } catch(err) {
-        throw new Error(`Timeline - error parsing widget_props: ${JSON.stringify(err)}`);
-      }
+    if (this._parsedWidgetProps) {
+      this._titleField = this._parsedWidgetProps.titleField;
+      this._summaryField = this.parsedWidgetProps.summaryField;
     }
   }
 }

package/src/Widget.ts

@@ -76,6 +76,14 @@ abstract class Widget {
     this._domain = value;
   }
 
+  _parsedWidgetProps: any;
+  get parsedWidgetProps(): any {
+    return this._parsedWidgetProps;
+  }
+  set parsedWidgetProps(value: any) {
+    this._parsedWidgetProps = value;
+  }
+
   constructor(props?: any) {
     this._colspan = Widget._defaultColspan;
     this._readOnly = false;
@@ -112,6 +120,14 @@ abstract class Widget {
       if (props.domain && typeof props.domain === "string") {
         this._domain = props.domain;
       }
+      if (props.widget_props) {
+
+      try {
+        this._parsedWidgetProps = JSON.parse(props.widget_props.replace(/'/g, '"'));
+      } catch(err) {
+        throw new Error('Error parsing widget_props');
+      }
+    }
     }
   }
 

package/src/spec/Timeline.spec.ts

@@ -0,0 +1,38 @@
+import WidgetFactory from "../WidgetFactory";
+import Timeline from "../Timeline";
+
+describe("A Timeline", () => {
+  it("should have an id corresponding to field name", () => {
+    const widgetFactory = new WidgetFactory();
+    const props = {
+      name: "timeline_field",
+    };
+
+    const widget = widgetFactory.createWidget("timeline", props);
+    expect(widget).toBeInstanceOf(Timeline);
+    expect(widget.id).toBe("timeline_field");
+
+  });
+
+  it("should properly set readonly", () => {
+    const widgetFactory = new WidgetFactory();
+    const props = {
+      name: "timeline_field",
+      readonly: 1,
+    };
+    const widget = widgetFactory.createWidget("timeline", props);
+
+    expect(widget.readOnly).toBe(true);
+  });
+
+  it('should parse widget props', () => {
+    const widgetFactory = new WidgetFactory();
+    const props = {
+      name: "timeline_field",
+      widget_props: "{'titleField': 'tfield', 'summaryField': 'sfield'}"
+    };
+    const widget = widgetFactory.createWidget("timeline", props);
+    expect(widget.summaryField).toBe('sfield');
+    expect(widget.titleField).toBe('tfield');
+  });
+});

package/src/spec/Widget.spec.ts

@@ -31,6 +31,29 @@ describe('A Widget', () => {
 
         expect(typeof widget.colspan).toBe("number");
     });
+    describe('Parsing widget props', () => {
+        it('should parse widget_props', () => {
+            const props = {
+                widget_props: "{'prop_1': 1, 'prop_2': 'prop2'}"
+            }
+            const widget = new WidgetImpl(props);
+            expect(JSON.stringify(widget.parsedWidgetProps)).toBe(
+              JSON.stringify({prop_1: 1, prop_2: 'prop2'})
+            )
+        });
+        it('should fail if widget props are not valid', () => {
+            const props = {
+                widget_props: "{'prop_1: 1, 'prop_2': 'prop2'}"
+            }
+            expect.assertions(1);
+            try {
+                new WidgetImpl(props);
+            } catch (e) {
+                expect(e.message).toBe('Error parsing widget_props');
+            }
+
+        });
+    });
 
     /*
     it('set colspan as string should store as a number', () => {