@datarailsshared/dr_renderer 1.2.456 → 1.2.459

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.456",
+  "version": "1.2.459",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/charts/dr_gauge_chart.js

@@ -1,3 +1,4 @@
+const _ = require('lodash');
 const { DrChartTooltip } = require("../dr_chart_tooltip");
 const helpers = require("../dr-renderer-helpers");
 
@@ -91,9 +92,10 @@ function DrGaugeChart(pivotData, opts) {
             gauge: { thickness },
         } = options;
 
-        const bands = segments.map((item) => {
+        const bands = segments.map((item, index) => {
+            const itemFrom = !!index ? item.from - 1 : item.from;
             return {
-                from: isAbsoluteValue ? Math.max(0, item.from - 1) : (Math.max(0, item.from - 1) * goalValue) / 100,
+                from: isAbsoluteValue ? itemFrom : (itemFrom * goalValue) / 100,
                 to: isAbsoluteValue ? item.to : (item.to * goalValue) / 100,
                 color: item.color,
                 thickness: thickness,
@@ -101,15 +103,14 @@ function DrGaugeChart(pivotData, opts) {
             };
         });
 
-        // clamp segments
-        bands[0].from = 0;
+        // clamp last segment
         bands[bands.length - 1].to = Math.max(bands[bands.length - 1].to, goalValue);
 
         return bands;
     };
 
     this.createTicks = function (plotBands, options) {
-        return [...new Set([0, ...plotBands.map((b) => b.to), options.goal.value])].sort((a, b) => a - b);
+        return _.uniq([plotBands[0].from || 0, ...plotBands.map((b) => b.to), options.goal.value]).sort((a, b) => a - b);
     };
 
     this.mergeOptions = function (options) {
@@ -122,7 +123,7 @@ function DrGaugeChart(pivotData, opts) {
 
     this.getAngleForValue = function (
         value,
-        min = 0,
+        min = this.min,
         max = this.max,
         startAngle = this.options.gauge.startAngle,
         endAngle = this.options.gauge.endAngle
@@ -196,10 +197,10 @@ function DrGaugeChart(pivotData, opts) {
     this.getValue = function (pivotData, opts) {
         const lineSeries = this.ptCreateBasicLineSeries(pivotData, null, true, null, null, opts, {});
 
-        let total = lineSeries
+        let total = _.flatten(lineSeries
             .map((s) => s.data.map((v) => v))
-            .filter((v) => !isNaN(v))
-            .flat();
+            .filter((v) => !_.isNaN(v))
+        );
 
         let aggfunc = (a, b) => a + b;
         let base = 0;
@@ -496,7 +497,7 @@ function DrGaugeChart(pivotData, opts) {
 
             // the value axis
             yAxis: {
-                min: 0,
+                min: this.min,
                 max: this.max,
                 tickPositions: this.ticks,
                 tickPosition: "inside",
@@ -558,6 +559,7 @@ function DrGaugeChart(pivotData, opts) {
     this.ticks = this.createTicks(this.plotBands, this.options);
     this.value = this.getValue(pivotData, opts);
     this.max = this.ticks[this.ticks.length - 1];
+    this.min = this.ticks[0];
 }
 
 module.exports = { DrGaugeChart, GAUGE_OPTIONS_DEFAULT };

package/tests/dr_gauge_chart.test.js

@@ -186,7 +186,7 @@ describe("DrGaugeChart", () => {
             ]);
         });
 
-        it("should clamp values (min is always 0, max of goal and last segment)", () => {
+        it("should clamp values (max of goal and last segment)", () => {
             expect(
                 chart.createPlotBands({
                     isAbsoluteValue: true,
@@ -219,7 +219,7 @@ describe("DrGaugeChart", () => {
                 })
             ).toEqual([
                 {
-                    from: 0,
+                    from: 100,
                     to: 200,
                     color: "red",
                     thickness: 10,