@datarailsshared/dr_renderer 1.2.211-dragons → 1.2.213-rocket

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.211-dragons",
+  "version": "1.2.213-rocket",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dr_pivottable.js

@@ -2421,14 +2421,8 @@ let initDRPivotTable = function($, window, document) {
             if (colAttrs.length > 0 && colKeys.length > 0) {
                 colHeaders = processKeys(colKeys, "pvtColLabel", 'cols', colAttrs);
             }
-            var tableClasses = ['pvtTable'];
-            if (opts.chartOptions.table_options.use_new_table_design) {
-                tableClasses.push('newPvtTable');
-            }
-            if (!pivotData.aggregator().uniq) {
-                tableClasses.push('numbers-to-right');
-            }
-            result = createElement("table", tableClasses.join(' ') , null, {
+            var tableClasses = useNewUx && opts.chartOptions.table_options.use_new_table_design ? 'pvtTable newPvtTable' : 'pvtTable';
+            result = createElement("table", tableClasses , null, {
                 style: "display: none;"
             });
 

package/src/highcharts_renderer.js

@@ -87,10 +87,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         EXCEL_VIEWER: 'excel_viewer',
     };
 
-    highchartsRenderer.VIRTUAL_FIELDS = {
-        WATERFALL_VARIANCE: 'DR_WATERFALL_VARIANCE',
-    };
-
     highchartsRenderer.highcharts_theme = {
         "colors": highchartsRenderer.defaults_colors,
         "chart": {
@@ -1343,11 +1339,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return chart_series;
     }
 
-    highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, additionOptions, opts) {
+    highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, onlyNumbers, additionOptions, opts) {
         const colorOptions = opts.breakdown_options.colors;
-        const chart_series = [];
-        const row_n_keys = pivotData.getRowKeys();
-        const col_n_keys = pivotData.getColKeys();
+        var chart_series = [],
+            row_n_keys = pivotData.getRowKeys(),
+            col_n_keys = pivotData.getColKeys();
+
+        if (row_n_keys.length === 0) {
+            row_n_keys.push([]);
+        }
 
         let resultObject = {
             data: [],
@@ -1363,48 +1363,60 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         };
         resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
 
+        const breakdownValues = [];
         lodash.forEach(col_n_keys, function(col_n_value, col_index) {
+            breakdownValues.push([]);
+            lodash.forEach(row_n_keys, function (row_n_value, row_index) {
+                var agg = pivotData.getAggregator(row_n_value, col_n_value);
+                var val = agg.value();
 
-            const totalColumnValue = pivotData.getAggregator([], col_n_value).value();
-            const nextTotalColumnKey = col_n_keys[col_index + 1];
-            const nextTotalColumnValue = nextTotalColumnKey ? pivotData.getAggregator([], nextTotalColumnKey).value() : null;
-            resultObject.data.push({
-                y: totalColumnValue,
-                name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
-                isSum: !!col_index,
-                isTotal: true,
-                color: colorOptions.total,
-            });
+                if (val != null && $.isNumeric(val)) {
+                    val = parseFloat(val);
+                } else if (onlyNumbers) {
+                    val = NaN;
+                } else {
+                    val = 0;
+                }
 
-            if (col_index !== col_n_keys.length - 1) {
-                lodash.forEach(row_n_keys, function (row_n_value) {
-                    const agg = pivotData.getAggregator(row_n_value, col_n_value);
-                    let val = agg.value();
+                breakdownValues[col_index][row_index] = val;
 
-                    val = $.isNumeric(val) ? parseFloat(val) : 0;
-                    if (val) {
-                        const tmoobj = {};
-                        const key = lodash.isArray(row_n_value) ? row_n_value[0] : row_n_value;
-                        tmoobj.name = lodash.unescape(key);
+                if (col_index) {
+                    const value = val - breakdownValues[col_index - 1][row_index];
 
+                    if (value) {
+                        var tmoobj = {};
+                        var key = row_n_value;
+                        if (lodash.isArray(row_n_value)) {
+                            key = row_n_value[0];
+                        }
+                        tmoobj.name = lodash.unescape(key);
+        
                         if (tmoobj.name) {
                             tmoobj.name = tmoobj.name.replace('DR_Others', highchartsRenderer.getOthersName(opts));
                         }
+        
                         if (lodash.isEmpty(String(tmoobj.name))) {
                             tmoobj.name = lodash.unescape(col_n_value);
                             tmoobj.visible = false;
                         }
-
-                        tmoobj.y = val;
+                        tmoobj.y = value;
                         tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
                         resultObject.data.push(tmoobj);
                     }
+                }
+            });
 
-                });
-            }
+            resultObject.data.push({
+                y: pivotData.colTotals[col_n_value].sum,
+                name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
+                isSum: !!col_index,
+                isTotal: true,
+                color: colorOptions.total,
+            });
         });
 
         chart_series.push(resultObject);
+
         opts.chart_series = [];
         if (!lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach(series => {
@@ -3178,8 +3190,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             ? opts.chartOptions
             : highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN);
 
-        pivotData.colKeys = lodash.map(lodash.keys(pivotData.colTotals), key => [key]);
-
         chartOptions.chart = {
             type: 'waterfall',
             zoomType: additionOptions && additionOptions.chart && additionOptions.chart.zoom_type ? additionOptions.chart.zoom_type : 'None',
@@ -3230,7 +3240,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
         }
         chartOptions.series = highchartsRenderer
-            .ptCreateWaterfallBreakdownSeries(pivotData, additionOptions, opts);
+            .ptCreateWaterfallBreakdownSeries(pivotData, null, additionOptions, opts);
 
         chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
         chartOptions.plotOptions = {
@@ -4366,7 +4376,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     title: 'Data Conflict',
                     text: `Please adjust your dashboard's reference date and filter selections as \
                         the quantity of data doesn't match the chart's ${ minCategories }-${ maxCategories } value limit.`,
-                    class: uniqueCategories.length < minCategories ? 'waterfall-nodata' : 'waterfall-too-much-data',
+                    class: 'nodata',
                 }
                 return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
             }
@@ -4955,28 +4965,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         });
 
-        // add virtual fields to rows if required
-        let rows = widgetOptions.rows;
-        if (!lodash.get(widgetOptions, 'rows.length') && widgetOptions.options.breakdown_options) {
-            rows = [
-                {
-                    id: -1,
-                    name: highchartsRenderer.VIRTUAL_FIELDS.WATERFALL_VARIANCE,
-                    type: 'Text',
-                },
-            ];
-        }
-
         // fill rows fields
-        lodash.forEach(rows, function (valObj) {
-            if (lodash.includes(highchartsRenderer.VIRTUAL_FIELDS, valObj.name)) {
-                legendFields.push(valObj);
-            } else {
-                fieldOb = lodash.find(fields, {id: valObj.id});
-                if (fieldOb) {
-                    legendFields.push(fieldOb);
-                    lodash.remove(fields, {id: fieldOb.id});
-                }
+        lodash.forEach(widgetOptions.rows, function (valObj) {
+            fieldOb = lodash.find(fields, {id: valObj.id});
+            if (fieldOb) {
+                legendFields.push(fieldOb);
+                lodash.remove(fields, {id: fieldOb.id});
             }
         });
 
@@ -5103,22 +5097,71 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
 
-        var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
-        var fieldOb;
-        var selectedFields = [];
+        const scenarioName = 'scenario';
+        const fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.fields);
+        const fieldScenarioAlias = _.find(fields, field => (field.alias || '').toLowerCase() === scenarioName)
+        const fieldScenario = _.find(fields, field => (field.name || '').toLowerCase() === scenarioName)
+        const filters = calcModelOptions.config && calcModelOptions.config.filters;
 
-        // fill selected fields
-        lodash.forEach(calcModelOptions.fields, function (valObj) {
-            fieldOb = lodash.find(fields, {id: valObj.id});
-            if (fieldOb) {
-                selectedFields.push(fieldOb);
-                lodash.remove(fields, {id: fieldOb.id});
+        const filterFields = [];
+        const valueFields = [];
+        const dateFields = [];
+        const dataTypeFields = [];
+        const dataSeriesFields = [];
+
+        let scenarioField = lodash.get(calcModelOptions, 'config.scenario', undefined) || fieldScenarioAlias || fieldScenario;
+        let fieldOb;
+
+        const fillData = (fieldsArr, destinationArr) => {
+            lodash.forEach(fieldsArr, function (valObj) {
+                fieldOb = lodash.find(fields, { id: valObj.id });
+                if (fieldOb) {
+                    destinationArr.push(fieldOb);
+                    lodash.remove(fields, { id: fieldOb.id });
+                }
+            });
+        }
+
+        lodash.forEach(filters, function (filterObj) {
+            fieldOb = lodash.find(fields, { id: filterObj.id });
+            if (fieldOb && filterObj.values && filterObj.values.datetype && filterObj.values.datetype === 'list') {
+                filterObj.values = filterObj.values.val
+            } else if (fieldOb && filterObj.values && filterObj.values.datetype && filterObj.values.datetype !== 'list') {
+                fieldOb.values = filterObj.values;
+            } else if (fieldOb && filterObj.values && filterObj.values.type === 'advanced') {
+                fieldOb.values = filterObj.values;
+            }
+            if (fieldOb && filterObj.values && filterObj.values instanceof Array) {
+                if (filterObj.is_excluded == true) {
+                    fieldOb.excludes = filterObj.values;
+                } else {
+                    fieldOb.includes = filterObj.values;
+                }
+            }
+            if (filterObj.allow_nulls && fieldOb) {
+                fieldOb.allow_nulls = filterObj.allow_nulls;
             }
         });
 
+        const storedGroupByFields = lodash.get(calcModelOptions, 'config.group_by', []);
+        const storedDateFields = [lodash.get(calcModelOptions, 'config.date_field', undefined)].filter(f => !!f);
+        const storedAggFields = [lodash.get(calcModelOptions, 'config.agg_field', undefined)].filter(f => !!f);
+        const storedDataTypeFields = [lodash.get(calcModelOptions, 'config.data_type_field', undefined)].filter(f => !!f);
+
+        fillData(storedGroupByFields, dataSeriesFields);
+        fillData(storedDateFields, dateFields);
+        fillData(storedAggFields, valueFields);
+        fillData(storedDataTypeFields, dataTypeFields);
+        fillData(filters, filterFields);
+
         calcModelOptions.pivot = {
             fieldsArray: fields,
-            selectedFieldsArray: selectedFields
+            selectedFieldsArray: dataSeriesFields,
+            filtersArray: filterFields,
+            scenarioField,
+            dateFields,
+            dataTypeFields,
+            valueFields
         };
     }
 
@@ -7944,7 +7987,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.createDateFromString = function (dateString, format) {
-        if (!(format && highchartsRenderer.isDateFormat(dateString, format) || highchartsRenderer.isDate(dateString))) {
+        if ((format && !highchartsRenderer.isDateFormat(dateString, format)) || !highchartsRenderer.isDate(dateString)) {
             return null;
         }
         const utcDate = format 
@@ -8098,7 +8141,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 filter.is_excluded = false;
             } else {
                 filter = highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[0], colKey[0]);
-                filters.push(filter);
             }
             filter.values = [];
             for (let i = 0; i < colKey.length; i++) {
@@ -8701,7 +8743,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             rows = [];
         } else {
             rows = cols;
-            cols = [point.colKeys[1]];
+            cols = [];
         }
         return { rows, cols };
     }

package/src/novix_renderer.js

@@ -28,6 +28,8 @@ let initNovixRenderer = function($, window, document, Handsontable){
     const delim = " , ";
     const subtotal = "subtotalDatarailsPlaceholder";
     const replaceValue = "SubTotals";
+    const useNewUx = document.ReportHippo && document.ReportHippo && document.ReportHippo.user &&
+      document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
 
     $.pivotUtilities.novix_renderers = {
 
@@ -887,14 +889,9 @@ let initNovixRenderer = function($, window, document, Handsontable){
 
             // inject the widgetId to the class name so we can separate the tables by it
             // look for the search side on line 653 "opts.$el.find(".widget-id-" + opts.widgetId);"
-            var tableClasses = ['novixPivot', `widget-id-${opts.widgetId}`];
-            if (opts.chartOptions.table_options.use_new_table_design) {
-                tableClasses.push('handsontable-new');
-            }
-            if (!pvtData.aggregator().uniq) {
-                tableClasses.push('numbers-to-right');
-            }
-            return `<div class='${tableClasses.join(' ')}' style='overflow:auto'></div>`;
+            return `<div class='novixPivot widget-id-${opts.widgetId} ${
+              useNewUx && opts.chartOptions.table_options.use_new_table_design ? 'handsontable-new' : ''
+            }' style='overflow:auto'></div>`;
         }
 
     };

package/src/pivot.css

@@ -29,6 +29,9 @@ table.pvtTable tbody tr th > i {
     font-size: 10px;
 }
 
+table.pvtTable .pvtColLabel {text-align: center;}
+table.pvtTable .pvtTotalLabel {text-align: right;}
+
 table.pvtTable tbody tr td {
     color: #3D3D3D;
     padding: 5px;
@@ -260,6 +263,11 @@ table.pvtTable.newPvtTable tbody tr td.rowTotal {
   background-color: #dfe6ec !important;
   border-color: #ffffff !important;
 }
+table.pvtTable.newPvtTable .pvtColLabel,
+table.pvtTable.newPvtTable .pvtTotalLabel,
+table.pvtTable.newPvtTable .pvtTotalLabel.rowTotal {
+  text-align: left;
+}
 
 table.pvtTable.newPvtTable tbody tr th .fa {
   padding: 2px;
@@ -400,27 +408,3 @@ table.pvtTable.newPvtTable tbody tr td:hover:after {
   top: 4px;
   font-size: 12px;
 }
-
-
-/* Table cells alignment */
-table.pvtTable .pvtColLabel {text-align: center;}
-table.pvtTable .pvtTotalLabel {text-align: right;}
-
-table.pvtTable.newPvtTable .pvtColLabel,
-table.pvtTable.newPvtTable .pvtTotalLabel,
-table.pvtTable.newPvtTable .pvtTotalLabel.rowTotal {
-    text-align: left;
-}
-
-table.pvtTable thead tr th.pvtColLabel,
-table.pvtTable thead tr th.pvtTotalLabel  {
-    text-align: center !important;
-}
-
-table.pvtTable.numbers-to-right tbody tr td.pvtVal,
-table.pvtTable.numbers-to-right tbody tr td.rowTotal.rowTotal,
-table.pvtTable.numbers-to-right tbody tr td.pvtGrandTotal  {
-    text-align: right !important;
-    padding-right: 9px;
-    line-height: 15px;
-}