@adaptabletools/adaptable-cjs 20.2.0 → 20.2.1

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -177,7 +177,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             .filter((predicateDef) => this.getColumnScopeApi().isScopeInScope(scope, predicateDef.columnScope));
     }
     formatColumnWithColumnGroupStateShouldRender(formatColumn, column) {
-        if (!formatColumn.ColumnGroupState) {
+        if (!formatColumn.ColumnGroupScope) {
             return true;
         }
         const agGridApi = this.getAdaptableApi().agGridApi;
@@ -199,13 +199,13 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             columnGroupLeafColumns.length === 1 &&
             columnGroupLeafColumns[0] === agGridColumn;
         if (columnIsTopLevel) {
-            // for top-level columns don't apply formatColumns that have an explicit ColumnGroupState defined
+            // for top-level columns don't apply formatColumns that have an explicit ColumnGroupScope defined
             return false;
         }
-        if (formatColumn.ColumnGroupState === 'Both') {
+        if (formatColumn.ColumnGroupScope === 'Both') {
             return true;
         }
-        return formatColumn.ColumnGroupState === columnGroupState;
+        return formatColumn.ColumnGroupScope === columnGroupState;
     }
     /**
      * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
@@ -237,7 +237,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
                 return false;
             }
         }
-        if (formatColumn.ColumnGroupState &&
+        if (formatColumn.ColumnGroupScope &&
             !this.formatColumnWithColumnGroupStateShouldRender(formatColumn, column)) {
             return false;
         }

package/src/Api/StateApi.d.ts

@@ -210,4 +210,13 @@ export interface StateApi {
      * @param module Module which is Ready
      */
     dispatchStateReadyAction(module: AdaptableModule): void;
+    /**
+     * Persists the current Adaptable State to storage.
+     *
+     * This method first calls StateOption.saveState() to prepare the state
+     * and then StateOptions.persistState() to save it to the configured storage.
+     *
+     * @returns Promise<AdaptableState> - A promise that resolves to the persisted state
+     */
+    persistAdaptableState(): Promise<AdaptableState>;
 }

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+const buildAdaptableStateFunctionConfig_1 = require("./buildAdaptableStateFunctionConfig");
 const checkStatus = (response) => {
     const error = new Error(response.statusText);
     if (response.status >= 200 && response.status < 300) {
@@ -46,12 +47,8 @@ class AdaptableReduxLocalStorageEngine {
     setStateKey(adaptableStateKey) {
         this.adaptableStateKey = adaptableStateKey;
     }
-    load(initialState = this.initialState) {
-        return (this.loadState || loadState)({
-            adaptableId: this.adaptableId,
-            adaptableStateKey: this.adaptableStateKey,
-            userName: this.userName,
-        }).then((parsedJsonState) => {
+    load(adaptableInstance, initialState = this.initialState) {
+        return (this.loadState || loadState)((0, buildAdaptableStateFunctionConfig_1.buildAdaptableStateFunctionConfig)(adaptableInstance)).then((parsedJsonState) => {
             // we need to merge the Initial Adaptable State
             return Promise.resolve(initialState)
                 .then((parsedInitialState) => {
@@ -60,20 +57,19 @@ class AdaptableReduxLocalStorageEngine {
                 .catch((err) => AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
         });
     }
-    save(state, getState) {
-        return this.saveNow(state, getState);
+    save(adaptableInstance, state, actionName) {
+        return this.saveNow(adaptableInstance, state, actionName);
     }
-    saveNow(state, getState) {
-        const config = {
-            adaptableId: this.adaptableId,
-            adaptableStateKey: this.adaptableStateKey,
-            userName: this.userName,
-        };
-        let result = state;
-        if (getState) {
-            result = getState(state, config);
+    saveNow(adaptableInstance, state, actionName) {
+        const config = (0, buildAdaptableStateFunctionConfig_1.buildAdaptableStateFunctionConfig)(adaptableInstance);
+        config.actionName = actionName;
+        config.previousState = adaptableInstance.adaptableStore.getPreviousStorageState() || null;
+        let stateObject = structuredClone(state);
+        const getTransformedState = adaptableInstance.adaptableOptions.stateOptions.saveState;
+        if (getTransformedState) {
+            stateObject = getTransformedState(stateObject, config);
         }
-        const promise = (this.persistState || persistState)(result, config)?.catch(rejectWithMessage);
+        const promise = (this.persistState || persistState)(stateObject, config)?.catch(rejectWithMessage);
         if (!(promise instanceof Promise)) {
             AdaptableLogger_1.AdaptableLogger.consoleWarnBase(`AdaptableId: ${this.adaptableId}`, 'stateOptions.persistState should return a promise, it returned', 'Error', promise);
         }

package/src/Redux/Store/AdaptableStore.d.ts

@@ -26,6 +26,7 @@ export declare class AdaptableStore implements IAdaptableStore {
     private emitter;
     private storageEngine;
     private currentStorageState?;
+    private previousStorageState?;
     private loadStorageInProgress;
     private loadStateOnStartup;
     on: (eventName: string, callback: EmitterCallback) => (() => void);
@@ -39,6 +40,7 @@ export declare class AdaptableStore implements IAdaptableStore {
     constructor(adaptable: IAdaptable);
     destroy(): void;
     getCurrentStorageState(): AdaptableState;
+    getPreviousStorageState(): AdaptableState;
     saveStateNow(adaptable: IAdaptable): Promise<any>;
     loadStore: (config: LoadStoreConfig) => Promise<any>;
 }

package/src/Redux/Store/AdaptableStore.js

@@ -43,6 +43,7 @@ const TeamSharingRedux = tslib_1.__importStar(require("../ActionsReducers/TeamSh
 const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
 const ToolPanelRedux = tslib_1.__importStar(require("../ActionsReducers/ToolPanelRedux"));
 const TeamSharingState_1 = require("../../AdaptableState/TeamSharingState");
+const buildAdaptableStateFunctionConfig_1 = require("./buildAdaptableStateFunctionConfig");
 exports.INIT_STATE = 'INIT_STATE';
 exports.LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -97,10 +98,10 @@ class AdaptableStore {
             // START STATE LOAD
             this.loadStorageInProgress = true;
             return (this.Load = this.storageEngine
-                .load(initialState)
+                .load(adaptable, initialState)
                 .then((storedState) => {
                 if (storedState && this.loadStateOnStartup) {
-                    this.TheStore.dispatch((0, exports.LoadState)(postProcessState(adaptable.adaptableOptions.stateOptions.applyState(storedState))));
+                    this.TheStore.dispatch((0, exports.LoadState)(postProcessState(adaptable.adaptableOptions.stateOptions.applyState(storedState, (0, buildAdaptableStateFunctionConfig_1.buildAdaptableStateFunctionConfig)(adaptable)))));
                 }
             })
                 .then(() => {
@@ -224,7 +225,11 @@ class AdaptableStore {
                     delete storageState[key];
                 });
                 this.currentStorageState = storageState;
-                storageEngine.save(storageState, adaptable.adaptableOptions.stateOptions.saveState);
+                this.previousStorageState = { ...state };
+                NON_PERSISTENT_STORE_KEYS.forEach((key) => {
+                    delete this.previousStorageState[key];
+                });
+                storageEngine.save(adaptable, storageState, action.type);
             }
             return finalState;
         };
@@ -248,10 +253,13 @@ class AdaptableStore {
     getCurrentStorageState() {
         return this.currentStorageState;
     }
+    getPreviousStorageState() {
+        return this.previousStorageState;
+    }
     saveStateNow(adaptable) {
         const storageState = this.getCurrentStorageState();
         if (storageState) {
-            return this.storageEngine.saveNow(storageState, adaptable.adaptableOptions.stateOptions.saveState);
+            return this.storageEngine.saveNow(adaptable, storageState, 'API_CALL_SAVE_STATE');
         }
         return Promise.resolve(true);
     }

package/src/Redux/Store/Interface/IAdaptableStore.d.ts

@@ -13,6 +13,7 @@ export interface IAdaptableStore {
     Load: Promise<any>;
     loadStore: (config: LoadStoreConfig) => Promise<any>;
     getCurrentStorageState: () => AdaptableState | void;
+    getPreviousStorageState: () => AdaptableState | void;
     saveStateNow: (adaptable: IAdaptable) => Promise<any>;
     on: (eventName: string, callback: (data?: any) => any) => () => void;
     onAny: (callback: (eventName: string, data?: any) => any) => () => void;

package/src/Redux/Store/Interface/IStorageEngine.d.ts

@@ -1,9 +1,9 @@
-import { AdaptableSaveStateFunction } from '../../../AdaptableOptions/StateOptions';
 import { AdaptableState } from '../../../AdaptableState/AdaptableState';
 import { InitialState } from '../../../AdaptableState/InitialState';
+import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
 export default interface IStorageEngine {
-    load(initialState?: string | InitialState): Promise<any>;
-    save(state: AdaptableState, getEnhancedState?: AdaptableSaveStateFunction): Promise<any>;
-    saveNow(state: AdaptableState, getEnhancedState?: AdaptableSaveStateFunction): Promise<any>;
+    load(adaptable: IAdaptable, initialState?: string | InitialState): Promise<any>;
+    save(adaptable: IAdaptable, state: AdaptableState, actionName: string): Promise<any>;
+    saveNow(adaptable: IAdaptable, state: AdaptableState, actionName: string): Promise<any>;
     setStateKey(stateKey: string): void;
 }

package/src/Redux/Store/buildAdaptableStateFunctionConfig.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableStateFunctionConfig } from '../../AdaptableOptions/StateOptions';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+export declare function buildAdaptableStateFunctionConfig(adaptable: IAdaptable): AdaptableStateFunctionConfig;

package/src/Redux/Store/buildAdaptableStateFunctionConfig.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAdaptableStateFunctionConfig = void 0;
+function buildAdaptableStateFunctionConfig(adaptable) {
+    return {
+        adaptableId: adaptable.adaptableOptions.adaptableId,
+        adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
+        userName: adaptable.adaptableOptions.userName,
+        adaptableApi: adaptable.api,
+        adaptableContext: adaptable.api?.optionsApi?.getAdaptableContext(),
+    };
+}
+exports.buildAdaptableStateFunctionConfig = buildAdaptableStateFunctionConfig;

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -295,7 +295,7 @@ const getDataChangedInfoStub = (context) => {
     const rowNode = rowNodeStub;
     if (rowNode) {
         const primaryKeyValue = context.adaptableApi.gridApi.getPrimaryKeyValueForRowNode(rowNode);
-        const columnId = context.adaptableApi.columnApi.getQueryableColumns()[0]?.columnId;
+        const columnId = context.adaptableApi.columnApi.internalApi.getQueryableColumnsForUIEditor()[0]?.columnId;
         const oldValue = context.adaptableApi.gridApi.getCellRawValue(primaryKeyValue, columnId);
         const column = context.adaptableApi.columnApi.getColumnWithColumnId(columnId);
         const newValue = oldValue;

package/src/Utilities/Helpers/StyleHelper.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableStyle } from '../../types';
-export declare const AgGridCellStyleProperties: readonly ["backgroundColor", "color", "fontWeight", "fontStyle", "fontSize", "borderColor"];
+export declare const AgGridCellStyleProperties: readonly ["backgroundColor", "color", "fontWeight", "fontStyle", "fontSize", "borderColor", "--ab-dynamic-background-color", "--ab-dynamic-color", "--ab-dynamic-font-weight", "--ab-dynamic-font-style", "--ab-dynamic-font-size", "--ab-dynamic-text-decoration", "--ab-dynamic-border-radius", "--ab-dynamic-border-color"];
 export declare const normalizeStyleForAgGrid: (style: Record<string, any>) => {
     [x: string]: any;
 };

package/src/Utilities/Helpers/StyleHelper.js

@@ -10,6 +10,17 @@ exports.AgGridCellStyleProperties = [
     'fontStyle',
     'fontSize',
     'borderColor',
+    // needed for quick search
+    // as otherwise, the currentTextMatchStyle is not removed correctly
+    // from the cell when looping through the values, and the cell is no longer the current match
+    '--ab-dynamic-background-color',
+    '--ab-dynamic-color',
+    '--ab-dynamic-font-weight',
+    '--ab-dynamic-font-style',
+    '--ab-dynamic-font-size',
+    '--ab-dynamic-text-decoration',
+    '--ab-dynamic-border-radius',
+    '--ab-dynamic-border-color',
 ];
 // see https://github.com/AdaptableTools/adaptable/issues/2119
 // since v29 AG Grid ignores style properties with null or undefined values

package/src/Utilities/Services/LicenseService/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/InternalRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=e.__importDefault(require("lodash/clamp")),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p||(exports.LicenseValidityType=p={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",(()=>{requestAnimationFrame((()=>{this.adaptable.isDestroyed||this.init()}))}))}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||_()||I()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let s=0;e instanceof Error||!e?.end||(s=Math.floor((e?.end?.getTime()-t.getTime())/d),s=(0,i.default)(s,0,1/0));let p="",h="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(p=e.appName,h=" for application [APP_NAME]");const E=(e,a=o.LicenseDocsLink,t=l,i=s,n=p)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",n).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(s<=c)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseDisablePersistence)())}destroy(){}}exports.LicenseService=O;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/InternalRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=e.__importDefault(require("lodash/clamp")),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p||(exports.LicenseValidityType=p={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",()=>{requestAnimationFrame(()=>{this.adaptable.isDestroyed||this.init()})})}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||_()||I()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let s=0;e instanceof Error||!e?.end||(s=Math.floor((e?.end?.getTime()-t.getTime())/d),s=(0,i.default)(s,0,1/0));let p="",h="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(p=e.appName,h=" for application [APP_NAME]");const E=(e,a=o.LicenseDocsLink,t=l,i=s,n=p)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",n).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(s<=c)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseDisablePersistence)())}destroy(){}}exports.LicenseService=O;

package/src/Utilities/license/decode.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.decode=exports.fieldsToLicenseDetails=exports.GENERIC_APP_NAME=void 0;const e=require("./hashing"),t=()=>new Error("Invalid License");exports.GENERIC_APP_NAME="GenericAdaptableApp";const r=e=>{const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),o={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||exports.GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:r.get("Ref")??""};if(!(o.start&&o.end&&o.owner&&"boolean"==typeof o.trial&&o.ref))throw t();return o};exports.fieldsToLicenseDetails=r;const o=r=>{let o="",s=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(o=r),{name:t,value:r}}));if(!o)throw t();const a=o.split(",").reverse(),n=a.pop();a.forEach(((r,o)=>{const a=s[o];if((0,e.compute_string)(a.value)!==r)throw t()}));const p=[...s];p.pop();const i=p.map((e=>`${e.name}=${e.value}`)).join("|");if((0,e.compute_string)(i)!==n)throw t();return s=s.map((e=>({...e,value:decodeURI(e.value)}))),(0,exports.fieldsToLicenseDetails)(s)};exports.decode=o;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.decode=exports.fieldsToLicenseDetails=exports.GENERIC_APP_NAME=void 0;const e=require("./hashing"),t=()=>new Error("Invalid License");exports.GENERIC_APP_NAME="GenericAdaptableApp";const r=e=>{const r=e.reduce((e,t)=>(e.set(t.name,t.value),e),new Map),o={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||exports.GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:r.get("Ref")??""};if(!(o.start&&o.end&&o.owner&&"boolean"==typeof o.trial&&o.ref))throw t();return o};exports.fieldsToLicenseDetails=r;const o=r=>{let o="",s=r.split("|").map(e=>{let[t,r]=e.split("=");return"C"===t&&(o=r),{name:t,value:r}});if(!o)throw t();const a=o.split(",").reverse(),n=a.pop();a.forEach((r,o)=>{const a=s[o];if((0,e.compute_string)(a.value)!==r)throw t()});const p=[...s];p.pop();const i=p.map(e=>`${e.name}=${e.value}`).join("|");if((0,e.compute_string)(i)!==n)throw t();return s=s.map(e=>({...e,value:decodeURI(e.value)})),(0,exports.fieldsToLicenseDetails)(s)};exports.decode=o;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.js

@@ -58,9 +58,7 @@ const CalculatedColumnExpressionWizardSection = (props) => {
                 return 'quantileAggregatedScalar';
         }
     };
-    const columns = api.columnApi
-        .getQueryableColumns()
-        .filter((c) => !c.isGeneratedPivotResultColumn);
+    const columns = api.columnApi.internalApi.getQueryableColumnsForUIEditor();
     return (React.createElement(Tabs_1.Tabs, { autoFocus: false, height: "100%" },
         React.createElement(Tabs_1.Tabs.Tab, null, (0, StringExtensions_1.Humanize)(props.expressionType)),
         React.createElement(Tabs_1.Tabs.Content, null, (() => {

package/src/View/Components/EntityRulesEditor/index.js

@@ -152,14 +152,14 @@ const EntityRulesEditor = (props) => {
                 React.createElement(EntityRulePredicatesEditor_1.EntityRulePredicatesEditor, { enablePredicateColumnId: props.enablePredicateColumnId, data: data, descriptions: descriptions, predicateDefs: filteredPredicateDefs, getPredicateDefsForColId: props.getPredicateDefsForColId, onChange: props.onChange }))) : null,
             showBoolean ? (React.createElement(QueryTab, { showRadio: showRadioButtons, value: "BooleanExpression", type: type, label: "Boolean" })) : null,
             showBoolean ? (React.createElement(Tabs_1.Tabs.Content, { "data-name": "BooleanExpression", value: 'BooleanExpression' }, (() => {
-                const editor = (React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: module, value: data.Rule?.BooleanExpression, onChange: setBooleanExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api, showQueryBuilder: props.showQueryBuilder }));
+                const editor = (React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: module, value: data.Rule?.BooleanExpression, onChange: setBooleanExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api, showQueryBuilder: props.showQueryBuilder }));
                 return props.showQueryBuilder ? React.createElement(Panel_1.default, null, editor) : editor;
             })())) : null,
             showObservable ? (React.createElement(QueryTab, { showRadio: showRadioButtons, value: "ObservableExpression", type: type, label: "Observable" })) : null,
             showObservable ? (React.createElement(Tabs_1.Tabs.Content, { "data-name": "ObservableExpression", value: 'ObservableExpression' },
-                React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'observable', module: module, value: data.Rule?.ObservableExpression, onChange: setReactiveExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null,
+                React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'observable', module: module, value: data.Rule?.ObservableExpression, onChange: setReactiveExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null,
             showAggregation ? (React.createElement(QueryTab, { showRadio: showRadioButtons, value: "AggregatedBooleanExpression", type: type, label: "Aggregated Boolean" })) : null,
             showAggregation ? (React.createElement(Tabs_1.Tabs.Content, { "data-name": "AggregatedBooleanExpression", value: 'AggregatedBooleanExpression' },
-                React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregatedBoolean', module: module, value: data.Rule?.AggregatedBooleanExpression, onChange: setAggregationExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null)));
+                React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregatedBoolean', module: module, value: data.Rule?.AggregatedBooleanExpression, onChange: setAggregationExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null)));
 };
 exports.EntityRulesEditor = EntityRulesEditor;

package/src/View/Components/ExpressionWizard.js

@@ -31,7 +31,7 @@ class ExpressionWizard extends React.Component {
     render() {
         const initialData = (0, react_1.useMemo)(() => this.props.api.internalApi.getQueryPreviewData(), []);
         return (React.createElement(React.Fragment, null,
-            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: ModuleConstants_1.NamedQueryModuleId, value: this.state.expression, onChange: this.handleCustomExpressionChange, initialData: initialData, columns: this.props.api.columnApi.getQueryableColumns(), fields: this.props.api.expressionApi.internalApi.getAvailableFields(), namedQueries: this.props.api.namedQueryApi.getNamedQueries(), api: this.props.api }),
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: ModuleConstants_1.NamedQueryModuleId, value: this.state.expression, onChange: this.handleCustomExpressionChange, initialData: initialData, columns: this.props.api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: this.props.api.expressionApi.internalApi.getAvailableFields(), namedQueries: this.props.api.namedQueryApi.getNamedQueries(), api: this.props.api }),
             ' ',
             React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 1, marginBottom: 2, marginLeft: 1, alignItems: "center", "data-name": "expression-wizard-save-option" },
                 React.createElement(CheckBox_1.CheckBox, { marginLeft: 2, disabled: !this.isValidExpression(), marginBottom: 2, checked: this.state.saveToNamedQueries, onChange: (checked) => this.setState({

package/src/View/Export/Wizard/ReportRowsWizardSection.js

@@ -76,6 +76,6 @@ const ReportRowsWizardSection = (props) => {
                                 BooleanExpression,
                             },
                         });
-                    }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api })))));
+                    }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api })))));
 };
 exports.ReportRowsWizardSection = ReportRowsWizardSection;

package/src/View/GridFilter/GridFilterExpressionEditor.js

@@ -92,7 +92,7 @@ const GridFilterExpressionEditor = (props) => {
             },
         } },
         React.createElement(rebass_1.Flex, { height: "100%", flexDirection: "column" },
-            React.createElement(ExpressionEditor_1.ExpressionEditor, { ...expressionEditorProps, type: 'boolean', module: ModuleConstants_1.GridFilterModuleId, value: expression, onChange: (expression) => setExpression(expression), initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }),
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { ...expressionEditorProps, type: 'boolean', module: ModuleConstants_1.GridFilterModuleId, value: expression, onChange: (expression) => setExpression(expression), initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }),
             React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 1, alignItems: "center" },
                 props.onDismiss && (React.createElement(SimpleButton_1.default, { margin: 1, variant: "text", "data-name": "action-close", onClick: () => {
                         props.onDismiss();

package/src/View/Layout/Wizard/sections/GridFilterSection.js

@@ -38,7 +38,7 @@ const GridFilterSection = (props) => {
                     Expression: expression,
                 },
             });
-        }, initialData: initialData, columns: api.columnApi.getQueryableColumns().filter((c) => !c.isGeneratedPivotResultColumn), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
+        }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
     return React.createElement("div", null, expressionEditorContent);
 };
 exports.GridFilterSection = GridFilterSection;

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -23,8 +23,8 @@ const RowGroupingSectionSummary = () => {
             React.createElement(Tag_1.Tag, null, "Row Grouping is not available in Tree Grids")));
     }
     return (React.createElement(rebass_1.Box, { display: 'flex', flexDirection: 'row' }, layout.RowGroupedColumns?.length ? (layout.RowGroupedColumns.map((columnId) => {
-        return (React.createElement(rebass_1.Box, { mb: 2, mr: 2 },
-            React.createElement(Tag_1.Tag, { key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))));
+        return (React.createElement(rebass_1.Box, { key: columnId, mb: 2, mr: 2 },
+            React.createElement(Tag_1.Tag, null, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))));
     })) : (React.createElement(Tag_1.Tag, null, "No Row Grouping"))));
 };
 exports.RowGroupingSectionSummary = RowGroupingSectionSummary;

package/src/View/License/LicenseWatermark.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseWatermark=void 0;const e=require("tslib"),t=e.__importStar(require("react")),r=require("../../components/Logo"),o=require("rebass"),n={border:"1px solid var(--ab-color-error)",padding:"5px",fontWeight:600,margin:"5px",fontSize:"14px",alignItems:"center",color:"var(--ab-color-text-on-defaultbackground)",background:"var(--ab-color-defaultbackground)"},i=e=>{const t=[["display","none"],["opacity","0"],["position","absolute"],["position","fixed"],["position","relative"],["visibility","hidden"]];for(const[r,o]of t)if(e.style[r]===o)return!1;return!0},l=e=>{const l=t.useRef(null);return t.useEffect((()=>{const e=setInterval((()=>{l.current?.isConnected||alert("It is not allowed to remove the Adaptable watermark."),i(l.current)||alert("It is not allowed to modify the Adaptable watermark."),l?.current?.style&&(l.current.style.border=n.border,l.current.style.padding=n.padding,l.current.style.fontWeight=`${n.fontWeight}`,l.current.style.margin=n.margin,l.current.style.fontSize=n.fontSize,l.current.style.color=n.color,l.current.style.background=n.background,l.current.style.display="flex",l.current.style.position="static",l.current.style.opacity="1",l.current.style.visibility="visible")}),5e3);return()=>clearTimeout(e)}),[]),t.createElement(o.Flex,{style:n,ref:l},t.createElement(r.Logo,{style:{marginRight:10}}),t.createElement("div",null,e.children))};exports.LicenseWatermark=l;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseWatermark=void 0;const e=require("tslib"),t=e.__importStar(require("react")),r=require("../../components/Logo"),o=require("rebass"),n={border:"1px solid var(--ab-color-error)",padding:"5px",fontWeight:600,margin:"5px",fontSize:"14px",alignItems:"center",color:"var(--ab-color-text-on-defaultbackground)",background:"var(--ab-color-defaultbackground)"},i=e=>{const t=[["display","none"],["opacity","0"],["position","absolute"],["position","fixed"],["position","relative"],["visibility","hidden"]];for(const[r,o]of t)if(e.style[r]===o)return!1;return!0},l=e=>{const l=t.useRef(null);return t.useEffect(()=>{const e=setInterval(()=>{l.current?.isConnected||alert("It is not allowed to remove the Adaptable watermark."),i(l.current)||alert("It is not allowed to modify the Adaptable watermark."),l?.current?.style&&(l.current.style.border=n.border,l.current.style.padding=n.padding,l.current.style.fontWeight=`${n.fontWeight}`,l.current.style.margin=n.margin,l.current.style.fontSize=n.fontSize,l.current.style.color=n.color,l.current.style.background=n.background,l.current.style.display="flex",l.current.style.position="static",l.current.style.opacity="1",l.current.style.visibility="visible")},5e3);return()=>clearTimeout(e)},[]),t.createElement(o.Flex,{style:n,ref:l},t.createElement(r.Logo,{style:{marginRight:10}}),t.createElement("div",null,e.children))};exports.LicenseWatermark=l;

package/src/View/NamedQuery/Wizard/NamedQueryExpressionWizardSection.js

@@ -32,6 +32,6 @@ const NamedQueryExpressionWizardSection = (props) => {
     const initialData = (0, react_1.useMemo)(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(ExpressionEditor_1.ExpressionEditor, { allowSaveNamedQuery: false, showQueryBuilder: true, type: 'boolean', module: moduleInfo.ModuleName, value: data.BooleanExpression, onChange: (BooleanExpression) => {
             props.onChange({ ...data, BooleanExpression });
-        }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
+        }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
 };
 exports.NamedQueryExpressionWizardSection = NamedQueryExpressionWizardSection;

package/src/View/QuickSearch/QuickSearchInput.js

@@ -16,12 +16,13 @@ const QuickSearchInput = (props) => {
     const QuickSearchText = (0, react_redux_1.useSelector)((state) => state.QuickSearch.QuickSearchText);
     const dispatch = (0, react_redux_1.useDispatch)();
     const onRunQuickSearch = react_1.default.useCallback((newQuickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(newQuickSearchText)), []);
+    const isServerSideRowModel = adaptable.api.gridApi.getAgGridRowModelType() === 'serverSide';
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)({
         QuickSearchText,
         onRunQuickSearch,
     });
-    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: (0, join_1.default)('ab-DashboardToolbar__QuickSearch__text', props.className), value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' }, actionTools: react_1.default.createElement(rebass_1.Box, { display: "flex", flexDirection: "row", alignItems: "center", flex: 'none' },
+    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: (0, join_1.default)('ab-DashboardToolbar__QuickSearch__text', props.className), value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' }, actionTools: isServerSideRowModel ? null : (react_1.default.createElement(rebass_1.Box, { display: "flex", flexDirection: "row", alignItems: "center", flex: 'none' },
             react_1.default.createElement(SimpleButton_1.default, { "aria-label": 'Previous Match', icon: "arrow-up", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoPreviousMatch() }),
-            react_1.default.createElement(SimpleButton_1.default, { "aria-label": 'Next Match', icon: "arrow-down", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoNextMatch() })) }));
+            react_1.default.createElement(SimpleButton_1.default, { "aria-label": 'Next Match', icon: "arrow-down", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoNextMatch() }))) }));
 };
 exports.QuickSearchInput = QuickSearchInput;

package/src/agGrid/AdaptableAgGrid.js

@@ -1326,12 +1326,12 @@ You need to define at least one Layout!`);
             this.autoSizeLayoutIfNeeded();
         }));
         /**
-         * Use Case: A format column that has ColumnGroupState needs to be re-evaluated
+         * Use Case: A format column that has ColumnGroupScope needs to be re-evaluated
          * whenever a column group is expanded or collapsed
          */
         this.agGridAdapter.getAgGridApi().addEventListener('columnGroupOpened', (this.listenerColumnGroupOpened = () => {
             if (this.api.formatColumnApi.getActiveFormatColumns().some((fc) => {
-                return fc.ColumnGroupState != null;
+                return fc.ColumnGroupScope != null;
             })) {
                 this.updateColumnModelAndRefreshGrid();
             }

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -36,6 +36,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnValueSetter;
     private setupColumnComparator;
     private setupColumnGetFindText;
+    private getCellSearchText;
     private isCellSearchable;
     private isQuickSearchActive;
     private getEditableCellClass;

package/src/agGrid/AgGridColumnAdapter.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgGridColumnAdapter = exports.getEditorForColumnDataType = void 0;
 const tslib_1 = require("tslib");
+const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
 const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
 const FilterWrapper_1 = require("./FilterWrapper");
 const FloatingFilterWrapper_1 = require("./FloatingFilterWrapper");
@@ -215,15 +216,17 @@ class AgGridColumnAdapter {
             const quickSearchCurrentTextMatchStyle = this.getQuickSearchCurrentTextMatchStyle();
             const textMatchStyle = quickSearchTextMatchStyle
                 ? Object.entries(quickSearchTextMatchStyle).reduce((acc, [key, value]) => {
+                    // needed as AG-Grid vanilla turns all CSS props
+                    // to kebab, while AG Grid React does not
                     // @ts-ignore
-                    acc[`--ab-dynamic-${key}`] = value;
+                    acc[`--ab-dynamic-${(0, kebabCase_1.default)(key)}`] = value;
                     return acc;
                 }, {})
                 : undefined;
             const currentTextMatchStyle = quickSearchCurrentTextMatchStyle
                 ? Object.entries(quickSearchCurrentTextMatchStyle).reduce((acc, [key, value]) => {
                     // @ts-ignore
-                    acc[`--ab-dynamic-${key}`] = value;
+                    acc[`--ab-dynamic-${(0, kebabCase_1.default)(key)}`] = value;
                     return acc;
                 }, {})
                 : undefined;
@@ -690,18 +693,25 @@ class AgGridColumnAdapter {
                 }
                 const getCellSearchText = this.adaptableOptions.quickSearchOptions.getCellSearchText;
                 if (getCellSearchText) {
-                    const quickSearchValue = this.adaptableApi.quickSearchApi.getQuickSearchValue();
-                    const quickSearchContext = {
-                        ...this.adaptableApi.internalApi.buildBaseContext(),
-                        gridCell,
-                        quickSearchValue,
-                    };
-                    return getCellSearchText(quickSearchContext);
+                    return this.getCellSearchText(gridCell);
                 }
                 return userGetFindText?.(params) ?? gridCell.displayValue;
             };
         });
     }
+    getCellSearchText(gridCell) {
+        const getCellSearchText = this.adaptableOptions.quickSearchOptions.getCellSearchText;
+        if (getCellSearchText) {
+            const quickSearchValue = this.adaptableApi.quickSearchApi.getQuickSearchValue();
+            const quickSearchContext = {
+                ...this.adaptableApi.internalApi.buildBaseContext(),
+                gridCell,
+                quickSearchValue,
+            };
+            return getCellSearchText(quickSearchContext);
+        }
+        return gridCell.displayValue;
+    }
     isCellSearchable(gridCell) {
         const isCellSearchableFn = this.adaptableOptions.quickSearchOptions.isCellSearchable;
         if (!gridCell.column) {
@@ -737,6 +747,16 @@ class AgGridColumnAdapter {
         if (!column) {
             return false;
         }
+        const isServerSideRowModel = this.adaptableApi.gridApi.getAgGridRowModelType() === 'serverSide';
+        if (isServerSideRowModel) {
+            const isCaseSensitive = this.adaptableOptions.quickSearchOptions.isQuickSearchCaseSensitive;
+            const cellDisplayValue = String(this.getCellSearchText(gridCell));
+            const displayValue = isCaseSensitive
+                ? cellDisplayValue
+                : cellDisplayValue.toLocaleLowerCase();
+            const searchText = isCaseSensitive ? quickSearchValue : quickSearchValue.toLocaleLowerCase();
+            return displayValue.indexOf(searchText) !== -1;
+        }
         return (this.agGridApi.findGetNumMatches({
             column,
             node: gridCell.rowNode,

package/src/agGrid/AgGridExportAdapter.js

@@ -184,19 +184,19 @@ class AgGridExportAdapter {
             // recreating the standard AG Grid styling for row groups: 'Parent -> Child'
             // additionally the values are formatted
             let rowGroupNode = params.node;
-            const isFooterRow = rowGroupNode.footer;
+            const agColumn = params.column;
             const rowGroupSummary = [
-                this.processRowGroupForExcelExport(rowGroupNode, exportContext) ?? '',
+                this.processRowGroupForExcelExport(rowGroupNode, exportContext, agColumn) ?? '',
             ];
             while (rowGroupNode.parent) {
                 rowGroupNode = rowGroupNode.parent;
-                const formattedParentNode = this.processRowGroupForExcelExport(rowGroupNode, exportContext);
+                const formattedParentNode = this.processRowGroupForExcelExport(rowGroupNode, exportContext, agColumn);
                 if (formattedParentNode) {
                     rowGroupSummary.push(formattedParentNode);
                 }
             }
             let summary = rowGroupSummary.reverse().join(' -> ');
-            if (isFooterRow) {
+            if (agColumn?.getColId() === GeneralConstants_1.AG_GRID_GROUPED_COLUMN && rowGroupNode.footer) {
                 summary = `Total: ${summary}`;
             }
             return summary;
@@ -411,17 +411,29 @@ class AgGridExportAdapter {
         }
         return this.getCellExportValueFromRawValue(rowNode, this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId), columnId, exportContext);
     }
-    processRowGroupForExcelExport(rowNode, exportContext) {
+    processRowGroupForExcelExport(rowNode, exportContext, agColumn) {
         if (this.isTreeDataGrid()) {
             return rowNode.key;
         }
-        const columnId = rowNode.field ??
-            rowNode.rowGroupColumn?.getColId() ??
-            rowNode.rowGroupColumn?.getColDef()?.field;
-        if (!columnId || !rowNode.key) {
+        const getColIdAndRawValue = () => {
+            if (this.adaptableApi.columnApi.isAutoRowGroupColumn(agColumn?.getColId())) {
+                const columnId = rowNode.field ??
+                    rowNode.rowGroupColumn?.getColId() ??
+                    rowNode.rowGroupColumn?.getColDef()?.field;
+                let rawValue = rowNode.key;
+                return { columnId, rawValue };
+            }
+            if (this.adaptableApi.columnApi.isPivotResultColumn(agColumn.getColId())) {
+                const columnId = agColumn.getColId();
+                const rawValue = rowNode.aggData?.[columnId];
+                return { columnId, rawValue };
+            }
+            return {};
+        };
+        let { columnId, rawValue } = getColIdAndRawValue();
+        if (!columnId || rawValue == null) {
             return;
         }
-        let rawValue = rowNode.key;
         const columnDataType = this.adaptableApi.columnApi.getColumnDataTypeForColumnId(columnId);
         if ((columnDataType === 'date' || columnDataType === 'dateString') &&
             typeof rawValue === 'string' &&

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_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: 1749810340250 || Date.now(),
-    VERSION: "20.2.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1750416454142 || Date.now(),
+    VERSION: "20.2.1" || '--current-version--',
 };