@datarailsshared/dr_renderer 1.2.235-dragons → 1.2.237

package/package.json

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

package/src/highcharts_renderer.js

@@ -1042,7 +1042,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (row_n_value && row_n_value.length > 0) {
                 ob.name = row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName);
             }
-
             lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
@@ -1259,7 +1258,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (opts.trendLine) {
                 const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
                 const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
-
                 const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
                 trendSeries.className = 'trendSeries';
                 trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
@@ -1270,7 +1268,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (colors && colors[i]) {
                     trendSeries.color = colors[i];
                 }
-
                 trendSerieses.push(trendSeries);
             }
             i++;
@@ -1287,7 +1284,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
-
         if (opts.comboOptions && lodash.includes(chartType,'combo') && !lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach((series, seriesIndex) => {
                 const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
@@ -4970,7 +4966,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)
     };
@@ -5333,34 +5329,104 @@ 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 fillData = (fieldsArr, destinationArr) => {
+        const fillData = (fieldsArr, ignoreFieldsIdToRemove = []) => {
+            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 });
+                    !lodash.includes(ignoreFieldsIdToRemove, fieldOb.id) && lodash.remove(fields, { id: fieldOb.id });
                 }
             });
+
+            return destinationArr;
+        }
+
+        const canAssignPredefinedField = (() => {
+            const assignedFields = {};
+
+            return function (predefinedData, type, field, bindValue, oppositeValue) {
+                if (!assignedFields[type]) {
+                    assignedFields[type] = [];
+                }
+
+                const isFieldMatch = predefinedData.regex.test(field[bindValue] || '');
+
+                const isFieldTypeCorrect = predefinedData.allowedFieldTypes
+                    ? lodash.includes(predefinedData.allowedFieldTypes, field.type) : true;
+
+                const isFieldAssigned = assignedFields[type].includes(field[bindValue].toLowerCase())
+                    || assignedFields[type].includes(field[oppositeValue].toLowerCase());
+
+                if (!(isFieldMatch && isFieldTypeCorrect)) return false;
+
+                const loweredFieldValue = field[bindValue].toLowerCase();
+                assignedFields[type].push(loweredFieldValue, loweredFieldValue.replaceAll('_', ' '));
+
+                return !isFieldAssigned;
+            }
+        })();
+
+        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/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)) {
+            /**
+             * alias stronger than name (order in array is important)
+             * Firstly we try to get predefined field by aliases and then fill in by names
+             * */
+            const fieldsDataQueueConfig = [
+                { value: 'alias', opposite: 'name' },
+                { value: 'name', opposite: 'alias' }
+            ];
+
+            for (const key in predefinedField) {
+                lodash.forEach(fieldsDataQueueConfig, ({value, opposite}) => {
+                    const ignoredFields = predefinedField[key].ignoreAssignedFields;
+                    const result = predefinedField[key].isMultipleFields
+                        ? lodash.filter(fields, field => canAssignPredefinedField(predefinedField[key], key, field, value, opposite, ignoredFields))
+                        : [lodash.find(fields, field => canAssignPredefinedField(predefinedField[key], key, field, value, opposite, ignoredFields))].filter(f => !!f);
+
+                    if (result && result.length) {
+                        predefinedField[key].fields.push(...result);
+                    }
+                });
+            }
         }
 
+        const filters = lodash.get(calcModelOptions, 'config.filters', predefinedField.filters.fields);
+
         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);
@@ -5378,22 +5444,32 @@ 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 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));
+
+        /**
+         * We can have several common fields, so we should ignore deleting during fillData
+         * */
+        const commonFieldsId = [scenarioField && scenarioField.id];
+        const filterFields = fillData(filters, commonFieldsId);
+        const valueFields = fillData(storedAggFields, commonFieldsId);
+        const dateFields = fillData(storedDateFields, commonFieldsId);
+        const dataTypeFields = fillData(storedDataTypeFields, commonFieldsId);
+        const dataSeriesFields = fillData(storedGroupByFields, commonFieldsId);
+
+        lodash.remove(fields, _field => lodash.includes(commonFieldsId, _field.id));
 
         calcModelOptions.pivot = {
             fieldsArray: fields,
             selectedFieldsArray: dataSeriesFields,
             filtersArray: filterFields,
             scenarioField,
+            reportingMonthField: reportingMonthFieldWithAlias || reportingMonthFieldWithName,
             dateFields,
             dataTypeFields,
             valueFields