@datarailsshared/dr_renderer 1.2.174-dragons → 1.2.176-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -5,6 +5,7 @@ const SERIES_CLASSNAMES = {
 };
 
 const EMPTY_ROW_N_KEYS = [[]];
+const NULL_VALUE = '[null]';
 
 let getHighchartsRenderer = function ($, document, Highcharts, default_colors, highchartsRenderer,
                                       DataFormatter, lodash, moment_lib, isNewAngular) {
@@ -1406,7 +1407,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             resultObject.data.push({
                 y: pivotData.colTotals[col_n_value].sum,
-                name: lodash.unescape(col_n_value),
+                name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
                 isSum: !!col_index,
                 isTotal: true,
                 color: colorOptions.total,
@@ -8211,9 +8212,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         lodash.forEach(datesFields, function (row) {
             row.values = lodash.uniq(row.values);
 
-            const isTimestampDateField = row.type === 'Date' && typeof row.values[0] === 'number';
+            const isTimestampDateField = row.type === 'Date' && lodash.some(row.values, value => typeof value ==='number');
             if (isTimestampDateField) {
+                const nullValueIndex = row.values.indexOf(NULL_VALUE);
+                if (~nullValueIndex) {
+                    row.values.splice(nullValueIndex, 1);
+                }
                 row.values = row.values.sort((a, b) => a - b);
+                if (~nullValueIndex) {
+                    row.values.push(NULL_VALUE);
+                }
             } else {
                 row.values = row.values.sort();
             }