@datarailsshared/dr_renderer 1.2.395 → 1.2.397

package/package.json

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

package/src/highcharts_renderer.js

@@ -728,7 +728,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         destroyWhenHiding: true,
         formatter: function () {
             const rowKey = pivotData.rowAttrs.length ? lodash.get(this.point, 'series.name') || "" : "";
-            const colKey = lodash.get(this.point, 'name') || this.x.name[0] || "";
+            const colKey = lodash.get(this.point, 'initialName') || lodash.get(this.point, 'name') || this.x.name[0] || "";
+
             const insight = pivotData.getInsight(colKey, rowKey) || {};
             setTimeout(() => {
                 var aggr = highchartsRenderer.defaultFormatterToTooltip(pivotData, opts);
@@ -1520,10 +1521,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 let totalKey = columnKey;
                 if (lodash.isArray(columnKey)) {
                     key = columnKey[0];
-                    totalKey = totalKey.join(' , ');
+                    totalKey = totalKey.join(highchartsRenderer.delimer);
                 }
+
+                const initialKey = lodash.unescape(key);
+                const formattedKey = highchartsRenderer.getFormattedColKey(initialKey, pivotData);
                 const value = pivotData.colTotals[totalKey] ? pivotData.colTotals[totalKey].value() : 0;
-                totalSeries.data.push({name: lodash.unescape(key), y: value});
+
+                totalSeries.data.push({name: lodash.unescape(formattedKey), initialName: initialKey, y: value});
             });
 
             chart_series.push(totalSeries);
@@ -8927,6 +8932,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                                 value,
                                 highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
                             );
+                        } else if (!isNaN(value)) {
+                            value = +value;
                         }
                         break;
                     case 'Integer':
@@ -9765,11 +9772,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     const isDate = formatInfo.type === 'Date';
                     const isDateFormatting = isDate && highchartsRenderer.isFormattingDatesAsOtherAxisTypes();
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
-                    const isApplyingFormat = !isNaN(valueToFloat) && (isNumberFormatting || isDateFormatting);
-                    if (isApplyingFormat) {
+
+                    if (isNumberFormatting || isDateFormatting) {
                         values[key] = highchartsRenderer.returnRawDataValue(
                             formatInfo.type,
-                            valueToFloat,
+                            !isNaN(valueToFloat) ? valueToFloat : value,
                             formatInfo.format,
                             formatInfo.name,
                             formatInfo.val_not_convert,

package/tests/highcharts_renderer.test.js

@@ -6174,4 +6174,250 @@ describe('highcharts_renderer', () => {
             expect(tooltipHtml).toEqual('row 1: 10.99%');
         });
     });
+
+    describe("Function updateFiltersShowNames", () => {
+
+        it("should receive array or object", () => {
+    
+            const filters = [{
+                    field: 4030578,
+                    name: "Month",
+                    values: [1682812800, 1680220800, "[null]"],
+                    is_excluded: false,
+                    allow_nulls: false,
+                    show_in_graph: true,
+                    type: "Date",
+                    override_global_filter: false,
+                },
+                {
+                    field: 4030223,
+                    name: "AccountCode",
+                    values: null,
+                    is_excluded: false,
+                    allow_nulls: false,
+                    show_in_graph: true,
+                    type: "Text",
+                    override_global_filter: false,
+                },
+            ];
+    
+            highchartsRenderer.updateFiltersShowNames(filters);
+    
+            expect(filters[0].value_to_show).toEqual("04/30/2023, 03/31/2023, [null]");
+            expect(filters[1].value_to_show).toEqual("All");
+        });
+    
+        it("should receive array or object", () => {
+            const filters = [{
+                    field: 934090,
+                    name: "Data Type",
+                    values: ["Activity"],
+                    is_excluded: false,
+                    allow_nulls: false,
+                    show_in_graph: false,
+                    type: "Text",
+                    override_global_filter: false,
+                },
+                {
+                    field: 934093,
+                    name: "Scenario",
+                    values: {
+                        type: "advanced",
+                        val: [{
+                            operator: null,
+                            condition: "equals",
+                            value: "Actuals",
+                        }, ],
+                    },
+                    is_excluded: false,
+                    allow_nulls: false,
+                    show_in_graph: false,
+                    type: "Text",
+                    override_global_filter: false,
+                },
+            ];
+    
+            highchartsRenderer.updateFiltersShowNames(filters);
+    
+            expect(filters[0].value_to_show).toEqual("Activity");
+            expect(filters[1].value_to_show).toEqual("All");
+        });
+    });
+    
+    describe("Function returnRawDataValue", () => {
+        const testCases = [{
+                name: "Date",
+                filter: {
+                    field: 4030578,
+                    name: "Month",
+                    values: [1682812800, 1680220800, "[null]", null, 0, "", 1680220800],
+                    is_excluded: false,
+                    allow_nulls: false,
+                    show_in_graph: true,
+                    type: "Date",
+                    override_global_filter: false,
+                },
+                expectedResults: [
+                    "04/30/2023", "03/31/2023", "[null]", "[null]", "Untagged", "[blank]", "03/31/2023",
+                ],
+            },
+            {
+                name: "Date with VT_Month",
+                filter: {
+                    field: 4030578,
+                    name: "VT_Month",
+                    values: [1682812800, 1680220800, "[null]", null, 0, "", 1680220800],
+                    is_excluded: false,
+                    allow_nulls: false,
+                    show_in_graph: true,
+                    type: "Date",
+                    override_global_filter: false,
+                },
+                expectedResults: [
+                    "Apr 2023", "Mar 2023", "[null]", "[null]", "Untagged", "[blank]", "Mar 2023",
+                ],
+            },
+            {
+                name: "Number",
+                filter: {
+                    field: 4030578,
+                    name: "Month",
+                    values: [100, 200, "[null]", null, "Text", 0],
+                    is_excluded: false,
+                    allow_nulls: false,
+                    show_in_graph: true,
+                    type: "Number",
+                    override_global_filter: false,
+                },
+                expectedResults: [100, 200, "[null]", "[null]", "Text", 0],
+            },
+        ];
+    
+        testCases.forEach((testCase) => {
+            describe(`Scenario: ${testCase.name}`, () => {
+                testCase.filter.values.forEach((value, index) => {
+                    it(`should return the expected result with value ${value}`, () => {
+                        const result = highchartsRenderer.returnRawDataValue(testCase.filter.type, value, testCase.filter.format, testCase.filter.name);
+                        expect(result).toEqual(testCase.expectedResults[index]);
+                    });
+                });
+            });
+        });
+    });
+    
+    describe("Function check_values_not_for_convert", () => {
+        const testCases = [{
+                name: "should return a array when field is series row name equal to field name",
+                currentgraph: {
+                    rows: [{
+                        name: "Month",
+                    }, ],
+                    cols: [{
+                        name: "Grouping",
+                    }, ],
+                    options: {
+                        chartOptions: {
+                            delta_column: {
+                                field: "series",
+                                name: "Month",
+                            },
+                        },
+                    },
+                },
+                field_name: "Month",
+                expected: ["Month"],
+            },
+            {
+                name: "should return an empty array when field is category and col name does not equal to field name",
+                currentgraph: {
+                    rows: [{
+                        name: "Month",
+                    }, ],
+                    cols: [{
+                        name: "Grouping",
+                    }, ],
+                    options: {
+                        chartOptions: {
+                            delta_column: {
+                                field: "category",
+                                name: "Month",
+                            },
+                        },
+                    },
+                },
+                field_name: "Month",
+                expected: [],
+            },
+            {
+                name: "should return an empty array when field is category and col name does not equal to field name",
+                currentgraph: {
+                    rows: [{
+                        name: "Grouping",
+                    }, ],
+                    cols: [{
+                        name: "Month",
+                    }, ],
+                    options: {
+                        chartOptions: {
+                            delta_column: {
+                                field: "category",
+                                name: "Month",
+                            },
+                        },
+                    },
+                },
+                field_name: "Month",
+                expected: ["Month"],
+            },
+            {
+                name: 'should return an array with keys with trend "total" from walkthrough_options.values.walkthrough',
+                currentgraph: {
+                    chart_type: "waterfall-chart-walkthrough",
+                    options: {
+                        walkthrough_options: {
+                            values: {
+                                walkthrough: [{
+                                        trend: "total",
+                                        key: ["Total"]
+                                    },
+                                    {
+                                        trend: "other",
+                                        key: ["Value2"]
+                                    },
+                                ],
+                            },
+                        },
+                    },
+                },
+                field_name: "SampleName",
+                expected: ["Total"],
+            },
+            {
+                name: "should return an empty array when no conditions are met",
+                currentgraph: {
+                    options: {
+                        chartOptions: {}
+                    },
+                    chart_type: "column-chart",
+                },
+                field_name: "Month",
+                expected: [],
+            },
+        ];
+    
+        testCases.forEach(({
+            name,
+            currentgraph,
+            field_name,
+            expected
+        }) => {
+            it(name, () => {
+                const result = highchartsRenderer.check_values_not_for_convert(
+                    currentgraph,
+                    field_name
+                );
+                expect(result).toEqual(expected);
+            });
+        });
+    });
 });