@datarailsshared/dr_renderer 1.2.339 → 1.2.341

package/package.json

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

package/src/highcharts_renderer.js

@@ -145,6 +145,8 @@ const FEATURES = {
     FORMAT_AXIS: 'use_default_table_format_for_axis',
 }
 
+const TICKS_COUNT = 5;
+
 let getHighchartsRenderer = function ($, document, Highcharts, default_colors, highchartsRenderer,
                                       DataFormatter, lodash, moment_lib, isNewAngular) {
 
@@ -1157,7 +1159,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (row_n_value && row_n_value.length > 0) {
                 ob.initialName = row_n_value.join(highchartsRenderer.delimer)
                     .replace(highchartsRenderer.DR_OTHERS_KEY, othersName);
-                ob.name = highchartsRenderer.getFormattedRowKey(ob.initialName, pivotData); 
+                ob.name = highchartsRenderer.getFormattedRowKey(ob.initialName, pivotData);
             }
             lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
@@ -1200,7 +1202,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 ob.data.push(
                     key
-                        ? { 
+                        ? {
                             y: val,
                             initialName: lodash.unescape(key),
                             name: highchartsRenderer.getFormattedColKey(lodash.unescape(key), pivotData),
@@ -1241,14 +1243,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             i++;
         });
 
-        lodash.forEach(col_n_keys, (col_n_value, index) => {
-            if (lodash.isArray(col_n_value)) {
-                col_n_keys[index] = lodash.map(
-                    lodash.filter(col_n_value, value => !!value),
-                    value => lodash.replace(value, highchartsRenderer.DR_OTHERS_KEY, othersName)
-                );
-            }
-        });
+        if (lodash.get(chartOptions, 'xAxis.categories')) {
+            lodash.forEach(chartOptions.xAxis.categories, (col_n_value, index) => {
+                if (lodash.isArray(col_n_value)) {
+                    chartOptions.xAxis.categories[index] = lodash.map(
+                        lodash.filter(col_n_value, value => !!value),
+                        value => lodash.replace(value, highchartsRenderer.DR_OTHERS_KEY, othersName)
+                    );
+                }
+            });
+        }
 
         const ethalonSeries = chart_series[chart_series.length - 1];
 
@@ -1661,7 +1665,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             let initialName = value.trend === 'total' ? value.formattedKey || value.key[0] : keys.join(highchartsRenderer.delimer);
             let name = value.trend === 'total' ? initialName : highchartsRenderer.getFormattedColKey(initialName, pivotData);
-                
+
             let color = '';
 
             if (!lodash.get(waterfallOptions, 'colors', {}) && value.color) {
@@ -4819,7 +4823,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 result = {};
             }
         }
-        
+
         return result;
     };
 
@@ -9123,7 +9127,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
      return topPosition;
     }
-
+    highchartsRenderer.setStaticTicksAmount = function (yAxis) {
+        yAxis.tickAmount = TICKS_COUNT;
+    }
     highchartsRenderer.setYAxisMinMax = function (yAxis, axisYOptions) {
         if (!axisYOptions) {
             return;
@@ -9133,6 +9139,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const maxNumber = parseInt(axisYOptions.max);
         yAxis.min = !isNaN(minNumber) ? minNumber : null;
         yAxis.max = !isNaN(maxNumber) ? maxNumber : null;
+        if (minNumber || maxNumber) {
+            highchartsRenderer.setStaticTicksAmount(yAxis);
+        }
     }
 
     highchartsRenderer.getDateFieldFormat = function(widget, dateField) {
@@ -9385,7 +9394,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     highchartsRenderer.getColsInFormatterContext = function(context, pivotData) {
-        return lodash.get(context, 'point.options.colsForTotal') 
+        return lodash.get(context, 'point.options.colsForTotal')
             || highchartsRenderer.isFormattingAxis(pivotData) && (lodash.get(context, 'point.initialName') || lodash.get(context, 'options.initialName'))
             || context.key;
     }