@adaptabletools/adaptable 11.0.0-canary.3 → 11.0.0-canary.7

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -131,6 +131,8 @@ exports.PopupReducer = (state = initialState, action) => {
                 Header: actionTyped.prompt.Header,
                 Message: actionTyped.prompt.Msg,
                 ConfirmAction: actionTyped.prompt.ConfirmAction,
+                ConfirmActionCreator: actionTyped.prompt.ConfirmActionCreator,
+                DefaultValue: actionTyped.prompt.DefaultValue,
             };
             return Object.assign({}, state, { PromptPopup: newPromptPopup });
         }
@@ -140,6 +142,8 @@ exports.PopupReducer = (state = initialState, action) => {
                 Header: '',
                 Message: '',
                 ConfirmAction: null,
+                ConfirmActionCreator: null,
+                DefaultValue: '',
             };
             return Object.assign({}, state, { PromptPopup: newPromptPopup });
         }
@@ -167,7 +171,9 @@ exports.PopupReducer = (state = initialState, action) => {
                 ConfirmationComment: null,
                 MessageType: actionTyped.confirmation.MessageType,
             };
-            return Object.assign({}, state, { ConfirmationPopup: newConfirmationPopup });
+            return Object.assign({}, state, {
+                ConfirmationPopup: newConfirmationPopup,
+            });
         }
         case exports.POPUP_CONFIRM_CONFIRMATION: {
             let actionTyped = action;
@@ -184,7 +190,9 @@ exports.PopupReducer = (state = initialState, action) => {
                 ConfirmationComment: actionTyped.comment,
                 MessageType: null,
             };
-            return Object.assign({}, state, { ConfirmationPopup: newConfirmationPopup });
+            return Object.assign({}, state, {
+                ConfirmationPopup: newConfirmationPopup,
+            });
         }
         case exports.POPUP_CANCEL_CONFIRMATION: {
             //we dispatch the Action of CancelAction in the middelware in order to keep the reducer pure
@@ -200,7 +208,9 @@ exports.PopupReducer = (state = initialState, action) => {
                 ConfirmationComment: null,
                 MessageType: null,
             };
-            return Object.assign({}, state, { ConfirmationPopup: newConfirmationPopup });
+            return Object.assign({}, state, {
+                ConfirmationPopup: newConfirmationPopup,
+            });
         }
         case exports.POPUP_SHOW_ALERT: {
             let showAlertAction = action;

package/src/Redux/ActionsReducers/QuickSearchRedux.js

@@ -40,7 +40,9 @@ exports.QuickSearchReducer = (state = initialState, action) => {
                 QuickSearchText: action.quickSearchText,
             });
         case exports.QUICK_SEARCH_SET_STYLE:
-            return Object.assign({}, state, { Style: action.style });
+            return Object.assign({}, state, {
+                Style: action.style,
+            });
         default:
             return state;
     }

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

@@ -1,6 +1,7 @@
 import * as Redux from 'redux';
 import { SystemState } from '../../PredefinedConfig/SystemState';
-import { CellHighlightInfo, RowHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import { ExportCustomDestinationPopup, Report } from '../../PredefinedConfig/ExportState';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
@@ -11,14 +12,14 @@ import { CachedQuery } from '../../PredefinedConfig/QueryState';
 import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { MathOperation, SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
-export declare const FLASHING_ALERT_ROW_KEY = "__ROW";
+export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
 export declare const SYSTEM_ALERT_DELETE = "SYSTEM_ALERT_DELETE";
 export declare const SYSTEM_ALERT_DELETE_ALL = "SYSTEM_ALERT_DELETE_ALL";
 export declare const SYSTEM_ALERT_REMOVE_HIGHLIGHT = "SYSTEM_ALERT_REMOVE_HIGHLIGHT";
-export declare const SYSTEM_FLASHING_ALERT_ADD = "SYSTEM_FLASHING_ALERT_ADD";
-export declare const SYSTEM_FLASHING_ALERT_DELETE = "SYSTEM_FLASHING_ALERT_DELETE";
-export declare const SYSTEM_FLASHING_ALERT_DELETE_ALL = "SYSTEM_FLASHING_ALERT_DELETE_ALL";
+export declare const SYSTEM_FLASHING_CELL_ADD = "SYSTEM_FLASHING_CELL_ADD";
+export declare const SYSTEM_FLASHING_CELL_DELETE = "SYSTEM_FLASHING_CELL_DELETE";
+export declare const SYSTEM_FLASHING_CELL_DELETE_ALL = "SYSTEM_FLASHING_CELL_DELETE_ALL";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_ADD = "SYSTEM_STATUS_MESSAGE_INFO_ADD";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_DELETE = "SYSTEM_STATUS_MESSAGE_INFO_DELETE";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = "SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL";

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemReducer = exports.getSystemExportCustomDestinationPopups = exports.SystemSettingsPanelSet = exports.SystemExportCustomDestinationPopupHide = exports.SystemExportCustomDestinationPopupShow = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowDelete = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_ALERT_DELETE_ALL = exports.SYSTEM_FLASHING_ALERT_DELETE = exports.SYSTEM_FLASHING_ALERT_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_ALERT_ROW_KEY = void 0;
+exports.SystemReducer = exports.getSystemExportCustomDestinationPopups = exports.SystemSettingsPanelSet = exports.SystemExportCustomDestinationPopupHide = exports.SystemExportCustomDestinationPopupShow = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowDelete = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
 /*
@@ -8,16 +8,16 @@ Bit of a mixed bag of actions but essentially its those that are related to Stra
 This allows us to keep the other reducers pure in terms of everything persists
 Not sure if its a good idea or not and perhaps we need 2 stores but I think its better than it was...
 */
-exports.FLASHING_ALERT_ROW_KEY = '__ROW';
+exports.FLASHING_CELL_ROW_KEY = '__ROW';
 // Alerts
 exports.SYSTEM_ALERT_ADD = 'SYSTEM_ALERT_ADD';
 exports.SYSTEM_ALERT_DELETE = 'SYSTEM_ALERT_DELETE';
 exports.SYSTEM_ALERT_DELETE_ALL = 'SYSTEM_ALERT_DELETE_ALL';
 exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = 'SYSTEM_ALERT_REMOVE_HIGHLIGHT';
 // Flashing Alerts
-exports.SYSTEM_FLASHING_ALERT_ADD = 'SYSTEM_FLASHING_ALERT_ADD';
-exports.SYSTEM_FLASHING_ALERT_DELETE = 'SYSTEM_FLASHING_ALERT_DELETE';
-exports.SYSTEM_FLASHING_ALERT_DELETE_ALL = 'SYSTEM_FLASHING_ALERT_DELETE_ALL';
+exports.SYSTEM_FLASHING_CELL_ADD = 'SYSTEM_FLASHING_CELL_ADD';
+exports.SYSTEM_FLASHING_CELL_DELETE = 'SYSTEM_FLASHING_CELL_DELETE';
+exports.SYSTEM_FLASHING_CELL_DELETE_ALL = 'SYSTEM_FLASHING_CELL_DELETE_ALL';
 // Status Message
 exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = 'SYSTEM_STATUS_MESSAGE_INFO_ADD';
 exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = 'SYSTEM_STATUS_MESSAGE_INFO_DELETE';
@@ -113,15 +113,15 @@ exports.SystemAlertRemoveHighlight = (alert) => ({
     alert: alert,
 });
 exports.SystemFlashingCellAdd = (flashingCell) => ({
-    type: exports.SYSTEM_FLASHING_ALERT_ADD,
+    type: exports.SYSTEM_FLASHING_CELL_ADD,
     flashingCell: flashingCell,
 });
 exports.SystemFlashingCellDelete = (flashingCell) => ({
-    type: exports.SYSTEM_FLASHING_ALERT_DELETE,
+    type: exports.SYSTEM_FLASHING_CELL_DELETE,
     flashingCell: flashingCell,
 });
 exports.SystemFlashingCellDeleteAll = (flashingCells) => ({
-    type: exports.SYSTEM_FLASHING_ALERT_DELETE_ALL,
+    type: exports.SYSTEM_FLASHING_CELL_DELETE_ALL,
     flashingCells: flashingCells,
 });
 exports.SystemStatusMessageInfoAdd = (SystemStatusMessageInfo, MaxSystemStatusMessagesInStore) => ({
@@ -305,14 +305,14 @@ exports.SystemReducer = (state = initialState, action) => {
                     return abObject;
                 }) });
         }
-        case exports.SYSTEM_FLASHING_ALERT_ADD: {
+        case exports.SYSTEM_FLASHING_CELL_ADD: {
             const { flashingCell: FlashingCell } = action;
             const { rowPrimaryKey } = FlashingCell;
             const AdaptableFlashingCells = Object.assign({}, state.AdaptableFlashingCells);
             AdaptableFlashingCells[rowPrimaryKey] = Object.assign({}, AdaptableFlashingCells[rowPrimaryKey]);
             const secondaryIds = Object.keys(FlashingCell.flashColumnIds);
             if (FlashingCell.flashTarget === 'row') {
-                secondaryIds.push(exports.FLASHING_ALERT_ROW_KEY);
+                secondaryIds.push(exports.FLASHING_CELL_ROW_KEY);
             }
             secondaryIds.forEach((COL_ID) => {
                 AdaptableFlashingCells[rowPrimaryKey][COL_ID] = FlashingCell.Uuid;
@@ -324,7 +324,7 @@ exports.SystemReducer = (state = initialState, action) => {
                 AdaptableFlashingCellsMap: AdaptableFlashingCellsMap,
             });
         }
-        case exports.SYSTEM_FLASHING_ALERT_DELETE: {
+        case exports.SYSTEM_FLASHING_CELL_DELETE: {
             const { flashingCell: FlashingCell } = action;
             const { rowPrimaryKey } = FlashingCell;
             const AdaptableFlashingCells = Object.assign({}, state.AdaptableFlashingCells);
@@ -332,7 +332,7 @@ exports.SystemReducer = (state = initialState, action) => {
             AdaptableFlashingCells[rowPrimaryKey] = Object.assign({}, AdaptableFlashingCells[rowPrimaryKey]);
             const secondaryIds = Object.keys(FlashingCell.flashColumnIds);
             if (FlashingCell.flashTarget === 'row') {
-                secondaryIds.push(exports.FLASHING_ALERT_ROW_KEY);
+                secondaryIds.push(exports.FLASHING_CELL_ROW_KEY);
             }
             secondaryIds.forEach((COL_ID) => {
                 if (AdaptableFlashingCells[rowPrimaryKey][COL_ID] === FlashingCell.Uuid) {
@@ -345,7 +345,7 @@ exports.SystemReducer = (state = initialState, action) => {
             delete AdaptableFlashingCellsMap[FlashingCell.Uuid];
             return Object.assign(Object.assign({}, state), { AdaptableFlashingCells: AdaptableFlashingCells, AdaptableFlashingCellsMap: AdaptableFlashingCellsMap });
         }
-        case exports.SYSTEM_FLASHING_ALERT_DELETE_ALL: {
+        case exports.SYSTEM_FLASHING_CELL_DELETE_ALL: {
             return Object.assign({}, state, {
                 AdaptableFlashingCells: {},
                 AdaptableFlashingCellsMap: {},
@@ -400,7 +400,9 @@ exports.SystemReducer = (state = initialState, action) => {
                 systemStatusMessages.splice(0, 1);
             }
             systemStatusMessages.push(actionTypedAdd.systemStatusMessageInfo);
-            return Object.assign({}, state, { SystemStatusMessages: systemStatusMessages });
+            return Object.assign({}, state, {
+                SystemStatusMessages: systemStatusMessages,
+            });
         }
         case exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL: {
             return Object.assign({}, state, { SystemStatusMessages: [] });

package/src/Redux/ActionsReducers/ThemeRedux.js

@@ -50,7 +50,9 @@ exports.ThemeReducer = (state = initialState, action) => {
                 UserThemes: action.UserThemes,
             });
         case exports.THEME_SELECT:
-            return Object.assign({}, state, { CurrentTheme: action.Theme });
+            return Object.assign({}, state, {
+                CurrentTheme: action.Theme,
+            });
         default:
             return state;
     }

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -64,7 +64,7 @@ function MergeStateFunction(oldState, newState) {
     }
     // any Module in config that doesn't exist in state will be added
     for (const configModuleName in config) {
-        (_a = state[configModuleName]) !== null && _a !== void 0 ? _a : (state[configModuleName] = config[configModuleName]);
+        state[configModuleName] = (_a = state[configModuleName]) !== null && _a !== void 0 ? _a : config[configModuleName];
     }
     // any Module in state that has an older revision then the config will be replaced
     for (const stateModuleName in state) {

package/src/Redux/Store/AdaptableStore.js

@@ -182,6 +182,7 @@ class AdaptableStore {
         // If the user has remote storage set then we use Remote Engine, otherwise we use Local Enginge
         // not sure we can do this as we need to be backwardly compatible with existing users so need to stick with adaptable id (which should be unique)
         // const localStorageKey =  'adaptable-adaptable-state-' + adaptable.adaptableOptions.primaryKey;
+        const predefinedConfig = adaptable.adaptableOptions.predefinedConfig;
         storageEngine = AdaptableReduxLocalStorageEngine_1.createEngine({
             adaptableId: adaptable.adaptableOptions.adaptableId,
             adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
@@ -316,9 +317,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 /*******************
                  * FLASHING ALERT ACTIONS
                  *******************/
-                case SystemRedux.SYSTEM_FLASHING_ALERT_ADD:
-                case SystemRedux.SYSTEM_FLASHING_ALERT_DELETE: {
-                    const { flashingCell: FlashingCell, } = action;
+                case SystemRedux.SYSTEM_FLASHING_CELL_ADD:
+                case SystemRedux.SYSTEM_FLASHING_CELL_DELETE: {
+                    const { flashingCell: FlashingCell } = action;
                     const { dataChangedInfo } = FlashingCell;
                     let ret = next(action);
                     if (dataChangedInfo) {
@@ -495,6 +496,21 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 /*******************
                  * SPECIAL COLUMN ACTIONS
                  *******************/
+                case CalculatedColumnRedux.CALCULATED_COLUMN_READY: {
+                    // create aggregated scalar columns at grid startup
+                    const aggregatedCalculatedColumns = adaptable.api.calculatedColumnApi
+                        .getAllCalculatedColumn()
+                        .filter((calculatedColumn) => { var _a; return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression; });
+                    aggregatedCalculatedColumns.forEach((calculatedColumn) => {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .createAggregatedScalarCalculatedColumn(calculatedColumn);
+                    });
+                    // refresh calcualted columns
+                    const aggCalculatedColumnIds = aggregatedCalculatedColumns.map((calculatedColumn) => calculatedColumn.ColumnId);
+                    adaptable.refreshCells(null, aggCalculatedColumnIds, true);
+                    return;
+                }
                 /**
                  * Use Case: We have added / edited / deleted a Special Column (i.e. one not in initial ColumnDefs)
                  * Action: We update the Special ColumnDefs
@@ -503,7 +519,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case FreeTextColumnRedux.FREE_TEXT_COLUMN_EDIT:
                 case CalculatedColumnRedux.CALCULATED_COLUMN_ADD:
                 case CalculatedColumnRedux.CALCULATED_COLUMN_EDIT: {
-                    const returnAction = next(action);
+                    const actionTyped = action;
+                    const returnAction = next(actionTyped);
+                    if (returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_ADD ||
+                        returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_EDIT) {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .createAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
+                    }
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }
@@ -523,7 +546,10 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         }));
                         return;
                     }
-                    const returnAction = next(action);
+                    const returnAction = next(actionTyped);
+                    adaptable.api.internalApi
+                        .getCalculatedColumnExpressionService()
+                        .destroyAggregatedScalarCalculatedColumn(returnAction.calculatedColumn);
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }
@@ -1086,7 +1112,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case TeamSharingRedux.TEAMSHARING_IMPORT_ITEM: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    const [importStepActions, needsOverwriteConfirmation,] = adaptable.api.internalApi
+                    const [importStepActions, needsOverwriteConfirmation] = adaptable.api.internalApi
                         .getTeamSharingService()
                         .buildSharedEntityImportActions(actionTyped.SharedEntity);
                     const processImportAction = TeamSharingRedux.TeamSharingProcessImport(importStepActions);
@@ -1159,14 +1185,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .getSharedEntities(adaptableId)
                         .then((sharedEntities) => {
                         // check if remote server has a newer revision
-                        const [localRevision, remoteRevision,] = adaptable.api.internalApi
+                        const [localRevision, remoteRevision] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .getSharedEntityLocalAndRemoteRevisions(ChangedAdaptableObject.Uuid, sharedEntities);
                         if (remoteRevision > localRevision) {
                             // if remote has a newer version, we will NOT overwrite it
                             return;
                         }
-                        const [updatedSharedEntities, newActiveEntities,] = adaptable.api.internalApi
+                        const [updatedSharedEntities, newActiveEntities] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .updateActiveSharedEntity(ChangedAdaptableObject, UserName, sharedEntities);
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingLinkItem(...newActiveEntities));

package/src/Strategy/AlertModule.js

@@ -20,11 +20,11 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.AlertModuleId, 'Alert', 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
         this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
             if (dataChangedInfo.trigger === 'undo' || dataChangedInfo.trigger === 'aggChange') {
-                // do NOT handle reverted changes
+                // do NOT handle reverted or aggregated changes
                 return;
             }
-            if (this.api.internalApi.getAdaptableOptions().notificationsOptions
-                .dataChangeDetectionPolicy === 'formattedValue') {
+            if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
+                'formattedValue') {
                 const { oldValue, newValue } = dataChangedInfo;
                 const columnId = dataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
@@ -44,7 +44,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.alertApi.getAlertDefinitions();
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
             return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
         }
@@ -56,15 +56,17 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }
         return this.api.queryApi.getReferencedNamedQueryNames(queryExpression);
     }
     updateOldConfig() {
+        var _a;
         // 1. Make all (new) Flashing Alerts have a Predicate if none exists
-        const flashingAlertDefinitions = this.api.alertApi.getAlertState().FlashingAlertDefinitions;
+        const alertState = this.api.alertApi.getAlertState();
+        const flashingAlertDefinitions = alertState.FlashingAlertDefinitions;
         const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
         if (ArrayExtensions_1.ArrayExtensions.IsEmpty(flashingCellDefinitions) &&
             ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingAlertDefinitions)) {
@@ -72,6 +74,14 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // TODO: state does not clear
             this.api.internalApi.clearFlashingCellState();
         }
+        //migrate alert definitions with `AggregationExpression` (now `AggregatedBooleanExpression`)
+        (_a = alertState.AlertDefinitions) === null || _a === void 0 ? void 0 : _a.forEach((alertDefinition) => {
+            // @ts-ignore
+            const obsoleteAggregationExpression = alertDefinition.Rule['AggregationExpression'];
+            if (obsoleteAggregationExpression) {
+                alertDefinition.Rule.AggregatedBooleanExpression = obsoleteAggregationExpression;
+            }
+        });
     }
     addContextMenuItems(menuContext) {
         const items = [];

package/src/Strategy/CalculatedColumnModule.js

@@ -33,12 +33,12 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.calculatedColumnApi.editCalculatedColumns(oldCalculatedColumns);
     }
     getExplicitlyReferencedColumnIds(calculatedColumn) {
-        var _a, _b;
-        return ((_b = this.api.queryLanguageApi.getColumnsFromExpression((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.api.queryLanguageApi.getColumnsFromExpression(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     getReferencedNamedQueryNames(calculatedColumn) {
-        var _a, _b;
-        return ((_b = this.api.queryApi.getReferencedNamedQueryNames((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) !== null && _b !== void 0 ? _b : []);
+        var _a;
+        return ((_a = this.api.queryApi.getReferencedNamedQueryNames(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {

package/src/Strategy/ChartingModule.d.ts

@@ -1,6 +1,6 @@
-import { AdaptableModuleBase } from '@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase';
-import { IModule } from '@adaptabletools/adaptable/src/Strategy/Interface/IModule';
-import { AdaptableApi } from '@adaptabletools/adaptable/src/Api/AdaptableApi';
+import { IModule } from './Interface/IModule';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;

package/src/Strategy/ChartingModule.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingModule = void 0;
 const tslib_1 = require("tslib");
-const AdaptableModuleBase_1 = require("@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase");
-const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create Charts in order to see Adaptable Data visually', api);

package/src/Strategy/ConditionalStyleModule.js

@@ -191,6 +191,10 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 getScopeViewItems_1.getScopeViewItems(conditionalStyle.Scope),
                 getStyleViewItems_1.getStyleViewItems(),
                 getRuleViewItems_1.getRuleViewItems(conditionalStyle.Rule, this.api),
+                {
+                    name: 'Settings',
+                    values: [`Include grouped rows: ${conditionalStyle.IncludeGroupedRows ? 'Yes' : 'No'}`],
+                },
             ],
             abObject: conditionalStyle,
         };

package/src/Strategy/FlashingCellModule.js

@@ -24,8 +24,8 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             // TODO: think about flashing row value only
             // - flash for the underlying small data changes, but the visual does not
-            if (this.api.internalApi.getAdaptableOptions().notificationsOptions
-                .dataChangeDetectionPolicy === 'formattedValue') {
+            if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
+                'formattedValue') {
                 const { oldValue, newValue } = dataChangedInfo;
                 const columnId = dataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
@@ -42,7 +42,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.flashingCellApi.getFlashingCellDefinitions();
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
             return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
         }
@@ -54,7 +54,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = AdaptableQuery_1.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -7,12 +7,12 @@ import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
 import { AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class FreeTextColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
-    getModuleAdaptableObjects(): AdaptableObject[];
+    getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
+    updateOldConfig(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FreeTextColumn>;
     toView(freeTextColumn: FreeTextColumn): AdaptableObjectView;

package/src/Strategy/FreeTextColumnModule.js

@@ -21,6 +21,17 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
+    updateOldConfig() {
+        // make sure all default to type string
+        const allFreeTextColumns = this.getModuleAdaptableObjects();
+        for (const freeTextColumn of allFreeTextColumns) {
+            if (!freeTextColumn.DataType) {
+                const updatedFreeTextColumn = Object.assign(Object.assign({}, freeTextColumn), { DataType: 'String' });
+                // FIXME AFL add api method to edit multiple columns in one run
+                this.api.freeTextColumnApi.editFreeTextColumn(updatedFreeTextColumn);
+            }
+        }
+    }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi

package/src/Strategy/LayoutModule.js

@@ -48,12 +48,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (column) {
                 if (!isReadOnlyLayout) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => {
-                        let newname = prompt('Enter a new Caption for the Column');
-                        if (newname) {
-                            this.api.layoutApi.setColumnCaption(column.columnId, newname);
-                        }
-                    }));
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
                 }
                 if (column.hideable) {
                     returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {

package/src/Strategy/ToolPanelModule.js

@@ -15,8 +15,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!super.isModuleAvailable()) {
             return false;
         }
-        const toolPanelOptions = this.api.internalApi.getAdaptableOptions()
-            .toolPanelOptions;
+        const toolPanelOptions = this.api.internalApi.getAdaptableOptions().toolPanelOptions;
         return (toolPanelOptions &&
             toolPanelOptions.showAdaptableToolPanel &&
             toolPanelOptions.showAdaptableToolPanel == true);
@@ -25,7 +24,10 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;
         if (deprecatedToolPanelConfigs === null || deprecatedToolPanelConfigs === void 0 ? void 0 : deprecatedToolPanelConfigs.length) {
             LoggingHelper_1.LogAdaptableWarning(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
-            const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({ Name: toolPanel, State: 'collapsed' }));
+            const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({
+                Name: toolPanel,
+                State: 'collapsed',
+            }));
             this.api.internalApi.dispatchReduxAction(ToolPanelRedux_1.ToolPanelSetToolPanels(migratedToolPanelConfigs));
         }
         else if (!this.api.toolPanelApi.getToolPanelState().ToolPanels) {

package/src/Strategy/Utilities/getAlertPreviewViewItems.js

@@ -13,7 +13,7 @@ exports.getAlertPreviewViewItems = (alert, api) => {
             if (!((_a = alert === null || alert === void 0 ? void 0 : alert.AlertProperties) === null || _a === void 0 ? void 0 : _a.DisplayNotification)) {
                 return React.createElement(Tag_1.Tag, null, alert.MessageType);
             }
-            return React.createElement(AlertDisplayWizardSection_1.AlertPreview, { style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert });
+            return (React.createElement(AlertDisplayWizardSection_1.AlertPreview, { focusFirstButton: false, style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert }));
         },
     };
 };

package/src/Strategy/Utilities/getExpressionViewItems.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableScalarQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
-export declare const getExpressionViewItems: (query: AdaptableScalarQuery) => {
+import { AdaptableCalculatedColumnQuery } from '../../PredefinedConfig/CalculatedColumnState';
+export declare const getExpressionViewItems: (query: AdaptableCalculatedColumnQuery) => {
     name: string;
     values: string[];
 };

package/src/Strategy/Utilities/getExpressionViewItems.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpressionViewItems = void 0;
 exports.getExpressionViewItems = (query) => {
+    var _a;
     return {
         name: 'Expression',
-        values: [query === null || query === void 0 ? void 0 : query.ScalarExpression],
+        values: [(_a = query === null || query === void 0 ? void 0 : query.ScalarExpression) !== null && _a !== void 0 ? _a : query === null || query === void 0 ? void 0 : query.AggregatedScalarExpression],
     };
 };

package/src/Strategy/Utilities/getFormatColumnSettingsViewItems.js

@@ -6,7 +6,7 @@ exports.getFormatColumnSettingsViewItems = (calculatedColumn) => {
     const values = [
         `Cell alignment: ${(_a = calculatedColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
         calculatedColumn.HeaderName && `Header name: ${calculatedColumn.HeaderName}`,
-        `Include grouped rows: ${calculatedColumn.IncludeGroupedRows ? 'yes' : 'no'}`,
+        `Include grouped rows: ${calculatedColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
     ].filter(Boolean);
     return {
         name: 'Settings',

package/src/Strategy/Utilities/getRuleViewItems.d.ts

@@ -1,6 +1,5 @@
 import { AdaptableApi } from '../../../types';
 export declare const getRuleViewItems: (rule: any, api: AdaptableApi) => {
     name: string;
-    label: string;
     values: string[];
 };

package/src/Strategy/Utilities/getRuleViewItems.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuleViewItems = void 0;
-const AdaptableQuery_1 = require("../../PredefinedConfig/Common/AdaptableQuery");
 exports.getRuleViewItems = (rule, api) => {
     return {
         name: 'Condition',
-        label: 'Condition',
         values: [
             rule.Predicate
                 ? api.predicateApi.predicateToString(rule.Predicate)
-                : AdaptableQuery_1.getAdaptableQueryExpression(rule),
+                : api.queryLanguageApi.getAdaptableQueryExpression(rule),
         ],
     };
 };

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

@@ -3,7 +3,8 @@ export declare const ExpressionEditorDocsLink: string;
 export declare const BooleanQueryDocsLink: string;
 export declare const ScalarQueryDocsLink: string;
 export declare const ObservableQueryDocsLink: string;
-export declare const AggregationQueryDocsLink: string;
+export declare const AggregatedBooleanQueryDocsLink: string;
+export declare const AggregatedScalarQueryDocsLink: string;
 export declare const PredicateDocsLink: string;
 export declare const PrimaryKeyDocsLink: string;
 export declare const LicenseDocsLink: string;