@adaptabletools/adaptable-cjs 18.0.14 → 18.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "18.0.14",
+  "version": "18.0.16",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -255,6 +255,7 @@ export interface IAdaptable {
     getAgGridContainerElement(): HTMLElement | null;
     updateColumnModelAndRefreshGrid(config?: {
         skipColDefsRefresh?: boolean;
+        preemptiveColumnStateRefresh?: boolean;
     }): void;
     getAgGridColumnForColumnId(columnId: string): Column;
     getMinMaxCachedValueForColumn(column: AdaptableColumn, minMax: 'min' | 'max'): number | undefined;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -138,7 +138,9 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                     });
                     promise
                         .then(() => {
-                        this.adaptable.updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
+                        this.adaptable.updateColumnModelAndRefreshGrid({
+                            preemptiveColumnStateRefresh: true,
+                        });
                         this.adaptable.setLayout();
                     })
                         .then(() => {

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -196,6 +196,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
     updateColumnModelAndRefreshGrid(config?: {
         skipColDefsRefresh?: boolean;
+        preemptiveColumnStateRefresh?: boolean;
     }): void;
     redrawBody(): void;
     refreshHeader(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -1800,12 +1800,6 @@ class AdaptableAgGrid {
         if (result == undefined && rowNode.data) {
             result = rowNode.data[this.adaptableOptions.primaryKey];
         }
-        if (result == undefined && rowNode.id != undefined) {
-            // this is reached when called for group rows,
-            // which don't have a rowNode.data object
-            // but do have an id property
-            result = rowNode.id;
-        }
         return result;
     }
     getRawValueFromRowNode(rowNode, columnId) {
@@ -1883,6 +1877,9 @@ class AdaptableAgGrid {
         return rawValue;
     }
     updateColumnModelAndRefreshGrid(config) {
+        if (config === null || config === void 0 ? void 0 : config.preemptiveColumnStateRefresh) {
+            this.deriveAdaptableColumnStateFromAgGrid();
+        }
         if (!(config === null || config === void 0 ? void 0 : config.skipColDefsRefresh)) {
             this.refreshColDefs();
         }
@@ -3163,8 +3160,13 @@ class AdaptableAgGrid {
         return this.ReportService.getCellExportValueFromRawValue(rowNode, rawValue, columnId);
     }
     processCellForExcelExport(rowNode, columnId) {
+        var _a;
         if (this.api.exportApi.internalApi.isVisualDataExportInProgress()) {
-            const cellKey = this.agGridColumnAdapter.getExcelClassNameForCell(columnId, this.getPrimaryKeyValueFromRowNode(rowNode));
+            const cellKey = this.agGridColumnAdapter.getExcelClassNameForCell(columnId, (_a = this.getPrimaryKeyValueFromRowNode(rowNode)) !== null && _a !== void 0 ? _a : rowNode.id
+            // when getPrimaryKeyValueFromRowNode is called for group rows,
+            // which don't have a rowNode.data object, the result is undefined
+            // but we do have an id property on the rowNode object, so we'll use that
+            );
             const isoFormattedDate = this.ReportService.getExcelStyleWithFormattedDate(cellKey);
             if (isoFormattedDate) {
                 // this is a Date cell which will be formatted by Excel
@@ -3725,6 +3727,7 @@ class AdaptableAgGrid {
      */
     updateLayoutFromGrid() {
         var _a, _b;
+        this.logger.info('updateLayoutFromGrid()');
         const agGridApi = this.agGridAdapter.getAgGridApi();
         const columnState = agGridApi.getColumnState();
         const expandedState = agGridApi.getState().rowGroupExpansion || { expandedRowGroupIds: [] };

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1716905716519 || Date.now(),
-    VERSION: "18.0.14" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1716977367968 || Date.now(),
+    VERSION: "18.0.16" || '--current-version--',
 };