@datarailsshared/dr_renderer 1.2.252 → 1.2.254-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -1042,6 +1042,7 @@ 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();
@@ -1258,6 +1259,7 @@ 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);
@@ -1268,6 +1270,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (colors && colors[i]) {
                     trendSeries.color = colors[i];
                 }
+
                 trendSerieses.push(trendSeries);
             }
             i++;
@@ -1284,6 +1287,7 @@ 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});
@@ -1455,7 +1459,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 keys = value.key;
             } else {
                 _.forEach(value.key, (item) => {
-                    const findKeyByValue = Object.keys(pivotData.dateValuesDictionary || {}).find(key => pivotData.dateValuesDictionary[key] === item);
+                    const findKeyByValue = lodash.find(
+                        Object.keys(pivotData.dateValuesDictionary || {}),
+                        key => pivotData.dateValuesDictionary[key] === item
+                    );
                     keys.push(findKeyByValue ? findKeyByValue : item);
                  })
             }
@@ -1493,7 +1500,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             resultObject.data.push({
                 y: val,
-                name: lodash.unescape(name).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
+                name: lodash.replace(lodash.unescape(name), 'DR_Others', highchartsRenderer.getOthersName(opts)),
                 totalIndex: value.trend === 'total' ? index : undefined,
                 isSum: value.trend === 'total',
                 isTotal: value.trend === 'total',
@@ -7253,13 +7260,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         [highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH]: {
             name: 'Walkthrough Chart',
             label: 'Walkthrough Chart',
-            title: 'Describe and explain changes in your financial outcomes.',
-            titleInEditor: 'TODO: add text',
-            description: 'For example, describe the gaps between income and your gross profit.',
+            title: 'Drag one or more fields to configure your x-axis.',
+            description: 'The category is shown on the x-axis and should be between 2 to 10 columns.',
+            titleInEditor: 'Waterfall walkthrough widget.',
+            descriptionInEditor: 'This chart visualizes the cumulative effect of positive and negative changes on an initial value, ultimately showing the net value.  You can change the trend of each item and add new totals columns using the Walkthrough options button.',
             axisName: 'Category',
-            startedMessage: 'TODO: add text',
-            axisTooltipTitle: 'TODO: add text',
-            legendTooltipTitle: 'TODO: add text',
+            startedMessage: '',
+            axisTooltipTitle: 'Drag one or more fields to configure your x-axis.',
+            axisTooltipDescription: 'The category is shown on the x-axis and should be between 2 to 10 columns.',
+            legendTooltipTitle: '',
         },
         'combo-chart': {
             name: 'Combo Chart ',
@@ -8426,7 +8435,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             colFilter.value_to_show = labels.join(', ');
             filters.push(colFilter);
         } else if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH) {
-            lodash.forEach(col_key, function (colKeyElement, index) {   
+            lodash.forEach(col_key, function (colKeyElement, index) {
                 const field = lodash.get(widget, `cols[${ index }]`);
                 if (field) {
                     let filter = highchartsRenderer.createFilterObject(field);
@@ -8915,12 +8924,21 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let pivot = {};
+
+        let templateNoData = lodash.find(templates, {id: widget_obj.template_id});
+        if (templateNoData) {
+
+            // we need to assign this before calling getWidgetDataSorters method
+            // other way we won't get dateValuesDictionary
+            // preserved condition templateNoData == true - not to interfere with further logic
+            widget_obj.pivot = pivot;
+        }
+
         pivot.sorters = highchartsRenderer.getWidgetDataSorters(res, widget_obj);
         pivot.rowData = res;
         widget_obj.options = highchartsRenderer.parseOptionsToObject(widget_obj.options);
-        let templateNoData = lodash.find(templates, {id: widget_obj.template_id});
+        
         if (templateNoData) {
-            widget_obj.pivot = pivot;
             let hasServerDrill = widget_obj.chart_type.indexOf("column-chart") > -1 && widget_obj.cols && widget_obj.cols.length >= 1;
             if (hasServerDrill)
                 highchartsRenderer.addPivotOptions(templateNoData, widget_obj, drillDownFunction, openDrillDownListFunction);
@@ -9236,7 +9254,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.buildFilterValuesFromWalkthroughColKey = function(widget, field, filter, colKey) {
         const isTotal = lodash.isArray(colKey);
         colKey = isTotal ? colKey : [colKey];
- 
+
         lodash.forEach(colKey, function (colValue) {
             let value = colValue;
             if (field.type === 'Date' && !isTotal) {

package/src/pivot.css

@@ -420,7 +420,7 @@ table.pvtTable thead tr th.pvtTotalLabel  {
 table.pvtTable.numbers-to-right tbody tr td.pvtVal,
 table.pvtTable.numbers-to-right tbody tr td.rowTotal.rowTotal,
 table.pvtTable.numbers-to-right tbody tr td.pvtGrandTotal  {
-    text-align: right !important;
+    text-align: right;
     padding-right: 9px;
     line-height: 15px;
 }