@adaptabletools/adaptable 12.1.6 → 12.1.8-canary.1

package/src/Redux/ActionsReducers/PlusMinusRedux.js

@@ -26,7 +26,7 @@ exports.PLUS_MINUS_RULE_DELETE = 'PLUS_MINUS_RULE_DELETE';
  */
 exports.PLUS_MINUS_RULE_SUSPEND = 'PLUS_MINUS_RULE_SUSPEND';
 /**
- * @ReduxAction A Plus Minus Rule has been un-suspended
+ * @ReduxAction A Plus Minus Rule has been unsuspended
  */
 exports.PLUS_MINUS_RULE_UNSUSPEND = 'PLUS_MINUS_RULE_UNSUSPEND';
 /**

package/src/Redux/ActionsReducers/PopupRedux.d.ts

@@ -11,7 +11,6 @@ export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
 export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
 export declare const POPUP_HIDE_LOADING = "POPUP_HIDE_LOADING";
 export declare const POPUP_SHOW_ALERT = "POPUP_SHOW_ALERT";
-export declare const POPUP_HIDE_ALERT = "POPUP_HIDE_ALERT";
 export declare const POPUP_SHOW_PROMPT = "POPUP_SHOW_PROMPT";
 export declare const POPUP_HIDE_PROMPT = "POPUP_HIDE_PROMPT";
 export declare const POPUP_CONFIRM_PROMPT = "POPUP_CONFIRM_PROMPT";
@@ -96,7 +95,6 @@ export declare const PopupShowForm: (config: {
 }) => PopupShowFormAction;
 export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;
-export declare const PopupHideAlert: () => PopupHideAlertAction;
 export declare const PopupShowLoading: () => PopupShowLoadingAction;
 export declare const PopupHideLoading: () => PopupHideLoadingAction;
 export declare const PopupShowPrompt: (prompt: UIPrompt) => PopupShowPromptAction;

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupHideAlert = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_HIDE_ALERT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
+exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
 exports.POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 exports.POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
 exports.POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
 exports.POPUP_HIDE_LOADING = 'POPUP_HIDE_LOADING';
 exports.POPUP_SHOW_ALERT = 'POPUP_SHOW_ALERT';
-exports.POPUP_HIDE_ALERT = 'POPUP_HIDE_ALERT';
 exports.POPUP_SHOW_PROMPT = 'POPUP_SHOW_PROMPT';
 exports.POPUP_HIDE_PROMPT = 'POPUP_HIDE_PROMPT';
 exports.POPUP_CONFIRM_PROMPT = 'POPUP_CONFIRM_PROMPT';
@@ -63,10 +62,6 @@ const PopupShowAlert = (alert) => {
     };
 };
 exports.PopupShowAlert = PopupShowAlert;
-const PopupHideAlert = () => ({
-    type: exports.POPUP_HIDE_ALERT,
-});
-exports.PopupHideAlert = PopupHideAlert;
 const PopupShowLoading = () => ({
     type: exports.POPUP_SHOW_LOADING,
 });
@@ -75,12 +70,6 @@ const PopupHideLoading = () => ({
     type: exports.POPUP_HIDE_LOADING,
 });
 exports.PopupHideLoading = PopupHideLoading;
-//export const PopupShowGridInfo = (): PopupShowGridInfoAction => ({
-//  type: POPUP_SHOW_GRID_INFO,
-//});
-//export const PopupHideGridInfo = (): PopupHideGridInfoAction => ({
-//  type: POPUP_HIDE_GRID_INFO,
-//});
 const PopupShowPrompt = (prompt) => ({
     type: exports.POPUP_SHOW_PROMPT,
     prompt: prompt,
@@ -123,9 +112,6 @@ const initialState = {
     LoadingPopup: {
         ShowLoadingPopup: true,
     },
-    AlertPopup: {
-        Alert: null,
-    },
     ConfirmationPopup: {
         ShowConfirmationPopup: false,
         Msg: '',
@@ -261,19 +247,6 @@ const PopupReducer = (state = initialState, action) => {
                 ConfirmationPopup: newConfirmationPopup,
             });
         }
-        case exports.POPUP_SHOW_ALERT: {
-            let showAlertAction = action;
-            let newAlertPopup = {
-                Alert: showAlertAction.alert,
-            };
-            return Object.assign({}, state, { AlertPopup: newAlertPopup });
-        }
-        case exports.POPUP_HIDE_ALERT: {
-            let newAlertPopup = {
-                Alert: null,
-            };
-            return Object.assign({}, state, { AlertPopup: newAlertPopup });
-        }
         case exports.POPUP_SHOW_LOADING: {
             let newLoadingPopup = { ShowLoadingPopup: true };
             return Object.assign({}, state, { LoadingPopup: newLoadingPopup });

package/src/Redux/ActionsReducers/ScheduleRedux.d.ts

@@ -27,7 +27,7 @@ export declare const REPORT_SCHEDULE_DELETE = "REPORT_SCHEDULE_DELETE";
  */
 export declare const REPORT_SCHEDULE_SUSPEND = "REPORT_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction A Report Schedule has been un-suspended or activated
+ * @ReduxAction A Report Schedule has been unsuspended or activated
  */
 export declare const REPORT_SCHEDULE_UNSUSPEND = "REPORT_SCHEDULE_UNSUSPEND";
 /**
@@ -47,7 +47,7 @@ export declare const REMINDER_SCHEDULE_DELETE = "REMINDER_SCHEDULE_DELETE";
  */
 export declare const REMINDER_SCHEDULE_SUSPEND = "REMINDER_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction A Reminder Schedule has been un-suspended or activated
+ * @ReduxAction A Reminder Schedule has been unsuspended or activated
  */
 export declare const REMINDER_SCHEDULE_UNSUSPEND = "REMINDER_SCHEDULE_UNSUSPEND";
 /**
@@ -67,7 +67,7 @@ export declare const IPUSHPULL_SCHEDULE_DELETE = "IPUSHPULL_SCHEDULE_DELETE";
  */
 export declare const IPUSHPULL_SCHEDULE_SUSPEND = "IPUSHPULL_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction An ipushpull Schedule has been un-suspended or activated
+ * @ReduxAction An ipushpull Schedule has been unsuspended or activated
  */
 export declare const IPUSHPULL_SCHEDULE_UNSUSPEND = "IPUSHPULL_SCHEDULE_UNSUSPEND";
 /**
@@ -87,7 +87,7 @@ export declare const GLUE42_SCHEDULE_DELETE = "GLUE42_SCHEDULE_DELETE";
  */
 export declare const GLUE42_SCHEDULE_SUSPEND = "GLUE42_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction A Glue42 Schedule has been un-suspended or activated
+ * @ReduxAction A Glue42 Schedule has been unsuspended or activated
  */
 export declare const GLUE42_SCHEDULE_UNSUSPEND = "GLUE42_SCHEDULE_UNSUSPEND";
 /**
@@ -107,7 +107,7 @@ export declare const OPENFIN_SCHEDULE_DELETE = "OPENFIN_SCHEDULE_DELETE";
  */
 export declare const OPENFIN_SCHEDULE_SUSPEND = "OPENFIN_SCHEDULE_SUSPEND";
 /**
- * @ReduxAction An OpenFin Schedule has been un-suspended or activated
+ * @ReduxAction An OpenFin Schedule has been unsuspended or activated
  */
 export declare const OPENFIN_SCHEDULE_UNSUSPEND = "OPENFIN_SCHEDULE_UNSUSPEND";
 /**

package/src/Redux/ActionsReducers/ScheduleRedux.js

@@ -27,7 +27,7 @@ exports.REPORT_SCHEDULE_DELETE = 'REPORT_SCHEDULE_DELETE';
  */
 exports.REPORT_SCHEDULE_SUSPEND = 'REPORT_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction A Report Schedule has been un-suspended or activated
+ * @ReduxAction A Report Schedule has been unsuspended or activated
  */
 exports.REPORT_SCHEDULE_UNSUSPEND = 'REPORT_SCHEDULE_UNSUSPEND';
 /**
@@ -47,7 +47,7 @@ exports.REMINDER_SCHEDULE_DELETE = 'REMINDER_SCHEDULE_DELETE';
  */
 exports.REMINDER_SCHEDULE_SUSPEND = 'REMINDER_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction A Reminder Schedule has been un-suspended or activated
+ * @ReduxAction A Reminder Schedule has been unsuspended or activated
  */
 exports.REMINDER_SCHEDULE_UNSUSPEND = 'REMINDER_SCHEDULE_UNSUSPEND';
 /**
@@ -67,7 +67,7 @@ exports.IPUSHPULL_SCHEDULE_DELETE = 'IPUSHPULL_SCHEDULE_DELETE';
  */
 exports.IPUSHPULL_SCHEDULE_SUSPEND = 'IPUSHPULL_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction An ipushpull Schedule has been un-suspended or activated
+ * @ReduxAction An ipushpull Schedule has been unsuspended or activated
  */
 exports.IPUSHPULL_SCHEDULE_UNSUSPEND = 'IPUSHPULL_SCHEDULE_UNSUSPEND';
 /**
@@ -87,7 +87,7 @@ exports.GLUE42_SCHEDULE_DELETE = 'GLUE42_SCHEDULE_DELETE';
  */
 exports.GLUE42_SCHEDULE_SUSPEND = 'GLUE42_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction A Glue42 Schedule has been un-suspended or activated
+ * @ReduxAction A Glue42 Schedule has been unsuspended or activated
  */
 exports.GLUE42_SCHEDULE_UNSUSPEND = 'GLUE42_SCHEDULE_UNSUSPEND';
 /**
@@ -107,7 +107,7 @@ exports.OPENFIN_SCHEDULE_DELETE = 'OPENFIN_SCHEDULE_DELETE';
  */
 exports.OPENFIN_SCHEDULE_SUSPEND = 'OPENFIN_SCHEDULE_SUSPEND';
 /**
- * @ReduxAction An OpenFin Schedule has been un-suspended or activated
+ * @ReduxAction An OpenFin Schedule has been unsuspended or activated
  */
 exports.OPENFIN_SCHEDULE_UNSUSPEND = 'OPENFIN_SCHEDULE_UNSUSPEND';
 /**

package/src/Redux/ActionsReducers/ShortcutRedux.d.ts

@@ -17,7 +17,7 @@ export declare const SHORTCUT_DELETE = "SHORTCUT_DELETE";
  */
 export declare const SHORTCUT_SUSPEND = "SHORTCUT_SUSPEND";
 /**
- * @ReduxAction A Shortcut has been un-suspended or activated
+ * @ReduxAction A Shortcut has been unsuspended or activated
  */
 export declare const SHORTCUT_UNSUSPEND = "SHORTCUT_UNSUSPEND";
 /**

package/src/Redux/ActionsReducers/ShortcutRedux.js

@@ -22,7 +22,7 @@ exports.SHORTCUT_DELETE = 'SHORTCUT_DELETE';
  */
 exports.SHORTCUT_SUSPEND = 'SHORTCUT_SUSPEND';
 /**
- * @ReduxAction A Shortcut has been un-suspended or activated
+ * @ReduxAction A Shortcut has been unsuspended or activated
  */
 exports.SHORTCUT_UNSUSPEND = 'SHORTCUT_UNSUSPEND';
 /**

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -112,7 +112,6 @@ export interface SystemFlashingCellDeleteAction extends Redux.Action {
     flashingCell: AdaptableFlashingCell;
 }
 export interface SystemFlashingCellDeleteAllAction extends Redux.Action {
-    flashingCells: AdaptableFlashingCell[];
 }
 export interface SystemStatusMessageInfoAddAction extends Redux.Action {
     systemStatusMessageInfo: SystemStatusMessageInfo;
@@ -241,7 +240,7 @@ export declare const SystemAlertRemoveCellHighlight: (alert: AdaptableAlert) =>
 export declare const SystemAlertRemoveRowHighlight: (alert: AdaptableAlert) => SystemAlertRemoveRowHighlightAction;
 export declare const SystemFlashingCellAdd: (flashingCell: AdaptableFlashingCell) => SystemFlashingCellAddAction;
 export declare const SystemFlashingCellDelete: (flashingCell: AdaptableFlashingCell) => SystemFlashingCellDeleteAction;
-export declare const SystemFlashingCellDeleteAll: (flashingCells: AdaptableFlashingCell[]) => SystemFlashingCellDeleteAllAction;
+export declare const SystemFlashingCellDeleteAll: () => SystemFlashingCellDeleteAllAction;
 export declare const SystemStatusMessageInfoAdd: (SystemStatusMessageInfo: SystemStatusMessageInfo, MaxSystemStatusMessagesInStore: number) => SystemStatusMessageInfoAddAction;
 export declare const SystemStatusMessageInfoDelete: (SystemStatusMessageInfo: SystemStatusMessageInfo) => SystemStatusMessageInfoDeleteAction;
 export declare const SystemStatusMessageInfoDeleteAll: () => SystemStatusMessageInfoDeleteAllAction;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -154,9 +154,8 @@ const SystemFlashingCellDelete = (flashingCell) => ({
     flashingCell: flashingCell,
 });
 exports.SystemFlashingCellDelete = SystemFlashingCellDelete;
-const SystemFlashingCellDeleteAll = (flashingCells) => ({
+const SystemFlashingCellDeleteAll = () => ({
     type: exports.SYSTEM_FLASHING_CELL_DELETE_ALL,
-    flashingCells: flashingCells,
 });
 exports.SystemFlashingCellDeleteAll = SystemFlashingCellDeleteAll;
 const SystemStatusMessageInfoAdd = (SystemStatusMessageInfo, MaxSystemStatusMessagesInStore) => ({

package/src/Redux/Store/AdaptableStore.js

@@ -354,6 +354,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     }
                     return ret;
                 }
+                case SystemRedux.SYSTEM_FLASHING_CELL_DELETE_ALL: {
+                    let ret = next(action);
+                    adaptable.redrawRenderedRows();
+                    return ret;
+                }
                 /*******************
                  * ALERT ACTIONS
                  *******************/
@@ -570,7 +575,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     aggregatedCalculatedColumns.forEach((calculatedColumn) => {
                         adaptable.api.internalApi
                             .getCalculatedColumnExpressionService()
-                            .createAggregatedScalarCalculatedColumn(calculatedColumn);
+                            .createAggregatedScalarLiveValue(calculatedColumn);
                     });
                     // refresh calculated columns
                     const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
@@ -591,7 +596,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_EDIT) {
                         adaptable.api.internalApi
                             .getCalculatedColumnExpressionService()
-                            .createAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
+                            .createAggregatedScalarLiveValue(returnAction.calculatedColumn);
                     }
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
@@ -616,7 +621,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const returnAction = next(actionTyped);
                     adaptable.api.internalApi
                         .getCalculatedColumnExpressionService()
-                        .destroyAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
+                        .destroyAggregatedScalarLiveValue(returnAction.calculatedColumn);
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }
@@ -716,7 +721,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL: {
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
                     let returnAction;
                     // needs to be called before 'next' so previous and next column filters are known
                     const shouldTriggerGridFiltering = adaptable.api.filterApi.shouldNewColumnFilterTriggerGridFiltering(action);
@@ -863,6 +872,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_SET_COLUMN_CAPTION:
                 case LayoutRedux.LAYOUT_SELECT: {
                     const oldLayoutState = middlewareAPI.getState().Layout;
+                    // this must be called before 'next(action)'
+                    const previousLayout = adaptable.api.layoutApi.getCurrentLayout();
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
                     adaptable.api.layoutApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
@@ -901,9 +912,12 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     }
                     // when changing current layout via the api, the layout should update
                     if (returnAction.type == LayoutRedux.LAYOUT_SAVE) {
-                        const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
                         const savingLayout = returnAction.layout;
-                        if (currentLayout.Name === savingLayout.Name) {
+                        if (previousLayout.Name === savingLayout.Name &&
+                            previousLayout !== savingLayout &&
+                            // objects may have changed, but have the same contents
+                            // this prevents pivot layout from infinite set-layout
+                            !adaptable.api.layoutApi.areLayoutsEqual(previousLayout, savingLayout)) {
                             adaptable.setLayout(savingLayout);
                         }
                     }

package/src/Strategy/AlertModule.d.ts

@@ -22,6 +22,7 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     private getAlertDefinitionsForCellDataChange;
     private getAlertDefinitionsForGridDataChange;
     private getBaseAlertDefinitionsForDataChange;
+    private isAggregationAlertTriggered;
     private isAlertPredicateTriggered;
     private isAlertDefinitionForRowChangeEvent;
     getTeamSharingAction(): TeamSharingImportInfo<AlertDefinition>;

package/src/Strategy/AlertModule.js

@@ -18,6 +18,7 @@ const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
 const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
+const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.AlertModuleId, ModuleConstants.AlertModuleFriendlyName, 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
@@ -215,6 +216,14 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         triggeredAlerts.push(alertDefinition);
                     }
                 }
+                else if (alertDefinition.Rule.AggregatedBooleanExpression) {
+                    const isValidExpression = this.api.queryLanguageApi.isValidAggregatedBooleanExpression(alertDefinition.Rule.AggregatedBooleanExpression, this.moduleInfo.ModuleName, `Invalid Alert boolean expression '${alertDefinition.Rule.AggregatedBooleanExpression}'`);
+                    const isSatisfiedExpression = isValidExpression &&
+                        this.isAggregationAlertTriggered(alertDefinition, dataChangedEvent);
+                    if (isSatisfiedExpression) {
+                        triggeredAlerts.push(alertDefinition);
+                    }
+                }
                 else {
                     if (!this.isAlertDefinitionForRowChangeEvent(alertDefinition) &&
                         this.isAlertPredicateTriggered(alertDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
@@ -225,6 +234,17 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return triggeredAlerts;
     }
+    isAggregationAlertTriggered(alertDefinition, dataChangedEvent) {
+        const changedColumn = dataChangedEvent.column.columnId;
+        const aggregationColumns = this.api.queryLanguageApi.getColumnsFromExpression(alertDefinition.Rule.AggregatedBooleanExpression);
+        if (!aggregationColumns.includes(changedColumn)) {
+            return false;
+        }
+        const aggregatedBooleanValue = this.api.internalApi
+            .getQueryLanguageService()
+            .computeAggregatedBooleanValue(alertDefinition.Rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
+        return aggregatedBooleanValue;
+    }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         return this.api.predicateApi.handlePredicate(alert.Rule.Predicate, {
             value: dataChangedEvent.newValue,

package/src/Strategy/CalculatedColumnModule.js

@@ -8,9 +8,9 @@ const CalculatedColumnRedux = tslib_1.__importStar(require("../Redux/ActionsRedu
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const getExpressionViewItems_1 = require("./Utilities/getExpressionViewItems");
 const CalculatedColumnWizard_1 = require("../View/CalculatedColumn/Wizard/CalculatedColumnWizard");
-const getCalculatedColumnSettingTags_1 = require("../View/CalculatedColumn/Utilities/getCalculatedColumnSettingTags");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const getCalculatedColumnSettingsTags_1 = require("../View/CalculatedColumn/Utilities/getCalculatedColumnSettingsTags");
 class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CalculatedColumnModuleId, ModuleConstants.CalculatedColumnFriendlyName, 'calculated-column', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
@@ -69,7 +69,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     toView(calculateColumn) {
-        const settingsTags = getCalculatedColumnSettingTags_1.getCalculatedColumnSettingTags(calculateColumn.CalculatedColumnSettings);
+        const settingsTags = getCalculatedColumnSettingsTags_1.getCalculatedColumnSettingsTags(calculateColumn.CalculatedColumnSettings);
         let items = [
             {
                 name: 'Settings',

package/src/Strategy/ExportModule.d.ts

@@ -12,7 +12,6 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(report: Report): string[];
     getReferencedNamedQueryNames(report: Report): string[];
-    updateOldConfig(): void;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     export(report: Report, exportDestination: ExportDestination | string): void;
     private isCustomDestination;

package/src/Strategy/ExportModule.js

@@ -9,7 +9,6 @@ const Helper_1 = require("../Utilities/Helpers/Helper");
 const ExportRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/ExportRedux"));
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
-const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 const ObjectFactory_1 = require("../Utilities/ObjectFactory");
@@ -41,21 +40,6 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.queryApi.getReferencedNamedQueryNames(report.Query.BooleanExpression);
     }
-    updateOldConfig() {
-        let reportsToEdit = [];
-        this.api.exportApi.getAllReports().forEach((report) => {
-            if (!report.Query && report.Expression) {
-                report.Query = {
-                    BooleanExpression: report.Expression,
-                };
-                LoggingHelper_1.LogAdaptableWarning(`Updating incorrect Predefined Config for Report: ${report.Name}`);
-                report.Expression = undefined;
-                LoggingHelper_1.LogAdaptableInfo('Updating Report: ' + report.Name + ' to use existing Expression');
-                reportsToEdit.push(report);
-            }
-        });
-        this.api.exportApi.editReports(reportsToEdit);
-    }
     addContextMenuItems(menuContext) {
         const canExport = !menuContext.isRowGroupColumn &&
             this.isModuleAvailable() &&

package/src/Strategy/FilterModule.js

@@ -111,6 +111,12 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         const api = this.api;
         return {
+            getSuspendAction: (columnFilter) => LayoutRedux.LayoutColumnFilterSuspend(columnFilter),
+            getUnSuspendAction: (columnFilter) => LayoutRedux.LayoutColumnFilterUnSuspend(columnFilter),
+            getCompactSuspendAction: (columnFilter) => LayoutRedux.LayoutColumnFilterSuspend(columnFilter),
+            getCompactUnSuspendAction: (columnFilter) => LayoutRedux.LayoutColumnFilterUnSuspend(columnFilter),
+            getSuspendAllAction: () => LayoutRedux.LayoutColumnFilterSuspendAll(),
+            getUnSuspendAllAction: () => LayoutRedux.LayoutColumnFilterUnSuspendAll(),
             getDeleteAction: LayoutRedux.LayoutColumnFilterClear,
             getCompactDeleteAction: LayoutRedux.LayoutColumnFilterClear,
             getDeleteAllAction: LayoutRedux.LayoutColumnFilterClearAll,

package/src/Strategy/FlashingCellModule.js

@@ -95,10 +95,10 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const flashingCellForRow = this.api.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue);
                 const flashingCellForCell = this.api.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingCellForRow && flashingCellForRow.flashTarget === 'row') {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell for Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
+                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
                 }
                 else if (flashingCellForCell && flashingCellForCell.flashTarget === 'cell') {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell for Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
+                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
                 }
             }
         }

package/src/Strategy/Interface/IModule.d.ts

@@ -93,6 +93,10 @@ export interface AdaptableModuleView {
     getCompactDeleteAction?: (abObject: AdaptableObject) => Redux.Action;
     getSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
     getUnSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
+    getCompactSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
+    getCompactUnSuspendAction?: (abObject: AdaptableObject) => Redux.Action;
+    getSuspendAllAction?: () => Redux.Action;
+    getUnSuspendAllAction?: () => Redux.Action;
     getDeleteAllAction?: () => Redux.Action;
     emptyView?: React.FunctionComponent<{
         module: IModule;

package/src/Strategy/LayoutModule.js

@@ -14,6 +14,7 @@ const SaveLayoutButton_1 = require("../View/Layout/SaveLayoutButton");
 const LayoutWizard_1 = require("../View/Layout/Wizard/LayoutWizard");
 const getLayoutFilterViewItems_1 = require("./Utilities/Layout/getLayoutFilterViewItems");
 const getLayoutSortViewItems_1 = require("./Utilities/Layout/getLayoutSortViewItems");
+const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColumns");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -26,26 +27,6 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
-    /*
-  // commenting this out as it doesnt make sense we dont know which filters should be applied to which layout
-  // for this we will jsut say they need to reapply them
-    updateOldConfig() {
-      // @ts-ignore ignore reading deprecated state
-      const oldColumnFilters = this.api.filterApi.getFilterState().ColumnFilters;
-      if (ArrayExtensions.IsNotNullOrEmpty(oldColumnFilters)) {
-        ConsoleLogWarning(
-          `DEPRECATED: The 'Filter.ColumnFilters' property is deprecated; use 'Layout.ColumnFilters' instead'!`
-        );
-  
-        this.api.internalApi.clearColumnFilterState();
-        const currentLayout = this.api.layoutApi.getCurrentLayout();
-  
-        if (ArrayExtensions.IsNullOrEmpty(currentLayout.ColumnFilters)) {
-          this.api.layoutApi.setColumnFilter(oldColumnFilters);
-        }
-      }
-    }
-    */
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getAllLayout();
     }
@@ -264,6 +245,25 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Pivot Columns',
                     values: layout.PivotColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },
+                (layout === null || layout === void 0 ? void 0 : layout.AggregationColumns) &&
+                    Object.keys(layout === null || layout === void 0 ? void 0 : layout.AggregationColumns).length && {
+                    name: 'Aggregation Columns',
+                    values: Object.entries(layout === null || layout === void 0 ? void 0 : layout.AggregationColumns)
+                        .map(([colId, aggFn]) => {
+                        if (colId === 'Source' || colId === 'Uuid') {
+                            return '';
+                        }
+                        let aggFnName = '';
+                        if (typeof aggFn === 'string') {
+                            aggFnName = aggFn;
+                        }
+                        else if (typeof aggFn === 'object' && aggFn.type === 'weightedAverage') {
+                            aggFnName = AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME;
+                        }
+                        return `${aggFnName}(${columnIdToFriendlyName(colId)})`;
+                    })
+                        .filter(Boolean),
+                },
             ].filter(Boolean),
             abObject: layout,
         };

package/src/Strategy/Utilities/FormatColumn/getFormatColumnStyleViewItems.js

@@ -6,6 +6,21 @@ const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const FormatColumnStyleWizardSection_1 = require("../../../View/FormatColumn/Wizard/FormatColumnStyleWizardSection");
 const getFormatColumnStyleViewItems = (formatColumn, api) => {
-    return React.createElement(rebass_1.Box, { mt: 2 }, FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary(formatColumn, api));
+    var _a, _b;
+    let styleType = '';
+    if ((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.ColumnStyle) === null || _a === void 0 ? void 0 : _a.GradientStyle) {
+        styleType = 'Gradient';
+    }
+    else if ((_b = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.ColumnStyle) === null || _b === void 0 ? void 0 : _b.PercentBarStyle) {
+        styleType = 'Percent Bar';
+    }
+    else {
+        styleType = 'Standard';
+    }
+    return (React.createElement(rebass_1.Box, { mt: 2 },
+        React.createElement(rebass_1.Box, { mb: 1 },
+            "Type: ",
+            styleType),
+        FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary(formatColumn, api)));
 };
 exports.getFormatColumnStyleViewItems = getFormatColumnStyleViewItems;

package/src/Strategy/Utilities/Layout/getLayoutFilterViewItems.js

@@ -8,17 +8,21 @@ const getLayoutFilterViewItems = (layout, api) => {
     };
     return {
         name: 'Filter',
-        values: ((_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : []).map((customFilter) => `[${columnIdToFriendlyName(customFilter.ColumnId)}: ${customFilter.Predicate.PredicateId} ${customFilter.Predicate.Inputs.map((input) => {
-            if (typeof input === 'string') {
-                return input;
-            }
-            if (typeof (input === null || input === void 0 ? void 0 : input.toString) === 'function') {
-                return input.toString();
-            }
-            return '';
-        })
-            .filter(Boolean)
-            .join(', ')}]`),
+        values: ((_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : []).map((customFilter) => {
+            var _a, _b;
+            return `[${columnIdToFriendlyName(customFilter.ColumnId)}: ${customFilter.Predicate.PredicateId} ${((_b = (_a = customFilter.Predicate) === null || _a === void 0 ? void 0 : _a.Inputs) !== null && _b !== void 0 ? _b : [])
+                .map((input) => {
+                if (typeof input === 'string') {
+                    return input;
+                }
+                if (typeof (input === null || input === void 0 ? void 0 : input.toString) === 'function') {
+                    return input.toString();
+                }
+                return '';
+            })
+                .filter(Boolean)
+                .join(', ')}]`;
+        }),
     };
 };
 exports.getLayoutFilterViewItems = getLayoutFilterViewItems;

package/src/Utilities/Constants/DocumentationLinkConstants.d.ts

@@ -5,6 +5,7 @@ export declare const ScalarQueryDocsLink: string;
 export declare const ObservableQueryDocsLink: string;
 export declare const AggregatedBooleanQueryDocsLink: string;
 export declare const AggregatedScalarQueryDocsLink: string;
+export declare const CumulativeAggregatedScalarQueryDocsLink: string;
 export declare const PredicateDocsLink: string;
 export declare const PrimaryKeyDocsLink: string;
 export declare const LicenseDocsLink: string;

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableOptionsDocsLink = exports.LicenseDocsLink = exports.PrimaryKeyDocsLink = exports.PredicateDocsLink = exports.AggregatedScalarQueryDocsLink = exports.AggregatedBooleanQueryDocsLink = exports.ObservableQueryDocsLink = exports.ScalarQueryDocsLink = exports.BooleanQueryDocsLink = exports.ExpressionEditorDocsLink = exports.HOST_URL_DOCS = void 0;
+exports.AdaptableOptionsDocsLink = exports.LicenseDocsLink = exports.PrimaryKeyDocsLink = exports.PredicateDocsLink = exports.CumulativeAggregatedScalarQueryDocsLink = exports.AggregatedScalarQueryDocsLink = exports.AggregatedBooleanQueryDocsLink = exports.ObservableQueryDocsLink = exports.ScalarQueryDocsLink = exports.BooleanQueryDocsLink = exports.ExpressionEditorDocsLink = exports.HOST_URL_DOCS = void 0;
 exports.HOST_URL_DOCS = 'https://docs.adaptabletools.com';
 //export const HOST_URL_DOCS = 'http://localhost:3000';
 exports.ExpressionEditorDocsLink = `${exports.HOST_URL_DOCS}/guide/ui-expression-editor`;
@@ -9,6 +9,7 @@ exports.ScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expre
 exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-observable`;
 exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-boolean`;
 exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-scalar`;
+exports.CumulativeAggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-scalar#cumulative-aggregation`;
 exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-predicate`;
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/dev-guide-tutorial-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/guide/licensing`;

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -206,6 +206,8 @@ exports.DefaultAdaptableOptions = {
         systemFilters: AdaptablePredicate_1.SystemFilterPredicateIds,
         showQuickFilter: true,
         showDistinctFilteredValuesOnly: false,
+        showClearFilterButton: false,
+        showSuspendFilterButton: false,
     },
     searchOptions: {
         excludeColumnFromQuickSearch: undefined,