@datarailsshared/dr_renderer 1.2.410 → 1.2.412

package/package.json

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

package/src/highcharts_renderer.js

@@ -149,7 +149,6 @@ const CHART_LEGEND_DEFAULT_LABEL = 'Legend (Series)';
 
 const FEATURES = {
     ENABLE_NEW_WIDGET_VALUE_FORMATTING: 'enable_new_widget_value_formatting',
-    FORMAT_AXIS: 'use_default_table_format_for_axis',
     FORMAT_DATES_AS_OTHER_AXIS_TYPES: 'format_dates_as_other_axis_types',
     MULTIPLE_DIMENSION_TAGS: 'multiple_dimension_tags',
     USE_NEW_SCENARIO_TAG: 'use_new_scenario_tag',
@@ -580,7 +579,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var func = function () {
             var value = parseFloat(this.y);
             if (pivotData) {
-                let series_name = highchartsRenderer.getSeriesNameInFormatterContext(this, pivotData);
+                let series_name = highchartsRenderer.getSeriesNameInFormatterContext(this);
                 var rows = series_name.split(highchartsRenderer.delimer);
 
                 if (is_drill_down_pie && highchartsRenderer.selfStartsWith(series_name, "Series ")) {
@@ -593,7 +592,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     rows = [];
                 }
 
-                var cols = highchartsRenderer.getColsInFormatterContext(this, pivotData);
+                var cols = highchartsRenderer.getColsInFormatterContext(this);
                 if (typeof (cols) == 'object' && cols.name) {
                     cols = cols.name;
                 }
@@ -737,7 +736,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             var y = parseFloat(this.y);
             if (pivotData) {
-                let series_name = highchartsRenderer.getSeriesNameInFormatterContext(this, pivotData);
+                let series_name = highchartsRenderer.getSeriesNameInFormatterContext(this);
                 var rows = series_name.split(highchartsRenderer.delimer);
                 if (is_drill_down_pie && highchartsRenderer.selfStartsWith(series_name,"Series ")) {
                     rows = [];
@@ -748,7 +747,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     rows = [];
                 }
 
-                var cols = highchartsRenderer.getColsInFormatterContext(this, pivotData);
+                var cols = highchartsRenderer.getColsInFormatterContext(this);
                 if (!cols && is_drill_down_pie) {
                     cols = this.name;
                 }
@@ -775,7 +774,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             ? isWaterfallWalkthrough
                                 ? this.key
                                 : cols[0]
-                            : highchartsRenderer.isFormattingAxisFeatureOn() && lodash.get(this, 'point.name') || cols
+                            : lodash.get(this, 'point.name') || cols
                     );
 
                     highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
@@ -3003,7 +3002,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             zoomType: additionOptions && additionOptions.chart && additionOptions.chart.zoom_type ? additionOptions.chart.zoom_type : 'None',
             events: {
                 'drilldown': function (e) {
-                    highchartsRenderer.modifyEventPointForDrilldown(e, pivotData);
+                    highchartsRenderer.modifyEventPointForDrilldown(e);
                     if (drilldownFunc)
                         drilldownFunc(e, this, "drilldown");
 
@@ -3115,7 +3114,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             zoomType: 'x',
             events: {
                 'drilldown': function (e) {
-                    highchartsRenderer.modifyEventPointForDrilldown(e, pivotData);
+                    highchartsRenderer.modifyEventPointForDrilldown(e);
                     if (drilldownFunc)
                         drilldownFunc(e, this, "drilldown");
 
@@ -3258,7 +3257,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             type: 'column',
             events: {
                 'drilldown': function (e) {
-                    highchartsRenderer.modifyEventPointForDrilldown(e, pivotData);
+                    highchartsRenderer.modifyEventPointForDrilldown(e);
                     if (drilldownFunc)
                         drilldownFunc(e, this, "drilldown");
 
@@ -5180,7 +5179,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 return 'Wrong date format';
             }
         } else {
-            const isFormatting = highchartsRenderer.isFormattingAxisFeatureOn() && isFormattingNumbers && format && !isNaN(value);
+            const isFormatting = isFormattingNumbers && format && !isNaN(value);
             if (value === null || value === '[null]') {
                 return '[null]';
             } else if (isFormatting) {
@@ -6041,7 +6040,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     opt = {};
                 }
                 opt.drillDownListFunc = (e) => {
-                    highchartsRenderer.modifyEventPointForDrilldown(e, pivotData);
+                    highchartsRenderer.modifyEventPointForDrilldown(e);
                     drillDownListFunc(e);
                 };
             } else {
@@ -8167,7 +8166,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         }
                         all_vals.push(val);
                     });
-                } else if (isFormattingNumbers && highchartsRenderer.isFormattingAxisFeatureOn()) {
+                } else if (isFormattingNumbers) {
                     all_vals = lodash.map(lodash.cloneDeep(fieldFilter.includes), val =>
                         highchartsRenderer.returnRawDataValue(fieldFilter.type, val, fieldFilter.format || '', null, null, true) + ""
                     );
@@ -8358,8 +8357,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 (element.datetypevalues && element.datetypevalues.datetype != 'list')
         });
         dashboardsFilters = lodash.map(dashboardsFilters, function (element) {
-            var ret = {};
-            ret['fields'] = element.fields;
+            var ret = {
+                id: element.id,
+                fields: element.fields,
+            };
             if (element.datetypevalues && element.datetypevalues.datetype != 'list')
                 ret['values'] = element.datetypevalues;
             else {
@@ -8708,10 +8709,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 let temp = highchartsRenderer.createFilterObject(widget.rows[index]);
 
                 if (widget.rows[index].type === 'Date' && row_value !== NULL_VALUE) {
-                    let datetrange = highchartsRenderer.createDateTypeFromValue(
-                        row_value,
-                        highchartsRenderer.getDateFieldFormat(widget, widget.rows[index])
-                    );
+                    const format = highchartsRenderer.getDateFieldFormat(widget, widget.rows[index]);
+                    let datetrange = highchartsRenderer.createDateTypeFromValue(row_value, format);
 
                     if ($.isEmptyObject(datetrange)) {
                         return;
@@ -9609,15 +9608,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     highchartsRenderer.isFormattingNumberAxis = function (pivotData) {
-        return highchartsRenderer.isFormattingAxisFeatureOn() && pivotData.isFormattingAxisLabels;
+        return pivotData.isFormattingAxisLabels;
     }
 
     highchartsRenderer.isFormattingDatesAsOtherAxisTypes = function () {
-        return highchartsRenderer.isFormattingAxisFeatureOn() && highchartsRenderer.hasFeature(FEATURES.FORMAT_DATES_AS_OTHER_AXIS_TYPES);
-    }
-
-    highchartsRenderer.isFormattingAxisFeatureOn = function () {
-        return highchartsRenderer.hasFeature(FEATURES.FORMAT_AXIS);
+        return highchartsRenderer.hasFeature(FEATURES.FORMAT_DATES_AS_OTHER_AXIS_TYPES);
     }
 
     highchartsRenderer.sortHasBeenDoneOnBE = function (keysObject) {
@@ -9664,9 +9659,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.getFormattedKeys = function(pivotData, isCols, keys) {
         keys = keys || (isCols ? pivotData.getColKeys() : pivotData.getRowKeys());
-        return highchartsRenderer.isFormattingAxisFeatureOn()
-            ? lodash.map(keys, key => highchartsRenderer.getFormattedKey(key, pivotData, isCols ? 'colFormats' : 'rowFormats'))
-            : keys;
+        return lodash.map(keys, key => highchartsRenderer.getFormattedKey(key, pivotData, isCols ? 'colFormats' : 'rowFormats'));
     }
 
     highchartsRenderer.getFormattedColKeys = function(pivotData, keys) {
@@ -9677,23 +9670,21 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return highchartsRenderer.getFormattedKeys(pivotData, false, keys);
     }
 
-    highchartsRenderer.modifyEventPointForDrilldown = function(e, pivotData) {
-        if (!highchartsRenderer.isFormattingAxisFeatureOn()) {
-            return;
-        }
+    highchartsRenderer.modifyEventPointForDrilldown = function(e) {
         e.point = lodash.cloneDeep(e.point);
         e.point.name = e.point.initialName;
         e.point.series.name = lodash.get(e.point.series, 'userOptions.initialName', e.point.series.name);
         lodash.set(e, 'point.category.userOptions', e.point.initialName.toString().split(highchartsRenderer.delimer));
     }
 
-    highchartsRenderer.getSeriesNameInFormatterContext = function(context, pivotData) {
-        return ((highchartsRenderer.isFormattingAxisFeatureOn() && lodash.get(context, 'series.userOptions.initialName')) || context.series.name || '') + "";
+    highchartsRenderer.getSeriesNameInFormatterContext = function(context) {
+        return (lodash.get(context, 'series.userOptions.initialName') || context.series.name || '') + "";
     }
 
-    highchartsRenderer.getColsInFormatterContext = function(context, pivotData) {
+    highchartsRenderer.getColsInFormatterContext = function(context) {
         return lodash.get(context, 'point.options.colsForTotal')
-            || highchartsRenderer.isFormattingAxisFeatureOn() && (lodash.get(context, 'point.initialName') || lodash.get(context, 'options.initialName'))
+            || lodash.get(context, 'point.initialName')
+            || lodash.get(context, 'options.initialName')
             || context.key;
     }
 

package/tests/highcharts_renderer.test.js

@@ -4856,274 +4856,158 @@ describe('highcharts_renderer', () => {
     });
 
     describe('Function isFormattingNumberAxis', () => {
-        it('should return true if FF is true', () => {
+        it('should return true if isFormattingAxisLabels is true', () => {
             const pivotData = { isFormattingAxisLabels: true };
-            lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
             expect(highchartsRenderer.isFormattingNumberAxis(pivotData)).toEqual(true);
         });
 
-        it('should return false if FF is false', () => {
-            const pivotData = { isFormattingAxisLabels: true };
-            lodash.set(document, 'ReportHippo.user.features', []);
-            expect(highchartsRenderer.isFormattingNumberAxis(pivotData)).toEqual(false);
-        });
 
-        it('should return false if FF is true but isFormattingAxisLabels for chart is false', () => {
+        it('should return false if isFormattingAxisLabels is false', () => {
             const pivotData = { isFormattingAxisLabels: false };
-            lodash.set(document, 'ReportHippo.user.features', []);
             expect(highchartsRenderer.isFormattingNumberAxis(pivotData)).toEqual(false);
         });
     });
 
     describe('Function getFormattedKey', () => {
-        describe('getFormattedKey with FF on', () => {
-            beforeEach(() => {
-                lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
-            });
-    
-            it('should return properly formatted colKey as array', () => {
-                const initialKey = ['1000'];
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    rowFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['$1000.0']);
-            });
-
-            it('should return properly formatted rowKey as array', () => {
-                const initialKey = ['1000'];
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
-                    rowFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'rowFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['$1000.0']);
-            });
-
-            it('should return properly formatted colKey as string', () => {
-                const initialKey = '1000';
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    rowFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual('$1000.0');
-            });
-
-            it('should return properly formatted rowKey as string', () => {
-                const initialKey = '1000';
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
-                    rowFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'rowFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual('$1000.0');
-            });
-
-            it('should return formatted multivalue colKey as string', () => {
-                const initialKey = '1000 , 2000';
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual('$1000.0 , ₪2000.0');
-            });
-
-            it('should return formatted multivalue colKey as array', () => {
-                const initialKey = ['1000', '2000'];
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['$1000.0', '₪2000.0']);
-            });
-
-            it('should return not formatted second value (test as array)', () => {
-                const initialKey = ['1000', '2000'];
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, null],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['$1000.0', '2000']);
-            });
+        it('should return properly formatted colKey as array', () => {
+            const initialKey = ['1000'];
+            const pivotData = {
+                colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                rowFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'colFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual(['$1000.0']);
+        });
 
-            it('should return not formatted first value (test as array)', () => {
-                const initialKey = ['1000', '2000'];
-                const pivotData = {
-                    colFormats: [null, { type: 'Float', format: '$####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['1000', '$2000.0']);
-            });
+        it('should return properly formatted rowKey as array', () => {
+            const initialKey = ['1000'];
+            const pivotData = {
+                colFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
+                rowFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'rowFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual(['$1000.0']);
+        });
 
-            describe('formatting Dates', () => {
-                it('should return formatted multivalue colKey as array (format_dates_as_other_axis_types is ON)', () => {
-                    lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types', 'use_default_table_format_for_axis']);
-                    const initialKey = [1687277052, 1687277052];
-                    const pivotData = {
-                        colFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
-                        isFormattingAxisLabels: true,
-                    };
-                    const type = 'colFormats';
-                    const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                    expect(formattedKey).toEqual(['06/20/2023', 'Jun-23']);
-                });
+        it('should return properly formatted colKey as string', () => {
+            const initialKey = '1000';
+            const pivotData = {
+                colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                rowFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'colFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual('$1000.0');
+        });
 
-                it('should return formatted multivalue rowKey as array (format_dates_as_other_axis_types is ON)', () => {
-                    lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types', 'use_default_table_format_for_axis']);
-                    const initialKey = [1687277052, 1687277052];
-                    const pivotData = {
-                        rowFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
-                        isFormattingAxisLabels: true,
-                    };
-                    const type = 'rowFormats';
-                    const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                    expect(formattedKey).toEqual(['06/20/2023', 'Jun-23']);
-                });
+        it('should return properly formatted rowKey as string', () => {
+            const initialKey = '1000';
+            const pivotData = {
+                colFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
+                rowFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'rowFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual('$1000.0');
+        });
 
-                it('should return NOT formatted multivalue colKey as array (format_dates_as_other_axis_types is OFF)', () => {
-                    lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
-                    const initialKeyAlreadyFormatted = ['10/10/2020', '10/10/2021'];
-                    const pivotData = {
-                        colFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
-                        isFormattingAxisLabels: true,
-                    };
-                    const type = 'colFormats';
-                    const formattedKey = highchartsRenderer.getFormattedKey(initialKeyAlreadyFormatted, pivotData, type);
-                    expect(formattedKey).toEqual(initialKeyAlreadyFormatted);
-                });
+        it('should return formatted multivalue colKey as string', () => {
+            const initialKey = '1000 , 2000';
+            const pivotData = {
+                colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'colFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual('$1000.0 , ₪2000.0');
+        });
 
-                it('should return NOT formatted multivalue rowKey as array (format_dates_as_other_axis_types is OFF)', () => {
-                    lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
-                    const initialKeyAlreadyFormatted = ['10/10/2020', '10/10/2021'];
-                    const pivotData = {
-                        rowFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
-                        isFormattingAxisLabels: true,
-                    };
-                    const type = 'rowFormats';
-                    const formattedKey = highchartsRenderer.getFormattedKey(initialKeyAlreadyFormatted, pivotData, type);
-                    expect(formattedKey).toEqual(initialKeyAlreadyFormatted);
-                });
-            });
+        it('should return formatted multivalue colKey as array', () => {
+            const initialKey = ['1000', '2000'];
+            const pivotData = {
+                colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'colFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual(['$1000.0', '₪2000.0']);
         });
 
-        describe('getFormattedKey with FF off', () => {
-            beforeEach(() => {
-                lodash.set(document, 'ReportHippo.user.features', []);
-            });
-    
-            it('should return NOT formatted colKey as array', () => {
-                const initialKey = ['1000'];
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    rowFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type,);
-                expect(formattedKey).toEqual(['1000']);
-            });
+        it('should return not formatted second value (test as array)', () => {
+            const initialKey = ['1000', '2000'];
+            const pivotData = {
+                colFormats: [{ type: 'Float', format: '$####.##' }, null],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'colFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual(['$1000.0', '2000']);
+        });
 
-            it('should return NOT formatted rowKey as array', () => {
-                const initialKey = ['1000'];
-                const pivotData = {
-                    colFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
-                    rowFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    isFormattingAxisLabels: true,
-                };
-                const type = 'rowFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['1000']);
-            });
+        it('should return not formatted first value (test as array)', () => {
+            const initialKey = ['1000', '2000'];
+            const pivotData = {
+                colFormats: [null, { type: 'Float', format: '$####.##' }],
+                isFormattingAxisLabels: true,
+            };
+            const type = 'colFormats';
+            const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+            expect(formattedKey).toEqual(['1000', '$2000.0']);
+        });
 
-            it('should return NOT formatted colKey as string', () => {
-                const initialKey = '1000';
+        describe('formatting Dates', () => {
+            it('should return formatted multivalue colKey as array (format_dates_as_other_axis_types is ON)', () => {
+                lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types']);
+                const initialKey = [1687277052, 1687277052];
                 const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
-                    rowFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
+                    colFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
                     isFormattingAxisLabels: true,
                 };
                 const type = 'colFormats';
                 const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual('1000');
+                expect(formattedKey).toEqual(['06/20/2023', 'Jun-23']);
             });
 
-            it('should return NOT formatted rowKey as string', () => {
-                const initialKey = '1000';
+            it('should return formatted multivalue rowKey as array (format_dates_as_other_axis_types is ON)', () => {
+                lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types']);
+                const initialKey = [1687277052, 1687277052];
                 const pivotData = {
-                    colFormats: [{ type: 'Float', format: '€####.##' }, { type: 'Float', format: '£####.##' }],
-                    rowFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                    rowFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
                     isFormattingAxisLabels: true,
                 };
                 const type = 'rowFormats';
                 const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual('1000');
+                expect(formattedKey).toEqual(['06/20/2023', 'Jun-23']);
             });
 
-            it('should return NOT formatted multivalue colKey as string', () => {
-                const initialKey = '1000 , 2000';
+            it('should return NOT formatted multivalue colKey as array (format_dates_as_other_axis_types is OFF)', () => {
+                lodash.set(document, 'ReportHippo.user.features', []);
+                const initialKeyAlreadyFormatted = ['10/10/2020', '10/10/2021'];
                 const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                    colFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
                     isFormattingAxisLabels: true,
                 };
                 const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual('1000 , 2000');
+                const formattedKey = highchartsRenderer.getFormattedKey(initialKeyAlreadyFormatted, pivotData, type);
+                expect(formattedKey).toEqual(initialKeyAlreadyFormatted);
             });
 
-            it('should return NOT formatted multivalue colKey as array', () => {
-                const initialKey = ['1000', '2000'];
+            it('should return NOT formatted multivalue rowKey as array (format_dates_as_other_axis_types is OFF)', () => {
+                lodash.set(document, 'ReportHippo.user.features', []);
+                const initialKeyAlreadyFormatted = ['10/10/2020', '10/10/2021'];
                 const pivotData = {
-                    colFormats: [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }],
+                    rowFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
                     isFormattingAxisLabels: true,
                 };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['1000', '2000']);
-            });
-
-            describe('formatting Dates', () => {
-
-                it('should return NOT formatted multivalue colKey as array (even when format_dates_as_other_axis_types is ON)', () => {
-                    lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types']);
-                    const initialKeyAlreadyFormatted = ['10/10/2020', '10/10/2021'];
-                    const pivotData = {
-                        colFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
-                        isFormattingAxisLabels: true,
-                    };
-                    const type = 'colFormats';
-                    const formattedKey = highchartsRenderer.getFormattedKey(initialKeyAlreadyFormatted, pivotData, type);
-                    expect(formattedKey).toEqual(initialKeyAlreadyFormatted);
-                });
-
-                it('should return NOT formatted multivalue rowKey as array (even when format_dates_as_other_axis_types is ON)', () => {
-                    lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types']);
-                    const initialKeyAlreadyFormatted = ['10/10/2020', '10/10/2021'];
-                    const pivotData = {
-                        rowFormats: [{ type: 'Date', format: 'MM/DD/YYYY' }, { type: 'Date', format: 'MMM-yy' }],
-                        isFormattingAxisLabels: true,
-                    };
-                    const type = 'rowFormats';
-                    const formattedKey = highchartsRenderer.getFormattedKey(initialKeyAlreadyFormatted, pivotData, type);
-                    expect(formattedKey).toEqual(initialKeyAlreadyFormatted);
-                });
+                const type = 'rowFormats';
+                const formattedKey = highchartsRenderer.getFormattedKey(initialKeyAlreadyFormatted, pivotData, type);
+                expect(formattedKey).toEqual(initialKeyAlreadyFormatted);
             });
         });
     });
@@ -5157,94 +5041,65 @@ describe('highcharts_renderer', () => {
             spyOn(highchartsRenderer, 'getFormattedKey').and.callThrough();
         });
 
-        describe('getFormattedKeys with FF on', () => {
-
-            beforeEach(() => {
-                lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
-            });
-
-            it('should call getFormattedKey 6 times', () => {
-                pivotData.colFormats = [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }];
-                const isCols = true;
-                highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(highchartsRenderer.getFormattedKey).toHaveBeenCalledTimes(6);
-            });
-    
-            it('should return properly formatted colKeys as arrays [Dataset 1]', () => {
-                pivotData.colFormats = [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }];
-                const isCols = true;
-                const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(formattedKeys).toEqual(
-                    [['$1.0', '₪11.0'], ['$2.0', '₪32.0'], ['[null]', '₪43.0'], ['$5.0', '₪54.0'], ['Others', '₪33.0'], ['$6.0', '₪98.0']]
-                );
-            });
-    
-            it('should return properly formatted colKeys as arrays [Dataset 2]', () => {
-                pivotData.colFormats =  [null, { type: 'Float', format: '₪####.##'}];
-                const isCols = true;
-                const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(formattedKeys).toEqual(
-                    [['1', '₪11.0'], ['2', '₪32.0'], ['[null]', '₪43.0'], ['5', '₪54.0'], ['Others', '₪33.0'], ['6', '₪98.0']]
-                );
-            });
-
-            it('should return properly formatted colKeys as arrays [Dataset 3]', () => {
-                pivotData.colFormats = [{ type: 'Float', format: '$####.##' }, null];
-                const isCols = true;
-                const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(formattedKeys).toEqual(
-                    [['$1.0', '11'], ['$2.0', '32'], ['[null]', '43'], ['$5.0', '54'], ['Others', '33'], ['$6.0', '98']]
-                );
-            });
-
-            it('should return properly formatted rowKeys as arrays [Dataset 1]', () => {
-                pivotData.rowFormats = [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }];
-                const isCols = false;
-                const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(formattedKeys).toEqual(
-                    [['$1.0', '₪11.0'], ['$2.0', '₪32.0'], ['[null]', '₪43.0'], ['$5.0', '₪54.0'], ['Others', '₪33.0'], ['$6.0', '₪98.0']]
-                );
-            });
-    
-            it('should return properly formatted rowKeys as arrays [Dataset 2]', () => {
-                pivotData.rowFormats =  [null, { type: 'Float', format: '₪####.##' }];
-                const isCols = false;
-                const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(formattedKeys).toEqual(
-                    [['1', '₪11.0'], ['2', '₪32.0'], ['[null]', '₪43.0'], ['5', '₪54.0'], ['Others', '₪33.0'], ['6', '₪98.0']]
-                );
-            });
+        it('should call getFormattedKey 6 times', () => {
+            pivotData.colFormats = [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }];
+            const isCols = true;
+            highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
+            expect(highchartsRenderer.getFormattedKey).toHaveBeenCalledTimes(6);
+        });
 
-            it('should return properly formatted rowKeys as arrays [Dataset 3]', () => {
-                pivotData.rowFormats = [{ type: 'Float', format: '$####.##' }, null];
-                const isCols = false;
-                const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(formattedKeys).toEqual(
-                    [['$1.0', '11'], ['$2.0', '32'], ['[null]', '43'], ['$5.0', '54'], ['Others', '33'], ['$6.0', '98']]
-                );
-            });
+        it('should return properly formatted colKeys as arrays [Dataset 1]', () => {
+            pivotData.colFormats = [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }];
+            const isCols = true;
+            const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
+            expect(formattedKeys).toEqual(
+                [['$1.0', '₪11.0'], ['$2.0', '₪32.0'], ['[null]', '₪43.0'], ['$5.0', '₪54.0'], ['Others', '₪33.0'], ['$6.0', '₪98.0']]
+            );
         });
 
-        describe('getFormattedKey with FF off', () => {
+        it('should return properly formatted colKeys as arrays [Dataset 2]', () => {
+            pivotData.colFormats =  [null, { type: 'Float', format: '₪####.##'}];
+            const isCols = true;
+            const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
+            expect(formattedKeys).toEqual(
+                [['1', '₪11.0'], ['2', '₪32.0'], ['[null]', '₪43.0'], ['5', '₪54.0'], ['Others', '₪33.0'], ['6', '₪98.0']]
+            );
+        });
 
-            pivotData.colFormats = [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }];
+        it('should return properly formatted colKeys as arrays [Dataset 3]', () => {
+            pivotData.colFormats = [{ type: 'Float', format: '$####.##' }, null];
             const isCols = true;
+            const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
+            expect(formattedKeys).toEqual(
+                [['$1.0', '11'], ['$2.0', '32'], ['[null]', '43'], ['$5.0', '54'], ['Others', '33'], ['$6.0', '98']]
+            );
+        });
 
-            beforeEach(() => {
-                lodash.set(document, 'ReportHippo.user.features', []);
-            });
+        it('should return properly formatted rowKeys as arrays [Dataset 1]', () => {
+            pivotData.rowFormats = [{ type: 'Float', format: '$####.##' }, { type: 'Float', format: '₪####.##' }];
+            const isCols = false;
+            const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
+            expect(formattedKeys).toEqual(
+                [['$1.0', '₪11.0'], ['$2.0', '₪32.0'], ['[null]', '₪43.0'], ['$5.0', '₪54.0'], ['Others', '₪33.0'], ['$6.0', '₪98.0']]
+            );
+        });
 
-            it('should not call getFormattedKey', () => {
-                highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(highchartsRenderer.getFormattedKey).not.toHaveBeenCalled();
-            });
+        it('should return properly formatted rowKeys as arrays [Dataset 2]', () => {
+            pivotData.rowFormats =  [null, { type: 'Float', format: '₪####.##' }];
+            const isCols = false;
+            const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
+            expect(formattedKeys).toEqual(
+                [['1', '₪11.0'], ['2', '₪32.0'], ['[null]', '₪43.0'], ['5', '₪54.0'], ['Others', '₪33.0'], ['6', '₪98.0']]
+            );
+        });
 
-            it('should return NOT formatted colKeys', () => {
-                const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
-                expect(formattedKeys).toEqual(
-                    [['1', '11'], ['2', '32'], ['[null]', '43'], ['5', '54'], ['Others', '33'], ['6', '98']]
-                );
-            });
+        it('should return properly formatted rowKeys as arrays [Dataset 3]', () => {
+            pivotData.rowFormats = [{ type: 'Float', format: '$####.##' }, null];
+            const isCols = false;
+            const formattedKeys = highchartsRenderer.getFormattedKeys(pivotData, isCols, null);
+            expect(formattedKeys).toEqual(
+                [['$1.0', '11'], ['$2.0', '32'], ['[null]', '43'], ['$5.0', '54'], ['Others', '33'], ['$6.0', '98']]
+            );
         });
     });
 
@@ -5290,19 +5145,8 @@ describe('highcharts_renderer', () => {
             spyOn(highchartsRenderer, 'getFormattedKeys').and.returnValue(null);
         });
 
-        it('should not modify if FF is off', () => {
-            const e = lodash.cloneDeep(event);
-            lodash.set(document, 'ReportHippo.user.features', []);
-
-            highchartsRenderer.modifyEventPointForDrilldown(e, pivotData);
-            expect(e.point.name).toEqual(event.point.name);
-            expect(e.point.series.name).toEqual(event.point.series.name);
-            expect(e.point.category.userOptions).toEqual(event.point.category.userOptions);
-        });
-
-        it('should modify if FF is on', () => {
+        it('should modify event point for drilldown with formatted value', () => {
             const e = lodash.cloneDeep(event);
-            lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
 
             highchartsRenderer.modifyEventPointForDrilldown(e, pivotData);
             expect(e.point.name).toEqual(event.point.initialName);
@@ -5320,8 +5164,7 @@ describe('highcharts_renderer', () => {
             isFormattingAxisLabels: true,
         };
 
-        it('should return series.userOptions.initialName if it is present and axis formatting is on', () => {
-            lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
+        it('should return series.userOptions.initialName if it is present', () => {
             const context = {
                 series: {
                     userOptions: {
@@ -5333,8 +5176,7 @@ describe('highcharts_renderer', () => {
             expect(highchartsRenderer.getSeriesNameInFormatterContext(context, pivotData)).toEqual(name1);
         });
 
-        it('should return series.name if axis formatting is on but series.userOptions.initialName is not present', () => {
-            lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
+        it('should return series.name if series.userOptions.initialName is not present', () => {
             const context = {
                 series: {
                     name: name2,
@@ -5342,19 +5184,6 @@ describe('highcharts_renderer', () => {
             }
             expect(highchartsRenderer.getSeriesNameInFormatterContext(context, pivotData)).toEqual(name2);
         });
-
-        it('should return series.name if series.userOptions.initialName is present but axis formatting is off', () => {
-            lodash.set(document, 'ReportHippo.user.features', []);
-            const context = {
-                series: {
-                    userOptions: {
-                        initialName: name1,
-                    },
-                    name: name2,
-                }
-            }
-            expect(highchartsRenderer.getSeriesNameInFormatterContext(context, pivotData)).toEqual(name2);
-        });
     });
 
     describe('Function getColsInFormatterContext', () => {
@@ -5377,14 +5206,10 @@ describe('highcharts_renderer', () => {
                 key: name2,
             }
 
-            lodash.forEach(['use_default_table_format_for_axis'], [], features => {
-                lodash.set(document, 'ReportHippo.user.features', features);
-                expect(highchartsRenderer.getColsInFormatterContext(context, pivotData)).toEqual(name3);
-            });
+            expect(highchartsRenderer.getColsInFormatterContext(context, pivotData)).toEqual(name3);
         });
 
-        it('should return point.initialName if it is present and FF is on and colsForTotal is not present', () => {
-            lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
+        it('should return point.initialName if it is present and colsForTotal is not present', () => {
             const context = {
                 point: {
                     initialName: name1,
@@ -5397,22 +5222,7 @@ describe('highcharts_renderer', () => {
             expect(highchartsRenderer.getColsInFormatterContext(context, pivotData)).toEqual(name1);
         });
 
-        it('should return context.key if FF is off and colsForTotal is not present', () => {
-            lodash.set(document, 'ReportHippo.user.features', []);
-            const context = {
-                point: {
-                    initialName: name1,
-                },
-                options: {
-                    initialName: name3,
-                },
-                key: name2,
-            };
-            expect(highchartsRenderer.getColsInFormatterContext(context, pivotData)).toEqual(name2);
-        });
-
-        it('should return options.initialName if FF is on, colsForTotal is not present and point.initialName is not present', () => {
-            lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
+        it('should return options.initialName if colsForTotal is not present and point.initialName is not present', () => {
             const context = {
                 options: {
                     initialName: name3,
@@ -5422,8 +5232,7 @@ describe('highcharts_renderer', () => {
             expect(highchartsRenderer.getColsInFormatterContext(context, pivotData)).toEqual(name3);
         });
 
-        it('should return context.key if FF is on, no colsForTotal a, no point.initialName no options.initialName', () => {
-            lodash.set(document, 'ReportHippo.user.features', ['use_default_table_format_for_axis']);
+        it('should return context.key no colsForTotal no point.initialName no options.initialName', () => {
             const context = {
                 key: name2,
             }