@datarailsshared/dr_renderer 1.4.10 → 1.4.23

package/.github/workflows/build-deploy.yml

@@ -8,7 +8,6 @@ on:
   push:
     branches:
       - 'master'
-      - 'DEVOPS-239-GH-Actions'
 
 concurrency:
   group: '${{ github.ref }}-${{ github.workflow }}'
@@ -23,8 +22,8 @@ jobs:
       branch_postfix: false
       main_branch: 'master'
       version_prefix: '1.4'
-      skip_publish: ${{ github.event_name != 'pull_request' }}
+      skip_publish: ${{ github.event_name == 'pull_request' }}
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      SSH_PRIVATE_KEY: ${{ secrets.GITHUB_PRIVATE_KEY }} 
+      SSH_PRIVATE_KEY: ${{ secrets.GH_PRIVATE_KEY }} 
       

package/CODEOWNERS

@@ -1 +1 @@
-* @Datarails/RnD_Team_Dragons @Datarails/Admins @Datarails/devops_agent
+* @Datarails/RnD_Team_Dragons 

package/package.json

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

package/src/highcharts_renderer.js

@@ -1417,21 +1417,25 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         chart_series = chart_series.concat(trendSerieses);
 
         highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
-        
         const chartType = chartOptions && chartOptions.chart && chartOptions.chart.type ? chartOptions.chart.type : null;
+        const isCombiLineForecastChart = opts.chartOptions.isSmartQueriesEnabled;
         const smartQuerySeries = isChartTypeSupportedForSmartQuery(chartType)
-            ? smartQueriesHelper.createSingleDataSeriesForForecast(chart_series, opts.chartOptions, pivotData)
+            ? smartQueriesHelper.createSingleDataSeriesForForecast(chart_series, opts.chartOptions, pivotData, isCombiLineForecastChart)
             : null;
 
         if (smartQuerySeries) {
             if (chart_series.length > 1) {
-                lodash.remove(chart_series, s => 
-                (s.name && lodash.includes(s.name, 'SQ_Actuals')) || s.name === 'Forecast'
-                );
+                if (isCombiLineForecastChart) {
+                    chart_series = smartQuerySeries;
+                } else {
+                    lodash.remove(chart_series, s =>
+                        (s.name && lodash.includes(s.name, 'SQ_Actuals')) || s.name === 'Forecast'
+                    );
+                    chart_series.push(smartQuerySeries);
+                }
             } else {
-                chart_series = []
+                chart_series = [smartQuerySeries];
             }
-            chart_series.push(smartQuerySeries);
         }
 
         return chart_series;

package/src/smart_queries_helper.js

@@ -5,7 +5,7 @@ const DR_SCENARIO = {
     Forecast: 'Forecast',
 };
 
-function createSingleDataSeriesForForecast(chart_series, chartOptions, pivotData) {
+function createSingleDataSeriesForForecast(chart_series, chartOptions, pivotData, isChartCombiLine) {
   const { actuals, forecast, smart_query } = chartOptions.chart;
   const input = pivotData.input;
 
@@ -14,12 +14,14 @@ function createSingleDataSeriesForForecast(chart_series, chartOptions, pivotData
   if (!smart_query || !hasSQActuals) return null;
 
   const midMonthOffset = 0.5
-  return chart_series.length === 1
-    ? buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset)
-    : buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset);
+    return chart_series.length === 1
+        ? buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset, chart_series[0].name)
+        : (isChartCombiLine ?
+            buildChartSeriesForMultipleSeriesCombinedLine(chart_series, input, actuals, forecast, midMonthOffset) :
+            buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset));
 }
 
-function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset) {
+function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset, name) {
   const filtered = input.filter(item =>
     (item.Scenario === DR_SCENARIO.SQ_Actuals || item.Scenario === DR_SCENARIO.Forecast) &&
     item.Amount !== 0
@@ -27,15 +29,15 @@ function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOf
 
   const data = filtered.map(item => ({
     y: item.Amount,
-    name: item.Reporting_Month,
-    initialName: item.Reporting_Month,
+    name: item['Reporting Month'],
+    initialName: item['Reporting Month'],
     type: item.Scenario,
   })).sort((a, b) => new Date(a.name) - new Date(b.name));
 
   const sqCount = input.filter(item => item.Scenario === DR_SCENARIO.SQ_Actuals).length;
 
   return {
-    name: "Forecast Smart Query",
+    name,
     data,
     zoneAxis: "x",
     zones: [
@@ -45,6 +47,42 @@ function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOf
   };
 }
 
+function buildChartSeriesForMultipleSeriesCombinedLine(chart_series, input, actuals, forecast, midMonthOffset) {
+    const resultingSeries = [];
+    for (let i = 0; i < chart_series.length; i++) {
+        const series = chart_series[i];
+        if (!series || !series.data || !series.data.length) continue;
+
+        const data = input.filter(item => item['Scenario Cycle'] === series.name &&
+            (item['Scenario'] === DR_SCENARIO.SQ_Actuals || item['Scenario'] === DR_SCENARIO.Forecast))
+            .map(item => ({
+                y: item.Amount,
+                name: item['Reporting Month'],
+                initialName: item['Reporting Month'],
+                type: item.Scenario,
+            })).sort((a, b) => new Date(a.name) - new Date(b.name));
+
+        if (!data.length) {
+            resultingSeries.push(series);
+            continue;
+        }
+
+        const sqCount = data.filter(item => item.type === DR_SCENARIO.SQ_Actuals).length;
+        resultingSeries.push(
+            {
+                name: series.name,
+                data,
+                zoneAxis: "x",
+                zones: [
+                    { value: sqCount - midMonthOffset, dashStyle: actuals },
+                    { dashStyle: forecast },
+                ],
+            }
+        )
+    }
+    return resultingSeries;
+}
+
 function buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset) {
   const seriesA = lodash.find(chart_series, s => s.name && lodash.includes(s.name, DR_SCENARIO.SQ_Actuals));
   const seriesB = lodash.find(chart_series, s => s.name && lodash.includes(s.name, DR_SCENARIO.Forecast));

package/tests/highcharts_renderer.test.js

@@ -6854,7 +6854,9 @@ describe('highcharts_renderer', () => {
             ]);
         });
         it('should prepare appropriate chart series for standard input', () => {
-            opts = {};
+            opts = {
+                chartOptions: {}
+            };
             chartType = null;
             const value = highchartsRenderer.ptCreateColumnSeries(pivotDataMock, colors, onlyNumbers, isUniqueVals, isNotDrillDown, additionalOptionsMock, opts, chartOptions, chartType);
             expect(value).toEqual([
@@ -7083,7 +7085,9 @@ describe('highcharts_renderer', () => {
                 "#b3060e",
                 "#70000a"
             ];
-            opts = {};
+            opts = {
+                chartOptions: {}
+            };
             chartOptions = {
                 chart: {
                     type: '',
@@ -7241,7 +7245,8 @@ describe('highcharts_renderer', () => {
 
         it('should prepare appropriate chart series, when opts \'total\' configuration is set to true', ()=> {
             opts = {
-                total: true
+                total: true,
+                chartOptions: {}
             };
             pivotDataMock.colTotals = {
                 'col 1': {value: () => 123450},
@@ -7310,6 +7315,7 @@ describe('highcharts_renderer', () => {
 
         it('should prepare appropriate chart series, when opts \'trendLine\' configuration is set to true', ()=> {
             opts = {
+                chartOptions: {},
                 trendLine: true
             };
             const value = highchartsRenderer.ptCreateBasicLineSeries(pivotDataMock, colors, onlyNumbers, isUniqueVals, additionalOptionsMock, opts, chartOptions);