@datarailsshared/dr_renderer 1.2.199 → 1.2.201-rocket

package/package.json

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

package/src/highcharts_renderer.js

@@ -4371,15 +4371,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             );
 
             if (uniqueCategories && (uniqueCategories.length > maxCategories || uniqueCategories.length < minCategories )) {
-                const commonErrorSentence = `Please choose ${ minCategories }-${ maxCategories } items in the Category section.`
                 options.error_has_occurred = true;
                 options.error_params = {
-                    title: uniqueCategories.length > maxCategories
-                        ? `There is too much data. ${ commonErrorSentence }`
-                        : `Not enough data. ${ commonErrorSentence }`,
-                    text: '',
-                    btnText: 'Edit Widget',
-                    class: 'too-much-data',
+                    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',
                 }
                 return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
             }
@@ -5097,6 +5094,27 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         dynamicRangeOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(dynamicRangeOptions.calculated_values || []);
     }
 
+    highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions) {
+        highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
+
+        var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
+        var fieldOb;
+        var selectedFields = [];
+
+        // 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});
+            }
+        });
+
+        calcModelOptions.pivot = {};
+        calcModelOptions.pivot.fieldsArray = fields;
+        calcModelOptions.pivot.selectedFieldsArray = selectedFields;
+    }
+
     highchartsRenderer.addTemplateDataToFunctionOptions = function (selectedTemplate, functionOptions) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);