@cdmx/wappler_ag_grid 1.5.0 → 1.5.2

package/dmx-ag-grid.js

@@ -368,6 +368,8 @@ dmx.Component('ag-grid', {
     const cnames = this.props.cnames
     const cwidths = this.props.cwidths
     const ctypes = this.props.ctypes
+    let gridInstance = this.get('gridInstance') ? this.get('gridInstance') : null;
+    let pagination_page_size = gridInstance ? gridInstance.paginationGetPageSize() : this.props.pagination_page_size
     const enableRowClickEvent = this.props.row_click_event && !this.props.enable_actions && !this.props.row_checkbox_event;
     const enableRowDoubleClickEvent = this.props.row_double_click_event && !this.props.enable_actions && !this.props.row_checkbox_event;
     const enableCellClickEvent = this.props.row_click_event && (this.props.enable_actions || this.props.row_checkbox_event);
@@ -376,7 +378,6 @@ dmx.Component('ag-grid', {
     let columnDefs = [];
     let groupedColumnDefs = [];
     let exportToCSV = this.props.export_to_csv;
-    let gridInstance = null; 
     let cellRenderer;
     const gridThemeClass = options.dark_mode ? `${options.grid_theme}-dark` : options.grid_theme;
     this.$node.innerHTML = `<div id=${options.id}-grid class="${gridThemeClass}"></div>`;
@@ -1300,7 +1301,7 @@ dmx.Component('ag-grid', {
       suppressRowDeselection: this.props.suppress_row_deselection,
       pagination: this.props.pagination,
       paginationAutoPageSize: this.props.pagination_auto_page_size,
-      paginationPageSize: this.props.pagination_page_size,
+      paginationPageSize: pagination_page_size,
       paginationPageSizeSelector: options.pagination_page_size_selector,
       rowHeight: this.props.row_height,
       headerHeight: this.props.header_height,
@@ -1404,21 +1405,27 @@ dmx.Component('ag-grid', {
           const uniqueValuesToCount = new Set(colObj.unique_values.split(','));
           result[0][col] = 0;
           const uniqueValues = new Set();
+          const totalValues = new Set();
         
           rowData.forEach(function (line) {
             const value = line.data[col];
             if (line.index < rowData.length && value !== undefined && value !== null) {
               const valueString = value.toString();
-              if (options.columns_to_count_nonunique || uniqueValuesToCount.has(valueString)) {
+              if (uniqueValuesToCount.has(valueString)) {
                 result[0][col]++;
+                totalValues.add(valueString);
                 if (!uniqueValues.has(valueString)) {
                   uniqueValues.add(valueString);
                 }
               }
             }
           });
-        
-          result[0][col + '_unique_count'] = uniqueValues.size;
+          if (options.columns_to_count_nonunique) {
+          result[0][col + '_total_count'] = totalValues.size;
+          }
+          else {
+            result[0][col] = uniqueValues.size;
+          }
         });
       }
       api.setGridOption('pinnedBottomRowData', result);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cdmx/wappler_ag_grid",
-    "version": "1.5.0",
+    "version": "1.5.2",
     "type": "module",
     "description": "App Connect module for AG Grid Table Generation.",
     "license": "MIT",