@datarailsshared/dr_renderer 1.2.177-dragons → 1.2.179

package/package.json

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

package/src/dr_pivottable.js

@@ -146,7 +146,7 @@ let initDRPivotTable = function($, window, document) {
         DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
             if (useTotalsCalculation) {
                 if (!this.notFirst) {
-                    this.keysLength = _.filter(_.keys(record), key => !['data_types', 'formats', 'values_formats'].includes(key)).length - 1;
+                    this.keysLength = _.filter(_.keys(record), key => !_.includes(['data_types', 'formats', 'values_formats'], key)).length - 1;
                     this.notFirst = true;
                 }
                 let getRowAggregator = (function(_this) {

package/src/highcharts_renderer.js

@@ -458,7 +458,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         const labelOptions = lodash.get(opts.chartOptions, 'label') || lodash.get(opts.chartOptions, 'label_pie');
         const othersName = opts.total_value_options ?
-            lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others' :
+            highchartsRenderer.getOthersName(opts) :
             undefined;
         var drOthersInColumn = lodash.find(
             pivotData.getColKeys(), 
@@ -1013,16 +1013,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if (row_n_keys.length == 0)
             row_n_keys.push([]);
 
-        if (!col_n_keys.length && lodash.get(chartOptions, "chart.type") === 'kpi' && isUniqueVals) {
-            col_n_keys.push([]);
-        }
-
         var i = 0;
         var variat_serias = null;
         const n = col_n_keys.length;
         const xSum = (1 + n) / 2 * n;
         const trendSerieses = [];
-        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
+        const othersName = highchartsRenderer.getOthersName(opts);
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             var ob = {};
@@ -1170,7 +1166,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const n = col_n_keys.length;
         const xSum = (1 + n) / 2 * n;
         const trendSerieses = [];
-        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
+        const othersName = highchartsRenderer.getOthersName(opts);
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             let ySum = 0;
@@ -1543,7 +1539,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var num_rows = row_n_keys.length;
 
         const isOthersIncludedInRow = num_rows === 1 && lodash.includes(row_n_keys[0], 'DR_Others');
-        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
+        const othersName = highchartsRenderer.getOthersName(opts);
 
         lodash.forEach(col_n_keys, function (col_n_value) {
             const row_n_value = isOthersIncludedInRow ? row_n_keys[0] : [];
@@ -1590,7 +1586,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var num_cols = col_n_keys.length;
         var num_rows = row_n_keys.length;
 
-        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
+        const othersName = highchartsRenderer.getOthersName(opts);
 
         lodash.forEach(col_n_keys, function (col_n_value) {
             var col_ob = {};
@@ -2101,13 +2097,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var kpioptions = opts.chartOptions ? opts.chartOptions : highchartsRenderer.getDefaultValueForChart('kpi');
 
         chartOptions.chart = {
-            type: 'kpi'
+            type: ''
         };
         if (disableAnimation) {
             chartOptions.chart.animation = false;
         }
         var uniqueVals = kpioptions.value.value == "Unique";
 
+        if (!pivotData.colKeys.length) {
+            pivotData.colKeys.push([]);
+        }
+
         let temp_series = highchartsRenderer.ptCreateBasicLineSeries(pivotData, null, true, uniqueVals, null, opts, chartOptions);
 
         var total = [];
@@ -4354,16 +4354,20 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             const breakdownSettings = widget.options.breakdown_options.settings;
             const maxCategories = breakdownSettings.maxCategoriesCount;
             const minCategories = breakdownSettings.minCategoriesCount;
-            const categoryFieldName = widget.cols[0].name;
-            const uniqueCategories = lodash.filter(lodash.uniq(lodash.map(rowData, row => row[categoryFieldName])), value => !!value);
+            const uniqueCategories = lodash.filter(
+                lodash.uniq(
+                    lodash.map(rowData, row => row[widget.cols[0].name])
+                ),
+                value => !!value
+            );
 
             if (uniqueCategories && (uniqueCategories.length > maxCategories || uniqueCategories.length < minCategories )) {
-                const commonErrorSentence = `Please choose ${minCategories}-${maxCategories} items in the Category section.`
+                const commonErrorSentence = `Please choose ${ minCategories }-${ maxCategories } items in the Category section.`
                 options.error_has_occurred = true;
                 options.error_params = {
                     title: uniqueCategories.length > maxCategories
-                        ? `There is too much data. ${commonErrorSentence}`
-                        : `Not enough data. ${commonErrorSentence}`,
+                        ? `There is too much data. ${ commonErrorSentence }`
+                        : `Not enough data. ${ commonErrorSentence }`,
                     text: '',
                     btnText: 'Edit Widget',
                     class: 'too-much-data',
@@ -8167,7 +8171,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if ($.pivotUtilities && !$.pivotUtilities.additionalFieldsList) {
             $.pivotUtilities.additionalFieldsList = [
                 {key: 'DR_Average', name: 'DR_Average'},
-                {key: 'DR_Others', name: _.get(widget.options, "total_value_options.filter_options.filteredOutFieldName") || 'Others'}
+                {key: 'DR_Others', name: highchartsRenderer.getOthersName(widget.options)}
             ];
         }