@datarailsshared/dr_renderer 1.2.89 → 1.2.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.89",
+  "version": "1.2.92",
   "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) {
@@ -481,7 +484,7 @@ let initDRPivotTable = function($, window, document) {
     }
 
     SubtotalRenderer = function(pivotData, opts, charttype, tooMuch = false, error_params) {
-        var addClass, allTotal, arrowCollapsed, arrowExpanded, buildColHeaderHeader, buildColHeaderHeaders, buildColHeaderHeadersClickEvents, buildColHeaders, buildColTotals, buildColTotalsHeader, buildGrandTotal, buildRowHeaderHeaders, buildRowHeaderHeadersClickEvents, buildRowHeaders, buildRowTotalsHeader, buildValues, classColCollapsed, classColExpanded, classColHide, classColShow, classCollapsed, classExpanded, classRowCollapsed, classRowExpanded, classRowHide, classRowShow, clickStatusCollapsed, clickStatusExpanded, colAttrs, colDisableAfter, colKeys, colTotals, collapseCol, collapseColsAt, collapseHideDescendantRow, collapseRow, collapseRowsAt, collapseShowColSubtotal, collapseShowRowSubtotal, createElement, defaults, expandChildCol, expandChildRow, expandCol, expandColsAt, expandHideColSubtotal, expandHideRowSubtotal, expandRow, expandRowsAt, expandShowColSubtotal, expandShowRowSubtotal, getTableEventHandlers, hasClass, hideDescendantCol, isColDisable, isColDisableExpandCollapse, isColHideOnExpand, isRowDisable, isRowDisableExpandCollapse, isRowHideOnExpand, main, getSubtotalInBrackets, processKeys, encodeHtmlEntities, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, removeClass, replaceClass, rowAttrs, rowDisableAfter, rowKeys, rowTotals, setAttributes, showChildCol, showChildRow, toggleCol, toggleColHeaderHeader, toggleRow, toggleRowHeaderHeader, tree, assumptionSubscribe;
+        var addClass, allTotal, arrowCollapsed, arrowExpanded, buildColHeaderHeader, buildColHeaderHeaders, buildColHeaderHeadersClickEvents, buildColHeaders, buildColTotals, buildColTotalsHeader, buildGrandTotal, buildRowHeaderHeaders, buildRowHeaderHeadersClickEvents, buildRowHeaders, buildRowTotalsHeader, buildValues, classColCollapsed, classColExpanded, classColHide, classColShow, classCollapsed, classExpanded, classRowCollapsed, classRowExpanded, classRowHide, classRowShow, clickStatusCollapsed, clickStatusExpanded, colAttrs, colDisableAfter, colKeys, colTotals, collapseCol, collapseColsAt, collapseHideDescendantRow, collapseRow, collapseRowsAt, collapseShowColSubtotal, collapseShowRowSubtotal, applyInlineStyles, createElement, defaults, expandChildCol, expandChildRow, expandCol, expandColsAt, expandHideColSubtotal, expandHideRowSubtotal, expandRow, expandRowsAt, expandShowColSubtotal, expandShowRowSubtotal, getTableEventHandlers, hasClass, hideDescendantCol, isColDisable, isColDisableExpandCollapse, isColHideOnExpand, isRowDisable, isRowDisableExpandCollapse, isRowHideOnExpand, main, getSubtotalInBrackets, processKeys, encodeHtmlEntities, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, removeClass, replaceClass, rowAttrs, rowDisableAfter, rowKeys, rowTotals, setAttributes, showChildCol, showChildRow, toggleCol, toggleColHeaderHeader, toggleRow, toggleRowHeaderHeader, tree, assumptionSubscribe;
         var createTotalValsBolder, createGrandTotalBolder, getHeaderColorProperties, colorizeRowLabelHeaders, colorizeTableIfNeed, valueNoDashes, getColorsWithOffsetForTable, offsetColors, handleFreezePanesScroll, selectFreezableElements, removeRowHeaderNullValue;
         var getAdditionalAggregation, buildAdditionalHeaderCols, buildAdditionalHeaderRows, buildAdditionalColValues, buildAdditionalRowValues, buildAdditionalRowTotals, buildAdditionalColTotals;
         var additionalFieldsCol, additionalFieldsRow, additionalFieldsList;
@@ -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;
@@ -775,24 +780,30 @@ let initDRPivotTable = function($, window, document) {
         applyInlineStyles = function(element, className) {
             const tableDesignOptions = opts.chartOptions.table_design_options;
             let optionName;
-            if (!className || !tableDesignOptions) return element;
-
-            if (element.className.includes('pvtAxisLabel') ||
-                element.className.includes('pvtColLabel')) {
-                optionName = 'columns';
-            } else if (element.className.includes('pvtRowLabel')) {
-                optionName = 'rows';
-            } else if (element.className.includes('pvtVal') &&
-                !element.className.includes('pvtTotal')) {
-                optionName = 'values';
-            } else if (element.className.includes('colTotal') ||
-                        element.className.includes('rowTotal') ||
-                        element.className.includes('pvtGrandTotal')) {
-                optionName = 'totals';
-            }
-            element.style.fontSize = tableDesignOptions[optionName + '_font_size'] + 'px';
-            element.style.textAlign = tableDesignOptions[optionName + '_align_text'];
-            element.style.fontFamily = tableDesignOptions[optionName + '_font_style'];
+            if (!className) return element;
+
+            if(element.className){
+                if (_.includes(element.className, 'pvtAxisLabel') ||
+                    _.includes(element.className, 'pvtColLabel')) {
+                    optionName = 'columns';
+                }else if (_.includes(element.className,'pvtRowLabel')) {
+                    optionName = 'rows';
+                } else if (_.includes(element.className,'pvtVal') &&
+                    !_.includes(element.className,'pvtTotal')) {
+                    optionName = 'values';
+                } else if (_.includes(element.className,'colTotal') ||
+                    _.includes(element.className,'rowTotal') ||
+                    _.includes(element.className,'pvtGrandTotal')) {
+                    optionName = 'totals';
+                }
+            }
+
+            if(optionName && tableDesignOptions){
+                element.style.fontSize = tableDesignOptions[optionName + '_font_size'] + 'px';
+                element.style.textAlign = tableDesignOptions[optionName + '_align_text'];
+                element.style.fontFamily = tableDesignOptions[optionName + '_font_style'];
+            }
+
             return element;
         }
         createElement = function(elementType, className, textContent, attributes, eventHandlers) {

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});