@datarailsshared/dr_renderer 1.5.52 → 1.5.59

package/package.json

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

package/src/highcharts_renderer.js

@@ -463,6 +463,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         ].includes(type);
     };
 
+    const objectCopyJsonMethod = function (o) {
+        if(!o) return 0;
+        return JSON.parse(JSON.stringify(o));
+    };
+
     /**
      * @param {String} value
      * @param {{ useUnitAbbreviation: boolean } labelOptions
@@ -495,7 +500,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (offset > highchartsRenderer.highcharts_theme.colors.length) {
                     offset = offset % highchartsRenderer.highcharts_theme.colors.length;
                 }
-                var colors_to_return = highchartsRenderer.objectCopyJsonMethod(highchartsRenderer.highcharts_theme.colors);
+                var colors_to_return = objectCopyJsonMethod(highchartsRenderer.highcharts_theme.colors);
                 for (var i = 0; i < offset; i++) {
                     //colors_to_return.unshift(colors_to_return.pop());
                     colors_to_return.push(colors_to_return.shift());
@@ -536,38 +541,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return str;
     };
 
-    highchartsRenderer.updateDashboardFilterObject = function (value, dashboardId) {
-        value.excludes = null;
-        value.includes = null;
-        if (value.values && value.values.datetype && value.values.datetype != 'list') {
-            value.datetypevalues = value.values;
-        } else if (value.is_excluded) {
-            value.excludes = value.values;
-        } else {
-            value.includes = value.values;
-        }
-        value.dashboard = dashboardId;
-    };
-
-    highchartsRenderer.createDashboardFilterObject = function (value) {
-        var filtOb = {};
-        if (value.datetypevalues && value.datetypevalues.datetype !== 'list') {
-            filtOb.values = value.datetypevalues;
-            filtOb.is_excluded = false;
-        } else if (value.excludes) {
-            filtOb.is_excluded = true;
-            filtOb.values = value.excludes;
-        } else {
-            filtOb.is_excluded = false;
-            filtOb.values = value.includes;
-        }
-        filtOb.fields = value.fields;
-        filtOb.id = value.id;
-        filtOb.type = value.type;
-        filtOb.name = value.name;
-        return filtOb;
-    };
-
     highchartsRenderer.createValFieldObject = function (value) {
         var valFieldOb = {};
         valFieldOb.field = value.id;
@@ -926,12 +899,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     if (this.category) {
                         category_text = '';
                     }
+
                     var series_text = '<br/>' + '<span style="font-weight: bold; color: ' + this.series.color + ';">\u200E' + this.series.name + '</span>';
                     if (tooltipOptions.show_value) {
                         series_text += ': '
                     }
 
-                    if (pivotData.rowAttrs.length == 0 && !isTrendSeries) {
+                    // Hide series label for TOTAL points (e.g., Walkthrough TOTAL column)
+                    if (lodash.get(this, 'point.options.isTotal')) {
                         series_text = ': ';
                     }
 
@@ -2316,11 +2291,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
 
     highchartsRenderer.transformOldGaugeOptions = (oldOptions) => {
-        const newOptions = highchartsRenderer.objectCopyJsonMethod(oldOptions);
+        const newOptions = objectCopyJsonMethod(oldOptions);
         const { range, segments } = newOptions;
 
         if (!segments) {
-            newOptions.segments = highchartsRenderer.objectCopyJsonMethod(GAUGE_OPTIONS_DEFAULT.segments);
+            newOptions.segments = objectCopyJsonMethod(GAUGE_OPTIONS_DEFAULT.segments);
         }
 
         if (!range) {
@@ -2335,7 +2310,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         });
 
         if (!newOptions.goal) {
-            newOptions.goal = highchartsRenderer.objectCopyJsonMethod(GAUGE_OPTIONS_DEFAULT.goal);
+            newOptions.goal = objectCopyJsonMethod(GAUGE_OPTIONS_DEFAULT.goal);
         }
 
         newOptions.goal.value = 1 * range.max || newOptions.goal.value;
@@ -5225,11 +5200,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
     };
 
-    highchartsRenderer.objectCopyJsonMethod = function (o) {
-        if(!o) return 0;
-        return JSON.parse(JSON.stringify(o));
-    };
-
     highchartsRenderer.updateBackwardCompatibleWidgetOptions = function(options, type) {
         if (lodash.get(options, 'chartOptions.chart.hideLegends', false)) {
             options.chartOptions.legends_position = { value: 'none' };
@@ -5337,7 +5307,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction) {
         // Check if not rendered data, than it will render
 
-        var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplateWOData.fields);
+        var fields = objectCopyJsonMethod(selectedTemplateWOData.fields);
         var fieldOb;
         var xaxisFields = [];
         var legendFields = [];
@@ -5438,7 +5408,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.addTemplateDataToExTableOptions = function (selectedTemplate, exTableOptions) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
 
-        var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
+        var fields = objectCopyJsonMethod(selectedTemplate.widget_fields);
         var fieldOb;
         var filterFields = [];
         var selectedFields = [];
@@ -5486,13 +5456,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         exTableOptions.pivot.fieldsArray = fields;
         exTableOptions.pivot.selectedFieldsArray = selectedFields;
         exTableOptions.pivot.filtersArray = filterFields;
-        exTableOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(exTableOptions.calculated_values || []);
+        exTableOptions.pivot.calculatedValues = objectCopyJsonMethod(exTableOptions.calculated_values || []);
     };
 
     highchartsRenderer.addTemplateDataToDynamicRangeOptions = function (selectedTemplate, dynamicRangeOptions) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
 
-        var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
+        var fields = objectCopyJsonMethod(selectedTemplate.widget_fields);
         var fieldOb;
         var filterFields = [];
         var selectedFields = [];
@@ -5537,12 +5507,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         dynamicRangeOptions.pivot.fieldsArray = fields;
         dynamicRangeOptions.pivot.selectedFieldsArray = selectedFields;
         dynamicRangeOptions.pivot.filtersArray = filterFields;
-        dynamicRangeOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(dynamicRangeOptions.calculated_values || []);
+        dynamicRangeOptions.pivot.calculatedValues = objectCopyJsonMethod(dynamicRangeOptions.calculated_values || []);
     }
 
     highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions, calcModelPredefinedField, isInputStep) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
-        const fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.fields);
+        const fields = objectCopyJsonMethod(selectedTemplate.fields);
         const predefinedField = lodash.cloneDeep(calcModelPredefinedField);
 
         const fillData = (fieldsArr, ignoreFieldsIdToRemove = []) => {
@@ -5682,7 +5652,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         let fieldOb;
 
-        const fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
+        const fields = objectCopyJsonMethod(selectedTemplate.widget_fields);
         const filterFields = [];
         const valuesFields = [];
 
@@ -5746,7 +5716,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         functionOptions.pivot.fieldsArray = fields;
         functionOptions.pivot.valuesArray = valuesFields;
         functionOptions.pivot.filtersArray = filterFields;
-        functionOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(functionOptions.calculated_values || []);
+        functionOptions.pivot.calculatedValues = objectCopyJsonMethod(functionOptions.calculated_values || []);
     };
 
     highchartsRenderer.addTemplateDataToWidgetOptions = function (selectedTemplate, widgetOptions, doNotRemoveFilters) {
@@ -5755,7 +5725,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         const options = typeof widgetOptions.options === 'string' ? JSON.parse(widgetOptions.options) : widgetOptions.options;
 
-        var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
+        var fields = objectCopyJsonMethod(selectedTemplate.widget_fields);
         var fieldOb;
         var xaxisFields = [];
         var legendFields = [];
@@ -5851,7 +5821,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             widgetOptions.pivot.sorters = sorters;
         }
 
-        widgetOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(widgetOptions.calculated_values || []);
+        widgetOptions.pivot.calculatedValues = objectCopyJsonMethod(widgetOptions.calculated_values || []);
         widgetOptions.pivot.fieldsArray = fields;
         widgetOptions.pivot.axisArray = xaxisFields;
         widgetOptions.pivot.legendArray = legendFields;
@@ -8764,32 +8734,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return all_vals;
     }
 
-    highchartsRenderer.getRelevantFilters = function (filtersList) {
-        var dashboardsFilters = lodash.filter(filtersList, function (element) {
-            return (element.hasOwnProperty('includes') && element.includes != null) || (element.hasOwnProperty('excludes') && element.excludes != null) ||
-                (element.datetypevalues && element.datetypevalues.datetype != 'list')
-        });
-        dashboardsFilters = lodash.map(dashboardsFilters, function (element) {
-            var ret = {
-                id: element.id,
-                fields: element.fields,
-            };
-            if (element.datetypevalues && element.datetypevalues.datetype != 'list')
-                ret['values'] = element.datetypevalues;
-            else {
-                ret['values'] = element['includes'] || element['excludes'] || [];
-                ret['values'] = lodash.isArray(ret['values']) ? ret['values'].filter(function (n) {
-                    return n != undefined
-                }) : ret['values'];
-            }
-            ret['is_excluded'] = element.hasOwnProperty('excludes') && element.excludes != null;
-            ret['inject_only'] = element.hasOwnProperty('inject_only') ? element.inject_only : false;
-            return ret;
-        });
-
-        return dashboardsFilters;
-    };
-
     highchartsRenderer.parseOptionsToObject = function (options) {
         if (typeof options == 'object')
             return options;
@@ -8802,104 +8746,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return options;
     };
 
-    highchartsRenderer.getDashboardOverrideValues = function (data_model, graph, local_current_dashboard) {
-        let overrideValues = [];
-
-        if (!local_current_dashboard) {
-            local_current_dashboard = data_model.current_dashboard;
-        }
-
-        if (data_model.ebmedded_override_value_ids && data_model.ebmedded_override_value_ids.length > 0) {
-            return lodash.map(data_model.ebmedded_override_value_ids, function (value_id) {
-                return {"id": value_id}
-            });
-        }
-
-        if (local_current_dashboard && graph && graph.vals && graph.vals.length == 1) {
-            // Check Field Selector
-            let selector = lodash.find(local_current_dashboard.fields_selectors, function (dashboard_Selector) {
-                if (dashboard_Selector && dashboard_Selector.value && dashboard_Selector.fields_selector && dashboard_Selector.fields_selector.default_field) {
-                    if (dashboard_Selector.fields_selector.default_field.id == graph.vals[0].field) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-            if (selector && selector.value != graph.vals[0].field) {
-                let temp_field = lodash.find(selector.fields_selector.other_fields, {id: selector.value});
-                let name = "no_name_for_selected";
-                if (temp_field) {
-                    name = temp_field.name;
-                }
-                overrideValues = [{id: selector.value, name: name}];
-            }
-        }
-        return overrideValues;
-    };
-
-    highchartsRenderer.getDashboardFilters = function (data_model, remove_filters_from_global, local_current_dashboard) {
-        var dashboardsFilters = [];
-
-        if (local_current_dashboard == undefined) {
-            local_current_dashboard = data_model.current_dashboard;
-        }
-
-        if (data_model.ebmedded_filters) {
-            dashboardsFilters = dashboardsFilters.concat(data_model.ebmedded_filters);
-        }
-
-        if (local_current_dashboard && local_current_dashboard.filters) {
-            dashboardsFilters = dashboardsFilters.concat(highchartsRenderer.getRelevantFilters(local_current_dashboard.filters));
-        }
-
-        if (remove_filters_from_global) {
-            dashboardsFilters = highchartsRenderer.objectCopyJsonMethod(dashboardsFilters);
-            lodash.forEach(remove_filters_from_global, function (field) {
-                lodash.forEach(dashboardsFilters, function (df) {
-                    lodash.remove(df.fields, {id: field.id});
-                });
-            });
-
-            lodash.remove(dashboardsFilters, (df) => df.fields.length == 0);
-        }
-
-        return dashboardsFilters;
-    };
-
-    highchartsRenderer.getPresentationTagType = function (data_model, local_current_dashboard) {
-        if (local_current_dashboard == undefined) {
-            local_current_dashboard = data_model.current_dashboard;
-        }
-
-        if (local_current_dashboard.date_tags && local_current_dashboard.date_tags.length > 0) {
-            return 'date_tags';
-        }
-
-        if (local_current_dashboard.plan_tags && local_current_dashboard.plan_tags.length > 0) {
-            return 'plan_tags';
-        }
-    };
-
-    highchartsRenderer.getPresentationDataTag = function (data_model, local_current_dashboard, dataKeyTag = 'date_tags') {
-        let presentation_data_tag = null;
-
-        if (local_current_dashboard == undefined) {
-            local_current_dashboard = data_model.current_dashboard;
-        }
-
-        if (local_current_dashboard && local_current_dashboard.presentation_data_tag_object) {
-            presentation_data_tag = local_current_dashboard.presentation_data_tag_object.value;
-        }
-        else if(local_current_dashboard && local_current_dashboard[dataKeyTag] && local_current_dashboard[dataKeyTag].length > 0){
-            local_current_dashboard.presentation_data_tag_object = lodash.clone(lodash.maxBy(local_current_dashboard[dataKeyTag], 'value'));
-            if(local_current_dashboard.presentation_data_tag_object){
-                presentation_data_tag = local_current_dashboard.presentation_data_tag_object.value;
-            }
-        }
-
-        return presentation_data_tag;
-    };
-
     highchartsRenderer.isDate = function (date) {
         return new Date(date) !== "Invalid Date" && !isNaN(new Date(date));
     };

package/tests/highcharts_renderer.test.js

@@ -275,83 +275,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function updateDashboardFilterObject', () => {
-        const dashboardId = 1;
-
-        it('Filter includes', () => {
-            const object = {
-                values: ['test']
-            };
-            highchartsRenderer.updateDashboardFilterObject(object, dashboardId);
-            expect(object.includes).toEqual(object.values);
-            expect(object.excludes).toEqual(null);
-            expect(object.dashboard).toEqual(dashboardId);
-        });
-
-        it('Filter excludes', () => {
-            const object = {
-                is_excluded: true,
-                values: ['test'],
-            };
-            highchartsRenderer.updateDashboardFilterObject(object, dashboardId);
-            expect(object.includes).toEqual(null);
-            expect(object.excludes).toEqual(object.values);
-            expect(object.dashboard).toEqual(dashboardId);
-        });
-
-        it('Filter date', () => {
-            const object = {
-                is_excluded: true,
-                values: {
-                    datetype: 'range'
-                },
-            };
-            highchartsRenderer.updateDashboardFilterObject(object, dashboardId);
-            expect(object.includes).toEqual(null);
-            expect(object.excludes).toEqual(null);
-            expect(object.datetypevalues ).toEqual(object.values);
-            expect(object.dashboard).toEqual(dashboardId);
-        });
-    });
-
-    describe('function createDashboardFilterObject', () => {
-        let value;
-        beforeEach(() => {
-            value = {
-                id: 1,
-                type: 'Float',
-                name: 'name',
-                fields: [1,3,4],
-            }
-        });
-
-        it('Filter includes', () => {
-            value.includes = [123];
-            const filter = highchartsRenderer.createDashboardFilterObject(value);
-            expect(filter.values).toEqual(value.includes);
-            expect(filter.is_excluded).toEqual(false);
-            expect(filter.fields).toEqual(value.fields);
-        });
-
-        it('Filter excludes', () => {
-            value.excludes = [123];
-            const filter = highchartsRenderer.createDashboardFilterObject(value);
-            expect(filter.values).toEqual(value.excludes);
-            expect(filter.is_excluded).toEqual(true);
-            expect(filter.fields).toEqual(value.fields);
-        });
-
-        it('Filter date', () => {
-            value.datetypevalues = {
-                datetype: 'range'
-            };
-            const filter = highchartsRenderer.createDashboardFilterObject(value);
-            expect(filter.values).toEqual(value.datetypevalues);
-            expect(filter.is_excluded).toEqual(false);
-            expect(filter.fields).toEqual(value.fields);
-        });
-    });
-
     describe('function createValFieldObject', () => {
         const value = {
             id: 1,
@@ -1900,26 +1823,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe("function objectCopyJsonMethod", () => {
-        it("should return null for null input", () => {
-            expect(highchartsRenderer.objectCopyJsonMethod(null)).toBe(0);
-        });
-
-        it("should return a copy of the object", () => {
-            const obj = { a: 1, b: 2 };
-            const objCopy = highchartsRenderer.objectCopyJsonMethod(obj);
-            expect(objCopy).toEqual(obj);
-            expect(objCopy).not.toBe(obj);
-        });
-
-        it("should return a copy of the array", () => {
-            const arr = [1, 2, 3];
-            const arrCopy = highchartsRenderer.objectCopyJsonMethod(arr);
-            expect(arrCopy).toEqual(arr);
-            expect(arrCopy).not.toBe(arr);
-        });
-    });
-
     describe("function updateBackwardCompatibleWidgetOptions", () => {
         it("should delete chart 'hideLegends' option if exists and true", () => {
             const options = {
@@ -4469,96 +4372,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function getRelevantFilters', () => {
-        it('should return an empty array if given an empty array', () => {
-            const filters = highchartsRenderer.getRelevantFilters([]);
-            expect(filters).toEqual([]);
-        });
-
-        it('should filter out elements that do not have includes, excludes, or datetypevalues properties', () => {
-            const filters = [
-                {fields: ['field1'], otherProperty: 'value'},
-                {fields: ['field2'], includes: [1, 2, 3]},
-                {fields: ['field3'], excludes: ['abc']},
-                {fields: ['field4'], datetypevalues: {datetype: 'date', start: '2022-01-01', end: '2022-01-31'}}
-            ];
-            const relevantFilters = highchartsRenderer.getRelevantFilters(filters);
-            expect(relevantFilters.length).toEqual(3);
-            expect(relevantFilters).toContainEqual({
-                fields: ['field2'],
-                values: [1, 2, 3],
-                is_excluded: false,
-                inject_only: false
-            });
-            expect(relevantFilters).toContainEqual({
-                fields: ['field3'],
-                values: ['abc'],
-                is_excluded: true,
-                inject_only: false
-            });
-            expect(relevantFilters).toContainEqual({
-                fields: ['field4'],
-                values: {datetype: 'date', start: '2022-01-01', end: '2022-01-31'},
-                is_excluded: false,
-                inject_only: false
-            });
-        });
-
-        it('should handle empty includes and excludes properties by returning an empty values array', () => {
-            const filters = [
-                {fields: ['field1'], includes: []},
-                {fields: ['field2'], includes: [1, 2, 3], excludes: []},
-                {fields: ['field3'], excludes: ['abc']}
-            ];
-            const relevantFilters = highchartsRenderer.getRelevantFilters(filters);
-            expect(relevantFilters.length).toEqual(3);
-            expect(relevantFilters[0].values).toEqual([]);
-            expect(relevantFilters[1].values).toEqual([1, 2, 3]);
-            expect(relevantFilters[2].values).toEqual(['abc']);
-        });
-
-        it('should set is_excluded to true for elements that have an excludes property', () => {
-            const filters = [
-                {fields: ['field1'], includes: [1, 2, 3]},
-                {fields: ['field2'], excludes: ['abc']},
-                {fields: ['field3'], excludes: [null]}
-            ];
-            const relevantFilters = highchartsRenderer.getRelevantFilters(filters);
-            expect(relevantFilters.length).toEqual(3);
-            expect(relevantFilters[0].is_excluded).toBe(false);
-            expect(relevantFilters[1].is_excluded).toBe(true);
-            expect(relevantFilters[2].is_excluded).toBe(true);
-        });
-
-        it('should handle datetypevalues', () => {
-            const filtersList = [
-                {
-                    fields: ['date'],
-                    datetypevalues: {
-                        datetype: 'last_month',
-                        from: null,
-                        to: null
-                    }
-                }
-            ];
-
-            const expected = [
-                {
-                    fields: ['date'],
-                    values: {
-                        datetype: 'last_month',
-                        from: null,
-                        to: null
-                    },
-                    is_excluded: false,
-                    inject_only: false
-                }
-            ];
-
-            expect(highchartsRenderer.getRelevantFilters(filtersList)).toEqual(expected);
-        });
-    });
-
     describe('function parseOptionsToObject', () => {
         it('should return an object when given an object', () => {
             const obj = { key: 'value' };
@@ -4588,240 +4401,7 @@ describe('highcharts_renderer', () => {
             expect(() => highchartsRenderer.parseOptionsToObject(str)).toThrow();
         });
     });
-
-    describe('function getDashboardOverrideValues', () => {
-        let dataModel;
-        let graph;
-        let localCurrentDashboard;
-
-        beforeEach(() => {
-            dataModel = {
-                current_dashboard: {
-                    fields_selectors: [
-                        {
-                            value: 'field1',
-                            fields_selector: {
-                                default_field: { id: 'field1', name: 'Field 1' },
-                                other_fields: [
-                                    { id: 'field1', name: 'Field 1' },
-                                    { id: 'field2', name: 'Field 2' },
-                                ]
-                            }
-                        },
-                        {
-                            value: 'field2',
-                            fields_selector: {
-                                default_field: { id: 'field2', name: 'Field 2' },
-                                other_fields: [
-                                    { id: 'field1', name: 'Field 1' },
-                                    { id: 'field2', name: 'Field 2' },
-                                ]
-                            }
-                        }
-                    ]
-                },
-                ebmedded_override_value_ids: []
-            };
-
-            graph = {
-                vals: [{ field: 'field1' }]
-            };
-
-            localCurrentDashboard = {
-                fields_selectors: [
-                    {
-                        value: 'field2',
-                        fields_selector: {
-                            default_field: { id: 'field1', name: 'Field 1' },
-                            other_fields: [
-                                { id: 'field1', name: 'Field 1' },
-                                { id: 'field2', name: 'Field 2' },
-                            ]
-                        }
-                    }
-                ]
-            };
-        });
-
-        it('should return empty array when no conditions met', () => {
-            expect(highchartsRenderer.getDashboardOverrideValues({}, {}, {})).toEqual([]);
-        });
-
-        it('should return array of value objects when ebmedded_override_value_ids exist', () => {
-            dataModel.ebmedded_override_value_ids = [1, 2, 3]
-            expect(highchartsRenderer.getDashboardOverrideValues(dataModel, {}, {})).toEqual([
-                { id: 1 },
-                { id: 2 },
-                { id: 3 }
-            ]);
-        });
-
-        it('should return empty array when local_current_dashboard undefined', () => {
-            expect(highchartsRenderer.getDashboardOverrideValues({}, graph, undefined)).toEqual([]);
-        });
-
-        it('should return empty array when graph undefined', () => {
-            expect(highchartsRenderer.getDashboardOverrideValues(dataModel, undefined, localCurrentDashboard)).toEqual([]);
-        });
-
-        it('should return empty array when graph vals empty', () => {
-            expect(highchartsRenderer.getDashboardOverrideValues(dataModel, { vals: [] }, localCurrentDashboard)).toEqual([]);
-        });
-
-        it('should return empty array when graph vals length > 1', () => {
-            expect(highchartsRenderer.getDashboardOverrideValues(dataModel, { vals: [{ field: 'field1' }, { field: 'field2' }] }, localCurrentDashboard)).toEqual([]);
-        });
-
-        it('should return empty array when no matching field selector', () => {
-            expect(highchartsRenderer.getDashboardOverrideValues(dataModel, { vals: [{ field: 'field3' }] }, localCurrentDashboard)).toEqual([]);
-        });
-
-        it('should return value object when selector value != graph val field', () => {
-            expect(highchartsRenderer.getDashboardOverrideValues(dataModel, graph, localCurrentDashboard)).toEqual([{ id: 'field2', name: 'Field 2' }]);
-        });
-    });
-
-    describe('function getDashboardFilters', () => {
-        let data_model;
-        let remove_filters_from_global;
-
-        beforeEach(() => {
-            data_model = {
-                current_dashboard: {
-                    filters: [
-                        {
-                            fields: [{id: '1', name: 'Field 1'}],
-                            includes: ['value 1']
-                        },
-                        {
-                            fields: [{id: '2', name: 'Field 2'}],
-                            includes: ['value 2']
-                        }
-                    ]
-                },
-                ebmedded_filters: []
-            };
-            remove_filters_from_global = [{id: '2', name: 'Field 2'}];
-        });
-
-        it('should return an empty array when no relevant filters found', () => {
-            const local_current_dashboard = {
-                fields_selectors: [{value: '1', fields_selector: {default_field: {id: '1'}}}]
-            };
-            const result = highchartsRenderer.getDashboardFilters({}, [], local_current_dashboard);
-            expect(result).toEqual([]);
-        });
-
-        it('should return an array of relevant filters from the current dashboard', () => {
-            const result = highchartsRenderer.getDashboardFilters(data_model, [], data_model.current_dashboard);
-            expect(result.length).toEqual(2);
-        });
-
-        it('should return an array of relevant filters from the current dashboard and embedded filters', () => {
-            data_model.ebmedded_filters = [{
-                fields: [{id: '3', name: 'Field 3'}],
-                includes: ['value 3']
-            }];
-            const result = highchartsRenderer.getDashboardFilters(data_model, [], data_model.current_dashboard);
-            expect(result.length).toEqual(3);
-        });
-
-        it('should remove specified fields from the returned filters array', () => {
-            const result = highchartsRenderer.getDashboardFilters(data_model, remove_filters_from_global, data_model.current_dashboard);
-            expect(result.length).toEqual(1);
-        });
-    });
-
-    describe('function getPresentationTagType', () => {
-        it('should return "date_tags" if local_current_dashboard has date tags', () => {
-            const data_model = {
-                current_dashboard: {
-                    date_tags: [{ id: 1, name: 'Date Tag 1' }]
-                }
-            };
-            const result = highchartsRenderer.getPresentationTagType(data_model, data_model.current_dashboard);
-            expect(result).toBe('date_tags');
-        });
-
-        it('should return "plan_tags" if local_current_dashboard has plan tags', () => {
-            const data_model = {
-                current_dashboard: {
-                    plan_tags: [{ id: 1, name: 'Plan Tag 1' }]
-                }
-            };
-            const result = highchartsRenderer.getPresentationTagType(data_model, data_model.current_dashboard);
-            expect(result).toBe('plan_tags');
-        });
-
-        it('should return undefined if local_current_dashboard has no tags', () => {
-            const data_model = {
-                current_dashboard: {}
-            };
-            const result = highchartsRenderer.getPresentationTagType(data_model);
-            expect(result).toBeUndefined();
-        });
-
-        it('should return "date_tags" if local_current_dashboard is undefined but data_model has date tags', () => {
-            const data_model = {
-                current_dashboard: {
-                    date_tags: [{ id: 1, name: 'Date Tag 1' }]
-                }
-            };
-            const result = highchartsRenderer.getPresentationTagType(data_model);
-            expect(result).toBe('date_tags');
-        });
-
-        it('should return "plan_tags" if local_current_dashboard is undefined but data_model has plan tags', () => {
-            const data_model = {
-                current_dashboard: {
-                    plan_tags: [{ id: 1, name: 'Plan Tag 1' }]
-                }
-            };
-            const result = highchartsRenderer.getPresentationTagType(data_model);
-            expect(result).toBe('plan_tags');
-        });
-    });
-
-    describe('function getPresentationDataTag', () => {
-        const data_model = { current_dashboard: { presentation_data_tag_object: { value: 'foo' } } };
-        const dataKeyTag = 'date_tags';
-
-        it('returns presentation_data_tag_object value if local_current_dashboard is undefined', () => {
-            const result = highchartsRenderer.getPresentationDataTag(data_model, undefined, dataKeyTag);
-            expect(result).toBe('foo');
-        });
-
-        it('returns presentation_data_tag_object value if local_current_dashboard has presentation_data_tag_object', () => {
-            const local_current_dashboard = { presentation_data_tag_object: { value: 'bar' } };
-            const result = highchartsRenderer.getPresentationDataTag(data_model, local_current_dashboard, dataKeyTag);
-            expect(result).toBe('bar');
-        });
-
-        it('returns value of highest dataKeyTag value in local_current_dashboard', () => {
-            const local_current_dashboard = {
-                date_tags: [
-                    { value: '2022-01-01' },
-                    { value: '2021-01-01' },
-                    { value: '2023-01-01' },
-                ],
-            };
-            const result = highchartsRenderer.getPresentationDataTag(data_model, local_current_dashboard, dataKeyTag);
-            expect(result).toBe('2023-01-01');
-        });
-
-        it('returns null if local_current_dashboard has no presentation_data_tag_object or dataKeyTag values', () => {
-            const local_current_dashboard = {};
-            const result = highchartsRenderer.getPresentationDataTag(data_model, local_current_dashboard, dataKeyTag);
-            expect(result).toBeNull();
-        });
-
-        it('returns null if local_current_dashboard has empty dataKeyTag array', () => {
-            const local_current_dashboard = { date_tags: [] };
-            const result = highchartsRenderer.getPresentationDataTag(data_model, local_current_dashboard, dataKeyTag);
-            expect(result).toBeNull();
-        });
-    });
-
+    
     describe('function isDate', () => {
         it('returns true for valid date string', () => {
             expect(highchartsRenderer.isDate('2022-01-01')).toBe(true);