@datarailsshared/dr_renderer 1.5.90 → 1.5.100

package/package.json

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

package/src/highcharts_renderer.js

@@ -544,30 +544,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return chart_option;
     }
 
-    /**
-     * @deprecated For new angular just use hcInstance
-     */
-    highchartsRenderer.downloadFile = function (title, graph_id, type) {
-        let chart = null;
-
-        const chartElement = $('#' + graph_id).find('div.chart');
-        if (chartElement.highcharts) {
-            // old angular
-            chart = chartElement.highcharts();
-        }
-
-        if (!chart) return;
-
-        if (type === 'png') {
-            chart.exportChartLocal({
-                filename: title
-            });
-        }
-        if (type === 'XLS') {
-            chart.downloadXLS();
-        }
-    };
-
     //TODO No totals formatts
     highchartsRenderer.defaultValueLabelsFormatter = function (pivotData, opts, forcePercentage = false) {
         const deltaColumn = lodash.get(opts, 'chartOptions.delta_column', null);
@@ -9536,7 +9512,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 lodash.forEach(values, (value, key) => {
                     const formatInfo = pivotData[type][key] || {};
                     const valueToFloat = parseFloat(value);
-                    const isDate = formatInfo.type === 'Date' && (moment_lib(valueToFloat).isValid() || moment_lib(value).isValid());
+                    const isDate = formatInfo.type === 'Date' && (moment_lib(valueToFloat).isValid() || moment_lib(value, formatInfo.format).isValid());
                     const isDateFormatting = isDate && highchartsRenderer.isFormattingDatesAsOtherAxisTypes();
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
 

package/tests/highcharts_renderer.test.js

@@ -338,12 +338,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function downloadFile', () => {
-        it('Old angular. No chart', () => {
-            expect(highchartsRenderer.downloadFile('test', '2_2', 'png')).toEqual(undefined)
-        });
-    });
-
     describe('function defaultValueLabelsFormatter', () => {
         let funcContext;
 
@@ -5160,6 +5154,17 @@ describe('highcharts_renderer', () => {
                 const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
                 expect(formattedKey).toEqual(initialKey);
             });
+
+            it('should return formatted value when type is Date and value is a valid moment date (with valid format)', () => {
+                const initialKey = ['Q4-20'];
+                const pivotData = {
+                    colFormats: [{ format: "[Q]Q-YY", name: "Date", type: "Date" }],
+                    isFormattingAxisLabels: true,
+                };
+                const type = 'colFormats';
+                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+                expect(formattedKey).toEqual(initialKey);
+            });
         });
     });
 
@@ -9395,5 +9400,4 @@ describe('highcharts_renderer', () => {
             expect(result).toEqual({ activeDataLabelStyle: { color: mockColor } });
         });
     });
-
 });