@datarailsshared/dr_renderer 1.2.88 → 1.2.91

package/package.json

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

package/src/dr_pivottable.js

@@ -4,6 +4,8 @@ let initDRPivotTable = function($, window, document) {
     var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
     var DRPivotData, sortDateStrings, getSort, processKey, SubtotalRenderer, getFormattedNumber, largeToSmallSort, largeToSmallSortByAbsolute, NovixRenderer;
+    const newTableColors = ['rgb(127, 196, 255)', 'rgb(200, 243,243)', 'rgb(247, 161, 173)', 'rgb(255, 237, 178)', 'rgb(221, 239, 255)',
+        'rgb(171, 216, 255)', 'rgb(174, 231, 220)', 'rgb(227, 255, 236)', 'rgb(162, 215, 227)', 'rgb(223, 239, 236)'];
 
     var delim = " , ";
     const useNewUx = document.ReportHippo && document.ReportHippo && document.ReportHippo.user &&
@@ -259,8 +261,9 @@ let initDRPivotTable = function($, window, document) {
 
         DRPivotData.prototype.getAggregator = function(rowKey, colKey) {
             var agg, flatColKey, flatRowKey;
-            flatRowKey = rowKey.join(delim);
-            flatColKey = colKey.join(delim);
+            let hebrewMarkRegex = new RegExp(String.fromCharCode(8206), 'g');
+            flatRowKey = rowKey.join(delim).replace(hebrewMarkRegex, '');
+            flatColKey = colKey.join(delim).replace(hebrewMarkRegex, '');
             if (rowKey.length === 0 && colKey.length === 0) {
                 agg = this.allTotal;
             } else if (rowKey.length === 0) {
@@ -646,8 +649,10 @@ let initDRPivotTable = function($, window, document) {
             if (opts.paletteOptions.widgetPalette) {
                 const mc_palette = _.find(_.get(opts.paletteOptions, 'monochromePalettes', []), { selected: true });
                 colors = mc_palette ? mc_palette.colors : opts.paletteOptions.widgetPalette;
-            } else if (opts.paletteOptions.dashboardPalette.colors) {
+            } else if (opts.paletteOptions.dashboardPalette && opts.paletteOptions.dashboardPalette.colors) {
                 colors = opts.paletteOptions.dashboardPalette.colors;
+            } else {
+                colors = newTableColors;
             }
 
             var isNewDesign = useNewUx && opts.chartOptions.table_options.use_new_table_design;

package/src/highcharts_renderer.js

@@ -7188,7 +7188,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return filters;
     };
 
-    highchartsRenderer.prepareDrillDownGraphFilters = function (rowKey, colKey, widget) {
+    highchartsRenderer.prepareDrillDownGraphFilters = function (r_key, c_key, widget) {
+        let rowKey = r_key;
+        let colKey = c_key;
+        let widgetOptions = typeof widget.options === 'string' ? JSON.parse(widget.options) : widget.options;
+        if (lodash.get(widgetOptions, 'chartOptions.table_options.transpose_table', false)) {
+            rowKey = c_key;
+            colKey = r_key;
+        }
+
         let filters = lodash.cloneDeep(widget.filters);
         for (let i = 0; i < rowKey.length; i++) {
             let filter = lodash.find(filters, {name: widget.rows[i].name});
@@ -7643,7 +7651,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
        verticalAlign: 'top',
        borderWidth: 0,
        itemMarginTop: 10,
-       y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle.subtitle ? 30 : 13)
+       y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle && additionOptions.subtitle.subtitle ? 30 : 13)
      } : {
        layout: 'vertical',
        align: 'right',
@@ -7659,7 +7667,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
        verticalAlign: 'top',
        borderWidth: 0,
        itemMarginTop: 10,
-       y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle.subtitle ? 30 : 13)
+       y: additionOptions.hideChartHeader ? -25 : (additionOptions.subtitle && additionOptions.subtitle.subtitle ? 30 : 13)
      } : {
        enabled: rowAttrsLength > 0,
        layout: 'vertical',