@datarailsshared/dr_renderer 1.5.72 → 1.5.76

package/package.json

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

package/src/highcharts_renderer.js

@@ -4464,30 +4464,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return to_return;
     };
 
-    highchartsRenderer.checkFreezePanesAvaliable = function (pivotView) {
-        if (!pivotView || !pivotView.querySelector) {
-            return;
-        }
-
-        const tableContainer = pivotView.querySelector('.pivot-div');
-        const tableHead = pivotView.querySelector('table.pvtTable thead');
-        const tableHeadChildren = tableHead ? tableHead.children[0] : null;
-        const trChildren = tableHeadChildren ? tableHeadChildren.children : [];
-        let thWidth = 0;
-
-        for (let th of trChildren) {
-            if (th.classList.contains('axis-freeze-pane') || th.classList.contains('horizontal-freeze-pane')) {
-                thWidth += th.offsetWidth;
-            }
-        }
-
-        if (thWidth >= tableContainer.offsetWidth) {
-            tableContainer.dataset.canFreezePanes = 'false';
-        } else if (thWidth < tableContainer.offsetWidth &&  tableContainer.dataset.canFreezePanes) {
-            delete tableContainer.dataset.canFreezePanes;
-        }
-    };
-
     /**
      * Support rhPivotViewV2 version
      */
@@ -5177,19 +5153,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
     };
 
-    highchartsRenderer.setWidgetRawData = function (selectedTemplate) {
-        if (!selectedTemplate.widget_raw_data) {
-            selectedTemplate.widget_raw_data = lodash.map(selectedTemplate.raw_data,
-                function (row) {
-                    var ob = {};
-                    lodash.forEach(selectedTemplate.fields, function (value, key) {
-                        ob[value.name] = row[value.name]; //highchartsRenderer.returnRawDataValue(value.type, row[value.name], value.format)+"";
-                    });
-                    return ob;
-                });
-        }
-    };
-
     highchartsRenderer.updateBackwardCompatibleWidgetOptions = function(options, type) {
         if (lodash.get(options, 'chartOptions.chart.hideLegends', false)) {
             options.chartOptions.legends_position = { value: 'none' };
@@ -10049,8 +10012,23 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             // It is just not counting sum there. So we remove it in order not to show improper values
             if ((calculatedValuesInValsCount > 1 || calculatedValuesInValsCount && widget.vals.length > 1) && !widget.rows.length) {
                 res = lodash.filter(res, record => {
+                    // Check if record is metadata (has col_keys or row_keys)
+                    const isMetadata = typeof record['col_keys'] !== 'undefined' || typeof record['row_keys'] !== 'undefined';
+                    if (isMetadata) {
+                        return false;
+                    }
+
                     const isColsTotal = typeof record['DR_Values'] === 'undefined';
-                    return !isColsTotal;
+                    
+                    if (!isColsTotal) {
+                        return true;
+                    }
+
+                    // If it doesn't have DR_Values, check if it has any value fields
+                    // Records with value fields are valid data, not empty subtotals
+                    return lodash.some(fieldWithDrValuesNames, fieldName => {
+                        return typeof record[fieldName] !== 'undefined' || typeof record['value'] !== 'undefined';
+                    });
                 })
             }
         }

package/tests/highcharts_renderer.test.js

@@ -1501,53 +1501,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function checkFreezePanesAvaliable', () => {
-        let pivotView;
-
-        beforeEach(() => {
-            pivotView = document.createElement('div');
-            pivotView.innerHTML = `
-                <div class="pivot-div">
-                    <table class="pvtTable">
-                        <thead>
-                            <tr>
-                                <th class="axis-freeze-pane" style="width: 100px;"></th>
-                                <th class="horizontal-freeze-pane" style="width: 100px;"></th>
-                                <th style="width: 500px;"></th>
-                            </tr>
-                        </thead>
-                    </table>
-                </div>
-            `;
-        });
-
-        it('should set dataset.canFreezePanes to false when total width of frozen columns exceeds table width', () => {
-            const tableContainer = pivotView.querySelector('.pivot-div');
-            const expectedDataset = { canFreezePanes: 'false' };
-
-            highchartsRenderer.checkFreezePanesAvaliable(pivotView);
-            expect(tableContainer.dataset.canFreezePanes).toEqual(expectedDataset.canFreezePanes);
-        });
-
-        it('should remove dataset.canFreezePanes when total width of frozen columns is less than table width', () => {
-            const tableContainer ={
-                dataset: { canFreezePanes: "false" },
-                offsetWidth: 1000
-            };
-
-            const _pivotView = {
-                querySelector: (p) => p === '.pivot-div' ? tableContainer : null
-            };
-            highchartsRenderer.checkFreezePanesAvaliable(_pivotView);
-
-            expect(tableContainer.dataset.canFreezePanes).toEqual(undefined);
-        });
-
-        it('should not set dataset.canFreezePanes when pivotView or pivotView.querySelector is undefined', () => {
-            expect(highchartsRenderer.checkFreezePanesAvaliable(null)).toEqual(undefined);
-        });
-    });
-
     describe('function getOnlyIncludedOfField', () => {
         it('returns includes array if it exists', () => {
             const fieldObj = {
@@ -1773,56 +1726,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function setWidgetRawData', () => {
-        it('should create widget_raw_data property if it does not exist', () => {
-            const selectedTemplate = {
-                raw_data: [{ name: 'John', age: 30 }, { name: 'Jane', age: 25 }],
-                fields: [{ name: 'name', type: 'string', format: '' }, { name: 'age', type: 'number', format: '' }]
-            };
-
-            highchartsRenderer.setWidgetRawData(selectedTemplate);
-
-            expect(selectedTemplate.widget_raw_data).toBeDefined();
-        });
-
-        it('should map raw_data to widget_raw_data property', () => {
-            const selectedTemplate = {
-                raw_data: [{ name: 'John', age: 30 }, { name: 'Jane', age: 25 }],
-                fields: [{ name: 'name', type: 'string', format: '' }, { name: 'age', type: 'number', format: '' }]
-            };
-
-            highchartsRenderer.setWidgetRawData(selectedTemplate);
-
-            expect(selectedTemplate.widget_raw_data).toEqual([{ name: 'John', age: 30 }, { name: 'Jane', age: 25 }]);
-        });
-
-        it('should return raw_data values formatted based on their type and format', () => {
-            const selectedTemplate = {
-                raw_data: [{ name: 'John', age: 30.5 }, { name: 'Jane', age: 25 }],
-                fields: [{ name: 'name', type: 'string', format: '' }, { name: 'age', type: 'number', format: '0.00' }]
-            };
-
-            highchartsRenderer.setWidgetRawData(selectedTemplate);
-
-            expect(selectedTemplate.widget_raw_data[0].name).toBe('John');
-            expect(selectedTemplate.widget_raw_data[0].age).toBe(30.5);
-            expect(selectedTemplate.widget_raw_data[1].name).toBe('Jane');
-            expect(selectedTemplate.widget_raw_data[1].age).toBe(25);
-        });
-
-        it('shouldn\'t create widget_raw_data if it exists', () => {
-            const selectedTemplate = {
-                widget_raw_data: [{}],
-                raw_data: [{ name: 'John', age: 30 }, { name: 'Jane', age: 25 }],
-                fields: [{ name: 'name', type: 'string', format: '' }, { name: 'age', type: 'number', format: '' }]
-            };
-
-            highchartsRenderer.setWidgetRawData(selectedTemplate);
-
-            expect(selectedTemplate.widget_raw_data.length).toBe(1);
-        });
-    });
-
     describe("function updateBackwardCompatibleWidgetOptions", () => {
         it("should delete chart 'hideLegends' option if exists and true", () => {
             const options = {