@adaptabletools/adaptable 19.2.3 → 20.0.0-canary.0

package/src/Utilities/Services/ChartingService.js

@@ -1,4 +1,4 @@
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import ObjectFactory from '../ObjectFactory';
 export class ChartingService {
     constructor(api) {
@@ -25,11 +25,14 @@ export class ChartingService {
                     // editing a non-saved chart
                     break;
                 }
-                const updatedChartDefinition = Object.assign(Object.assign({}, currentChartDefinition), { Model: currentChartModel });
+                const updatedChartDefinition = {
+                    ...currentChartDefinition,
+                    Model: currentChartModel,
+                };
                 this.api.chartingApi.editChartDefinition(updatedChartDefinition);
                 break;
         }
-        this.api.internalApi.dispatchReduxAction(SystemRedux.SystemChartingSetCurrentChartModels(models));
+        this.api.internalApi.dispatchReduxAction(InternalRedux.ChartingSetCurrentChartModels(models));
         this.emitAdaptableChartDefinitonChange();
     }
     /**
@@ -41,13 +44,15 @@ export class ChartingService {
      */
     emitAdaptableChartDefinitonChange() {
         const chartingOpenState = this.api.chartingApi.getChartingOpenState();
-        const chartChangedInfo = Object.assign({ chartingOpenState: chartingOpenState }, this.api.internalApi.buildBaseContext());
+        const chartChangedInfo = {
+            chartingOpenState: chartingOpenState,
+            ...this.api.internalApi.buildBaseContext(),
+        };
         this.api.eventApi.emit('ChartChanged', chartChangedInfo);
     }
     saveNewChart(chartModel) {
-        var _a, _b;
-        const chartingOptions = (_a = this.api.optionsApi.getChartingOptions()) !== null && _a !== void 0 ? _a : {};
-        const saveStragegy = (_b = chartingOptions.saveChartBehaviour) !== null && _b !== void 0 ? _b : 'manual';
+        const chartingOptions = this.api.optionsApi.getChartingOptions() ?? {};
+        const saveStragegy = chartingOptions.saveChartBehaviour ?? 'manual';
         if (saveStragegy === 'none') {
             return;
         }
@@ -56,14 +61,18 @@ export class ChartingService {
                 alertType: 'generic',
                 header: 'Save chart',
                 message: 'Do you want to save this Chart?',
-                alertDefinition: Object.assign(Object.assign({}, ObjectFactory.CreateEmptyAlertDefinition()), { MessageType: 'Info', AlertProperties: {
+                alertDefinition: {
+                    ...ObjectFactory.CreateEmptyAlertDefinition(),
+                    MessageType: 'Info',
+                    AlertProperties: {
                         DisplayNotification: true,
                         NotificationDuration: 'always',
-                    }, AlertForm: {
+                    },
+                    AlertForm: {
                         Buttons: [
                             {
                                 Label: 'Save',
-                                Action: (context) => {
+                                Command: (context) => {
                                     const chartName = context.formData.name || chartModel.chartId;
                                     this.api.chartingApi.addChartDefinition(ObjectFactory.CreateEmptyChartDefinition({
                                         Name: chartName,
@@ -90,9 +99,10 @@ export class ChartingService {
                                 fieldType: 'text',
                             },
                         ],
-                    } }),
+                    },
+                },
             };
-            this.api.alertApi.showAdaptableAlert(alert);
+            this.api.alertApi.displayAdaptableAlert(alert);
         }
         else if (saveStragegy === 'auto') {
             this.api.chartingApi.addChartDefinition(ObjectFactory.CreateEmptyChartDefinition({

package/src/Utilities/Services/DataService.d.ts

@@ -3,22 +3,22 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { EmitterCallback } from '../../Utilities/Emitter';
 import { Observable } from 'rxjs';
-import { GridDataChangedInfo } from '../../types';
+import { RowDataChangedInfo } from '../../types';
 export declare class DataService implements IDataService {
     private adaptable;
     private emitter;
-    private dataChangeLogSubject$;
-    dataChangeLog$: Observable<CellDataChangedInfo>;
-    private gridChangeLogSubject$;
-    gridChangeLog$: Observable<GridDataChangedInfo>;
+    private cellDataChangeLogSubject$;
+    cellDataChangeLog$: Observable<CellDataChangedInfo>;
+    private rowDataChangeLogSubject$;
+    rowDataChangeLog$: Observable<RowDataChangedInfo>;
     private undoChangeLog;
     private undoChangeTimers;
     constructor(adaptable: IAdaptable);
     destroy(): void;
     on: (eventName: string, callback: EmitterCallback) => (() => void);
     emit: (eventName: string, data?: any) => Promise<any>;
-    CreateDataChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
-    CreateGridChangedEvent(gridDataChangedInfo: GridDataChangedInfo): void;
+    CreateCellDataChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
+    CreateRowDataChangedEvent(rowDataChangedInfo: RowDataChangedInfo): void;
     logUndoChange(change: CellDataChangedInfo): void;
     extractUndoChange(change: CellDataChangedInfo): CellDataChangedInfo | undefined;
     private getUndoChangeKey;

package/src/Utilities/Services/DataService.js

@@ -10,37 +10,39 @@ export class DataService {
         this.emit = (eventName, data) => this.emitter.emit(eventName, data);
         this.adaptable = adaptable;
         this.emitter = new Emitter();
-        this.dataChangeLogSubject$ = new Subject();
-        this.dataChangeLog$ = this.dataChangeLogSubject$.asObservable();
-        this.gridChangeLogSubject$ = new Subject();
-        this.gridChangeLog$ = this.gridChangeLogSubject$.asObservable();
+        this.cellDataChangeLogSubject$ = new Subject();
+        this.cellDataChangeLog$ = this.cellDataChangeLogSubject$.asObservable();
+        this.rowDataChangeLogSubject$ = new Subject();
+        this.rowDataChangeLog$ = this.rowDataChangeLogSubject$.asObservable();
         this.undoChangeLog = new Map();
         this.undoChangeTimers = new Map();
     }
     destroy() {
         this.emitter.destroy();
         this.emitter = null;
-        this.dataChangeLogSubject$.complete();
-        this.dataChangeLogSubject$ = null;
-        this.dataChangeLog$ = null;
-        this.gridChangeLogSubject$.complete();
-        this.gridChangeLogSubject$ = null;
-        this.gridChangeLog$ = null;
+        this.cellDataChangeLogSubject$.complete();
+        this.cellDataChangeLogSubject$ = null;
+        this.cellDataChangeLog$ = null;
+        this.rowDataChangeLogSubject$.complete();
+        this.rowDataChangeLogSubject$ = null;
+        this.rowDataChangeLog$ = null;
         this.undoChangeLog.clear();
         this.undoChangeLog = null;
         this.undoChangeTimers.clear();
         this.undoChangeTimers = null;
     }
-    CreateDataChangedEvent(cellDataChangedInfo) {
+    CreateCellDataChangedEvent(cellDataChangedInfo) {
         if (cellDataChangedInfo.newValue != cellDataChangedInfo.oldValue) {
             this.emitter.emitSync('CellDataChanged', cellDataChangedInfo);
-            this.adaptable.api.gridApi.internalApi.fireCellChangedEvent(cellDataChangedInfo);
+            this.adaptable.api.eventApi.internalApi.fireCellChangedEvent(cellDataChangedInfo);
             const dataChangeLogEntry = this.extractDataChangeLogEntry(cellDataChangedInfo);
-            this.dataChangeLogSubject$.next(dataChangeLogEntry);
+            this.cellDataChangeLogSubject$.next(dataChangeLogEntry);
         }
     }
-    CreateGridChangedEvent(gridDataChangedInfo) {
-        this.gridChangeLogSubject$.next(gridDataChangedInfo);
+    CreateRowDataChangedEvent(rowDataChangedInfo) {
+        this.emitter.emitSync('RowDataChanged', rowDataChangedInfo);
+        this.adaptable.api.eventApi.internalApi.fireRowChangedEvent(rowDataChangedInfo);
+        this.rowDataChangeLogSubject$.next(rowDataChangedInfo);
     }
     // we need this temporary "shared memory" because the value change and the AG Grid cellChanged event are asynchronous
     // in the first phase we keep the undone change
@@ -62,7 +64,7 @@ export class DataService {
     // in the second phase, when AG-Grid triggers the cellChange event, we check if it corresponds to an undone change
     extractUndoChange(change) {
         const { primaryKeyValue, column, oldValue, newValue } = change;
-        // this is post-undo, so we have to swap the new& old values
+        // this is post-undo, so we have to swap the new & old values
         const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, column.columnId, newValue, oldValue);
         const result = this.undoChangeLog.get(undoChangeKey);
         this.undoChangeLog.delete(undoChangeKey);
@@ -87,7 +89,10 @@ export class DataService {
             : null;
         // strip down rowNode properties as it is pretty "heavy" on the memory
         const rowNode = rowData ? { data: rowData } : null;
-        return Object.assign(Object.assign({}, cellDataChangedInfo), { rowNode,
-            rowData });
+        return {
+            ...cellDataChangedInfo,
+            rowNode,
+            rowData,
+        };
     }
 }

package/src/Utilities/Services/Fdc3Service.js

@@ -2,52 +2,69 @@ import { ContextConfiguration } from '../../PredefinedConfig/Common/Fdc3Context'
 import { Fdc3IntentConfiguration } from '../../PredefinedConfig/Common/Fdc3Intent';
 export class Fdc3Service {
     constructor(adaptableApi) {
-        var _a, _b, _c, _d, _e, _f;
         this.adaptableApi = adaptableApi;
         this.contextHandlerSubscriptions = [];
         this.intentHandlerSubscriptions = [];
         this.loggedAgentError = false;
         // 1. Subscribe to FDC3 events
-        const adaptableHandleIntentFn = (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.handleIntent;
-        const listenForIntents = (_c = (_b = this.getFdc3Options().intents) === null || _b === void 0 ? void 0 : _b.listensFor) !== null && _c !== void 0 ? _c : [];
+        const adaptableHandleIntentFn = this.getFdc3Options().intents?.handleIntent;
+        const listenForIntents = this.getFdc3Options().intents?.listensFor ?? [];
         if (listenForIntents.length) {
             if (!adaptableHandleIntentFn) {
                 this.adaptableApi.logError(`Following FDC3 Intent Listener(s) have been provided but no 'handleIntent' function has been supplied in the FDC3 Options`, listenForIntents);
             }
             listenForIntents.forEach((intent) => {
-                var _a;
                 this.adaptableApi.logInfo(`Listening for FDC3 Intent: ${intent}`);
-                (_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.addIntentListener(intent, (context, metadata) => {
+                this.getDesktopAgent()
+                    ?.addIntentListener(intent, (context, metadata) => {
                     this.logFdc3Event('IN', `Intent`, JSON.stringify(context));
-                    const fnContext = Object.assign(Object.assign({}, this.adaptableApi.internalApi.buildBaseContext()), { context,
+                    const fnContext = {
+                        ...this.adaptableApi.internalApi.buildBaseContext(),
+                        context,
+                        intent,
+                        metadata,
+                    };
+                    adaptableHandleIntentFn?.(fnContext);
+                    const payload = {
+                        ...this.adaptableApi.internalApi.buildBaseContext(),
+                        direction: 'received',
+                        eventType: 'IntentRaised',
                         intent,
-                        metadata });
-                    adaptableHandleIntentFn === null || adaptableHandleIntentFn === void 0 ? void 0 : adaptableHandleIntentFn(fnContext);
-                    const payload = Object.assign(Object.assign({}, this.adaptableApi.internalApi.buildBaseContext()), { direction: 'received', eventType: 'IntentRaised', intent,
                         context,
-                        metadata });
+                        metadata,
+                    };
                     this.adaptableApi.eventApi.emit('Fdc3Message', payload);
-                }).then((listener) => this.intentHandlerSubscriptions.push(listener));
+                })
+                    .then((listener) => this.intentHandlerSubscriptions.push(listener));
             });
         }
-        const adaptableHandleContextFn = (_d = this.getFdc3Options().contexts) === null || _d === void 0 ? void 0 : _d.handleContext;
-        const listenForContexts = (_f = (_e = this.getFdc3Options().contexts) === null || _e === void 0 ? void 0 : _e.listensFor) !== null && _f !== void 0 ? _f : [];
+        const adaptableHandleContextFn = this.getFdc3Options().contexts?.handleContext;
+        const listenForContexts = this.getFdc3Options().contexts?.listensFor ?? [];
         if (listenForContexts.length) {
             if (!adaptableHandleContextFn) {
                 this.adaptableApi.logError(`Following FDC3 Context Listener(s) have been provided but no 'handleContext' function has been supplied in the FDC3 Options`, listenForContexts);
             }
             listenForContexts.forEach((contextType) => {
-                var _a;
                 this.adaptableApi.logInfo(`Listening for FDC3 Context: ${contextType}`);
-                (_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.addContextListener(contextType, (context, metadata) => {
+                this.getDesktopAgent()
+                    ?.addContextListener(contextType, (context, metadata) => {
                     this.logFdc3Event('IN', `Context`, JSON.stringify(context));
-                    const fnContext = Object.assign(Object.assign({}, this.adaptableApi.internalApi.buildBaseContext()), { context,
-                        metadata });
-                    adaptableHandleContextFn === null || adaptableHandleContextFn === void 0 ? void 0 : adaptableHandleContextFn(fnContext);
-                    const payload = Object.assign(Object.assign({}, this.adaptableApi.internalApi.buildBaseContext()), { direction: 'received', eventType: 'ContextBroadcast', context,
-                        metadata });
+                    const fnContext = {
+                        ...this.adaptableApi.internalApi.buildBaseContext(),
+                        context,
+                        metadata,
+                    };
+                    adaptableHandleContextFn?.(fnContext);
+                    const payload = {
+                        ...this.adaptableApi.internalApi.buildBaseContext(),
+                        direction: 'received',
+                        eventType: 'ContextBroadcast',
+                        context,
+                        metadata,
+                    };
                     this.adaptableApi.eventApi.emit('Fdc3Message', payload);
-                }).then((listener) => this.contextHandlerSubscriptions.push(listener));
+                })
+                    .then((listener) => this.contextHandlerSubscriptions.push(listener));
             });
         }
         // 2. Init UI Controls default configuration
@@ -73,9 +90,14 @@ export class Fdc3Service {
         }
         try {
             this.logFdc3Event('OUT', `raise ${intent}`, JSON.stringify(context));
-            const payload = Object.assign(Object.assign({}, this.adaptableApi.internalApi.buildBaseContext()), { direction: 'sent', eventType: 'RaiseIntent', intent,
+            const payload = {
+                ...this.adaptableApi.internalApi.buildBaseContext(),
+                direction: 'sent',
+                eventType: 'RaiseIntent',
+                intent,
                 context,
-                app });
+                app,
+            };
             this.adaptableApi.eventApi.emit('Fdc3Message', payload);
             const intentResolution = await this.getDesktopAgent().raiseIntent(intent, context, app);
             this.logFdc3Event('IN', `IntentResolution`, intentResolution.intent);
@@ -92,8 +114,13 @@ export class Fdc3Service {
         }
         try {
             this.logFdc3Event('OUT', `raise for context`, JSON.stringify(context));
-            const payload = Object.assign(Object.assign({}, this.adaptableApi.internalApi.buildBaseContext()), { direction: 'sent', eventType: 'RaiseIntentForContext', context,
-                app });
+            const payload = {
+                ...this.adaptableApi.internalApi.buildBaseContext(),
+                direction: 'sent',
+                eventType: 'RaiseIntentForContext',
+                context,
+                app,
+            };
             this.adaptableApi.eventApi.emit('Fdc3Message', payload);
             const intentResolution = await this.getDesktopAgent().raiseIntentForContext(context, app);
             this.logFdc3Event('IN', `IntentResolution`, intentResolution.intent);
@@ -110,7 +137,12 @@ export class Fdc3Service {
         }
         try {
             this.logFdc3Event('OUT', `broadcast`, JSON.stringify(context));
-            const payload = Object.assign(Object.assign({}, this.adaptableApi.internalApi.buildBaseContext()), { direction: 'sent', eventType: 'BroadcastMessage', context });
+            const payload = {
+                ...this.adaptableApi.internalApi.buildBaseContext(),
+                direction: 'sent',
+                eventType: 'BroadcastMessage',
+                context,
+            };
             this.adaptableApi.eventApi.emit('Fdc3Message', payload);
             return this.getDesktopAgent().broadcast(context);
         }
@@ -135,7 +167,6 @@ export class Fdc3Service {
         return this.adaptableApi.optionsApi.getFdc3Options();
     }
     buildUiControlsDefaultConfiguration() {
-        var _a, _b;
         const adaptableDefaultContextIcons = Object.keys(ContextConfiguration).reduce((contextsMapping, contextType) => {
             contextsMapping[contextType] = {
                 icon: {
@@ -154,8 +185,14 @@ export class Fdc3Service {
         }, {});
         // merge adaptable defaults with (optional) user provided configuration
         return {
-            contexts: Object.assign(Object.assign({}, adaptableDefaultContextIcons), (_a = this.getFdc3Options().uiControlsDefaultConfiguration) === null || _a === void 0 ? void 0 : _a.contexts),
-            intents: Object.assign(Object.assign({}, adaptableDefaultIntentIcons), (_b = this.getFdc3Options().uiControlsDefaultConfiguration) === null || _b === void 0 ? void 0 : _b.intents),
+            contexts: {
+                ...adaptableDefaultContextIcons,
+                ...this.getFdc3Options().uiControlsDefaultConfiguration?.contexts,
+            },
+            intents: {
+                ...adaptableDefaultIntentIcons,
+                ...this.getFdc3Options().uiControlsDefaultConfiguration?.intents,
+            },
         };
     }
 }

package/src/Utilities/Services/FlashingCellService.d.ts

@@ -3,7 +3,7 @@ import { TypeUuid } from '../../PredefinedConfig/Uuid';
 import { IAdaptableService } from './Interface/IAdaptableService';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 /**
- * This service controls the interaction between notes and comments
+ * This service manages Flashing Cells
  */
 export declare class FlashingCellService implements IAdaptableService {
     private api;

package/src/Utilities/Services/FlashingCellService.js

@@ -1,6 +1,6 @@
 export const FLASHING_CELL_ROW_KEY = '__ROW';
 /**
- * This service controls the interaction between notes and comments
+ * This service manages Flashing Cells
  */
 export class FlashingCellService {
     constructor(api) {
@@ -59,6 +59,6 @@ export class FlashingCellService {
         if (!cellDataChangedInfo) {
             return;
         }
-        this.api.gridApi.refreshCells([cellDataChangedInfo.rowNode], Object.keys(flashingCell.flashColumnIds), true);
+        this.api.gridApi.refreshCells(cellDataChangedInfo.rowNode, Object.keys(flashingCell.flashColumnIds), true);
     }
 }

package/src/Utilities/Services/Interface/IAlertService.d.ts

@@ -1,12 +1,12 @@
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
-import { GridDataChangedInfo } from '../../../types';
+import { RowDataChangedInfo } from '../../../PredefinedConfig/Common/RowDataChangedInfo';
 import { IAdaptableService } from './IAdaptableService';
-export type ReactiveAlertInfo = ReactiveGridDataChangedAlertInfo | ReactiveCellDataChangedAlertInfo;
-export type ReactiveGridDataChangedAlertInfo = {
-    type: 'gridDataChangedAlert';
+export type ReactiveAlertInfo = ReactiveRowDataChangedAlertInfo | ReactiveCellDataChangedAlertInfo;
+export type ReactiveRowDataChangedAlertInfo = {
+    type: 'rowDataChangedAlert';
     alertDefinition: AlertDefinition;
-    gridChangeLogEntry: GridDataChangedInfo;
+    gridChangeLogEntry: RowDataChangedInfo;
 };
 export type ReactiveCellDataChangedAlertInfo = {
     type: 'cellDataChangedAlert';
@@ -20,5 +20,5 @@ export interface IAlertService extends IAdaptableService {
     getReactiveActiveAlerts(): AlertDefinition[];
     isReactiveAlertActive(alertDefinition: AlertDefinition): boolean;
 }
-export declare const isGridDataChangedInfo: (value: CellDataChangedInfo | GridDataChangedInfo) => value is GridDataChangedInfo<any>;
-export declare const isCellDataChangedInfo: (value: CellDataChangedInfo | GridDataChangedInfo) => value is CellDataChangedInfo<any>;
+export declare const isRowDataChangedInfo: (value: CellDataChangedInfo | RowDataChangedInfo) => value is RowDataChangedInfo<any>;
+export declare const isCellDataChangedInfo: (value: CellDataChangedInfo | RowDataChangedInfo) => value is CellDataChangedInfo<any>;

package/src/Utilities/Services/Interface/IAlertService.js

@@ -1,6 +1,6 @@
-export const isGridDataChangedInfo = (value) => {
+export const isRowDataChangedInfo = (value) => {
     return typeof value.rowTrigger === 'string';
 };
 export const isCellDataChangedInfo = (value) => {
-    return !isGridDataChangedInfo(value);
+    return !isRowDataChangedInfo(value);
 };

package/src/Utilities/Services/Interface/ICalculatedColumnExpressionService.d.ts

@@ -1,10 +1,14 @@
 import { IAdaptableService } from './IAdaptableService';
-import { IRowNode } from '@ag-grid-community/core';
+import { IRowNode } from 'ag-grid-enterprise';
 import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../../PredefinedConfig/CalculatedColumnState';
+import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
+import { RowDataChangedInfo } from '../../../PredefinedConfig/Common/RowDataChangedInfo';
 export interface ICalculatedColumnExpressionService extends IAdaptableService {
     isCalculatedColumnQueryValid(calculatedColumnQuery: AdaptableCalculatedColumnQuery): boolean;
     evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: IRowNode): any;
     getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): CalculatedColumnSettings['DataType'];
     createAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
     destroyAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
+    listentoCellDataChange(cellDataChangedInfo: CellDataChangedInfo): void;
+    listentoRowDataChange(rowDataChangedInfo: RowDataChangedInfo): void;
 }

package/src/Utilities/Services/Interface/IChartingService.d.ts

@@ -1,4 +1,4 @@
-import { ChartModel } from '@ag-grid-community/core';
+import { ChartModel } from 'ag-grid-enterprise';
 import { IAdaptableService } from './IAdaptableService';
 export interface IChartingService extends IAdaptableService {
     onChartModelChange(models: ChartModel[], eventType: string, params: any): void;

package/src/Utilities/Services/Interface/IDataService.d.ts

@@ -1,13 +1,14 @@
 import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
-import { GridDataChangedInfo } from '../../../types';
+import { RowDataChangedInfo } from '../../../types';
 export interface IDataService extends IAdaptableService {
-    CreateDataChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
-    CreateGridChangedEvent(gridDataChangedInfo: GridDataChangedInfo): void;
+    CreateCellDataChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
+    CreateRowDataChangedEvent(rowDataChangedInfo: RowDataChangedInfo): void;
     on(eventName: 'CellDataChanged', callback: (cellDataChangedInfo: CellDataChangedInfo) => void): () => void;
-    readonly dataChangeLog$: Observable<CellDataChangedInfo>;
-    readonly gridChangeLog$: Observable<GridDataChangedInfo>;
+    on(eventName: 'RowDataChanged', callback: (rowDataChangedInfo: RowDataChangedInfo) => void): () => void;
+    readonly cellDataChangeLog$: Observable<CellDataChangedInfo>;
+    readonly rowDataChangeLog$: Observable<RowDataChangedInfo>;
     logUndoChange(undoChange: CellDataChangedInfo): void;
     extractUndoChange(undoChange: CellDataChangedInfo): CellDataChangedInfo | undefined;
 }

package/src/Utilities/Services/Interface/IModuleService.d.ts

@@ -6,7 +6,7 @@ import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
 export interface IModuleService extends IAdaptableService {
     isModuleAvailable(adaptableModule: AdaptableModule): boolean;
     isModuleEditable(adaptableModule: AdaptableModule): boolean;
-    createModuleMenus(): void;
+    createModuleUIItems(): void;
     getTeamSharingAction(adaptableModule: AdaptableModule): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleById<T = IModule>(adaptableModule: AdaptableModule): T | undefined;
     getModuleInfoByModule(adaptableModule: AdaptableModule): ModuleInfo | undefined;
@@ -14,4 +14,5 @@ export interface IModuleService extends IAdaptableService {
     getModuleDocumentationPageByModule(adaptableModule: AdaptableModule): string;
     getPopupMaxWidth(adaptableModule: AdaptableModule): number | undefined;
     getModuleCollection(): IModuleCollection;
+    getModuleFriendlyName(adaptableModule: AdaptableModule): string;
 }

package/src/Utilities/Services/Interface/IQueryLanguageService.d.ts

@@ -1,7 +1,8 @@
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
-import { IRowNode } from '@ag-grid-community/core';
+import { IRowNode } from 'ag-grid-enterprise';
 import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
+import { RowDataChangedInfo } from '../../../PredefinedConfig/Common/RowDataChangedInfo';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
 import { AggregatedScalarFunctionName, ScalarAggregationParameter } from '../../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { AggregatedBooleanFunctionName, BooleanAggregationParameter } from '../../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
@@ -9,11 +10,10 @@ import { BooleanFunctionName } from '../../ExpressionFunctions/booleanExpression
 import { ScalarFunctionName } from '../../ExpressionFunctions/scalarExpressionFunctions';
 import { ObservableFunctionName } from '../../ExpressionFunctions/observableExpressionFunctions';
 import { ExpressionFunctionMap } from '../../../parser/src/types';
-import { GridDataChangedInfo } from '../../../types';
 export interface IQueryLanguageService extends IAdaptableService {
-    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): boolean;
+    evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: IRowNode, dataChangedEvent?: CellDataChangedInfo): boolean;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): any;
-    evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<CellDataChangedInfo | GridDataChangedInfo>;
+    evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<CellDataChangedInfo | RowDataChangedInfo>;
     evaluateAggregatedBooleanExpression(expression: string, module: AdaptableModule): BooleanAggregationParameter;
     evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule, getRowNodes?: () => IRowNode[]): ScalarAggregationParameter;
     validateBoolean(expression: string, module: AdaptableModule, config?: {

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

@@ -1 +1 @@
-import{SystemLicenseDisablePersistence as e,SystemLicenseShowWatermark as a}from"../../../Redux/ActionsReducers/SystemRedux";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",d=10,p=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.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){var t;const i=new Date;i.setHours(0,0,0,0);let n=0;e instanceof Error||!(null==e?void 0:e.end)||(n=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-i.getTime())/p),n=s(n,0,1/0));let h="",E="";!e||e instanceof Error||!e.appName||e.appName==r||(h=e.appName,E=" for application [APP_NAME]");const I=(e,a=o,t=c,i=n,s=h)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",s).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(I("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(I("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(I("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(I("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(n<=d)this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{l()&&this.adaptable.logger.consoleLogByMessageType(I(`Thank you for using a valid AdapTable license${E}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} 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(I(`This AdapTable license${E} 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/Services/MetamodelService.js

@@ -26,11 +26,10 @@ export class MetamodelService {
         });
     }
     validateAdaptableOptionsValues() {
-        var _a;
         const adaptableOptionsValues = this.getAdaptableOptions();
         const adaptableOptionsMetamodel = this.getAdaptableOptionsMetamodel();
         const adaptableOptionsDefaultValues = this.getAdaptableOptionsDefaultValues();
-        if ((_a = adaptableOptionsValues.adaptableId) === null || _a === void 0 ? void 0 : _a.includes('.')) {
+        if (adaptableOptionsValues.adaptableId?.includes('.')) {
             AdaptableLogger.consoleWarnBase("The 'AdaptableOptions.adaptableId' property should NOT include a '.' character.  We strongly recommend to remove it to avoid unexpected AdapTable behavior.");
         }
         const validationErrors = [];
@@ -47,19 +46,20 @@ export class MetamodelService {
     }
     validateOptionsObject(validationErrors, optionsObjectName, optionsObject, optionsObjectMetamodel, optionsObjectDefaultValues) {
         Object.entries(optionsObject).forEach(([optionKey, optionValue]) => {
-            var _a;
-            if (optionKey === 'gridOptions') {
-                validationErrors.push('gridOptions was removed from Adaptable Options in Version 16 and is no longer used');
+            // ignore fdc3options
+            if (optionKey === 'fdc3Options') {
                 return;
             }
-            if (optionKey === '_gridOptions' || optionKey === 'fdc3Options') {
-                // skip special cases
-                return;
-            }
-            const optionMetamodel = (_a = optionsObjectMetamodel === null || optionsObjectMetamodel === void 0 ? void 0 : optionsObjectMetamodel.props) === null || _a === void 0 ? void 0 : _a.find((metamodelProperty) => metamodelProperty.name === optionKey);
+            const optionMetamodel = optionsObjectMetamodel?.props?.find((metamodelProperty) => metamodelProperty.name === optionKey);
+            // Return if property not found - log if not 'Revision' or 'Uuid' or 'AdaptableVersion'
             if (!optionMetamodel) {
-                validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: unknown/unsupported property, will be ignored`);
-                return;
+                if (optionKey === 'Revision' || optionKey === 'Uuid' || optionKey === 'AdaptableVersion') {
+                    return;
+                }
+                else {
+                    validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: unknown/unsupported property, will be ignored`);
+                    return;
+                }
             }
             // let's try to validate the type of the provided value
             const expectedOptionsValueType = this.getExpectedOptionsValueType(optionMetamodel);
@@ -72,8 +72,8 @@ export class MetamodelService {
                 const referenceObjectName = optionMetamodel.ref;
                 const referenceObject = optionsObject[optionKey];
                 const referenceObjectMetamodel = this.getAdaptableMetamodel()[referenceObjectName];
-                if (referenceObject && (referenceObjectMetamodel === null || referenceObjectMetamodel === void 0 ? void 0 : referenceObjectMetamodel.kind) === 'I') {
-                    this.validateOptionsObject(validationErrors, referenceObjectName, referenceObject, referenceObjectMetamodel, optionsObjectDefaultValues === null || optionsObjectDefaultValues === void 0 ? void 0 : optionsObjectDefaultValues[optionKey]);
+                if (referenceObject && referenceObjectMetamodel?.kind === 'I') {
+                    this.validateOptionsObject(validationErrors, referenceObjectName, referenceObject, referenceObjectMetamodel, optionsObjectDefaultValues?.[optionKey]);
                 }
             }
             else if (supportedMetamodelTypes.includes(providedOptionsValueType) &&
@@ -134,7 +134,7 @@ export class MetamodelService {
         return optionItemContainer.props.filter(filter).map((itemProperty) => {
             return {
                 name: itemProperty.name,
-                value: adaptableOptionsValues === null || adaptableOptionsValues === void 0 ? void 0 : adaptableOptionsValues[itemProperty.name],
+                value: adaptableOptionsValues?.[itemProperty.name],
                 defaultValue: defaultAdaptableOptionsValues[itemProperty.name],
                 kind: itemProperty.kind,
                 description: StringExtensions.UnescapeHtmlEntities(itemProperty.desc),

package/src/Utilities/Services/ModuleService.d.ts

@@ -7,10 +7,13 @@ import { AdaptableApi } from '../../../types';
 export declare class ModuleService implements IModuleService {
     private adaptableApi;
     constructor(adaptableApi: AdaptableApi);
-    createModuleMenus(): void;
     isModuleAvailable(adaptableModule: AdaptableModule): boolean;
     isModuleName(adaptableModule: string): adaptableModule is AdaptableModule;
     isModuleEditable(adaptableModule: AdaptableModule): boolean;
+    getModuleFriendlyName(adaptableModule: AdaptableModule): string;
+    createModuleUIItems(): void;
+    private createSettingsPanelItems;
+    private createModuleButtonsForDashboardAndToolPanel;
     getTeamSharingAction(adaptableModule: AdaptableModule): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleById<T = IModule>(adaptableModule: AdaptableModule): T | undefined;
     getModuleInfoByModule(adaptableModule: AdaptableModule): ModuleInfo | undefined;