@datarailsshared/dr_renderer 1.2.249 → 1.2.250

package/package.json

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

package/src/highcharts_renderer.js

@@ -1429,8 +1429,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, {'chartOptions': additionOptions, total_value_options: opts.total_value_options}),
                 style: highchartsRenderer.getDataLabelsStyle(additionOptions),
             },
-            upColor: waterfallOptions.colors.increase,
-            color: waterfallOptions.colors.decrease,
+            upColor: lodash.get(waterfallOptions, 'colors.increase'),
+            color: lodash.get(waterfallOptions, 'colors.decrease'),
             className: SERIES_CLASSNAMES.WATERFALL_WALKTHROUGH
         };
         resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
@@ -1457,18 +1457,24 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 val = 0;
             }
 
-            if (value.trend === 'decrease') {
+            if (val > 0 && value.trend === 'decrease' || val < 0 && value.trend === 'increase' ) {
                 val = val * -1;
             }
 
+            const baseColor = {
+                total: '',
+                decrease: '#BF1D30',
+                increase: '#20A452',
+            };
+
             const name = value.trend === 'total' ? value.formattedKey || value.key[0] : keys.join(highchartsRenderer.delimer);
             let color = '';
             if (value.color) {
                 color = value.color;
             } else {
-                if (value.trend === 'total') color = waterfallOptions.colors.total;
-                if (value.trend === 'decrease') color = waterfallOptions.colors.decrease;
-                if (value.trend === 'increase') color = waterfallOptions.colors.increase;
+                color = lodash.get(waterfallOptions, 'colors', {})
+                    ? lodash.get(waterfallOptions, 'colors', {})[value.trend]
+                    : baseColor[value.trend];
             }
 
             resultObject.data.push({
@@ -1485,14 +1491,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             {
                 name: 'Positive',
                 visible: false,
-                color: waterfallOptions.colors.increase
+                color: lodash.get(waterfallOptions, 'colors.increase')
             });
 
         chart_series.push(
             {
                 name: 'Negative',
                 visible: false,
-                color: waterfallOptions.colors.decrease
+                color: lodash.get(waterfallOptions, 'colors.decrease'),
             });
 
         return chart_series;
@@ -5219,7 +5225,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         // TODO: remove this logic after BE sort is implemented
         // it is required to do sort by totals for comparative analysis - we need to change deltas if columns swaped vice versa
-        const isTwoColumnComparisonWidget = widgetOptions.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN 
+        const isTwoColumnComparisonWidget = widgetOptions.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN
             && lodash.get(widgetOptions, 'options.breakdown_options.values.totals', []).length === 2;
 
         if (isTwoColumnComparisonWidget) {
@@ -5359,13 +5365,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         dynamicRangeOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(dynamicRangeOptions.calculated_values || []);
     }
 
-    highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions) {
+    highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions, calcModelPredefinedField) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
         const fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.fields);
+        const predefinedField = lodash.cloneDeep(calcModelPredefinedField);
 
         const fillData = (fieldsArr, ignoreFieldsIdToRemove = []) => {
             const destinationArr = [];
             lodash.forEach(fieldsArr, function (valObj) {
+                if (!valObj) return;
+
                 const fieldOb = lodash.find(fields, { id: valObj.id });
                 if (fieldOb) {
                     destinationArr.push(fieldOb);
@@ -5401,37 +5410,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         })();
 
-        const reportingMonthRegex = /reporting[_\s]month/i;
-
-        const predefinedField = {
-            value: {
-                regex: /posting[_\s]amount/i,
-                allowedFieldTypes: ['Float', 'Integer'],
-                fields: [],
-            },
-            dataType: {
-                regex: /^(data[_\s]type[_\s]by|data[_\s]type)$/i,
-                allowedFieldTypes: ['Text'],
-                fields: [],
-            },
-            date: {
-                regex: reportingMonthRegex,
-                allowedFieldTypes: ['Date'],
-                fields: [],
-            },
-            filters: {
-                isMultipleFields: true,
-                regex: /^(scenario|DR_ACC_L0)$/i,
-                fields: [],
-            },
-            dataSeries: {
-                isMultipleFields: true,
-                regex: /^(scenario|account[_\s]full|entity|intercompany|posting[_\s]currency|reporting[_\s]currency|report[_\s]field|USER_TO_DR_ACC_KEY|USER_TO_DR_KPI_KEY)$/i,
-                fields: [],
-            },
-        };
-
-        if (!lodash.get(calcModelOptions, 'config', false)) {
+        if (!lodash.get(calcModelOptions, 'config', false) && predefinedField) {
             /**
              * alias stronger than name (order in array is important)
              * Firstly we try to get predefined field by aliases and then fill in by names
@@ -5449,13 +5428,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         : [lodash.find(fields, field => canAssignPredefinedField(predefinedField[key], key, field, value, opposite, ignoredFields))].filter(f => !!f);
 
                     if (result && result.length) {
+                        if (!predefinedField[key].fields) {
+                            predefinedField[key].fields = [];
+                        }
+
                         predefinedField[key].fields.push(...result);
                     }
                 });
             }
         }
 
-        const filters = lodash.get(calcModelOptions, 'config.filters', predefinedField.filters.fields);
+        const defaultFilters = lodash.get(predefinedField, 'filters.fields', []);
+        const filters = lodash.get(calcModelOptions, 'config.filters', defaultFilters);
 
         lodash.forEach(filters, function (filterObj) {
             const fieldOb = lodash.find(fields, { id: filterObj.id });
@@ -5476,13 +5460,23 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         });
 
-        const storedGroupByFields = lodash.get(calcModelOptions, 'config.group_by', predefinedField.dataSeries.fields);
-        const storedDateFields = [lodash.get(calcModelOptions, 'config.date_field', predefinedField.date.fields[0])].filter(f => !!f);
-        const storedAggFields = [lodash.get(calcModelOptions, 'config.agg_field', predefinedField.value.fields[0])].filter(f => !!f);
-        const storedDataTypeFields = [lodash.get(calcModelOptions, 'config.data_type_field', predefinedField.dataType.fields[0])].filter(f => !!f);
-        const scenarioField = lodash.get(calcModelOptions, 'config.scenario', lodash.find(predefinedField.filters.fields, filter => [filter.name, filter.alias].includes('scenario')));
-        const reportingMonthFieldWithAlias = lodash.find(fields, _field => reportingMonthRegex.test(_field.alias));
-        const reportingMonthFieldWithName = lodash.find(fields, _field => reportingMonthRegex.test(_field.name));
+        const defaultGroupByValues = lodash.get(predefinedField, 'dataSeries.fields', []);
+        const storedGroupByFields = lodash.get(calcModelOptions, 'config.group_by', defaultGroupByValues);
+
+        const defaultDateValue = lodash.get(predefinedField, 'date.fields[0]', undefined);
+        const storedDateFields = [lodash.get(calcModelOptions, 'config.date_field', defaultDateValue)].filter(f => !!f);
+
+        const defaultAggValue = lodash.get(predefinedField, 'value.fields[0]', undefined);
+        const storedAggFields = [lodash.get(calcModelOptions, 'config.agg_field', defaultAggValue)].filter(f => !!f);
+
+        const defaultDataTypeValue = lodash.get(predefinedField, 'dataType.fields[0]', undefined);
+        const storedDataTypeFields = [lodash.get(calcModelOptions, 'config.data_type_field', defaultDataTypeValue)].filter(f => !!f);
+
+        const reportingMonthRegex = /reporting[_\s]month/i;
+        const scenarioRegex = /scenario/i;
+
+        const scenarioField = lodash.find(fields, _field => scenarioRegex.test(_field.alias)) || lodash.find(fields, _field => scenarioRegex.test(_field.name));
+        const reportingMonthField = lodash.find(fields, _field => reportingMonthRegex.test(_field.alias)) || lodash.find(fields, _field => reportingMonthRegex.test(_field.name));
 
         /**
          * We can have several common fields, so we should ignore deleting during fillData
@@ -5501,7 +5495,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             selectedFieldsArray: dataSeriesFields,
             filtersArray: filterFields,
             scenarioField,
-            reportingMonthField: reportingMonthFieldWithAlias || reportingMonthFieldWithName,
+            reportingMonthField,
             dateFields,
             dataTypeFields,
             valueFields