@adaptabletools/adaptable 11.0.9 → 11.1.1-canary.1

package/src/Strategy/FlashingCellModule.js

@@ -17,8 +17,10 @@ const getFlashingTargetViewItems_1 = require("./Utilities/getFlashingTargetViewI
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, 'Flashing Cell', 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);
-        this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
-            if (dataChangedInfo.trigger === 'undo') {
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            if (cellDataChangedInfo.trigger === 'undo') {
                 // do NOT handle reverted changes
                 return;
             }
@@ -26,8 +28,8 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // - flash for the underlying small data changes, but the visual does not
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
                 'formattedValue') {
-                const { oldValue, newValue } = dataChangedInfo;
-                const columnId = dataChangedInfo.column.columnId;
+                const { oldValue, newValue } = cellDataChangedInfo;
+                const columnId = cellDataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
                 const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
@@ -35,7 +37,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     return;
                 }
             }
-            this.handleDataSourceChanged(dataChangedInfo);
+            this.handleDataSourceChanged(cellDataChangedInfo);
         });
     }
     getModuleAdaptableObjects() {
@@ -101,23 +103,27 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return items;
     }
-    handleDataSourceChanged(dataChangedInfo) {
-        const flashingCellDefinitions = this.getFlashingCellDefinitionsForDataChange(dataChangedInfo);
+    handleDataSourceChanged(cellDataChangedInfo) {
+        const flashingCellDefinitions = this.getFlashingCellDefinitionsForDataChange(cellDataChangedInfo);
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingCellDefinitions)) {
-            this.showFlashingCellsForDefinitions(dataChangedInfo, flashingCellDefinitions);
+            this.showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions);
         }
     }
-    showFlashingCellsForDefinitions(dataChangedInfo, flashingCellDefinitions = []) {
+    showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions = []) {
         const allColumnIds = this.api.columnApi.getColumns().map((c) => c.columnId);
-        const columnDataType = dataChangedInfo.column.dataType;
+        const columnDataType = cellDataChangedInfo.column.dataType;
         const numeric = columnDataType === 'Number';
         const isComparableType = numeric || columnDataType === 'Date';
         let up = false;
         let down = false;
         let direction = 'neutral';
         if (isComparableType) {
-            const newValue = numeric ? Number(dataChangedInfo.newValue) : dataChangedInfo.newValue;
-            const oldValue = numeric ? Number(dataChangedInfo.oldValue) : dataChangedInfo.oldValue;
+            const newValue = numeric
+                ? Number(cellDataChangedInfo.newValue)
+                : cellDataChangedInfo.newValue;
+            const oldValue = numeric
+                ? Number(cellDataChangedInfo.oldValue)
+                : cellDataChangedInfo.oldValue;
             up = newValue > oldValue;
             down = newValue < oldValue;
             direction = up ? 'up' : down ? 'down' : 'neutral';
@@ -125,7 +131,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         flashingCellDefinitions.forEach((flashingCellDefinition) => {
             var _a;
             let flashTarget = this.api.flashingCellApi.getFlashingCellFlashTarget(flashingCellDefinition);
-            const flashColumnIds = { [dataChangedInfo.column.columnId]: true };
+            const flashColumnIds = { [cellDataChangedInfo.column.columnId]: true };
             /**
              * When flashing a row, all columns in that row are marked to flash.
              */
@@ -134,11 +140,11 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     flashColumnIds[colId] = true;
                 });
             }
-            const rowPrimaryKey = dataChangedInfo.primaryKeyValue;
+            const rowPrimaryKey = cellDataChangedInfo.primaryKeyValue;
             this.api.flashingCellApi.showFlashingCell({
                 rowPrimaryKey,
                 flashingCellDefinition: flashingCellDefinition,
-                dataChangedInfo,
+                cellDataChangedInfo: cellDataChangedInfo,
                 direction,
                 flashTarget,
                 flashColumnIds,

package/src/Strategy/FormatColumnModule.js

@@ -19,7 +19,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          * Use Case: Data (cell/row) has changed
          * Action: Any CheckboxFormatColumns need to be updated, as their disabled state may have changed
          */
-        this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
             const activeCheckboxColumnIds = this.api.columnApi
                 .getColumns()
                 .filter((aColumn) => {
@@ -28,7 +30,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             })
                 .map((aColumn) => aColumn.columnId);
             // no need to refresh the CheckboxColumns if the change was triggered by one of them
-            if (!activeCheckboxColumnIds.includes(dataChangedInfo.column.columnId)) {
+            if (!activeCheckboxColumnIds.includes(cellDataChangedInfo.column.columnId)) {
                 this.api.internalApi
                     .getAdaptableInstance()
                     .refreshCells(null, activeCheckboxColumnIds, true, true);

package/src/Strategy/SmartEditModule.js

@@ -49,6 +49,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.internalApi.isGridInPivotMode()) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'Cannot edit while Grid is in Pivot Mode.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -58,6 +59,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (selectedCellInfo == null || ArrayExtensions_1.default.IsNullOrEmpty(selectedCellInfo.columns)) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'No cells are selected.\nPlease select some cells.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -67,6 +69,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (ArrayExtensions_1.default.NotCorrectLength(selectedCellInfo.columns, 1)) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'Smart Edit only supports single column edit.\nPlease adjust cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -78,6 +81,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (column.dataType != Enums_1.DataType.Number) {
                 return {
                     Alert: {
+                        alertType: 'generic',
                         header: 'Smart Edit Error',
                         message: 'Smart Edit only supports editing of numeric columns.\nPlease adjust the cell selection.',
                         alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -87,6 +91,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (column.readOnly) {
                 return {
                     Alert: {
+                        alertType: 'generic',
                         header: 'Smart Edit Error',
                         message: 'Smart Edit is not permitted on readonly columns.\nPlease adjust the cell selection.',
                         alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -98,6 +103,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             !this.api.gridApi.areCellsEditable(selectedCellInfo.gridCells)) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'Smart Edit is not permitted on readonly cells.\nPlease adjust the cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -126,6 +126,7 @@ exports.DefaultAdaptableOptions = {
     },
     layoutOptions: {
         includeExpandedRowGroups: false,
+        displayRowGroups: 'closed',
         autoSaveLayouts: true,
         autoSizeColumnsInLayout: false,
         autoSizeColumnsInPivotLayout: false,

package/src/Utilities/Defaults/DefaultSettingsPanel.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableSettingsPanel } from '../../PredefinedConfig/Common/Types';
 import { AdaptableModule } from '../../types';
-export declare const ACTION_POPUPS: AdaptableModule[];
+export declare const STANDALONE_MODULE_POPUPS: AdaptableModule[];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_NAVIGATION_ITEMS = exports.ACTION_POPUPS = void 0;
-exports.ACTION_POPUPS = ['BulkUpdate', 'SmartEdit', 'CellSummary'];
+exports.DEFAULT_NAVIGATION_ITEMS = exports.STANDALONE_MODULE_POPUPS = void 0;
+exports.STANDALONE_MODULE_POPUPS = [
+    'BulkUpdate',
+    'SmartEdit',
+    'CellSummary',
+];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */

package/src/Utilities/Emitter.d.ts

@@ -7,7 +7,7 @@ declare class Emittery {
     on(eventName: string, listener: EmitterCallback): any;
     off(eventName: string, listener: EmitterCallback): void;
     once(eventName: string): Promise<unknown>;
-    onIncludeFiredOnce(eventName: string): Promise<any>;
+    onIncludeFiredOnce(eventName: string, listener: EmitterCallback): any;
     onIncludeFired(eventName: string, listener: EmitterCallback): any;
     emit(eventName: string, eventData?: any): Promise<any[]>;
     emitSync(eventName: string, eventData?: any): any[];

package/src/Utilities/Emitter.js

@@ -100,13 +100,16 @@ class Emittery {
             });
         });
     }
-    onIncludeFiredOnce(eventName) {
+    onIncludeFiredOnce(eventName, listener) {
         const triggeredEventsMap = triggeredMap.get(this);
         const eventInfo = triggeredEventsMap.get(eventName);
         if (eventInfo) {
-            return Promise.resolve(eventInfo.data);
+            listener(eventInfo.data);
+            return () => { };
+        }
+        else {
+            return this.on(eventName, listener);
         }
-        return this.once(eventName);
     }
     onIncludeFired(eventName, listener) {
         const triggeredEventsMap = triggeredMap.get(this);

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.d.ts

@@ -1,7 +1,7 @@
 import { ExpressionContext } from '../../parser/src/types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { Observable } from 'rxjs';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 export interface BaseParameter<T = string, N = string> {
     type: T;
     name: N;
@@ -12,7 +12,7 @@ export interface ColumnParameter extends BaseParameter<'config', 'COL'> {
 export declare const getStringValues: (context: ExpressionContext, ...stringArguments: string[]) => string[];
 export declare const getStringValue: (context: ExpressionContext, stringArgument: string) => string;
 export declare const isTextSearchCaseInsensitive: (context: ExpressionContext) => boolean;
-export declare const getDataChangeLog$: (context: ExpressionContext, columnNameFilter: string) => Observable<DataChangedInfo>;
+export declare const getDataChangeLog$: (context: ExpressionContext, columnNameFilter: string) => Observable<CellDataChangedInfo>;
 export declare const handleWhereFunction: (args: any[], context: ExpressionContext) => any;
 export declare const extractColumnParameter: (consumingFunctionName: string, args: BaseParameter[]) => ColumnParameter;
 export declare const extractParameter: <T extends BaseParameter<string, string>>(consumingFunctionName: string, allowedType: T["type"], allowedOperands: T["name"][], args: BaseParameter[], isOptional?: boolean) => T;

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -18,7 +18,7 @@ exports.getStringValue = (context, stringArgument) => {
     return exports.isTextSearchCaseInsensitive(context) ? stringArgument.toLowerCase() : stringArgument;
 };
 exports.isTextSearchCaseInsensitive = (context) => !context.api.internalApi.isTextComparisonCaseSensitive();
-// returns an observable which filters the source$ emissions and emits only if the DataChangedInfo relates to the given column
+// returns an observable which filters the source$ emissions and emits only if the CellDataChangedInfo relates to the given column
 // optionally, if a filter function (where clause) is provided, it is also evaluated
 exports.getDataChangeLog$ = (context, columnNameFilter) => {
     let dataChangeLog$ = context.api.internalApi.getDataService().dataChangeLog$;

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -58,3 +58,16 @@ export interface PromptPopup {
     DefaultValue?: string;
     ConfirmActionCreator?: (inputText: string) => Action;
 }
+export interface WindowPopup {
+    PopupList: {
+        /**
+         * Used to identify the window.
+         * - used to close the window
+         * - used to identify the 'Component' name, to know what to instantiate
+         */
+        Id: string;
+        Title: string;
+        PopupProps?: any;
+        Icon?: string;
+    }[];
+}

package/src/Utilities/ObjectFactory.d.ts

@@ -13,7 +13,7 @@ import { ConditionalStyle } from '../PredefinedConfig/ConditionalStyleState';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { Glue42Report, Glue42Schedule } from '../PredefinedConfig/Glue42State';
 import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
@@ -21,20 +21,21 @@ import { OpenFinSchedule, OpenFinReport } from '../PredefinedConfig/OpenFinState
 import { NamedQuery } from '../PredefinedConfig/QueryState';
 import { ColumnFilter } from '../PredefinedConfig/FilterState';
 import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { FlashingCellDefinition } from '../types';
+import { FlashingCellDefinition, GridDataChangedInfo } from '../types';
 import { ToastOptions } from 'react-toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyDataSource(): DataSource;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
-export declare function CreateEmptyAlert(): AdaptableAlert;
-export declare function CreateAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo): AdaptableAlert;
+export declare function CreateGenericAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition): AdaptableGenericAlert;
+export declare function CreateCellChangedAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, cellDataChangedInfo: CellDataChangedInfo): AdaptableCellChangedAlert;
+export declare function CreateRowChangedAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, gridDataChange: GridDataChangedInfo): AdaptableRowChangedAlert;
 export declare function CreateEmptyAlertDefinition(): AlertDefinition;
 export declare function CreateEmptyFlashingCellDefinition(): FlashingCellDefinition;
 export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: AlertProperties): AlertDefinition;
@@ -72,8 +73,9 @@ export declare const ObjectFactory: {
     CreateEmptyCalculatedColumn: typeof CreateEmptyCalculatedColumn;
     CreateEmptyNamedQuery: typeof CreateEmptyNamedQuery;
     CreateEmptyPlusMinusNudge: typeof CreateEmptyPlusMinusNudge;
-    CreateEmptyAlert: typeof CreateEmptyAlert;
-    CreateAlert: typeof CreateAlert;
+    CreateGenericAlert: typeof CreateGenericAlert;
+    CreateCellChangedAlert: typeof CreateCellChangedAlert;
+    CreateRowChangedAlert: typeof CreateRowChangedAlert;
     CreateEmptyAlertDefinition: typeof CreateEmptyAlertDefinition;
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateAlert = exports.CreateEmptyAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyDataSource = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyDataSource = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -51,25 +51,38 @@ function CreateEmptyPlusMinusNudge() {
     };
 }
 exports.CreateEmptyPlusMinusNudge = CreateEmptyPlusMinusNudge;
-function CreateEmptyAlert() {
+function CreateGenericAlert(alertHeader, alertMessage, alertDefinition) {
     return {
+        alertType: 'generic',
         Uuid: Uuid_1.createUuid(),
-        header: GeneralConstants_1.EMPTY_STRING,
-        message: GeneralConstants_1.EMPTY_STRING,
-        alertDefinition: CreateInternalAlertDefinitionForMessages('Info'),
+        header: alertHeader,
+        message: alertMessage,
+        alertDefinition: alertDefinition,
     };
 }
-exports.CreateEmptyAlert = CreateEmptyAlert;
-function CreateAlert(alertHeader, alertMessage, alertDefinition, dataChangedInfo) {
+exports.CreateGenericAlert = CreateGenericAlert;
+function CreateCellChangedAlert(alertHeader, alertMessage, alertDefinition, cellDataChangedInfo) {
     return {
+        alertType: 'cellChanged',
         Uuid: Uuid_1.createUuid(),
         header: alertHeader,
         message: alertMessage,
-        alertDefinition: alertDefinition,
-        dataChangedInfo: dataChangedInfo,
+        alertDefinition,
+        cellDataChangedInfo: cellDataChangedInfo,
+    };
+}
+exports.CreateCellChangedAlert = CreateCellChangedAlert;
+function CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition, gridDataChange) {
+    return {
+        alertType: 'rowChanged',
+        Uuid: Uuid_1.createUuid(),
+        header: alertHeader,
+        message: alertMessage,
+        alertDefinition,
+        gridDataChangedInfo: gridDataChange,
     };
 }
-exports.CreateAlert = CreateAlert;
+exports.CreateRowChangedAlert = CreateRowChangedAlert;
 function CreateEmptyAlertDefinition() {
     return {
         Uuid: Uuid_1.createUuid(),
@@ -403,8 +416,9 @@ exports.ObjectFactory = {
     CreateEmptyCalculatedColumn,
     CreateEmptyNamedQuery,
     CreateEmptyPlusMinusNudge,
-    CreateEmptyAlert,
-    CreateAlert,
+    CreateGenericAlert,
+    CreateCellChangedAlert,
+    CreateRowChangedAlert,
     CreateEmptyAlertDefinition,
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -12,8 +12,8 @@ class CalculatedColumnExpressionService {
         this.adaptable = adaptable;
         this.adaptable.api.internalApi
             .getDataService()
-            .on('DataChanged', (dataChangedInfo) => {
-            if (dataChangedInfo.trigger === 'aggChange') {
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            if (cellDataChangedInfo.trigger === 'aggChange') {
                 // do NOT handle changes on group rows
                 return;
             }
@@ -21,7 +21,7 @@ class CalculatedColumnExpressionService {
             this.aggregatedScalarCalculatedColumnsMap.forEach((aggregatedScalarCalculatedColumn) => {
                 if (aggregatedScalarCalculatedColumn
                     .getColumnDependencies()
-                    .includes(dataChangedInfo.column.columnId)) {
+                    .includes(cellDataChangedInfo.column.columnId)) {
                     aggregatedScalarCalculatedColumn.refreshAggregatedColumnValue();
                     refreshedCalculatedColumns.push(aggregatedScalarCalculatedColumn.getCalculatedColumnId());
                 }

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

@@ -1,21 +1,21 @@
 import { IDataService } from './Interface/IDataService';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { EmitterCallback } from '../../Utilities/Emitter';
 import { Observable } from 'rxjs';
 export declare class DataService implements IDataService {
     private adaptable;
     private emitter;
     private readonly dataChangeLogSubject$;
-    dataChangeLog$: Observable<DataChangedInfo>;
+    dataChangeLog$: Observable<CellDataChangedInfo>;
     private undoChangeLog;
     private undoChangeTimers;
     constructor(adaptable: IAdaptable);
     on: (eventName: string, callback: EmitterCallback) => (() => void);
     emit: (eventName: string, data?: any) => Promise<any>;
-    CreateDataChangedEvent(dataChangedInfo: DataChangedInfo): void;
-    logUndoChange(change: DataChangedInfo): void;
-    extractUndoChange(change: DataChangedInfo): DataChangedInfo | undefined;
+    CreateDataChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
+    logUndoChange(change: CellDataChangedInfo): void;
+    extractUndoChange(change: CellDataChangedInfo): CellDataChangedInfo | undefined;
     destroy(): void;
     private getUndoChangeKey;
     private logDataChange;

package/src/Utilities/Services/DataService.js

@@ -20,11 +20,11 @@ class DataService {
         this.undoChangeLog = new Map();
         this.undoChangeTimers = new Map();
     }
-    CreateDataChangedEvent(dataChangedInfo) {
-        if (dataChangedInfo.newValue != dataChangedInfo.oldValue) {
-            this.emitter.emitSync('DataChanged', dataChangedInfo);
-            this.adaptable.api.gridApi.fireCellChangedEvent(dataChangedInfo);
-            this.logDataChange(dataChangedInfo);
+    CreateDataChangedEvent(cellDataChangedInfo) {
+        if (cellDataChangedInfo.newValue != cellDataChangedInfo.oldValue) {
+            this.emitter.emitSync('CellDataChanged', cellDataChangedInfo);
+            this.adaptable.api.gridApi.fireCellChangedEvent(cellDataChangedInfo);
+            this.logDataChange(cellDataChangedInfo);
         }
     }
     // we need this temporary "shared memory" because the value change and the AG Grid cellChanged event are asynchronous
@@ -69,16 +69,18 @@ class DataService {
             newValue,
         });
     }
-    logDataChange(dataChangedInfo) {
-        const dataChangeLogEntry = this.extractDataChangeLogEntry(dataChangedInfo);
+    logDataChange(cellDataChangedInfo) {
+        const dataChangeLogEntry = this.extractDataChangeLogEntry(cellDataChangedInfo);
         this.dataChangeLogSubject$.next(dataChangeLogEntry);
     }
-    extractDataChangeLogEntry(dataChangedInfo) {
+    extractDataChangeLogEntry(cellDataChangedInfo) {
         // create rowData snapshot
-        const rowData = dataChangedInfo.rowData ? Helper_1.default.cloneObject(dataChangedInfo.rowData) : null;
+        const rowData = cellDataChangedInfo.rowData
+            ? Helper_1.default.cloneObject(cellDataChangedInfo.rowData)
+            : null;
         // strip down rowNode properties as it is pretty "heavy" on the memory
         const rowNode = rowData ? { data: rowData } : null;
-        return Object.assign(Object.assign({}, dataChangedInfo), { rowNode,
+        return Object.assign(Object.assign({}, cellDataChangedInfo), { rowNode,
             rowData });
     }
 }

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

@@ -1,10 +1,10 @@
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
-import { DataChangedInfo } from '../../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { IAdaptableService } from './IAdaptableService';
 export declare type ReactiveAlertInfo = {
     alertDefinition: AlertDefinition;
     type: 'alert';
-    dataChangeLogEntry: DataChangedInfo;
+    dataChangeLogEntry: CellDataChangedInfo;
 };
 export interface IAlertService extends IAdaptableService {
     createReactiveAlert(alertDefinition: AlertDefinition): void;

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

@@ -1,10 +1,10 @@
-import { DataChangedInfo } from '../../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
 export interface IDataService extends IAdaptableService {
-    CreateDataChangedEvent(dataChangedInfo: DataChangedInfo): void;
-    on(eventName: 'DataChanged', callback: (dataChangedInfo: DataChangedInfo) => void): () => void;
-    readonly dataChangeLog$: Observable<DataChangedInfo>;
-    logUndoChange(undoChange: DataChangedInfo): void;
-    extractUndoChange(undoChange: DataChangedInfo): DataChangedInfo | undefined;
+    CreateDataChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
+    on(eventName: 'CellDataChanged', callback: (cellDataChangedInfo: CellDataChangedInfo) => void): () => void;
+    readonly dataChangeLog$: Observable<CellDataChangedInfo>;
+    logUndoChange(undoChange: CellDataChangedInfo): void;
+    extractUndoChange(undoChange: CellDataChangedInfo): CellDataChangedInfo | undefined;
 }

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

@@ -1,15 +1,15 @@
 import { Observable } from 'rxjs';
 import { IAdaptableService } from './IAdaptableService';
 import { RowNode } from '@ag-grid-community/all-modules';
-import { DataChangedInfo } from '../../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
 import { AggregationParameter } from '../../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { ModuleExpressionFunctions } from '../../../AdaptableOptions/AdaptableQLOptions';
 export interface IQueryLanguageService extends IAdaptableService {
     evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: RowNode): boolean;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: RowNode): any;
-    evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<DataChangedInfo>;
-    evaluateAggregatedBooleanExpression(expression: string, module: AdaptableModule): Observable<DataChangedInfo>;
+    evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<CellDataChangedInfo>;
+    evaluateAggregatedBooleanExpression(expression: string, module: AdaptableModule): Observable<CellDataChangedInfo>;
     evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule): AggregationParameter;
     validateBoolean(expression: string, module: AdaptableModule, config?: {
         force?: boolean;

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

@@ -1,10 +1,10 @@
-import { DataChangedInfo } from '../../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 import { IAdaptableService } from './IAdaptableService';
 export interface IValidationService extends IAdaptableService {
-    getValidationRulesForDataChange(dataChangedInfo: DataChangedInfo): AlertDefinition[];
-    performValidation(dataChangedInfo: DataChangedInfo): boolean;
-    performServerValidation(dataChangedInfo: DataChangedInfo, config: {
+    getValidationRulesForDataChange(cellDataChangedInfo: CellDataChangedInfo): AlertDefinition[];
+    performValidation(cellDataChangedInfo: CellDataChangedInfo): boolean;
+    performServerValidation(cellDataChangedInfo: CellDataChangedInfo, config: {
         onServerValidationCompleted: () => void;
     }): () => boolean;
     createValidationDescription(alertDefinition: AlertDefinition): string;

package/src/Utilities/Services/LicenseService.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../Redux/ActionsReducers/SystemRedux"),t=require("../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../ObjectFactory")),o=require("../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../Constants/DocumentationLinkConstants"),r=require("../license/decode"),c="sales@adaptabletools.com",l=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const E=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,_=/(https):\/\/\S+(\.adaptabletools\.com)/g,O="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,t]=Array.from(E.exec(O)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},u=()=>{const[e,a,t]=Array.from(I.exec(O)||[]);return"https"===a&&".csb.app"===t},L=()=>{const[e,a,t]=Array.from(_.exec(O)||[]);return"https"===a&&".adaptabletools.com"===t};class A{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=r.decode(a)}catch(e){s=e}h()||u()||L()||this.handleLicenseValidation(s,this.getValidityType(s,t))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),o=s<new Date,i=e.trial;let n=null;return n=o?s>t?i?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:i?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let r=0;e instanceof Error||!(null==e?void 0:e.end)||(r=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/864e5),r=i.default(r,0,1/0));const l=(e,a=n.LicenseDocsLink,t=c,s=r)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":o.ConsoleLogByMessageType(l("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":o.ConsoleLogByMessageType(l("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":o.ConsoleLogByMessageType(l("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":o.ConsoleLogByMessageType(l("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":r<=10&&o.ConsoleLogByMessageType(l("This AdapTable license expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)"),"Info");break;case"COMMERCIAL_EXPIRED_IN_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable license 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":o.ConsoleLogByMessageType(l("This AdapTable license 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.PopupShowAlert({header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseShowWatermark(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseDisablePersistence())}destroy(){}}exports.LicenseService=A;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../Redux/ActionsReducers/SystemRedux"),t=require("../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../ObjectFactory")),o=require("../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../Constants/DocumentationLinkConstants"),r=require("../license/decode"),c="sales@adaptabletools.com",l=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const E=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,_=/(https):\/\/\S+(\.adaptabletools\.com)/g,O="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,t]=Array.from(E.exec(O)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},u=()=>{const[e,a,t]=Array.from(I.exec(O)||[]);return"https"===a&&".csb.app"===t},L=()=>{const[e,a,t]=Array.from(_.exec(O)||[]);return"https"===a&&".adaptabletools.com"===t};class A{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=r.decode(a)}catch(e){s=e}h()||u()||L()||this.handleLicenseValidation(s,this.getValidityType(s,t))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),o=s<new Date,i=e.trial;let n=null;return n=o?s>t?i?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:i?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let r=0;e instanceof Error||!(null==e?void 0:e.end)||(r=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/864e5),r=i.default(r,0,1/0));const l=(e,a=n.LicenseDocsLink,t=c,s=r)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":o.ConsoleLogByMessageType(l("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":o.ConsoleLogByMessageType(l("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":o.ConsoleLogByMessageType(l("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":o.ConsoleLogByMessageType(l("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":r<=10&&o.ConsoleLogByMessageType(l("This AdapTable license expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)"),"Info");break;case"COMMERCIAL_EXPIRED_IN_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable license 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":o.ConsoleLogByMessageType(l("This AdapTable license 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.PopupShowAlert({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseShowWatermark(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseDisablePersistence())}destroy(){}}exports.LicenseService=A;

package/src/Utilities/Services/ModuleService.js

@@ -76,7 +76,7 @@ class ModuleService {
     }
     getModuleDocumentationPageByModule(adaptableModule) {
         let url = `${DocumentationLinkConstants_1.HOST_URL_DOCS}/`;
-        let learnUrl = url + 'learn/';
+        let learnUrl = url + 'guide/';
         switch (adaptableModule) {
             case 'Alert':
                 return learnUrl + 'handbook-alerting';

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

@@ -1,7 +1,7 @@
 import { IQueryLanguageService } from './Interface/IQueryLanguageService';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { Observable } from 'rxjs';
-import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { ModuleExpressionFunctions } from '../../AdaptableOptions/AdaptableQLOptions';
@@ -17,8 +17,8 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: any): any;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: RowNode): any;
     evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule): AggregationParameter;
-    evaluateObservableExpression(reactiveExpression: string, module: AdaptableModule): Observable<DataChangedInfo>;
-    evaluateAggregatedBooleanExpression(aggregationExpression: string, module: AdaptableModule): Observable<DataChangedInfo>;
+    evaluateObservableExpression(reactiveExpression: string, module: AdaptableModule): Observable<CellDataChangedInfo>;
+    evaluateAggregatedBooleanExpression(aggregationExpression: string, module: AdaptableModule): Observable<CellDataChangedInfo>;
     validateBoolean(expressionInput: string, module: AdaptableModule, config?: {
         force?: boolean;
     }): {