@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.1

package/src/Strategy/Fdc3Module.js

@@ -14,13 +14,13 @@ export class Fdc3Module extends AdaptableModuleBase {
             const contextMenuItems = [];
             this.getFdc3Api()
                 .internalApi.getAllRaiseIntentConfigs()
-                .filter((raiseIntentConfig) => { var _a; return (_a = raiseIntentConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId); })
+                .filter((raiseIntentConfig) => raiseIntentConfig.contextMenu?.columnIds.includes(currentColumnId))
                 .forEach((raiseIntentConfig) => {
                 contextMenuItems.push(this.buildRaiseIntentMenuItem(raiseIntentConfig, currentRowNode));
             });
             this.getFdc3Api()
                 .internalApi.getAllBroadcastContextConfigs()
-                .filter((broadcastConfig) => { var _a; return (_a = broadcastConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId); })
+                .filter((broadcastConfig) => broadcastConfig.contextMenu?.columnIds.includes(currentColumnId))
                 .forEach((broadcastConfig) => {
                 contextMenuItems.push(this.buildBroadcastMenuItem(broadcastConfig, currentRowNode));
             });
@@ -29,7 +29,6 @@ export class Fdc3Module extends AdaptableModuleBase {
         }
     }
     buildRaiseIntentMenuItem(intentConfig, rowNode) {
-        var _a, _b, _c;
         const { intentType, contextType } = intentConfig;
         const menuItem = {
             name: 'fdc3-raise-intent',
@@ -38,18 +37,17 @@ export class Fdc3Module extends AdaptableModuleBase {
                 this.getFdc3Api().raiseIntentFromRow(rowNode, intentType, contextType);
             },
             isVisible: true,
-            module: this.moduleInfo.ModuleName,
+            category: this.moduleInfo.ModuleName,
         };
-        if ((_a = intentConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
-            const menuItemIcon = ((_b = intentConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'
+        if (intentConfig.contextMenu?.icon) {
+            const menuItemIcon = intentConfig.contextMenu?.icon === '_defaultFdc3'
                 ? this.getFdc3Api().internalApi.getDefaultIconForIntent(intentType)
-                : (_c = intentConfig.contextMenu) === null || _c === void 0 ? void 0 : _c.icon;
+                : intentConfig.contextMenu?.icon;
             menuItem.icon = menuItemIcon;
         }
         return menuItem;
     }
     buildBroadcastMenuItem(contextConfig, rowNode) {
-        var _a, _b, _c;
         const { contextType } = contextConfig;
         const menuItem = {
             name: 'fdc3-broadcast',
@@ -58,12 +56,12 @@ export class Fdc3Module extends AdaptableModuleBase {
                 this.getFdc3Api().broadcastFromRow(rowNode, contextType);
             },
             isVisible: true,
-            module: this.moduleInfo.ModuleName,
+            category: this.moduleInfo.ModuleName,
         };
-        if ((_a = contextConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
-            const menuItemIcon = ((_b = contextConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'
+        if (contextConfig.contextMenu?.icon) {
+            const menuItemIcon = contextConfig.contextMenu?.icon === '_defaultFdc3'
                 ? this.getFdc3Api().internalApi.getDefaultIconForContext(contextType)
-                : (_c = contextConfig.contextMenu) === null || _c === void 0 ? void 0 : _c.icon;
+                : contextConfig.contextMenu?.icon;
             menuItem.icon = menuItemIcon;
         }
         return menuItem;

package/src/Strategy/FlashingCellModule.d.ts

@@ -1,26 +1,29 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { FlashingCellDefinition } from '../PredefinedConfig/FlashingCellState';
-export declare class FlashingCellModule extends AdaptableModuleBase implements IModule {
+import { FlashingCellDefinition } from '../types';
+import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
+export declare class FlashingCellModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {
+    private isListeningToCellDataChanges;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
+    shouldListenToDataChanges(): boolean;
+    checkListenToCellDataChanged(): void;
+    setupCellDataChangeListener(): void;
+    private getFlashingCellDefinitionsForDataChange;
+    private showFlashingCellsForDefinitions;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: FlashingCellDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemDoReduxAction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
-    protected handleCellDataChanged(cellDataChangedInfo: CellDataChangedInfo): void;
-    private showFlashingCellsForDefinitions;
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemDoReduxAction<"calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar" | "separator">[];
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     private isFlashingTargetOnlyAggChange;
-    private getFlashingCellDefinitionsForDataChange;
     private isAlertPredicateTriggered;
     getTeamSharingAction(): TeamSharingImportInfo<FlashingCellDefinition>;
     toView(flashingCell: FlashingCellDefinition): AdaptableObjectView;

package/src/Strategy/FlashingCellModule.js

@@ -3,18 +3,34 @@ import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ArrayExtensions } from '../Utilities/Extensions/ArrayExtensions';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { isReactiveQuery } from '../PredefinedConfig/Common/AdaptableQuery';
-import { getScopeViewItems } from './Utilities/getScopeViewItems';
-import { getRuleViewItems } from './Utilities/getRuleViewItems';
-import { getFlashingCellDurationViewItems } from './Utilities/FlashingCell/getFlashingCellDurationViewItems';
-import { FlashingCellWizard } from '../View/FlashingCell/Wizard/FlashingCellWizard';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { getFlashingTargetViewItems } from './Utilities/FlashingCell/getFlashingTargetViewItems';
 import { getFlashingCellStyleViewItems } from './Utilities/FlashingCell/getFlashingCellStyleViewItems';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
+import { getRuleViewItems } from '../Utilities/getRuleViewItems';
+import { getScopeViewItems } from '../Utilities/getScopeViewItems';
+import { FlashingCellWizard } from '../View/FlashingCell/Wizard/FlashingCellWizard';
+import { getFlashingCellDurationViewItems } from './Utilities/FlashingCell/getFlashingCellDurationViewItems';
+import { errorOnce } from '../agGrid/AdaptableLogger';
 export class FlashingCellModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, ModuleConstants.FlashingCellFriendlyName, 'lightning', 'FlashingAlert', 'Flash cells when they change', api);
+        this.isListeningToCellDataChanges = false;
     }
     onAdaptableReady() {
+        this.checkListenToCellDataChanged();
+    }
+    shouldListenToDataChanges() {
+        return ArrayExtensions.IsNotNullOrEmpty(this.api.flashingCellApi.getActiveFlashingCellDefinitions());
+    }
+    checkListenToCellDataChanged() {
+        if (!this.isListeningToCellDataChanges) {
+            if (this.shouldListenToDataChanges()) {
+                this.setupCellDataChangeListener();
+                this.isListeningToCellDataChanges = true;
+            }
+        }
+    }
+    setupCellDataChangeListener() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
@@ -22,19 +38,109 @@ export class FlashingCellModule extends AdaptableModuleBase {
                 // do NOT handle reverted changes
                 return;
             }
-            // TODO: think about flashing row value only
-            // - flash for the underlying small data changes, but the visual does not
-            if (this.api.optionsApi.getAlertOptions().dataChangeDetectionPolicy === 'formattedValue') {
-                const { oldValue, newValue, rowNode } = cellDataChangedInfo;
-                const columnId = cellDataChangedInfo.column.columnId;
-                const oldFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, oldValue);
-                const newFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, newValue);
-                if (oldFormattedValue === newFormattedValue) {
-                    // if the formattedValues are identical, then no alert is fired
+            const activeFlashingCellDefinitions = this.api.flashingCellApi.getActiveFlashingCellDefinitions();
+            if (ArrayExtensions.IsNotNullOrEmpty(activeFlashingCellDefinitions)) {
+                // TODO: think about flashing row value only
+                // - flash for the underlying small data changes, but the visual does not
+                if (this.api.optionsApi.getAlertOptions().dataChangeDetectionPolicy === 'formattedValue') {
+                    const { oldValue, newValue, rowNode } = cellDataChangedInfo;
+                    const columnId = cellDataChangedInfo.column.columnId;
+                    const oldFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, oldValue);
+                    const newFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, newValue);
+                    if (oldFormattedValue === newFormattedValue) {
+                        // if the formattedValues are identical, then no alert is fired
+                        return;
+                    }
+                }
+                const relevantFlashingCellDefinitions = this.getFlashingCellDefinitionsForDataChange(activeFlashingCellDefinitions, cellDataChangedInfo);
+                if (ArrayExtensions.IsNotNullOrEmpty(relevantFlashingCellDefinitions)) {
+                    this.showFlashingCellsForDefinitions(cellDataChangedInfo, relevantFlashingCellDefinitions);
+                }
+            }
+        });
+    }
+    getFlashingCellDefinitionsForDataChange(activeFlashingCellDefinitions, cellDataChangedInfo) {
+        const defaultNoPredicateReturn = false;
+        let relatedFlashingCellsDefinitions = activeFlashingCellDefinitions
+            .filter((v) => this.api.columnScopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope))
+            .filter((flashingCellDefinition) => !isReactiveQuery(flashingCellDefinition.Rule));
+        let triggeredFlashingCells = [];
+        if (ArrayExtensions.IsNotNullOrEmpty(relatedFlashingCellsDefinitions)) {
+            relatedFlashingCellsDefinitions.forEach((flashingCellDefinition) => {
+                // for aggregation the data-change needs to be aggChange
+                if (cellDataChangedInfo.trigger !== 'aggChange' &&
+                    this.isFlashingTargetOnlyAggChange(flashingCellDefinition)) {
                     return;
                 }
+                if (flashingCellDefinition.Rule.BooleanExpression) {
+                    let expression = flashingCellDefinition.Rule.BooleanExpression;
+                    let rowNode = cellDataChangedInfo.rowNode;
+                    if (!rowNode) {
+                        rowNode = this.api.gridApi.getRowNodeForPrimaryKey(cellDataChangedInfo.primaryKeyValue);
+                    }
+                    const isValidExpression = this.api.expressionApi.isValidBooleanExpression(expression, this.moduleInfo.ModuleName, `Invalid Alert boolean expression '${expression}'`);
+                    let isSatisfiedExpression = false;
+                    try {
+                        isSatisfiedExpression =
+                            isValidExpression &&
+                                this.api.internalApi
+                                    .getQueryLanguageService()
+                                    .evaluateBooleanExpression(expression, this.moduleInfo.ModuleName, rowNode, cellDataChangedInfo);
+                    }
+                    catch (error) {
+                        isSatisfiedExpression = false;
+                        errorOnce(error.message);
+                    }
+                    if (isSatisfiedExpression) {
+                        triggeredFlashingCells.push(flashingCellDefinition);
+                    }
+                }
+                else if (this.isAlertPredicateTriggered(flashingCellDefinition, cellDataChangedInfo, defaultNoPredicateReturn)) {
+                    triggeredFlashingCells.push(flashingCellDefinition);
+                }
+            });
+        }
+        return triggeredFlashingCells;
+    }
+    showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions = []) {
+        const allColumnIds = this.api.columnApi.getUIAvailableColumns().map((c) => c.columnId);
+        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(cellDataChangedInfo.newValue)
+                : cellDataChangedInfo.newValue;
+            const oldValue = numeric
+                ? Number(cellDataChangedInfo.oldValue)
+                : cellDataChangedInfo.oldValue;
+            up = newValue > oldValue;
+            down = newValue < oldValue;
+            direction = up ? 'up' : down ? 'down' : 'neutral';
+        }
+        flashingCellDefinitions.forEach((flashingCellDefinition) => {
+            let flashTarget = this.api.flashingCellApi.getFlashingCellFlashTarget(flashingCellDefinition);
+            const flashColumnIds = { [cellDataChangedInfo.column.columnId]: true };
+            /**
+             * When flashing a row, all columns in that row are marked to flash.
+             */
+            if (flashTarget === 'row' || flashTarget?.includes?.('row')) {
+                allColumnIds.forEach((colId) => {
+                    flashColumnIds[colId] = true;
+                });
             }
-            this.handleCellDataChanged(cellDataChangedInfo);
+            const rowPrimaryKey = cellDataChangedInfo.primaryKeyValue;
+            this.api.flashingCellApi.showFlashingCell({
+                rowPrimaryKey,
+                flashingCellDefinition: flashingCellDefinition,
+                cellDataChangedInfo: cellDataChangedInfo,
+                direction,
+                flashTarget,
+                flashColumnIds,
+            });
         });
     }
     getModuleAdaptableObjects(config) {
@@ -47,7 +153,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
         }
         else if (this.api.columnScopeApi.scopeHasColumns(alertDefinition.Scope)) {
             return this.api.columnScopeApi
-                .getColumnsForScope(alertDefinition.Scope)
+                .getColumnsInScope(alertDefinition.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
@@ -61,7 +167,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
     }
     createColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
-            if (!this.api.columnApi.isCalculatedColumn(column.columnId)) {
+            if (!column.isCalculatedColumn && !column.isTreeColumn) {
                 const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
                 const flashingCellForCurrentColumn = flashingCellDefinitions.find((flashingCellDefinition) => {
                     return this.api.columnScopeApi.isColumnInScope(column, flashingCellDefinition.Scope);
@@ -92,7 +198,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
                 const flashingCellForCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingCellForRow) {
                     if (flashingCellForRow.flashTarget === 'row' ||
-                        (Array.isArray(flashingCellForRow === null || flashingCellForRow === void 0 ? void 0 : flashingCellForRow.flashTarget) &&
+                        (Array.isArray(flashingCellForRow?.flashTarget) &&
                             flashingCellForRow.flashTarget.includes('row'))) {
                         items.push(this.createMenuItemClickFunction('flashing-row-clear', 'Clear Flashing Row', this.moduleInfo.Glyph, () => this.api.internalApi
                             .getFlashingCellService()
@@ -108,54 +214,6 @@ export class FlashingCellModule extends AdaptableModuleBase {
         }
         return items;
     }
-    handleCellDataChanged(cellDataChangedInfo) {
-        const flashingCellDefinitions = this.getFlashingCellDefinitionsForDataChange(cellDataChangedInfo);
-        if (ArrayExtensions.IsNotNullOrEmpty(flashingCellDefinitions)) {
-            this.showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions);
-        }
-    }
-    showFlashingCellsForDefinitions(cellDataChangedInfo, flashingCellDefinitions = []) {
-        const allColumnIds = this.api.columnApi.getColumns().map((c) => c.columnId);
-        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(cellDataChangedInfo.newValue)
-                : cellDataChangedInfo.newValue;
-            const oldValue = numeric
-                ? Number(cellDataChangedInfo.oldValue)
-                : cellDataChangedInfo.oldValue;
-            up = newValue > oldValue;
-            down = newValue < oldValue;
-            direction = up ? 'up' : down ? 'down' : 'neutral';
-        }
-        flashingCellDefinitions.forEach((flashingCellDefinition) => {
-            var _a;
-            let flashTarget = this.api.flashingCellApi.getFlashingCellFlashTarget(flashingCellDefinition);
-            const flashColumnIds = { [cellDataChangedInfo.column.columnId]: true };
-            /**
-             * When flashing a row, all columns in that row are marked to flash.
-             */
-            if (flashTarget === 'row' || ((_a = flashTarget === null || flashTarget === void 0 ? void 0 : flashTarget.includes) === null || _a === void 0 ? void 0 : _a.call(flashTarget, 'row'))) {
-                allColumnIds.forEach((colId) => {
-                    flashColumnIds[colId] = true;
-                });
-            }
-            const rowPrimaryKey = cellDataChangedInfo.primaryKeyValue;
-            this.api.flashingCellApi.showFlashingCell({
-                rowPrimaryKey,
-                flashingCellDefinition: flashingCellDefinition,
-                cellDataChangedInfo: cellDataChangedInfo,
-                direction,
-                flashTarget,
-                flashColumnIds,
-            });
-        });
-    }
     isFlashingTargetOnlyAggChange(flashingCellDefinition) {
         if (flashingCellDefinition.FlashTarget === 'aggFuncCell') {
             return true;
@@ -164,48 +222,17 @@ export class FlashingCellModule extends AdaptableModuleBase {
             flashingCellDefinition.FlashTarget.length === 1 &&
             flashingCellDefinition.FlashTarget.includes('aggFuncCell'));
     }
-    getFlashingCellDefinitionsForDataChange(dataChangedEvent) {
-        const definitions = this.api.flashingCellApi.getActiveFlashingCellDefinitions();
-        const defaultNoPredicateReturn = false;
-        let relatedFlashingCellsDefinitions = definitions
-            .filter((v) => this.api.columnScopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
-            .filter((flashingCellDefinition) => !isReactiveQuery(flashingCellDefinition.Rule));
-        let triggeredFlashingCells = [];
-        if (ArrayExtensions.IsNotNullOrEmpty(relatedFlashingCellsDefinitions)) {
-            relatedFlashingCellsDefinitions.forEach((flashingCellDefinition) => {
-                // for aggregation the data-change needs to be aggChange
-                if (dataChangedEvent.trigger !== 'aggChange' &&
-                    this.isFlashingTargetOnlyAggChange(flashingCellDefinition)) {
-                    return;
-                }
-                if (flashingCellDefinition.Rule.BooleanExpression) {
-                    let expression = flashingCellDefinition.Rule.BooleanExpression;
-                    let rowNode = dataChangedEvent.rowNode;
-                    if (!rowNode) {
-                        rowNode = this.api.gridApi.getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
-                    }
-                    const isValidExpression = this.api.expressionApi.isValidBooleanExpression(expression, this.moduleInfo.ModuleName, `Invalid Alert boolean expression '${expression}'`);
-                    const isSatisfiedExpression = isValidExpression &&
-                        this.api.internalApi
-                            .getQueryLanguageService()
-                            .evaluateBooleanExpression(expression, this.moduleInfo.ModuleName, rowNode);
-                    if (isSatisfiedExpression) {
-                        triggeredFlashingCells.push(flashingCellDefinition);
-                    }
-                }
-                else if (this.isAlertPredicateTriggered(flashingCellDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
-                    triggeredFlashingCells.push(flashingCellDefinition);
-                }
-            });
-        }
-        return triggeredFlashingCells;
-    }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
-        var _a;
-        const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
+        const predicateDefHandlerContext = {
+            value: dataChangedEvent.newValue,
+            oldValue: dataChangedEvent.oldValue,
             // TODO send real display value
-            displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.api.internalApi.buildBaseContext());
-        return this.api.predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
+            displayValue: null,
+            node: dataChangedEvent.rowNode,
+            column: dataChangedEvent.column,
+            ...this.api.internalApi.buildBaseContext(),
+        };
+        return this.api.predicateApi.handleColumnPredicates(alert.Rule?.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
     }
     getTeamSharingAction() {
         return {
@@ -217,8 +244,12 @@ export class FlashingCellModule extends AdaptableModuleBase {
     toView(flashingCell) {
         return {
             items: [
-                Object.assign(Object.assign({}, getScopeViewItems(flashingCell.Scope, this.api)), { label: 'Trigger' }),
-                Object.assign(Object.assign({}, getRuleViewItems(flashingCell.Rule, this.api)), { label: 'Rule', name: 'Rule' }),
+                { ...getScopeViewItems(flashingCell.Scope, this.api), label: 'Trigger' },
+                {
+                    ...getRuleViewItems(flashingCell.Rule, this.api),
+                    label: 'Rule',
+                    name: 'Rule',
+                },
                 getFlashingCellDurationViewItems(flashingCell),
                 getFlashingTargetViewItems(flashingCell),
                 getFlashingCellStyleViewItems(),

package/src/Strategy/FormatColumnModule.d.ts

@@ -13,7 +13,7 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     getReferencedNamedQueryNames(formatColumn: FormatColumn): string[];
-    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar" | "separator">[];
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/FormatColumnModule.js

@@ -3,13 +3,13 @@ import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import * as FormatColumnRedux from '../Redux/ActionsReducers/FormatColumnRedux';
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
 import { FormatColumnWizard } from '../View/FormatColumn/Wizard/FormatColumnWizard';
-import { getScopeViewItems } from './Utilities/getScopeViewItems';
 import { getFormatColumnFormatSummaryValue } from '../View/FormatColumn/Wizard/FormatColumnFormatWizardSection';
 import { getFormatColumnSettingsViewItems } from './Utilities/FormatColumn/getFormatColumnSettingsViewItems';
 import { getFormatColumnStyleViewItems } from './Utilities/FormatColumn/getFormatColumnStyleViewItems';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
-import { getRuleViewItems } from './Utilities/getRuleViewItems';
 import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
+import { getRuleViewItems } from '../Utilities/getRuleViewItems';
+import { getScopeViewItems } from '../Utilities/getScopeViewItems';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -24,7 +24,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
         }
         else if (this.api.columnScopeApi.scopeHasColumns(formatColumn.Scope)) {
             return this.api.columnScopeApi
-                .getColumnsForScope(formatColumn.Scope)
+                .getColumnsInScope(formatColumn.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
@@ -55,7 +55,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
                 value: formatColumnsForColumn[0],
                 source: 'ColumnMenu',
             };
-            const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+            const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit Format Column', this.moduleInfo.Popup, 'edit', editPopupParam);
             returnColumnMenuItems.push(editFormatColumnMenuItem);
         }
         else if (formatColumnsForColumn.length > 1) {

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -1,22 +1,23 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import * as FreeTextColumnRedux from '../Redux/ActionsReducers/FreeTextColumnRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-export declare class FreeTextColumnModule extends AdaptableModuleBase implements IModule {
+import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
+export declare class FreeTextColumnModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {
+    private isListeningToCellDataChanges;
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
+    shouldListenToDataChanges(): boolean;
+    checkListenToCellDataChanged(): void;
+    setupCellDataChangeListener(): void;
     isModuleAvailable(): boolean;
     getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar" | "separator">[];
     getTeamSharingAction(): TeamSharingImportInfo<FreeTextColumn>;
     toView(freeTextColumn: FreeTextColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getDeleteAction: (freeTextColumn: FreeTextColumn) => FreeTextColumnRedux.FreeTextColumnDeleteAction;
-        getEditWizard(): (props: import("../View/FreeTextColumn/Wizard/FreeTextColumnWizard").FreeTextColumnWizardProps) => JSX.Element;
-    };
+    getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/FreeTextColumnModule.js

@@ -2,14 +2,41 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import * as FreeTextColumnRedux from '../Redux/ActionsReducers/FreeTextColumnRedux';
 import { FreeTextColumnWizard } from '../View/FreeTextColumn/Wizard/FreeTextColumnWizard';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
+import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 export class FreeTextColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FreeTextColumnModuleId, ModuleConstants.FreeTextColumnFriendlyName, 'horizontal-lines', 'FreeTextColumnPopup', 'Dynamic column showing custom content (stored in state and not with grid data)', api);
+        this.isListeningToCellDataChanges = false;
+    }
+    onAdaptableReady() {
+        this.checkListenToCellDataChanged();
+    }
+    shouldListenToDataChanges() {
+        return ArrayExtensions.IsNotNullOrEmpty(this.api.freeTextColumnApi.getFreeTextColumns());
+    }
+    checkListenToCellDataChanged() {
+        if (!this.isListeningToCellDataChanges) {
+            if (this.shouldListenToDataChanges()) {
+                this.setupCellDataChangeListener();
+                this.isListeningToCellDataChanges = true;
+            }
+        }
+    }
+    setupCellDataChangeListener() {
+        // Listen to Data Service to save any Free Text Column Edits
+        // We dont refresh here as that is all done in AdaptableAgGrid
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            if (cellDataChangedInfo.trigger !== 'aggChange') {
+                this.api.freeTextColumnApi.internalApi.handleFreeTextColumnDataChange(cellDataChangedInfo);
+            }
+        });
     }
     isModuleAvailable() {
         // FreeTextColumn module doesn't support autogenerated primary keys
-        return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
+        return super.isModuleAvailable() && !this.api.optionsApi.isAutogeneratePrimaryKey();
     }
     getModuleAdaptableObjects() {
         return this.api.freeTextColumnApi.getFreeTextColumns();
@@ -18,19 +45,15 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
         return false;
     }
     createColumnMenuItems(column) {
-        if (column && this.isModuleEditable()) {
-            if (this.api.freeTextColumnApi
-                .getFreeTextColumns()
-                .find((ftc) => ftc.ColumnId == column.columnId)) {
-                let popupParam = {
-                    column: column,
-                    action: 'Edit',
-                    source: 'ColumnMenu',
-                };
-                return [
-                    this.createMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
-                ];
-            }
+        if (column && column.isFreeTextColumn && this.isModuleEditable()) {
+            let popupParam = {
+                column: column,
+                action: 'Edit',
+                source: 'ColumnMenu',
+            };
+            return [
+                this.createMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            ];
         }
     }
     getTeamSharingAction() {
@@ -41,7 +64,6 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
         };
     }
     toView(freeTextColumn) {
-        var _a;
         return {
             abObject: freeTextColumn,
             items: [
@@ -58,7 +80,7 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
                 {
                     name: 'Settings',
                     label: 'Data Type',
-                    values: [(_a = freeTextColumn.FreeTextColumnSettings.DataType) !== null && _a !== void 0 ? _a : 'Not specified'],
+                    values: [freeTextColumn.FreeTextColumnSettings.DataType ?? 'Not specified'],
                 },
                 Boolean(freeTextColumn.DefaultValue) && {
                     name: 'Settings',

package/src/Strategy/GridFilterModule.d.ts

@@ -1,7 +1,9 @@
-import { AdaptableApi } from '../../types';
+import { AdaptableApi, AdaptableObject } from '../../types';
 import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 export declare class GridFilterModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    setModuleEntitlement(): void;
+    getModuleAdaptableObjects(): AdaptableObject[];
     getViewProperties(): AdaptableModuleView;
 }