@datarailsshared/dr_renderer 1.2.373 → 1.2.375

package/package.json

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

package/src/highcharts_renderer.js

@@ -8726,14 +8726,22 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
             filter.values = [];
             for (let i = 0; i < colKey.length; i++) {
-                filter.values.push(
-                    widget.cols[0].type === 'Date' && colKey[i] !== NULL_VALUE && !isFormattingDatesAsOtherAxisTypes
-                        ? highchartsRenderer.createDateFromString(
-                            colKey[i],
-                            highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
-                        )
-                        : +colKey[i]
-                );
+                let value = colKey[i];
+                switch (widget.cols[0].type) {
+                    case 'Date':
+                        if (value !== NULL_VALUE && !isFormattingDatesAsOtherAxisTypes) {
+                            value = highchartsRenderer.createDateFromString(
+                                value,
+                                highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
+                            );
+                        }
+                        break;
+                    case 'Integer':
+                    case 'Float':
+                        value = +value;
+                        break;
+                }
+                filter.values.push(value);
             }
         } else if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH) {
             lodash.forEach(colKey, function (colKeyElement, index) {
@@ -8914,7 +8922,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         if (datesFields.length > 0) {
-            const invertedDateStringMap = {};
+            widget.pivot.invertedDateStringMap = {};
             lodash.forEach(res, function (element) {
                 for (var i in datesFields) {
                     if (element.hasOwnProperty(datesFields[i].name)) {
@@ -8930,7 +8938,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                                     widget.pivot.dateValuesDictionary = {}
                                 }
                                 widget.pivot.dateValuesDictionary[dateStringValue] = element[datesFields[i].name];
-                                invertedDateStringMap[element[datesFields[i].name]] = dateStringValue;
+                                widget.pivot.invertedDateStringMap[element[datesFields[i].name]] = dateStringValue;
                             }
                             element[datesFields[i].name] = dateStringValue;
                         }
@@ -8941,7 +8949,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                     lodash.forEach(['col_keys', 'row_keys', 'row_keys_by_cols'], (keysListName) => {
                         const widgetFields = keysListName === 'col_keys' ? widget.cols : widget.rows;
-                        highchartsRenderer.replaceSortingKeysWithMappedValues(lodash.get(keysObject, keysListName), invertedDateStringMap, widgetFields);
+                        highchartsRenderer
+                            .replaceSortingKeysWithMappedValues(lodash.get(keysObject, keysListName), widget.pivot.invertedDateStringMap, widgetFields);
                     });
                 }
             });
@@ -9026,12 +9035,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         });
                     }
                 } else if (field.sorting && field.sorting.type == "CustomOrder" && field.sorting.values) {
-                    datesFields.push({
-                        "format": field.format,
-                        "name": field.name,
-                        "type": field.type,
-                        "values": field.sorting.values
-                    });
+                    if (field.type === 'Date' && field.sorting.values.length && widget.pivot.invertedDateStringMap) {
+                        const fieldInList = lodash.find(datesFields, { name: field.name });
+                        fieldInList.values = lodash.map(field.sorting.values, value => widget.pivot.invertedDateStringMap[value] || value);
+                    } else {
+                        datesFields.push({
+                            "format": field.format,
+                            "name": field.name,
+                            "type": field.type,
+                            "values": field.sorting.values
+                        });
+                    }
                 }
             });