@adaptabletools/adaptable 10.0.4-canary.1 → 10.0.4-canary.5

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

@@ -1,13 +1,13 @@
 import { ApiBase } from './ApiBase';
 import { AlertApi } from '../AlertApi';
-import { AlertState, AlertDefinition, AdaptableAlertAction, AlertButton, FlashingAlertDefinition, BaseAlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AlertState, AlertDefinition, AlertProperties, AdaptableAlertAction, AlertButton } from '../../PredefinedConfig/AlertState';
 import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
 import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableForm, AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
-import { AdaptableFlashingAlert } from '../../PredefinedConfig/Common/AdaptableFlashingAlert';
 import { AlertButtonContext } from '../../AdaptableOptions/NotificationsOptions';
+import { AdaptableMessageType } from '../../types';
 export declare class AlertApiImpl extends ApiBase implements AlertApi {
     getAlertState(): AlertState;
     getAdaptableFormByName(name: string): AdaptableForm<AlertButtonContext> | undefined;
@@ -17,13 +17,6 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     getActiveNonReactiveAlertDefinitions(): AlertDefinition[];
     getReactiveAlertDefinitions(): AlertDefinition[];
     getActiveReactiveAlertDefinitions(): AlertDefinition[];
-    getFlashingAlertDefinitions(): FlashingAlertDefinition[];
-    getFlashingAlertDefinitionById(id: FlashingAlertDefinition['Uuid']): FlashingAlertDefinition;
-    getNonReactiveFlashingAlertDefinitions(): FlashingAlertDefinition[];
-    getActiveNonReactiveFlashingAlertDefinitions(): FlashingAlertDefinition[];
-    getReactiveFlashingAlertDefinitions(): FlashingAlertDefinition[];
-    getActiveReactiveFlashingAlertDefinitions(): FlashingAlertDefinition[];
-    getFlashingAlertFlashTarget(flashingAlertDefinition: FlashingAlertDefinition): FlashingAlertDefinition['FlashTarget'];
     getAlertDefinitionsWithPreventEdit(): AlertDefinition[];
     getAlertDefinitionsWithAllowEdit(): AlertDefinition[];
     addAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
@@ -33,27 +26,20 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
         dataChangedInfo?: DataChangedInfo;
         formData?: AdaptableFormData;
     }): void;
-    showFlashingAlert(alertToShow: AdaptableFlashingAlert): void;
     displayAlert(alertToShow: AdaptableAlert): Promise<any>;
     publishAlertFiredEvent(alertToFire: AdaptableAlert): void;
     displayMessageAlertPopup(alertToDisplayAsPopup: AdaptableAlert): void;
-    showAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo): void;
-    showAlertInfo(alertHeader: string, alertMessage: string): void;
-    showAlertSuccess(alertHeader: string, alertMessage: string): void;
-    showAlertWarning(alertHeader: string, alertMessage: string): void;
-    showAlertError(alertHeader: string, alertMessage: string): void;
+    showAlert(alertHeader: string, alertMessage: string, messageType: AdaptableMessageType, alertProperties?: AlertProperties): void;
+    showAlertInfo(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): void;
+    showAlertSuccess(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): void;
+    showAlertWarning(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): void;
+    showAlertError(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): void;
     showAlertPopup(): void;
     getAlertPredicateDefs(): AdaptablePredicateDef[];
     getAlertPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
     editAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     suspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     unSuspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
-    addFlashingAlertDefinition(flashingAlertDefinition: FlashingAlertDefinition): FlashingAlertDefinition;
-    editFlashingAlertDefinition(flashingAlertDefinition: FlashingAlertDefinition): FlashingAlertDefinition;
-    suspendFlashingAlertDefinition(flashingAlertDefinition: FlashingAlertDefinition): FlashingAlertDefinition;
-    unSuspendFlashingAlertDefinition(flashingAlertDefinition: FlashingAlertDefinition): FlashingAlertDefinition;
-    addFlashingAlertDefinitions(flashingAlertDefinitions: FlashingAlertDefinition[]): FlashingAlertDefinition[];
-    editFlashingAlertDefinitions(flashingAlertDefinitions: FlashingAlertDefinition[]): FlashingAlertDefinition[];
     getAlertDescription(alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo): string;
-    getAlertRuleDescription(alert: BaseAlertDefinition): string;
+    getAlertRuleDescription(alert: AlertDefinition): string;
 }

package/src/Api/Implementation/AlertApiImpl.js

@@ -38,49 +38,6 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     getActiveReactiveAlertDefinitions() {
         return this.getReactiveAlertDefinitions().filter((alertDef) => !alertDef.IsSuspended);
     }
-    getFlashingAlertDefinitions() {
-        var _a, _b;
-        const flashingAlertDefinitions = this.getAlertState().FlashingAlertDefinitions;
-        const flashingDefaults = (_b = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.flashingAlertDefaultProperties) !== null && _b !== void 0 ? _b : {};
-        return flashingAlertDefinitions.map((flashingAlertDefinition) => {
-            return Object.assign(Object.assign({}, flashingDefaults), flashingAlertDefinition);
-        });
-    }
-    getFlashingAlertDefinitionById(id) {
-        var _a;
-        return (_a = this.getFlashingAlertDefinitions()) === null || _a === void 0 ? void 0 : _a.find((alert) => (alert === null || alert === void 0 ? void 0 : alert.Uuid) === id);
-    }
-    getNonReactiveFlashingAlertDefinitions() {
-        var _a, _b;
-        const flashingAlertDefinitions = this.getAlertState().FlashingAlertDefinitions.filter((alertDef) => !AdaptableQuery_1.isReactiveQuery(alertDef.Rule));
-        const flashingDefaults = (_b = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.flashingAlertDefaultProperties) !== null && _b !== void 0 ? _b : {};
-        return flashingAlertDefinitions.map((flashingAlertDefinition) => {
-            return Object.assign(Object.assign({}, flashingDefaults), flashingAlertDefinition);
-        });
-    }
-    getActiveNonReactiveFlashingAlertDefinitions() {
-        return this.getNonReactiveFlashingAlertDefinitions().filter((alertDef) => !alertDef.IsSuspended);
-    }
-    getReactiveFlashingAlertDefinitions() {
-        var _a, _b;
-        const reactiveFlashingAlertDefinitions = this.getAlertState().FlashingAlertDefinitions.filter((alertDef) => AdaptableQuery_1.isReactiveQuery(alertDef.Rule));
-        const flashingDefaults = (_b = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.flashingAlertDefaultProperties) !== null && _b !== void 0 ? _b : {};
-        return reactiveFlashingAlertDefinitions.map((flashingAlertDefinition) => {
-            return Object.assign(Object.assign({}, flashingDefaults), flashingAlertDefinition);
-        });
-    }
-    getActiveReactiveFlashingAlertDefinitions() {
-        return this.getReactiveFlashingAlertDefinitions().filter((alertDef) => !alertDef.IsSuspended);
-    }
-    getFlashingAlertFlashTarget(flashingAlertDefinition) {
-        const scopeApi = this.adaptable.api.scopeApi;
-        const isScopeAll = scopeApi.scopeIsAll(flashingAlertDefinition.Scope);
-        const flashTarget = flashingAlertDefinition.FlashTarget === 'cell' ||
-            (!flashingAlertDefinition.FlashTarget && !isScopeAll)
-            ? 'cell'
-            : 'row';
-        return flashTarget;
-    }
     getAlertDefinitionsWithPreventEdit() {
         return this.getActiveNonReactiveAlertDefinitions().filter((a) => a.AlertProperties != null && a.AlertProperties.PreventEdit === true);
     }
@@ -111,15 +68,30 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         }
     }
     executeAlertAction(actionName, details) {
-        const { alertDefinition, dataChangedInfo, formData } = details;
+        var _a;
+        const { alertDefinition, dataChangedInfo } = details;
         if (!dataChangedInfo) {
             return;
         }
         if (actionName === 'highlight-cell') {
+            const highhlightType = (_a = alertDefinition.MessageType) !== null && _a !== void 0 ? _a : 'Info';
+            let backgroundColor = '';
+            switch (highhlightType) {
+                case 'Error':
+                    backgroundColor = 'var(--ab-color-error)';
+                case 'Info':
+                    backgroundColor = 'var(--ab-color-info)';
+                case 'Success':
+                    backgroundColor = 'var(--ab-color-success)';
+                case 'Warning':
+                    backgroundColor = 'var(--ab-color-warn)';
+            }
             this.adaptable.api.gridApi.highlightCell({
                 columnId: dataChangedInfo.column.columnId,
                 primaryKeyValue: dataChangedInfo.primaryKeyValue,
-                highlightType: alertDefinition.MessageType,
+                highlightStyle: {
+                    BackColor: backgroundColor,
+                },
                 timeout: this.getNotificationsOptions().cellHighlightDuration,
             });
             return;
@@ -156,26 +128,6 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         }
         */
     }
-    showFlashingAlert(alertToShow) {
-        this.addUidToAdaptableObject(alertToShow);
-        const flashingAlertFiredInfo = {
-            adaptableApi: this.adaptable.api,
-            flashingAlert: alertToShow,
-        };
-        const results = this.adaptable.api.eventApi.emitSync('FlashingAlertFired', flashingAlertFiredInfo);
-        const shouldShow = results.reduce((endResult, aResult) => {
-            return endResult && aResult !== false;
-        }, true);
-        if (shouldShow) {
-            this.dispatchAction(SystemRedux.SystemFlashingAlertAdd(alertToShow));
-            const { FlashDuration } = alertToShow.flashingAlertDefinition;
-            if (FlashDuration && FlashDuration !== 'always') {
-                setTimeout(() => {
-                    this.dispatchAction(SystemRedux.SystemFlashingAlertDelete(alertToShow));
-                }, FlashDuration);
-            }
-        }
-    }
     async displayAlert(alertToShow) {
         // 3 things we always do with an alert are:
         // 1. Dispatch the Alert (so it appears in the toolbar)
@@ -226,6 +178,18 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                     }, this.adaptable.adaptableOptions.notificationsOptions.cellHighlightDuration);
                 }
             }
+            if (alertProperties.HighlightRow && dataChangedInfo) {
+                let alertNode = dataChangedInfo.rowNode;
+                if (!alertNode) {
+                    alertNode = this.adaptable.getRowNodeForPrimaryKey(dataChangedInfo.primaryKeyValue);
+                }
+                if (alertNode) {
+                    this.adaptable.api.gridApi.refreshRowNode(alertNode);
+                    setTimeout(() => {
+                        this.dispatchAction(SystemRedux.SystemAlertRemoveHighlight(alertToShow));
+                    }, this.adaptable.adaptableOptions.notificationsOptions.cellHighlightDuration);
+                }
+            }
             if (alertProperties.LogToConsole) {
                 LoggingHelper_1.ConsoleLogByMessageType(alertToShow.header + ': ' + alertToShow.message, alertDefinition.MessageType);
             }
@@ -238,25 +202,22 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     displayMessageAlertPopup(alertToDisplayAsPopup) {
         this.dispatchAction(PopupRedux.PopupShowAlert(alertToDisplayAsPopup));
     }
-    showAlert(alertHeader, alertMessage, alertDefinition, dataChangedInfo) {
-        let alertToShow = ObjectFactory_1.default.CreateAlert(alertHeader, alertMessage, alertDefinition, dataChangedInfo);
+    showAlert(alertHeader, alertMessage, messageType, alertProperties) {
+        const alertDefinition = ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages(messageType, alertProperties);
+        let alertToShow = ObjectFactory_1.default.CreateAlert(alertHeader, alertMessage, alertDefinition);
         this.displayAlert(alertToShow);
     }
-    showAlertInfo(alertHeader, alertMessage) {
-        let alertDefinition = ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Info');
-        this.showAlert(alertHeader, alertMessage, alertDefinition);
+    showAlertInfo(alertHeader, alertMessage, alertProperties) {
+        this.showAlert(alertHeader, alertMessage, 'Info', alertProperties);
     }
-    showAlertSuccess(alertHeader, alertMessage) {
-        let alertDefinition = ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Success');
-        this.showAlert(alertHeader, alertMessage, alertDefinition);
+    showAlertSuccess(alertHeader, alertMessage, alertProperties) {
+        this.showAlert(alertHeader, alertMessage, 'Success', alertProperties);
     }
-    showAlertWarning(alertHeader, alertMessage) {
-        let alertDefinition = ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Warning');
-        this.showAlert(alertHeader, alertMessage, alertDefinition);
+    showAlertWarning(alertHeader, alertMessage, alertProperties) {
+        this.showAlert(alertHeader, alertMessage, 'Warning', alertProperties);
     }
-    showAlertError(alertHeader, alertMessage) {
-        let alertDefinition = ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error');
-        this.showAlert(alertHeader, alertMessage, alertDefinition);
+    showAlertError(alertHeader, alertMessage, alertProperties) {
+        this.showAlert(alertHeader, alertMessage, 'Error', alertProperties);
     }
     showAlertPopup() {
         this.showModulePopup(ModuleConstants.AlertModuleId);
@@ -279,34 +240,6 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(AlertRedux.AlertDefinitionUnSuspend(alertDefinition));
         return this.getAlertDefinitionById(alertDefinition.Uuid);
     }
-    addFlashingAlertDefinition(flashingAlertDefinition) {
-        this.dispatchAction(AlertRedux.FlashingAlertDefinitionAdd(flashingAlertDefinition));
-        return this.getFlashingAlertDefinitionById(flashingAlertDefinition.Uuid);
-    }
-    editFlashingAlertDefinition(flashingAlertDefinition) {
-        this.dispatchAction(AlertRedux.FlashingAlertDefinitionEdit(flashingAlertDefinition));
-        return this.getFlashingAlertDefinitionById(flashingAlertDefinition.Uuid);
-    }
-    suspendFlashingAlertDefinition(flashingAlertDefinition) {
-        this.dispatchAction(AlertRedux.FlashingAlertDefinitionSuspend(flashingAlertDefinition));
-        return this.getFlashingAlertDefinitionById(flashingAlertDefinition.Uuid);
-    }
-    unSuspendFlashingAlertDefinition(flashingAlertDefinition) {
-        this.dispatchAction(AlertRedux.FlashingAlertDefinitionUnSuspend(flashingAlertDefinition));
-        return this.getFlashingAlertDefinitionById(flashingAlertDefinition.Uuid);
-    }
-    addFlashingAlertDefinitions(flashingAlertDefinitions) {
-        flashingAlertDefinitions.forEach((fad) => {
-            this.addFlashingAlertDefinition(fad);
-        });
-        return flashingAlertDefinitions === null || flashingAlertDefinitions === void 0 ? void 0 : flashingAlertDefinitions.map((alert) => this.getFlashingAlertDefinitionById(alert === null || alert === void 0 ? void 0 : alert.Uuid));
-    }
-    editFlashingAlertDefinitions(flashingAlertDefinitions) {
-        flashingAlertDefinitions.forEach((fad) => {
-            this.editFlashingAlertDefinition(fad);
-        });
-        return flashingAlertDefinitions === null || flashingAlertDefinitions === void 0 ? void 0 : flashingAlertDefinitions.map((alert) => this.getFlashingAlertDefinitionById(alert === null || alert === void 0 ? void 0 : alert.Uuid));
-    }
     getAlertDescription(alertDefinition, dataChangedInfo) {
         var _a;
         const alertMessageFunction = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.alertMessageText;

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

@@ -3,7 +3,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { DataType } from '../../PredefinedConfig/Common/Enums';
 import { ColumnApi } from '../ColumnApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { RowNode } from '@ag-grid-community/all-modules';
+import { Column, RowNode } from '@ag-grid-community/all-modules';
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getColumns(): AdaptableColumn[];
     getVisibleColumns(): AdaptableColumn[];
@@ -15,7 +15,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     selectColumns(columnIds: string[]): void;
     hideColumn(columnId: string): void;
     showColumn(columnId: string): void;
-    getVendorColumnType(columnId: string): string | string[];
+    getAgGridColumnType(columnId: string): string | string[];
     isRowGroupColumn(columnId: string): boolean;
     isCalculatedColumn(columnId: string): boolean;
     isFreeTextColumn(columnId: string): boolean;
@@ -35,7 +35,8 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     doesColumnExist(columnId: string): boolean;
     getColumnFromId(columnId: string, logWarning?: boolean): AdaptableColumn | undefined;
     getColumnIdsFromId(columnId: string, logWarning?: boolean): string[] | undefined;
-    getVendorGridColumnFieldForColumn(colId: string): string;
+    getAgGridColumnFieldForAdaptableColumn(colId: string): string;
+    getAgGridColumnForAdaptableColumn(columnId: string): Column;
     getColumnFromFriendlyName(columnName: string, logWarning?: boolean): AdaptableColumn;
     getColumnsOfType(dataType: DataType): AdaptableColumn[];
     getNumericColumns(): AdaptableColumn[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -44,8 +44,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     showColumn(columnId) {
         this.adaptable.showColumn(columnId);
     }
-    getVendorColumnType(columnId) {
-        return this.adaptable.getVendorColumnType(columnId);
+    getAgGridColumnType(columnId) {
+        return this.adaptable.getAgGridColumnType(columnId);
     }
     isRowGroupColumn(columnId) {
         // put this here as there might be other indicators we are not aware of
@@ -187,8 +187,12 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return undefined;
     }
-    getVendorGridColumnFieldForColumn(colId) {
-        return this.adaptable.getVendorGridColumnFieldForColumn(this.getColumnFromId(colId));
+    getAgGridColumnFieldForAdaptableColumn(colId) {
+        const agGridColumn = this.getAgGridColumnForAdaptableColumn(colId);
+        return agGridColumn.getColDef().field || '';
+    }
+    getAgGridColumnForAdaptableColumn(columnId) {
+        return this.adaptable.getAgGridColumnForAdaptableColumn(this.getColumnFromId(columnId));
     }
     getColumnFromFriendlyName(columnName, logWarning = true) {
         // just return null if no columns rather than logging a warning - otherwise get lots at startup
@@ -272,7 +276,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     async getDistinctFilterDisplayValuesForColumn(columnId, filter) {
@@ -283,10 +287,10 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
                 suppressClientSideFilter: false,
             };
         }
-        const { gridCells, suppressClientSideFilter, } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
+        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
         return {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-                return cv.displayValue;
+                return cv.normalisedValue;
             }),
             suppressClientSideFilter,
         };
@@ -298,7 +302,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, false);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     async getDistinctBulkUpdateDisplayValuesForColumn(columnId, selectedGridCells) {
@@ -308,7 +312,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, false, selectedGridCells);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     getDistinctVisibleDisplayValuesForColumn(columnId) {
@@ -318,7 +322,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
-            return cv.displayValue;
+            return cv.normalisedValue;
         });
     }
     getDistinctRawValuesForColumn(columnId, skipRowNode) {
@@ -370,8 +374,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         });
     }
     usesAdaptableFilterForm(columnId) {
-        const useAdaptableFilterForm = this.getFilterOptions()
-            .useAdaptableFilterForm;
+        const useAdaptableFilterForm = this.getFilterOptions().useAdaptableFilterForm;
         if (useAdaptableFilterForm == null || useAdaptableFilterForm == false) {
             return false;
         }
@@ -381,8 +384,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return true;
     }
     usesAdaptableQuickFilter(columnId) {
-        const useAdaptableQuickFilter = this.getFilterOptions()
-            .useAdaptableQuickFilter;
+        const useAdaptableQuickFilter = this.getFilterOptions().useAdaptableQuickFilter;
         if (useAdaptableQuickFilter == null || useAdaptableQuickFilter == false) {
             return false;
         }

package/src/Api/Implementation/ConfigApiImpl.js

@@ -76,9 +76,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
         return [
             'Alert',
             'Application',
-            'BulkUpdate',
             'CalculatedColumn',
-            'CellSummary',
             'Chart',
             'ConditionalStyle',
             'CustomSort',
@@ -94,12 +92,9 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             'Query',
             'QuickSearch',
             'Shortcut',
-            'SmartEdit',
             'SparklineColumn',
-            'SystemStatus',
             'Theme',
             'ToolPanel',
-            'UserInterface',
         ];
     }
     getAllUserState() {
@@ -179,18 +174,10 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Application)
                     : this.getAdaptableState().Application;
-            case 'BulkUpdate':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().BulkUpdate)
-                    : this.getAdaptableState().BulkUpdate;
             case 'CalculatedColumn':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CalculatedColumn)
                     : this.getAdaptableState().CalculatedColumn;
-            case 'CellSummary':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().SelectedCells)
-                    : this.getAdaptableState().CellSummary;
             case 'Chart':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Chart)
@@ -211,10 +198,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().DataSource)
                     : this.getAdaptableState().DataSource;
-            case 'Entitlement':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Entitlements)
-                    : this.getAdaptableState().Entitlements;
             case 'Export':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Export)
@@ -255,18 +238,10 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Shortcut)
                     : this.getAdaptableState().Shortcut;
-            case 'SmartEdit':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().SmartEdit)
-                    : this.getAdaptableState().SmartEdit;
             case 'SparklineColumn':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().SparklineColumn)
                     : this.getAdaptableState().SparklineColumn;
-            case 'SystemStatus':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().SystemStatus)
-                    : this.getAdaptableState().SystemStatus;
             case 'Theme':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Theme)
@@ -275,10 +250,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().ToolPanel)
                     : this.getAdaptableState().ToolPanel;
-            case 'UserInterface':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().UserInterface)
-                    : this.getAdaptableState().UserInterface;
         }
     }
     incrementUerStateRevision(stateKey) {

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

@@ -8,4 +8,5 @@ export declare class DataChangeHistoryApiImpl extends ApiBase implements DataCha
     suspendDataChangeHistory(): void;
     getDataChangeHistoryLog(): DataChangedInfo[];
     undoDataChangeHistoryEntry(dataChangeInfo: DataChangedInfo): void;
+    showDataChangeHistoryPopup(): void;
 }

package/src/Api/Implementation/DataChangeHistoryApiImpl.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataChangeHistoryApiImpl = void 0;
+const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     getDataChangeHistoryMode() {
         return this.getAdaptableState().System.DataChangeHistory.currentMode;
@@ -38,5 +40,8 @@ class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     undoDataChangeHistoryEntry(dataChangeInfo) {
         this.dispatchAction(SystemRedux_1.SystemDataChangeHistoryUndo(dataChangeInfo));
     }
+    showDataChangeHistoryPopup() {
+        this.showModulePopup(ModuleConstants.DataChangeHistoryModuleId);
+    }
 }
 exports.DataChangeHistoryApiImpl = DataChangeHistoryApiImpl;

package/src/Api/Implementation/FilterApiImpl.js

@@ -174,7 +174,7 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, {
             value: gridCell.normalisedValue,
             oldValue: null,
-            displayValue: gridCell.displayValue,
+            displayValue: gridCell.normalisedValue,
             node,
             column,
         }, true);

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

@@ -0,0 +1,20 @@
+import { ApiBase } from './ApiBase';
+import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
+import { FlashingCellApi } from '../FlashingCellApi';
+import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
+export declare class FlashingCellApiImpl extends ApiBase implements FlashingCellApi {
+    getFlashingCellState(): FlashingCellState;
+    getFlashingCellDefinitions(): FlashingCellDefinition[];
+    getFlashingCellDefinitionById(id: FlashingCellDefinition['Uuid']): FlashingCellDefinition;
+    getNonReactiveFlashingCellDefinitions(): FlashingCellDefinition[];
+    getActiveNonReactiveFlashingCellDefinitions(): FlashingCellDefinition[];
+    getFlashingCellFlashTarget(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition['FlashTarget'];
+    showFlashingCell(alertToShow: AdaptableFlashingCell): void;
+    addFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
+    setFlashingCellDefinition(flashingCellDefinitions: FlashingCellDefinition[]): void;
+    editFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
+    suspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
+    unSuspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
+    addFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
+    editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
+}

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlashingCellApiImpl = void 0;
+const tslib_1 = require("tslib");
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const FlashingCellRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FlashingCellRedux"));
+const ApiBase_1 = require("./ApiBase");
+const AdaptableQuery_1 = require("../../PredefinedConfig/Common/AdaptableQuery");
+class FlashingCellApiImpl extends ApiBase_1.ApiBase {
+    getFlashingCellState() {
+        return this.getAdaptableState().FlashingCell;
+    }
+    getFlashingCellDefinitions() {
+        var _a, _b;
+        const flashingCellDefinitions = this.getFlashingCellState().FlashingCellDefinitions;
+        const flashingDefaults = (_b = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.flashingCellDefaultProperties) !== null && _b !== void 0 ? _b : {};
+        return flashingCellDefinitions.map((flashingCellDefinition) => {
+            return Object.assign(Object.assign({}, flashingDefaults), flashingCellDefinition);
+        });
+    }
+    getFlashingCellDefinitionById(id) {
+        var _a;
+        return (_a = this.getFlashingCellDefinitions()) === null || _a === void 0 ? void 0 : _a.find((alert) => (alert === null || alert === void 0 ? void 0 : alert.Uuid) === id);
+    }
+    getNonReactiveFlashingCellDefinitions() {
+        var _a, _b;
+        const flashingCellDefinitions = this.getFlashingCellState().FlashingCellDefinitions.filter((alertDef) => !AdaptableQuery_1.isReactiveQuery(alertDef.Rule));
+        const flashingDefaults = (_b = (_a = this.adaptable.adaptableOptions.notificationsOptions) === null || _a === void 0 ? void 0 : _a.flashingCellDefaultProperties) !== null && _b !== void 0 ? _b : {};
+        return flashingCellDefinitions.map((flashingCellDefinition) => {
+            return Object.assign(Object.assign({}, flashingDefaults), flashingCellDefinition);
+        });
+    }
+    getActiveNonReactiveFlashingCellDefinitions() {
+        return this.getNonReactiveFlashingCellDefinitions().filter((alertDef) => !alertDef.IsSuspended);
+    }
+    getFlashingCellFlashTarget(flashingCellDefinition) {
+        //   const scopeApi = this.adaptable.api.scopeApi;
+        // const isScopeAll = scopeApi.scopeIsAll(flashingCellDefinition.Scope);
+        const flashTarget = flashingCellDefinition.FlashTarget === 'cell' || !flashingCellDefinition.FlashTarget
+            ? 'cell'
+            : 'row';
+        return flashTarget;
+    }
+    showFlashingCell(alertToShow) {
+        this.addUidToAdaptableObject(alertToShow);
+        const flashingCellFiredInfo = {
+            adaptableApi: this.adaptable.api,
+            flashingCell: alertToShow,
+        };
+        const results = this.adaptable.api.eventApi.emitSync('FlashingCellDisplayed', flashingCellFiredInfo);
+        const shouldShow = results.reduce((endResult, aResult) => {
+            return endResult && aResult !== false;
+        }, true);
+        if (shouldShow) {
+            this.dispatchAction(SystemRedux.SystemFlashingCellAdd(alertToShow));
+            const { FlashDuration } = alertToShow.flashingCellDefinition;
+            if (FlashDuration && FlashDuration !== 'always') {
+                setTimeout(() => {
+                    this.dispatchAction(SystemRedux.SystemFlashingCellDelete(alertToShow));
+                }, FlashDuration);
+            }
+        }
+    }
+    addFlashingCellDefinition(flashingCellDefinition) {
+        this.dispatchAction(FlashingCellRedux.FlashingCellDefinitionAdd(flashingCellDefinition));
+        return this.getFlashingCellDefinitionById(flashingCellDefinition.Uuid);
+    }
+    setFlashingCellDefinition(flashingCellDefinitions) {
+        this.dispatchAction(FlashingCellRedux.FlashingCellDefinitionSet(flashingCellDefinitions));
+    }
+    editFlashingCellDefinition(flashingCellDefinition) {
+        this.dispatchAction(FlashingCellRedux.FlashingCellDefinitionEdit(flashingCellDefinition));
+        return this.getFlashingCellDefinitionById(flashingCellDefinition.Uuid);
+    }
+    suspendFlashingCellDefinition(flashingCellDefinition) {
+        this.dispatchAction(FlashingCellRedux.FlashingCellDefinitionSuspend(flashingCellDefinition));
+        return this.getFlashingCellDefinitionById(flashingCellDefinition.Uuid);
+    }
+    unSuspendFlashingCellDefinition(flashingCellDefinition) {
+        this.dispatchAction(FlashingCellRedux.FlashingCellDefinitionUnSuspend(flashingCellDefinition));
+        return this.getFlashingCellDefinitionById(flashingCellDefinition.Uuid);
+    }
+    addFlashingCellDefinitions(flashingCellDefinitions) {
+        flashingCellDefinitions.forEach((fad) => {
+            this.addFlashingCellDefinition(fad);
+        });
+        return flashingCellDefinitions === null || flashingCellDefinitions === void 0 ? void 0 : flashingCellDefinitions.map((flashingCell) => this.getFlashingCellDefinitionById(flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.Uuid));
+    }
+    editFlashingCellDefinitions(flashingCellDefinitions) {
+        flashingCellDefinitions.forEach((fad) => {
+            this.editFlashingCellDefinition(fad);
+        });
+        return flashingCellDefinitions === null || flashingCellDefinitions === void 0 ? void 0 : flashingCellDefinitions.map((flashingCell) => this.getFlashingCellDefinitionById(flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.Uuid));
+    }
+}
+exports.FlashingCellApiImpl = FlashingCellApiImpl;