@datarailsshared/dr_renderer 1.2.217 → 1.2.218

package/package.json

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

package/src/highcharts_renderer.js

@@ -4365,7 +4365,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: 'nodata',
+                    class: uniqueCategories.length < minCategories ? 'waterfall-nodata' : 'waterfall-too-much-data',
                 }
                 return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
             }
@@ -5086,22 +5086,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 && lodash.get(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
         };
     }