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

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/AdaptableReduxLocalStorageEngine.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEngine = void 0;
 const tslib_1 = require("tslib");
 const isomorphic_fetch_1 = tslib_1.__importDefault(require("isomorphic-fetch"));
-const debounce_1 = tslib_1.__importDefault(require("lodash-es/debounce"));
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeReducer = exports.MergeState = exports.MergeStateFunction = exports.AddStateSource = void 0;
 const tslib_1 = require("tslib");
-const mergeWith_1 = tslib_1.__importDefault(require("lodash-es/mergeWith"));
-const merge_1 = tslib_1.__importDefault(require("lodash-es/merge"));
-const isArray_1 = tslib_1.__importDefault(require("lodash-es/isArray"));
-const extend_1 = tslib_1.__importDefault(require("lodash-es/extend"));
-const isObject_1 = tslib_1.__importDefault(require("lodash-es/isObject"));
+const mergeWith_1 = tslib_1.__importDefault(require("lodash/mergeWith"));
+const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
+const isArray_1 = tslib_1.__importDefault(require("lodash/isArray"));
+const extend_1 = tslib_1.__importDefault(require("lodash/extend"));
+const isObject_1 = tslib_1.__importDefault(require("lodash/isObject"));
 const isAdaptableObject_1 = require("../../Utilities/isAdaptableObject");
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 function customizer(objValue, srcValue) {

package/src/Redux/Store/AdaptableStore.js

@@ -160,6 +160,17 @@ class AdaptableStore {
                 case exports.LOAD_STATE:
                     const { State } = action;
                     Object.keys(State).forEach((key) => {
+                        // this check should be removed in version 12 !!!
+                        if (key === 'Chart') {
+                            LoggingHelper_1.ConsoleLogWarning(`DEPRECATED: AdapTable Charts Plugin is deprecated! AG Grid built-in charts are fully supported & integrated in AdapTable.
+
+            Please contact 'support@adaptabletools.com' if you require any charting features that are not currently available.`);
+                        }
+                        if (key === 'SparklineColumn') {
+                            LoggingHelper_1.ConsoleLogWarning(`DEPRECATED: AdapTable SparklineColumn is deprecated! AG Grid built-in Sparklines are fully supported & integrated in AdapTable.
+
+            Please contact 'support@adaptabletools.com' if you require any sparklines features that are not currently available.`);
+                        }
                         state[key] = State[key];
                     });
                     break;
@@ -171,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,
@@ -305,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) {
@@ -1075,7 +1087,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);
@@ -1148,14 +1160,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

@@ -19,12 +19,12 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         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') {
+            if (dataChangedInfo.trigger === 'undo' || dataChangedInfo.trigger === 'aggChange') {
                 // do NOT handle reverted 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);
@@ -64,7 +64,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     updateOldConfig() {
         // 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)) {

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/DataChangeHistoryModule.js

@@ -9,7 +9,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
     constructor(api) {
         super(ModuleConstants.DataChangeHistoryModuleId, 'Data Changes', 'track-changes', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
         this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
-            if (dataChangedInfo.trigger !== 'undo') {
+            if (dataChangedInfo.trigger !== 'undo' && dataChangedInfo.trigger !== 'aggChange') {
                 if (this.shouldLogDataChange(dataChangedInfo)) {
                     this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemDataChangeHistoryAdd(dataChangedInfo));
                 }

package/src/Strategy/FlashingCellModule.d.ts

@@ -18,8 +18,8 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     protected handleDataSourceChanged(dataChangedInfo: DataChangedInfo): void;
     private showFlashingCellsForDefinitions;
+    private isFlashingTargetOnlyAggChange;
     private getFlashingCellDefinitionsForDataChange;
-    private getBaseAlertDefinitionsForDataChange;
     private isAlertPredicateTriggered;
     getTeamSharingAction(): TeamSharingImportInfo<FlashingCellDefinition>;
     toView(flashingCell: FlashingCellDefinition): AdaptableObjectView;

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);
@@ -123,9 +123,13 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             direction = up ? 'up' : down ? 'down' : 'neutral';
         }
         flashingCellDefinitions.forEach((flashingCellDefinition) => {
-            const flashTarget = this.api.flashingCellApi.getFlashingCellFlashTarget(flashingCellDefinition);
+            var _a;
+            let flashTarget = this.api.flashingCellApi.getFlashingCellFlashTarget(flashingCellDefinition);
             const flashColumnIds = { [dataChangedInfo.column.columnId]: true };
-            if (flashTarget === 'row') {
+            /**
+             * When flashing a row, all columns in that row are marked to flash.
+             */
+            if (flashTarget === 'row' || ((_a = flashTarget === null || flashTarget === void 0 ? void 0 : flashTarget.includes) === null || _a === void 0 ? void 0 : _a.call(flashTarget, 'row'))) {
                 allColumnIds.forEach((colId) => {
                     flashColumnIds[colId] = true;
                 });
@@ -141,18 +145,30 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             });
         });
     }
-    getFlashingCellDefinitionsForDataChange(dataChangedEvent) {
-        return this.getBaseAlertDefinitionsForDataChange(dataChangedEvent, this.api.flashingCellApi.getActiveFlashingCellDefinitions(), true);
+    isFlashingTargetOnlyAggChange(flashingCellDefinition) {
+        if (flashingCellDefinition.FlashTarget === 'aggFuncCell') {
+            return true;
+        }
+        return (Array.isArray(flashingCellDefinition.FlashTarget) &&
+            flashingCellDefinition.FlashTarget.length === 1 &&
+            flashingCellDefinition.FlashTarget.includes('aggFuncCell'));
     }
-    getBaseAlertDefinitionsForDataChange(dataChangedEvent, definitions, defaultNoPredicateReturn = false) {
-        let relatedAlertDefinitions = definitions
+    getFlashingCellDefinitionsForDataChange(dataChangedEvent) {
+        const definitions = this.api.flashingCellApi.getActiveFlashingCellDefinitions();
+        const defaultNoPredicateReturn = false;
+        let relatedFlashingCellsDefinitions = definitions
             .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
             .filter((flashingCellDefinition) => !AdaptableQuery_1.isReactiveQuery(flashingCellDefinition.Rule));
-        let triggeredAlerts = [];
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(relatedAlertDefinitions)) {
-            relatedAlertDefinitions.forEach((alertDefinition) => {
-                if (alertDefinition.Rule.BooleanExpression) {
-                    let expression = alertDefinition.Rule.BooleanExpression;
+        let triggeredFlashingCells = [];
+        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(relatedFlashingCellsDefinitions)) {
+            relatedFlashingCellsDefinitions.forEach((flashingCellDefinition) => {
+                // for aggregation the data-change needs to be aggChange
+                if (dataChangedEvent.trigger !== 'aggChange' &&
+                    this.isFlashingTargetOnlyAggChange(flashingCellDefinition)) {
+                    return;
+                }
+                if (flashingCellDefinition.Rule.BooleanExpression) {
+                    let expression = flashingCellDefinition.Rule.BooleanExpression;
                     let rowNode = dataChangedEvent.rowNode;
                     if (!rowNode) {
                         rowNode = this.api.gridApi.getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
@@ -163,15 +179,15 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             .getQueryLanguageService()
                             .evaluateBooleanExpression(expression, this.moduleInfo.ModuleName, rowNode);
                     if (isSatisfiedExpression) {
-                        triggeredAlerts.push(alertDefinition);
+                        triggeredFlashingCells.push(flashingCellDefinition);
                     }
                 }
-                else if (this.isAlertPredicateTriggered(alertDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
-                    triggeredAlerts.push(alertDefinition);
+                else if (this.isAlertPredicateTriggered(flashingCellDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
+                    triggeredFlashingCells.push(flashingCellDefinition);
                 }
             });
         }
-        return triggeredAlerts;
+        return triggeredFlashingCells;
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         return this.api.predicateApi.handlePredicate(alert.Rule.Predicate, {
@@ -194,7 +210,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             items: [
                 Object.assign(Object.assign({}, getScopeViewItems_1.getScopeViewItems(flashingCell.Scope)), { label: 'Trigger' }),
-                getRuleViewItems_1.getRuleViewItems(flashingCell.Rule, this.api),
+                Object.assign(Object.assign({}, getRuleViewItems_1.getRuleViewItems(flashingCell.Rule, this.api)), { label: 'Rule', name: 'Rule' }),
                 getFlashingCellDurationViewItems_1.getFlashingCellDurationViewItems(flashingCell),
                 getFlashingTargetViewItems_1.getFlashingTargetViewItems(flashingCell),
                 getFlashingCellStyleViewItems_1.getFlashingCellStyleViewItems(),

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,16 @@ 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' });
+                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/TeamSharingModule.js

@@ -7,7 +7,7 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const isAdaptableObject_1 = require("../Utilities/isAdaptableObject");
 const TeamSharingRedux_1 = require("../Redux/ActionsReducers/TeamSharingRedux");
 const TeamSharingRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/TeamSharingRedux"));
-const isEqual_1 = tslib_1.__importDefault(require("lodash-es/isEqual"));
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const LayoutRedux_1 = require("../Redux/ActionsReducers/LayoutRedux");
 class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {

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/getFlashingTargetViewItems.d.ts

@@ -1,5 +1,5 @@
 import { FlashingCellDefinition } from '../../../types';
 export declare const getFlashingTargetViewItems: (flashingCell: FlashingCellDefinition) => {
     name: string;
-    values: ("cell" | "row")[];
+    values: import("../../PredefinedConfig/FlashingCellState").FlashTargetTypes[];
 };

package/src/Strategy/Utilities/getFlashingTargetViewItems.js

@@ -4,6 +4,8 @@ exports.getFlashingTargetViewItems = void 0;
 exports.getFlashingTargetViewItems = (flashingCell) => {
     return {
         name: 'Target',
-        values: [flashingCell.FlashTarget],
+        values: Array.isArray(flashingCell.FlashTarget)
+            ? flashingCell.FlashTarget
+            : [flashingCell.FlashTarget],
     };
 };

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

@@ -5,7 +5,6 @@ const AdaptableQuery_1 = require("../../PredefinedConfig/Common/AdaptableQuery")
 exports.getRuleViewItems = (rule, api) => {
     return {
         name: 'Condition',
-        label: 'Condition',
         values: [
             rule.Predicate
                 ? api.predicateApi.predicateToString(rule.Predicate)

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -19,20 +19,22 @@ exports.DefaultAdaptableOptions = {
     autogeneratePrimaryKey: false,
     userName: GeneralConstants.USER_NAME,
     predefinedConfig: undefined,
-    notificationsOptions: {
+    alertOptions: {
         alertForms: undefined,
         maxAlertsInStore: 20,
+        cellHighlightDuration: 3000,
+        dataChangeDetectionPolicy: 'rawValue',
+        actionHandlers: undefined,
+    },
+    notificationsOptions: {
         maxNotifications: 3,
         position: 'BottomRight',
         duration: 3000,
-        cellHighlightDuration: 3000,
-        dataChangeDetectionPolicy: 'rawValue',
         showProgressBar: false,
         closeWhenClicked: false,
         pauseWhenHovering: false,
         isDraggable: false,
         transition: 'Slide',
-        actionHandlers: undefined,
         showApplicationIcon: false,
         showSystemStatusMessageNotifications: false,
         maxSystemMessagesInStore: 100,