@datarailsshared/dr_renderer 1.2.99 → 1.2.102

package/package.json

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

package/src/dr_pivottable.js

@@ -646,10 +646,10 @@ let initDRPivotTable = function($, window, document) {
         getColorsWithOffsetForTable = function (value) {
             var colors = [];
 
-            if (opts.paletteOptions.widgetPalette) {
+            if (opts.paletteOptions && 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 && opts.paletteOptions.dashboardPalette.colors) {
+            } else if (opts.paletteOptions && opts.paletteOptions.dashboardPalette && opts.paletteOptions.dashboardPalette.colors) {
                 colors = opts.paletteOptions.dashboardPalette.colors;
             } else {
                 colors = newTableColors;
@@ -1421,13 +1421,18 @@ let initDRPivotTable = function($, window, document) {
                     "data-rownode": rowHeader.node
                 }, getTableEventHandlers(val, rowHeader.key, []));
 
+                if (rowHeader.children.length && rowHeader.clickStatus === 'expanded') {
+                    td.style.display = 'none';
+                }
+
                 tr.appendChild(td)
             }
         }
 
         buildAdditionalRowValues = function (tr, colHeaderCols, rowKey) {
             for (let i = 0; i < colHeaderCols.length; i++) {
-                const colKey = colHeaderCols[i].flatKey;
+                const colHeader = colHeaderCols[i];
+                const colKey = colHeader.flatKey;
                 const totalAggregator = getAdditionalAggregation(rowKey, colKey);
                 const val = totalAggregator.value();
                 const formattedValue = getFormattedNumber(val, totalAggregator, opts)
@@ -1439,6 +1444,10 @@ let initDRPivotTable = function($, window, document) {
                     "data-colnode": "" + i
                 });
 
+                if (colHeader.children.length && colHeader.clickStatus === 'expanded') {
+                    td.style.display = 'none';
+                }
+
                 tr.appendChild(td);
             }
 

package/src/highcharts_renderer.js

@@ -1,5 +1,5 @@
 let getHighchartsRenderer = function ($, document, Highcharts, default_colors, highchartsRenderer,
-                                      DataFormatter, lodash, moment_lib) {
+                                      DataFormatter, lodash, moment_lib, isNewAngular) {
 
     if(!lodash){
         lodash = _;
@@ -4445,7 +4445,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.isSystemField = function (field) {
-        var regex = new RegExp("^(FileBox_Name|Doc_ID|Doc_version|Label|Submission_Date|User|table_id|Latest_In_Dim|Tab_name|CP_Name|DT_.+|VT_.+|System_.+)$", "m");
+        var regex = new RegExp("^(FileBox_Name|DataMapper_Name|Doc_ID|Doc_version|Label|Submission_Date|User|table_id|Latest_In_Dim|Tab_name|CP_Name|DT_.+|VT_.+|System_.+)$", "m");
 
         return (field.category && field.category.includes("")) || regex.test(field.name)
     };
@@ -7640,7 +7640,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
        minHeight: 16,
        maxHeight: 45,
        x: -3,
-       y: -26,
+       y: isNewAngular ? -10 : -26,
        layout: "horizontal"
      } : {
        enabled: rowAttrsLength > 0,

package/src/index.js

@@ -16,8 +16,8 @@ dr_render_factory.init = function($, window, document, Handsontable){
     }
 }
 
-dr_render_factory.getInitHighchartsRenderer = function($, document, Highcharts, default_colors, highchartsRenderer, lodash, moment_lib){
-    return getHighchartsRenderer($, document, Highcharts, default_colors, highchartsRenderer, DataFormatter, lodash, moment_lib);
+dr_render_factory.getInitHighchartsRenderer = function($, document, Highcharts, default_colors, highchartsRenderer, lodash, moment_lib, isNewAngular){
+    return getHighchartsRenderer($, document, Highcharts, default_colors, highchartsRenderer, DataFormatter, lodash, moment_lib, isNewAngular);
 }
 
 dr_render_factory.getInitPublishedItemsRenderer = function (publishedItemsRenderer, bind = {}) {

package/src/novix_renderer.js

@@ -304,7 +304,7 @@ let initNovixRenderer = function($, window, document, Handsontable){
                 dataSource.fixedColumns = pvtData.rowAttrs.length + (hasColumnAttr ? 1 : 0);
                 dataSource.fixedRows = pvtData.colAttrs.length + (hasRowAttr ? 1 : 0);
 
-                for (i = 0; i < pvtData.rowAttrs.length; i++) {
+                for (let i = 0; i < pvtData.rowAttrs.length; i++) {
                     rowKeys.sort((a,b) => {
                         if (_.isEqual(a.slice(0, i), b.slice(0,i)) && a[i] && a[i] === subtotal) return -1;
                         if (_.isEqual(a.slice(0, i), b.slice(0,i)) && b[i] && b[i] === subtotal) return 1;