@datarailsshared/dr_renderer 1.2.171-dragons → 1.2.173-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -1391,6 +1391,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             tmoobj.visible = false;
                         }
                         tmoobj.y = value;
+                        tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
                         resultObject.data.push(tmoobj);
                     }
                 }
@@ -7883,6 +7884,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     };
 
+    highchartsRenderer.createDateFromString = function (dateString, format) {
+        if ((format && !highchartsRenderer.isDateFormat(dateString, format)) || !highchartsRenderer.isDate(dateString)) {
+            return null;
+        }
+        const utcDate = format 
+            ? moment_lib.utc(dateString, format, true)
+            : moment_lib.utc(dateString);
+        return utcDate.startOf('day').unix();
+    }
+
     highchartsRenderer.prepareDrillDownFilters = function (r_keys, c_keys, widget) {
         let row_key = r_keys;
         let col_key = c_keys;
@@ -7896,26 +7907,46 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         let filters = [];
         
-        lodash.forEach(col_key, function (col_value, index) {
-            if (widget && widget.cols[index]) {
-                let temp = highchartsRenderer.createFilterObject(widget.cols[index]);
-                if (widget.cols[index].type === 'Date') {
-                    let datetrange = highchartsRenderer.createDateTypeFromValue(
+        if (widget.chart_type === CHART_TYPES.WATERFALL_BREAKDOWN) {
+            const colFilter = highchartsRenderer.createFilterObject(widget.cols[0]);
+            const labels = [];
+            colFilter.values = [];
+            lodash.forEach(col_key, function (col_value) {
+                if (widget.cols[0].type === 'Date') {
+                    let date = highchartsRenderer.createDateFromString(
                         col_value,
-                        highchartsRenderer.getDateFieldFormat(widget, widget.cols[index])
+                        highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
                     );
-
-                    if ($.isEmptyObject(datetrange)) {
-                        return;
-                    }
-                    temp.values = datetrange;
-                    temp.values.label = col_value;
+                    colFilter.values.push(date);
                 } else {
-                    temp.values = [col_value];
+                    colFilter.values.push(col_value);
                 }
-                filters.push(temp);
-            }
-        });
+                labels.push(col_value);
+            });
+            colFilter.value_to_show = labels.join(', ');
+            filters.push(colFilter);
+        } else {
+            lodash.forEach(col_key, function (col_value, index) {
+                if (widget && widget.cols[index]) {
+                    let temp = highchartsRenderer.createFilterObject(widget.cols[index]);
+                    if (widget.cols[index].type === 'Date') {
+                        let datetrange = highchartsRenderer.createDateTypeFromValue(
+                            col_value,
+                            highchartsRenderer.getDateFieldFormat(widget, widget.cols[index])
+                        );
+    
+                        if ($.isEmptyObject(datetrange)) {
+                            return;
+                        }
+                        temp.values = datetrange;
+                        temp.values.label = col_value;
+                    } else {
+                        temp.values = [col_value];
+                    }
+                    filters.push(temp);
+                }
+            });
+        }
 
         lodash.forEach(row_key, function (row_value, index) {
             if (widget && widget.rows[index]) {
@@ -7960,6 +7991,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         });
 
         lodash.forEach(filters, function (filter) {
+            if (filter.value_to_show) {
+                return;
+            }
             if (Array.isArray(filter.values)) {
                 if (filter.type) {
                     for (let i = 0; i < filter.values.length; i++) {
@@ -7998,15 +8032,36 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 filters.push(highchartsRenderer.createDrillDownFilterObject(widget, widget.rows[i], rowKey[i]))
             }
         }
-        for (let i = 0; i < colKey.length; i++) {
-            let filter = lodash.find(filters, {name: widget.cols[i].name});
+
+        if (widget.chart_type === CHART_TYPES.WATERFALL_BREAKDOWN) {
+            let filter = lodash.find(filters, {name: widget.cols[0].name});
             if (filter) {
                 filter.is_excluded = false;
-                filter.values = widget.cols[i].type === 'Date' ?
-                    highchartsRenderer.createDateTypeFromValue(colKey[i], highchartsRenderer.getDateFieldFormat(widget, widget.cols[i])) :
-                    [colKey[i]];
             } else {
-                filters.push(highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[i], colKey[i]))
+                filter = highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[0], colKey[0]);
+            }
+            filter.values = [];
+            for (let i = 0; i < colKey.length; i++) {
+                filter.values.push(
+                    widget.cols[0].type === 'Date'
+                        ? highchartsRenderer.createDateFromString(
+                            colKey[i],
+                            highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
+                        )
+                        : colKey[i]
+                );
+            }
+        } else {
+            for (let i = 0; i < colKey.length; i++) {
+                let filter = lodash.find(filters, {name: widget.cols[i].name});
+                if (filter) {
+                    filter.is_excluded = false;
+                    filter.values = widget.cols[i].type === 'Date' ?
+                        highchartsRenderer.createDateTypeFromValue(colKey[i], highchartsRenderer.getDateFieldFormat(widget, widget.cols[i])) :
+                        [colKey[i]];
+                } else {
+                    filters.push(highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[i], colKey[i]))
+                }
             }
         }
         return filters;