@adaptabletools/adaptable 20.2.0-canary.1 → 20.2.1

package/src/Api/Implementation/SettingsPanelApiImpl.js

@@ -2,16 +2,21 @@ import { ApiBase } from './ApiBase';
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 export class SettingsPanelApiImpl extends ApiBase {
     openSettingsPanel(moduleName) {
+        if (!moduleName) {
+            this.dispatchAction(PopupRedux.PopupShowScreen());
+        }
         const moduleInfo = this.getAdaptableInternalApi()
             .getModuleService()
             .getModuleInfoByModule(moduleName);
         if (!moduleInfo) {
-            this.logError(`${moduleName} module does not exist`);
-            return;
+            this.logWarn(`${moduleName} module does not exist`);
         }
-        this.dispatchAction(PopupRedux.PopupShowScreen(moduleName, moduleInfo.Popup));
+        this.dispatchAction(PopupRedux.PopupShowScreen(moduleName, moduleInfo?.Popup));
     }
     openCustomSettingsPanel(name) {
         this.dispatchAction(PopupRedux.PopupShowScreen(null, name));
     }
+    closeSettingsPanel() {
+        this.dispatchAction(PopupRedux.PopupHideScreen());
+    }
 }

package/src/Api/Implementation/StateApiImpl.d.ts

@@ -40,6 +40,7 @@ export declare class StateApiImpl extends ApiBase implements StateApi {
         flushCurrentState?: boolean;
         progressIndicatorLabel?: string;
     }): Promise<void>;
+    persistAdaptableState(): Promise<AdaptableState>;
     getDescriptionForModule(module: AdaptableModule): string;
     getHelpPageForModule(module: AdaptableModule): string;
     getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): BaseState | string;

package/src/Api/Implementation/StateApiImpl.js

@@ -23,6 +23,7 @@ import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import * as ToolPanelRedux from '../../Redux/ActionsReducers/ToolPanelRedux';
 import { logDeprecation } from '../../Utilities/logDeprecation';
+import { buildAdaptableStateFunctionConfig } from '../../Redux/Store/buildAdaptableStateFunctionConfig';
 export class StateApiImpl extends ApiBase {
     configInit() {
         this.dispatchAction(InitState());
@@ -64,11 +65,7 @@ export class StateApiImpl extends ApiBase {
         this.getAdaptableStore()
             .saveStateNow(this._adaptable)
             .then(() => {
-            const promise = clearStateFn({
-                adaptableId: adaptableOptions.adaptableId,
-                adaptableStateKey: adaptableOptions.adaptableStateKey,
-                userName: adaptableOptions.userName,
-            });
+            const promise = clearStateFn(buildAdaptableStateFunctionConfig(this._adaptable));
             promise.then(() => {
                 this.setAdaptableStateKey(adaptableOptions.adaptableStateKey, {
                     initialState: newInitialState || adaptableOptions.initialState,
@@ -164,6 +161,10 @@ export class StateApiImpl extends ApiBase {
             });
         });
     }
+    async persistAdaptableState() {
+        await this.getAdaptableStore().saveStateNow(this._adaptable);
+        return this.getAdaptableStore().getCurrentStorageState();
+    }
     getDescriptionForModule(module) {
         return this._adaptable.ModuleService.getModuleInfoByModule(module).Description;
     }

package/src/Api/Internal/ColumnInternalApi.d.ts

@@ -33,4 +33,5 @@ export declare class ColumnInternalApi extends ApiBase {
     isSpecialColumn(columnId: string, column?: AdaptableColumn): boolean;
     getColumnHeaderName(params: HeaderValueGetterParams): string;
     private buildColumnHeaderContext;
+    getQueryableColumnsForUIEditor(): AdaptableColumn[];
 }

package/src/Api/Internal/ColumnInternalApi.js

@@ -282,4 +282,9 @@ export class ColumnInternalApi extends ApiBase {
         // if nothing matched, we skip this column[group]
         return 'skip';
     }
+    getQueryableColumnsForUIEditor() {
+        return this.getColumnApi()
+            .getQueryableColumns()
+            .filter((column) => !column.isGeneratedPivotResultColumn && !column.isGeneratedRowGroupColumn);
+    }
 }

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -173,7 +173,7 @@ export class FormatColumnInternalApi extends 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;
@@ -195,13 +195,13 @@ export class FormatColumnInternalApi extends 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)
@@ -233,7 +233,7 @@ export class FormatColumnInternalApi extends ApiBase {
                 return false;
             }
         }
-        if (formatColumn.ColumnGroupState &&
+        if (formatColumn.ColumnGroupScope &&
             !this.formatColumnWithColumnGroupStateShouldRender(formatColumn, column)) {
             return false;
         }

package/src/Api/SettingsPanelApi.d.ts

@@ -13,4 +13,8 @@ export interface SettingsPanelApi {
      * @param name name of Custom Settings Panel to display
      */
     openCustomSettingsPanel(name: string): void;
+    /**
+     * Closes Settings Panel
+     */
+    closeSettingsPanel(): void;
 }

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

@@ -1,6 +1,7 @@
 import debounce from 'lodash/debounce';
 import { MergeStateFunction } from './AdaptableReduxMerger';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
+import { buildAdaptableStateFunctionConfig } from './buildAdaptableStateFunctionConfig';
 const checkStatus = (response) => {
     const error = new Error(response.statusText);
     if (response.status >= 200 && response.status < 300) {
@@ -42,12 +43,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)(buildAdaptableStateFunctionConfig(adaptableInstance)).then((parsedJsonState) => {
             // we need to merge the Initial Adaptable State
             return Promise.resolve(initialState)
                 .then((parsedInitialState) => {
@@ -56,20 +53,19 @@ class AdaptableReduxLocalStorageEngine {
                 .catch((err) => 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 = 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.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

@@ -39,6 +39,7 @@ import * as TeamSharingRedux from '../ActionsReducers/TeamSharingRedux';
 import * as ThemeRedux from '../ActionsReducers/ThemeRedux';
 import * as ToolPanelRedux from '../ActionsReducers/ToolPanelRedux';
 import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../AdaptableState/TeamSharingState';
+import { buildAdaptableStateFunctionConfig } from './buildAdaptableStateFunctionConfig';
 export const INIT_STATE = 'INIT_STATE';
 export const LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -91,10 +92,10 @@ export 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(LoadState(postProcessState(adaptable.adaptableOptions.stateOptions.applyState(storedState))));
+                    this.TheStore.dispatch(LoadState(postProcessState(adaptable.adaptableOptions.stateOptions.applyState(storedState, buildAdaptableStateFunctionConfig(adaptable)))));
                 }
             })
                 .then(() => {
@@ -218,7 +219,11 @@ export 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;
         };
@@ -242,10 +247,13 @@ export 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,9 @@
+export function buildAdaptableStateFunctionConfig(adaptable) {
+    return {
+        adaptableId: adaptable.adaptableOptions.adaptableId,
+        adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
+        userName: adaptable.adaptableOptions.userName,
+        adaptableApi: adaptable.api,
+        adaptableContext: adaptable.api?.optionsApi?.getAdaptableContext(),
+    };
+}

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -291,7 +291,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

@@ -7,6 +7,17 @@ export const 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/ChartingService.js

@@ -6,16 +6,16 @@ export class ChartingService {
     }
     onChartModelChange(models, eventType, params) {
         const allChartDefinitions = this.api.chartingApi.getChartDefinitions();
-        const currentChartModel = models.find((model) => model.chartId === params.chartId);
-        const currentChartDefinition = allChartDefinitions.find((chartDefinition) => chartDefinition.Model.chartId === params.chartId);
+        const currentChartModel = models.find((model) => model?.chartId === params.chartId);
+        const currentChartDefinition = allChartDefinitions.find((chartDefinition) => chartDefinition.Model?.chartId === params.chartId);
         switch (eventType) {
             case 'chartCreated':
                 const createParams = params;
-                if (allChartDefinitions.some((chartDefinition) => chartDefinition.Model.chartId === createParams.chartId)) {
+                if (allChartDefinitions.some((chartDefinition) => chartDefinition.Model?.chartId === createParams.chartId)) {
                     // chart already exists
                 }
                 else {
-                    const chartModel = models.find((model) => model.chartId === createParams.chartId);
+                    const chartModel = models.find((model) => model?.chartId === createParams.chartId);
                     this.saveNewChart(chartModel);
                 }
                 break;

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

@@ -1 +1 @@
-import{LicenseDisablePersistence as e,LicenseShowWatermark as a}from"../../../Redux/ActionsReducers/InternalRedux";import{PopupShowAlert as t}from"../../../Redux/ActionsReducers/PopupRedux";import i from"../../ObjectFactory";import s from"lodash/clamp";import{LicenseDocsLink as o}from"../../Constants/DocumentationLinkConstants";import{decode as n,GENERIC_APP_NAME as r}from"../../license/decode";import{shouldLogThankYouMessage as l}from"./shouldLogThankYouMessage";const c="sales@adaptabletools.com",p=10,d=864e5;export var LicenseValidityType;!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"}(LicenseValidityType||(LicenseValidityType={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===i},I=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===i},_=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===i};export class LicenseService{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=n(this.licenseKey)}catch(a){e=a}E()||I()||_()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return LicenseValidityType.NO_LICENSE;if(e instanceof Error)return LicenseValidityType.INVALID_LICENSE;const t=new Date(a.publishedAt),i=new Date(e.end),s=i<new Date,o=e.trial;let n=null;return n=s?i>t?o?LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE:o?LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?LicenseValidityType.NON_PRODUCTION_VALID:LicenseValidityType.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let i=0;e instanceof Error||!e?.end||(i=Math.floor((e?.end?.getTime()-t.getTime())/d),i=s(i,0,1/0));let n="",h="";!e||e instanceof Error||!e.appName||e.appName==r||(n=e.appName,h=" for application [APP_NAME]");const E=(e,a=o,t=c,s=i,r=n)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",r).replace("[DAYS]",`${s}`);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(i<=p)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{l()&&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(t({alertType:"generic",header:"License Error",message:e,alertDefinition:i.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(e())}destroy(){}}
+import{LicenseDisablePersistence as e,LicenseShowWatermark as a}from"../../../Redux/ActionsReducers/InternalRedux";import{PopupShowAlert as t}from"../../../Redux/ActionsReducers/PopupRedux";import i from"../../ObjectFactory";import s from"lodash/clamp";import{LicenseDocsLink as o}from"../../Constants/DocumentationLinkConstants";import{decode as n,GENERIC_APP_NAME as r}from"../../license/decode";import{shouldLogThankYouMessage as l}from"./shouldLogThankYouMessage";const c="sales@adaptabletools.com",p=10,d=864e5;export var LicenseValidityType;!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"}(LicenseValidityType||(LicenseValidityType={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===i},I=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===i},_=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===i};export class LicenseService{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=n(this.licenseKey)}catch(a){e=a}E()||I()||_()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return LicenseValidityType.NO_LICENSE;if(e instanceof Error)return LicenseValidityType.INVALID_LICENSE;const t=new Date(a.publishedAt),i=new Date(e.end),s=i<new Date,o=e.trial;let n=null;return n=s?i>t?o?LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE:o?LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?LicenseValidityType.NON_PRODUCTION_VALID:LicenseValidityType.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let i=0;e instanceof Error||!e?.end||(i=Math.floor((e?.end?.getTime()-t.getTime())/d),i=s(i,0,1/0));let n="",h="";!e||e instanceof Error||!e.appName||e.appName==r||(n=e.appName,h=" for application [APP_NAME]");const E=(e,a=o,t=c,s=i,r=n)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",r).replace("[DAYS]",`${s}`);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(i<=p)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{l()&&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(t({alertType:"generic",header:"License Error",message:e,alertDefinition:i.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(e())}destroy(){}}

package/src/Utilities/license/decode.js

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

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

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

package/src/View/Charting/useAgChartState.js

@@ -16,7 +16,7 @@ export const useAgChartState = (chartDefinition) => {
     }, [currentChartModels, chartDefinition]);
     const closeAlreadyOpenedChartsInContainer = (element) => {
         const chartModelAlreadyInChartContainer = currentChartModels.find((chartModel) => {
-            const chartRef = adaptable.api.chartingApi.getChartRef(chartModel.chartId);
+            const chartRef = adaptable.api.chartingApi.getChartRef(chartModel?.chartId);
             return chartRef && element.contains(chartRef.chartElement);
         });
         if (chartModelAlreadyInChartContainer) {

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

@@ -147,13 +147,13 @@ export const EntityRulesEditor = (props) => {
                 React.createElement(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.Content, { "data-name": "BooleanExpression", value: 'BooleanExpression' }, (() => {
-                const editor = (React.createElement(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, { 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, null, editor) : editor;
             })())) : null,
             showObservable ? (React.createElement(QueryTab, { showRadio: showRadioButtons, value: "ObservableExpression", type: type, label: "Observable" })) : null,
             showObservable ? (React.createElement(Tabs.Content, { "data-name": "ObservableExpression", value: 'ObservableExpression' },
-                React.createElement(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, { 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.Content, { "data-name": "AggregatedBooleanExpression", value: 'AggregatedBooleanExpression' },
-                React.createElement(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, { 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)));
 };

package/src/View/Components/ExpressionWizard.js

@@ -27,7 +27,7 @@ export class ExpressionWizard extends React.Component {
     render() {
         const initialData = useMemo(() => this.props.api.internalApi.getQueryPreviewData(), []);
         return (React.createElement(React.Fragment, null,
-            React.createElement(ExpressionEditor, { type: 'boolean', module: 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, { type: 'boolean', module: 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(Flex, { flexDirection: "row", padding: 1, marginBottom: 2, marginLeft: 1, alignItems: "center", "data-name": "expression-wizard-save-option" },
                 React.createElement(CheckBox, { marginLeft: 2, disabled: !this.isValidExpression(), marginBottom: 2, checked: this.state.saveToNamedQueries, onChange: (checked) => this.setState({

package/src/View/Components/SharedProps/ModuleViewPopupProps.d.ts

@@ -18,7 +18,7 @@ export interface ModuleParams {
     value?: any;
     primaryKeyValues?: any[];
     maxWidth?: number;
-    source: 'Toolbar' | 'ModuleMenu' | 'ColumnMenu' | 'ContextMenu' | 'ModuleButton' | 'Other';
+    source: 'Toolbar' | 'ModuleMenu' | 'ColumnMenu' | 'ContextMenu' | 'ModuleButton' | 'Other' | 'Api';
     config?: {
         [key: string]: any;
     };

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

@@ -70,5 +70,5 @@ export 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 })))));
 };

package/src/View/GridFilter/GridFilterExpressionEditor.js

@@ -88,7 +88,7 @@ export const GridFilterExpressionEditor = (props) => {
             },
         } },
         React.createElement(Flex, { height: "100%", flexDirection: "column" },
-            React.createElement(ExpressionEditor, { ...expressionEditorProps, type: 'boolean', module: 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, { ...expressionEditorProps, type: 'boolean', module: 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(Flex, { flexDirection: "row", padding: 1, alignItems: "center" },
                 props.onDismiss && (React.createElement(SimpleButton, { margin: 1, variant: "text", "data-name": "action-close", onClick: () => {
                         props.onDismiss();

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

@@ -32,6 +32,6 @@ export 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);
 };

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

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

package/src/View/License/LicenseWatermark.js

@@ -1 +1 @@
-import*as e from"react";import{Logo as t}from"../../components/Logo";import{Flex as r}from"rebass";const o={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)"},n=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};export const LicenseWatermark=i=>{const l=e.useRef(null);return e.useEffect((()=>{const e=setInterval((()=>{l.current?.isConnected||alert("It is not allowed to remove the Adaptable watermark."),n(l.current)||alert("It is not allowed to modify the Adaptable watermark."),l?.current?.style&&(l.current.style.border=o.border,l.current.style.padding=o.padding,l.current.style.fontWeight=`${o.fontWeight}`,l.current.style.margin=o.margin,l.current.style.fontSize=o.fontSize,l.current.style.color=o.color,l.current.style.background=o.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)}),[]),e.createElement(r,{style:o,ref:l},e.createElement(t,{style:{marginRight:10}}),e.createElement("div",null,i.children))};
+import*as e from"react";import{Logo as t}from"../../components/Logo";import{Flex as r}from"rebass";const o={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)"},n=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};export const LicenseWatermark=i=>{const l=e.useRef(null);return e.useEffect(()=>{const e=setInterval(()=>{l.current?.isConnected||alert("It is not allowed to remove the Adaptable watermark."),n(l.current)||alert("It is not allowed to modify the Adaptable watermark."),l?.current?.style&&(l.current.style.border=o.border,l.current.style.padding=o.padding,l.current.style.fontWeight=`${o.fontWeight}`,l.current.style.margin=o.margin,l.current.style.fontSize=o.fontSize,l.current.style.color=o.color,l.current.style.background=o.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)},[]),e.createElement(r,{style:o,ref:l},e.createElement(t,{style:{marginRight:10}}),e.createElement("div",null,i.children))};

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

@@ -26,5 +26,5 @@ export const NamedQueryExpressionWizardSection = (props) => {
     const initialData = useMemo(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(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 }));
 };

package/src/View/QuickSearch/QuickSearchInput.js

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

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -101,6 +101,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private agGridListenerMouseEnter;
     private agGridListenerMouseLeave;
     private listenerGlobalSetRowSelection;
+    private listenerGlobalChartingChanges;
     private listenerCellEditingStarted;
     private listenerFirstDataRendered;
     private listenerPivotChanged;