@datarailsshared/dr_renderer 1.2.374 → 1.2.376

package/package.json

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

package/src/highcharts_renderer.js

@@ -24,8 +24,8 @@ const CHART_COLORS = {
     LABEL_SECOND: '#85889c',
     DRILL_UP_FILL: '#eef3f6',
     DRILL_BUTTON_COLOR_FILL: 'white',
-    DRILL_BUTTON_COLOR: '#333333',
-    DRILL_BUTTON_COLOR_HOVER: '#6D6E6F',
+    DRILL_BUTTON_COLOR: '#6D6E6F',
+    DRILL_BUTTON_COLOR_HOVER: '#333333',
     PLOT_BORDER: '#606063',
     MINOR_GRID_LINE: '#505053',
     TICK_COLOR: '#666',
@@ -66,7 +66,7 @@ const CHART_TYPES = {
 
 const HIGHCHARTS_CONSTANTS = {
     delimer: ' , ',
-    DRILL_BUTTON_FONT_SIZE: '14px',
+    DRILL_BUTTON_FONT_SIZE: '16px',
     MAX_ROWS_FOR_AUTO_REFRESH: 100000,
     MAX_ROWS_FOR_SHOW_RESULTS: 10000,
     DR_OTHERS_KEY: 'DR_Others',
@@ -340,7 +340,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         maskColor: CHART_COLORS.MASK,
         lang: {
             decimalPoint: '.',
-            drillUpText: '< Back'
+            drillUpText: '<&nbsp;Back'
         },
         navigation: {
             buttonOptions: {
@@ -1042,13 +1042,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
             if (isNewAngular) {
                 const isPieChart = chartOptions.chart && chartOptions.chart.type === 'pie';
-                const x = isPieChart ? 0 :
-                    chartOptions.yAxis && chartOptions.yAxis.title && (chartOptions.yAxis.title.text || chartOptions.yAxis.title.autoylabel) ? -60 : -40;
-                const y = isPieChart ? 27 :
-                    chartOptions.xAxis && chartOptions.xAxis.title && (chartOptions.xAxis.title.text || chartOptions.xAxis.title.autoxlabel) ? 65 : 43;
+                const x = isPieChart ? 13 : 12
+                const y = isPieChart ? -9 : 6
                 chartOptions.chart.spacingBottom = lodash.get(chartOptions, 'xAxis.title') ? 34 : 30; 
                 chartOptions.drilldown.breadcrumbs = {
-                    formatter: () => 'Back',
+                    formatter: () => '< &nbsp;Back',
                     showFullPath: false,
                     position: {
                         align: 'left',
@@ -1057,7 +1055,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         y: y,
                     },
                     floating: true,
-                    position:  { align: 'left', x: 12, y: 6, verticalAlign: 'bottom' },
                     relativeTo: 'spacingBox',
                     buttonTheme: {
                         fill: CHART_COLORS.DRILL_BUTTON_COLOR_FILL,
@@ -8922,7 +8919,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)) {
@@ -8938,7 +8935,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;
                         }
@@ -8949,7 +8946,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);
                     });
                 }
             });
@@ -9034,12 +9032,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
+                        });
+                    }
                 }
             });