pre release

algenty · Dec 16, 2019 · 430bf79 · 430bf79
1 parent d89b18e
commit 430bf79
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 45 deletions.
diff --git a/dist/README.md b/dist/README.md
@@ -32,20 +32,21 @@ See more example at draw.io
 ## [[0.6.0 SNAPSHOT]](https://algenty.github.io/flowcharting-repository/archives/agenty-flowcharting-panel-0.6.0-SNAPSHOT.zip) - 2019-12-08  
 ### Added  
   - Experimental implementation for table type data (Mysql, Postgres, Zabbix, Streaming, loki and other ...)
+  - PlaceHolder feature supported [see doc from draw.io](https://desk.draw.io/support/solutions/articles/16000051979)
   - Some optimization on : 
     - tooltips
     - States
   - Tooltip Graph :
     - Histogram ([See example](https://algenty.github.io/flowcharting-repository/images/histogram_ani.png))
   - Variables support in download input url ([See example](https://algenty.github.io/flowcharting-repository/images/url_download_variable_ani.png))
-  - Add graduate effect when color changed ([See example](https://video.twimg.com/tweet_video/EISkJwdWwAAi5Qh.mp4))
+  - Add graduate animation when color changed ([See example](https://video.twimg.com/tweet_video/EISkJwdWwAAi5Qh.mp4))
   - New rule design in editor ([See example](https://algenty.github.io/flowcharting-repository/images/rule_design.png))
-  - Typescript migration for best quality.
+  - Typescript migration for best quality code.
   - Build migration to grafana-toolkit (thanks Dominik and Ryan).
-  - New engine graph for best compatibility with draw.io
+  - New engine graph for best compatibility with draw.io.
   - Better Zoom for firefox and IE/edge.
-  - Add controls on edit mode for XML and URL.
-  - Regular expression for String type value implemented to define level state.
+  - Add checks/controls on edit mode for XML and URL.
+  - Regular expression for String type values implemented to define level state.
 ### Fixed
   - Fix download url on first load.
   - Fix value null for string [(issue #65)](https://github.com/algenty/grafana-flowcharting/issues/65)

diff --git a/dist/libs/Graph_custom.js b/dist/libs/Graph_custom.js
@@ -129,4 +129,4 @@ mxEvent.addMouseWheelListener = function(func, container) {
         )
       : mxEvent.addListener(document, 'mousewheel', c);
   }
-};
+};
diff --git a/dist/module.js b/dist/module.js
diff --git a/src/rule_class.ts b/src/rule_class.ts
@@ -116,46 +116,120 @@ export default class Rule {
    * @memberof Rule
    */
   import(obj: any): this {
-    if (!!obj.unit) this.data.unit = obj.unit;
-    if (!!obj.type) this.data.type = obj.type;
-    if (!!obj.metricType) this.data.metricType = obj.metricType;
-    if (!!obj.alias) this.data.alias = obj.alias;
-    if (!!obj.refId) this.data.refId = obj.refId;
-    if (!!obj.column) this.data.column = obj.column;
-    if (!!obj.aggregation) this.data.aggregation = obj.aggregation;
-    if (!!obj.decimals || obj.decimals == 0) this.data.decimals = obj.decimals;
-    if (!!obj.colors) this.data.colors = obj.colors;
-    if (!!this.data.reduce) this.data.reduce = true;
-    if (!!obj.style) this.data.style = obj.style;
-    if (!!obj.colorOn) this.data.colorOn = obj.colorOn;
-    if (!!obj.link) this.data.link = obj.link;
-    if (!!obj.linkUrl) this.data.linkUrl;
-    if (!!obj.linkParams) this.data.linkParams = obj.linkParams;
-    if (!!obj.textOn) this.data.textOn = obj.textOn;
-    if (!!obj.textReplace) this.data.textReplace = obj.textReplace;
-    if (!!obj.textPattern) this.data.textPattern = obj.textPattern;
-    if (!!obj.pattern) this.data.pattern = obj.pattern;
-    if (!!obj.dateFormat) this.data.dateFormat = obj.dateFormat;
-    if (!!obj.thresholds) this.data.thresholds = obj.thresholds;
-    if (!!obj.stringWarning) this.data.stringWarning = obj.stringWarning;
-    if (!!obj.stringCritical) this.data.stringCritical = obj.stringCritical;
-    if (!!obj.invert) this.data.invert = obj.invert;
-    if (!!obj.overlayIcon) this.data.overlayIcon;
-    if (!!obj.tooltip) this.data.tooltip = obj.tooltip;
-    if (!!obj.tooltipLabel) this.data.tooltipLabel = obj.tooltipLabel;
-    if (!!obj.tooltipColors) this.data.tooltipColors = obj.tooltipColors;
-    if (!!obj.tooltipOn) this.data.tooltipOn = obj.tooltipOn;
-    if (!!obj.tpDirection) this.data.tpDirection = obj.tpDirection;
-    if (!!obj.tpGraph) this.data.tpGraph = obj.tpGraph !== undefined;
-    if (!!obj.tpGraphSize) this.data.tpGraphSize = obj.tpGraphSize;
-    if (!!obj.tpGraphType) this.data.tpGraphType = obj.tpGraphType;
-    if (!!obj.tpGraphLow) this.data.tpGraphLow = obj.tpGraphLow;
-    if (!!obj.tpGraphHigh) this.data.tpGraphHigh = obj.tpGraphHigh;
-    if (!!obj.tpGraphScale) this.data.tpGraphScale = obj.tpGraphScale;
+    if (!!obj.unit) {
+      this.data.unit = obj.unit;
+    }
+    if (!!obj.type) {
+      this.data.type = obj.type;
+    }
+    if (!!obj.metricType) {
+      this.data.metricType = obj.metricType;
+    }
+    if (!!obj.alias) {
+      this.data.alias = obj.alias;
+    }
+    if (!!obj.refId) {
+      this.data.refId = obj.refId;
+    }
+    if (!!obj.column) {
+      this.data.column = obj.column;
+    }
+    if (!!obj.aggregation) {
+      this.data.aggregation = obj.aggregation;
+    }
+    if (!!obj.decimals || obj.decimals === 0) {
+      this.data.decimals = obj.decimals;
+    }
+    if (!!obj.colors) {
+      this.data.colors = obj.colors;
+    }
+    if (!!this.data.reduce) {
+      this.data.reduce = true;
+    }
+    if (!!obj.style) {
+      this.data.style = obj.style;
+    }
+    if (!!obj.colorOn) {
+      this.data.colorOn = obj.colorOn;
+    }
+    if (!!obj.link) {
+      this.data.link = obj.link;
+    }
+    if (!!obj.linkUrl) {
+      this.data.linkUrl = obj.linkUrl;
+    }
+    if (!!obj.linkParams) {
+      this.data.linkParams = obj.linkParams;
+    }
+    if (!!obj.textOn) {
+      this.data.textOn = obj.textOn;
+    }
+    if (!!obj.textReplace) {
+      this.data.textReplace = obj.textReplace;
+    }
+    if (!!obj.textPattern) {
+      this.data.textPattern = obj.textPattern;
+    }
+    if (!!obj.pattern) {
+      this.data.pattern = obj.pattern;
+    }
+    if (!!obj.dateFormat) {
+      this.data.dateFormat = obj.dateFormat;
+    }
+    if (!!obj.thresholds) {
+      this.data.thresholds = obj.thresholds;
+    }
+    if (!!obj.stringWarning) {
+      this.data.stringWarning = obj.stringWarning;
+    }
+    if (!!obj.stringCritical) {
+      this.data.stringCritical = obj.stringCritical;
+    }
+    if (!!obj.invert) {
+      this.data.invert = obj.invert;
+    }
+    if (!!obj.overlayIcon) {
+      this.data.overlayIcon = obj.overlayIcon;
+    }
+    if (!!obj.tooltip) {
+      this.data.tooltip = obj.tooltip;
+    }
+    if (!!obj.tooltipLabel) {
+      this.data.tooltipLabel = obj.tooltipLabel;
+    }
+    if (!!obj.tooltipColors) {
+      this.data.tooltipColors = obj.tooltipColors;
+    }
+    if (!!obj.tooltipOn) {
+      this.data.tooltipOn = obj.tooltipOn;
+    }
+    if (!!obj.tpDirection) {
+      this.data.tpDirection = obj.tpDirection;
+    }
+    if (!!obj.tpGraph) {
+      this.data.tpGraph = obj.tpGraph !== undefined;
+    }
+    if (!!obj.tpGraphSize) {
+      this.data.tpGraphSize = obj.tpGraphSize;
+    }
+    if (!!obj.tpGraphType) {
+      this.data.tpGraphType = obj.tpGraphType;
+    }
+    if (!!obj.tpGraphLow) {
+      this.data.tpGraphLow = obj.tpGraphLow;
+    }
+    if (!!obj.tpGraphHigh) {
+      this.data.tpGraphHigh = obj.tpGraphHigh;
+    }
+    if (!!obj.tpGraphScale) {
+      this.data.tpGraphScale = obj.tpGraphScale;
+    }
     let maps: any = [];
 
     // SHAPES
-    if (!!obj.shapeProp) this.data.shapeProp = obj.shapeProp;
+    if (!!obj.shapeProp) {
+      this.data.shapeProp = obj.shapeProp;
+    }
     this.data.shapeData = [];
 
     // For 0.2.0