@datarailsshared/dr_renderer 1.2.424 → 1.2.425

package/package.json

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

package/src/dr_pivottable.js

@@ -454,11 +454,11 @@ let initDRPivotTable = function($, window, document) {
     }
 
     SubtotalRenderer = function(pivotData, opts, charttype, tooMuch = false, error_params) {
-        var addClass, allTotal, arrowCollapsed, arrowExpanded, buildColHeaderHeader, buildColHeaderHeaders, buildColHeaderHeadersClickEvents, buildColHeaders, buildColTotals, buildColTotalsHeader, buildGrandTotal, buildRowHeaderHeaders, buildRowHeaderHeadersClickEvents, buildRowHeaders, buildRowTotalsHeader, buildValues, classColCollapsed, classColExpanded, classColHide, classColShow, classCollapsed, classExpanded, classRowCollapsed, classRowExpanded, classRowHide, classRowShow, clickStatusCollapsed, clickStatusExpanded, colAttrs, colDisableAfter, colKeys, colTotals, collapseCol, collapseColsAt, collapseHideDescendantRow, collapseRow, collapseRowsAt, collapseShowColSubtotal, collapseShowRowSubtotal, applyInlineStyles, createElement, defaults, expandChildCol, expandChildRow, expandCol, expandColsAt, expandHideColSubtotal, expandHideRowSubtotal, expandRow, expandRowsAt, expandShowColSubtotal, expandShowRowSubtotal, getTableEventHandlers, hasClass, hideDescendantCol, isColDisable, isColDisableExpandCollapse, isColHideOnExpand, isRowDisable, isRowDisableExpandCollapse, isRowHideOnExpand, main, getSubtotalInBrackets, processKeys, encodeHtmlEntities, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, removeClass, replaceClass, rowAttrs, rowDisableAfter, rowKeys, rowTotals, setAttributes, showChildCol, showChildRow, toggleCol, toggleColHeaderHeader, toggleRow, toggleRowHeaderHeader, tree, assumptionSubscribe;
+        var addClass, allTotal, arrowCollapsed, arrowExpanded, buildColHeaderHeader, buildColHeaderHeaders, buildColHeaderHeadersClickEvents, buildColHeaders, buildColTotals, buildColTotalsHeader, buildGrandTotal, buildRowHeaderHeaders, buildRowHeaderHeadersClickEvents, buildRowHeaders, buildRowTotalsHeader, buildValues, classColCollapsed, classColExpanded, classColHide, classColShow, classCollapsed, classExpanded, classRowCollapsed, classRowExpanded, classRowHide, classRowShow, clickStatusCollapsed, clickStatusExpanded, colAttrs, colDisableAfter, colKeys, colTotals, collapseCol, collapseColsAt, collapseHideDescendantRow, collapseRow, collapseRowsAt, collapseShowColSubtotal, collapseShowRowSubtotal, applyInlineStyles, createElement, defaults, expandChildCol, expandChildRow, expandCol, expandColsAt, expandHideColSubtotal, expandHideRowSubtotal, expandRow, expandRowsAt, expandShowColSubtotal, expandShowRowSubtotal, getTableEventHandlers, hasClass, hideDescendantCol, isColDisable, isColDisableExpandCollapse, isColHideOnExpand, isRowDisable, isRowDisableExpandCollapse, isRowHideOnExpand, main, getSubtotalInBrackets, processKeys, encodeHtmlEntities, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, removeClass, replaceClass, rowAttrs, rowDisableAfter, rowKeys, rowTotals, setAttributes, showChildCol, showChildRow, toggleCol, toggleColHeaderHeader, toggleRow, toggleRowHeaderHeader, tree, subscribeToClick;
         var createTotalValsBolder, createGrandTotalBolder, getHeaderColorProperties, colorizeRowLabelHeaders, colorizeTableIfNeed, valueNoDashes, getColorsWithOffsetForTable, offsetColors, handleFreezePanesScroll, selectFreezableElements, removeRowHeaderNullValue;
         var getAdditionalAggregation, buildAdditionalHeaderCols, buildAdditionalHeaderRows, buildAdditionalColValues, buildAdditionalRowValues, buildAdditionalRowTotals, buildAdditionalColTotals;
         var additionalFieldsCol, additionalFieldsRow, additionalFieldsList;
-        var edit_assumptions, getExistingAggregator;
+        var getExistingAggregator;
 
         var horizontalFreezePaneClass = opts.chartOptions.table_options.freeze_panes ? ' horizontal-freeze-pane' : '';
         var verticalFreezePaneClass = opts.chartOptions.table_options.freeze_panes ? ' vertical-freeze-pane' : '';
@@ -509,7 +509,6 @@ let initDRPivotTable = function($, window, document) {
         if(opts.chartOptions.table_options.start_collapsed_columns) {
             opts.collapseColsAt = 0;
         }
-        edit_assumptions = opts.chartOptions.edit_assumptions;
         isRowDisable = (ref = opts.rowSubtotalDisplay) != null ? ref.disableSubtotal : void 0;
         isRowHideOnExpand = (ref1 = opts.rowSubtotalDisplay) != null ? ref1.hideOnExpand : !opts.chartOptions.table_options.show_subtotals_for_rows;
         isRowDisableExpandCollapse = (ref2 = opts.rowSubtotalDisplay) != null ? ref2.disableExpandCollapse : void 0;
@@ -1540,7 +1539,7 @@ let initDRPivotTable = function($, window, document) {
                     if ((isRowSubtotal && (isRowHideOnExpand || isRowDisable || rowHeader.col > rowDisableAfter)) || (isColSubtotal && (isColHideOnExpand || isColDisable || colHeader.col > colDisableAfter))) {
                         td.style.display = "none";
                     }
-                    assumptionSubscribe(td, rowHeader, rowAttrs, colHeader, colAttrs, val);
+                    subscribeToClick(td, rowHeader, rowAttrs, colHeader, colAttrs, val);
 
                     tr.appendChild(td);
                 }
@@ -1578,7 +1577,7 @@ let initDRPivotTable = function($, window, document) {
                     td.style.display = "none";
                 }
 
-                assumptionSubscribe(td, rowHeader, rowAttrs, {key:[], flatKey:''}, colAttrs, val);
+                subscribeToClick(td, rowHeader, rowAttrs, {key:[], flatKey:''}, colAttrs, val);
 
                 if(opts.chartOptions.table_options.show_row_total)
                     tr.appendChild(td);
@@ -1588,43 +1587,7 @@ let initDRPivotTable = function($, window, document) {
             return results;
         };
 
-        assumptionSubscribe = function(td, rowHeader, rowAttrs, colHeader, colAttrs, val){
-            if(edit_assumptions){
-                var filters = [];
-                var i=0;
-                var temp;
-                for(i=0; i<rowHeader.key.length; i++){
-                    temp = {
-                        name: rowAttrs[i],
-                        values: [rowHeader.key[i]],
-                        is_excluded:false
-                    }
-                    filters.push(temp);
-                }
-                for(i=0; i<colHeader.key.length; i++){
-                    temp = {
-                        name: colAttrs[i],
-                        values: [colHeader.key[i]],
-                        is_excluded:false
-                    }
-                    filters.push(temp);
-                }
-                var obj_to_send = {
-                    "flatColKey": colHeader.flatKey,
-                    "flatRowKey": rowHeader.flatKey,
-                    "val": val,
-                    "filters": filters
-                };
-
-                // td.addEventListener('dblclick', function(){
-                //     edit_assumptions.fn(obj_to_send, this);
-                // });
-
-                td.addEventListener('click', function(){
-                    edit_assumptions.fn(obj_to_send, this);
-                });
-            }
-
+        subscribeToClick = function(td, rowHeader, rowAttrs, colHeader, colAttrs, val){
             if(opts.value_drill_down_fn){
                 td.classList.add('clickable');
                 td.addEventListener('click', function(rowKey, colKey, rowAttrs, colAttrs){
@@ -1685,7 +1648,7 @@ let initDRPivotTable = function($, window, document) {
                     td.style.display = "none";
                 }
 
-                assumptionSubscribe(td, {key:[], flatKey:''}, rowAttrs, h, colAttrs, val);
+                subscribeToClick(td, {key:[], flatKey:''}, rowAttrs, h, colAttrs, val);
 
                 results.push(tr.appendChild(td));
             }
@@ -1711,7 +1674,7 @@ let initDRPivotTable = function($, window, document) {
                 "data-value": val
             }, getTableEventHandlers(val, [], []));
             createTotalValsBolder(td);
-            assumptionSubscribe(td, {key:[], flatKey:''}, rowAttrs,  {key:[], flatKey:''}, colAttrs, val);
+            subscribeToClick(td, {key:[], flatKey:''}, rowAttrs,  {key:[], flatKey:''}, colAttrs, val);
 
             tr.appendChild(td);
             return result.appendChild(tr);

package/src/highcharts_renderer.js

@@ -8482,32 +8482,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return presentation_data_tag;
     };
 
-    highchartsRenderer.getDashboardApplyScenarios = function (data_model, graph, local_current_dashboard) {
-        if (local_current_dashboard == undefined) {
-            local_current_dashboard = data_model.current_dashboard;
-        }
-
-        let applyScenarios = [];
-        if (data_model.ebmedded_apply_scenario_ids && data_model.ebmedded_apply_scenario_ids.length > 0) {
-            return data_model.ebmedded_apply_scenario_ids;
-        }
-
-        if (local_current_dashboard && graph && graph.vals && graph.vals.length == 1) {
-            // Check Scenarios
-            lodash.forEach(local_current_dashboard.scenario_models, function (dashboard_scenario_model) {
-                if (dashboard_scenario_model && dashboard_scenario_model.value && dashboard_scenario_model.scenario_model && dashboard_scenario_model.scenario_model.source_fields) {
-                    if (lodash.includes(dashboard_scenario_model.scenario_model.source_fields, graph.vals[0].field)) {
-                        let selected_scenario = lodash.find(dashboard_scenario_model.scenario_model.scenarios, {id: dashboard_scenario_model.value});
-                        if (selected_scenario) {
-                            applyScenarios.push(selected_scenario);
-                        }
-                    }
-                }
-            });
-        }
-        return lodash.map(applyScenarios, 'id');
-    };
-
     highchartsRenderer.isDate = function (date) {
         return new Date(date) !== "Invalid Date" && !isNaN(new Date(date));
     };

package/tests/highcharts_renderer.test.js

@@ -4155,64 +4155,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function getDashboardApplyScenarios', () => {
-        let data_model;
-        let graph;
-
-        beforeEach(() => {
-            graph = { vals: [{ field: 'field1' }] };
-            data_model = {
-                current_dashboard: {
-                    scenario_models: [
-                        {
-                            value: 1,
-                            scenario_model: { source_fields: ['field1'], scenarios: [{ id: 1 }, { id: 2 }] },
-                        },
-                        {
-                            value: 2,
-                            scenario_model: { source_fields: ['field2'], scenarios: [{ id: 3 }, { id: 4 }] },
-                        },
-                    ],
-                },
-                ebmedded_apply_scenario_ids: [],
-            };
-        });
-
-        it('returns ebmedded_apply_scenario_ids if data_model has it', () => {
-            data_model.ebmedded_apply_scenario_ids = [5, 6];
-            const local_current_dashboard = { foo: 'bar' };
-            const result = highchartsRenderer.getDashboardApplyScenarios(data_model, graph, local_current_dashboard);
-            expect(result).toEqual([5, 6]);
-        });
-
-        it('returns empty array if scenario_models in local_current_dashboard are not provided', () => {
-            const result = highchartsRenderer.getDashboardApplyScenarios(data_model, {vals: [null]}, {});
-            expect(result).toEqual([]);
-        });
-
-        it('returns empty array if graph has no vals', () => {
-            const result = highchartsRenderer.getDashboardApplyScenarios(data_model, {});
-            expect(result).toEqual([]);
-        });
-
-        it('returns empty array if graph has more than one val', () => {
-            const graph = { vals: [{ field: 'field1' }, { field: 'field2' }] };
-            const result = highchartsRenderer.getDashboardApplyScenarios(data_model, graph, {});
-            expect(result).toEqual([]);
-        });
-
-        it('returns array of selected scenario ids', () => {
-            const result = highchartsRenderer.getDashboardApplyScenarios(data_model, graph, data_model.current_dashboard);
-            expect(result).toEqual([1]);
-        });
-
-        it('returns empty array if no matching scenario is found', () => {
-            const graph = { vals: [{ field: 'field3' }] };
-            const result = highchartsRenderer.getDashboardApplyScenarios(data_model, graph, data_model.current_dashboard);
-            expect(result).toEqual([]);
-        });
-    });
-
     describe('function isDate', () => {
         it('returns true for valid date string', () => {
             expect(highchartsRenderer.isDate('2022-01-01')).toBe(true);