@datarailsshared/dr_renderer 1.2.227 → 1.2.228-rocket

package/package.json

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

package/src/highcharts_renderer.js

@@ -4738,7 +4738,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.isSystemField = function (field) {
-        var regex = new RegExp("^(Parent_Name|Parent_Id|FileBox_ID|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");
+        var regex = new RegExp("^(Calc_Model_Name|Calc_Model_ID|Parent_Name|Parent_Id|FileBox_ID|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)
     };
@@ -5101,34 +5101,55 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
-
-        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;
-
-        const filterFields = [];
-        const valueFields = [];
-        const dateFields = [];
-        const dataTypeFields = [];
-        const dataSeriesFields = [];
-
-        let scenarioField = lodash.get(calcModelOptions, 'config.scenario', undefined) || fieldScenarioAlias || fieldScenario;
-        let fieldOb;
+        const filters = (calcModelOptions.config && calcModelOptions.config.filters) || [];
 
-        const fillData = (fieldsArr, destinationArr) => {
+        const fillData = (fieldsArr) => {
+            const destinationArr = [];
             lodash.forEach(fieldsArr, function (valObj) {
-                fieldOb = lodash.find(fields, { id: valObj.id });
+                const fieldOb = lodash.find(fields, { id: valObj.id });
                 if (fieldOb) {
                     destinationArr.push(fieldOb);
                     lodash.remove(fields, { id: fieldOb.id });
                 }
             });
+
+            return destinationArr;
+        }
+
+        const predefinedField = {
+            value: {
+                regex: /posting[_\s]?amount/i,
+                fieldWithAlias: undefined,
+                fieldWithName: undefined
+            },
+            dataType: {
+                regex: /data[_\s]?type/i,
+                fieldWithAlias: undefined,
+                fieldWithName: undefined
+            },
+            date: {
+                regex: /reporting[_\s]?month/i,
+                fieldWithAlias: undefined,
+                fieldWithName: undefined
+            },
+            filters: {
+                regex: /scenario/i,
+                fieldWithAlias: undefined,
+                fieldWithName: undefined
+            },
+        };
+
+        for (const key in predefinedField) {
+            predefinedField[key].fieldWithAlias = _.find(fields, field => predefinedField[key].regex.test((field.alias || '').toLowerCase()));
+
+            if (!predefinedField[key].fieldWithAlias) {
+                predefinedField[key].fieldWithName = _.find(fields, field => predefinedField[key].regex.test((field.name || '').toLowerCase()));
+            }
         }
 
         lodash.forEach(filters, function (filterObj) {
-            fieldOb = lodash.find(fields, { id: filterObj.id });
+            const fieldOb = lodash.find(fields, { id: filterObj.id });
             if (!fieldOb) return;
 
             filterObj.values = filterObj.values && lodash.map(filterObj.values, highchartsRenderer.decodeFunc);
@@ -5147,15 +5168,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         });
 
         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);
+        const storedDateFields = [lodash.get(calcModelOptions, 'config.date_field', predefinedField.date.fieldWithAlias || predefinedField.date.fieldWithName)].filter(f => !!f);
+        const storedAggFields = [lodash.get(calcModelOptions, 'config.agg_field', predefinedField.value.fieldWithAlias || predefinedField.value.fieldWithName)].filter(f => !!f);
+        const storedDataTypeFields = [lodash.get(calcModelOptions, 'config.data_type_field', predefinedField.dataType.fieldWithAlias || predefinedField.dataType.fieldWithName)].filter(f => !!f);
+        const scenarioField = lodash.get(calcModelOptions, 'config.scenario', predefinedField.filters.fieldWithAlias || predefinedField.filters.fieldWithName);
+
+        const filterFields = fillData(filters);
+        const valueFields = fillData(storedAggFields);
+        const dateFields = fillData(storedDateFields);
+        const dataTypeFields = fillData(storedDataTypeFields);
+        const dataSeriesFields = fillData(storedGroupByFields);
 
         calcModelOptions.pivot = {
             fieldsArray: fields,