@adaptabletools/adaptable 11.0.8 → 11.1.1-canary.0

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

@@ -17,6 +17,8 @@ export declare const POPUP_SHOW_CONFIRMATION = "POPUP_SHOW_CONFIRMATION";
 export declare const POPUP_CONFIRM_CONFIRMATION = "POPUP_CONFIRM_CONFIRMATION";
 export declare const POPUP_CANCEL_CONFIRMATION = "POPUP_CANCEL_CONFIRMATION";
 export declare const POPUP_CLEAR_PARAM = "POPUP_CLEAR_PARAM";
+export declare const POPUP_WINDOW_SHOW_SCREEN = "POPUP_WINDOW_SHOW_SCREEN";
+export declare const POPUP_WINDOW_HIDE_SCREEN = "POPUP_WINDOW_HIDE_SCREEN";
 export interface PopupShowScreenAction extends Redux.Action {
     ComponentModule: AdaptableModule;
     ComponentName: string;
@@ -27,6 +29,15 @@ export interface PopupShowScreenAction extends Redux.Action {
 }
 export interface PopupHideScreenAction extends Redux.Action {
 }
+export interface PopupShowWindowAction extends Redux.Action {
+    Id: string;
+    Title: string;
+    PopupProps: any;
+    Icon?: string;
+}
+export interface PopupHideWindowAction extends Redux.Action {
+    Id: string;
+}
 export interface PopupShowLoadingAction extends Redux.Action {
 }
 export interface PopupHideLoadingAction extends Redux.Action {
@@ -57,6 +68,13 @@ export declare const PopupShowScreen: (componentModule?: AdaptableModule, compon
     [key: string]: any;
 }) => PopupShowScreenAction;
 export declare const PopupHideScreen: () => PopupHideScreenAction;
+export declare const PopupShowWindow: (config: {
+    Id: string;
+    Title: string;
+    PopupProps?: any;
+    Icon?: string;
+}) => PopupShowWindowAction;
+export declare const PopupWindowHide: (id: string) => PopupHideWindowAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;
 export declare const PopupHideAlert: () => PopupHideAlertAction;
 export declare const PopupShowLoading: () => PopupShowLoadingAction;

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -1,6 +1,6 @@
 "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.PopupHideScreen = exports.PopupShowScreen = 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.PopupHideAlert = exports.PopupShowAlert = exports.PopupWindowHide = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_WINDOW_HIDE_SCREEN = exports.POPUP_WINDOW_SHOW_SCREEN = 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.POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 exports.POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
 exports.POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
@@ -14,6 +14,8 @@ exports.POPUP_SHOW_CONFIRMATION = 'POPUP_SHOW_CONFIRMATION';
 exports.POPUP_CONFIRM_CONFIRMATION = 'POPUP_CONFIRM_CONFIRMATION';
 exports.POPUP_CANCEL_CONFIRMATION = 'POPUP_CANCEL_CONFIRMATION';
 exports.POPUP_CLEAR_PARAM = 'POPUP_CLEAR_PARAM';
+exports.POPUP_WINDOW_SHOW_SCREEN = 'POPUP_WINDOW_SHOW_SCREEN';
+exports.POPUP_WINDOW_HIDE_SCREEN = 'POPUP_WINDOW_HIDE_SCREEN';
 exports.PopupShowScreen = (componentModule, componentName, params, popupProps) => ({
     type: exports.POPUP_SHOW_SCREEN,
     ComponentModule: componentModule,
@@ -24,6 +26,17 @@ exports.PopupShowScreen = (componentModule, componentName, params, popupProps) =
 exports.PopupHideScreen = () => ({
     type: exports.POPUP_HIDE_SCREEN,
 });
+exports.PopupShowWindow = (config) => ({
+    type: exports.POPUP_WINDOW_SHOW_SCREEN,
+    Id: config.Id,
+    Title: config.Title,
+    PopupProps: config.PopupProps,
+    Icon: config.Icon,
+});
+exports.PopupWindowHide = (id) => ({
+    type: exports.POPUP_WINDOW_HIDE_SCREEN,
+    Id: id,
+});
 exports.PopupShowAlert = (alert) => {
     return {
         type: exports.POPUP_SHOW_ALERT,
@@ -101,6 +114,9 @@ const initialState = {
         Message: '',
         ConfirmAction: null,
     },
+    WindowPopup: {
+        PopupList: [],
+    },
 };
 exports.PopupReducer = (state = initialState, action) => {
     switch (action.type) {
@@ -242,6 +258,25 @@ exports.PopupReducer = (state = initialState, action) => {
             };
             return Object.assign({}, state, { ScreenPopup: newScreenPopup });
         }
+        case exports.POPUP_WINDOW_SHOW_SCREEN: {
+            const showWindowAction = action;
+            const windowSettings = {
+                Id: showWindowAction.Id,
+                Icon: showWindowAction.Icon,
+                Title: showWindowAction.Title,
+                PopupProps: showWindowAction.PopupProps,
+            };
+            // Prevent opening the same popup twice
+            if (state.WindowPopup.PopupList.some((windowPopup) => windowPopup.Id === windowSettings.Id)) {
+                return state;
+            }
+            const PopupList = [...state.WindowPopup.PopupList, windowSettings];
+            return Object.assign(Object.assign({}, state), { WindowPopup: Object.assign(Object.assign({}, state.WindowPopup), { PopupList }) });
+        }
+        case exports.POPUP_WINDOW_HIDE_SCREEN: {
+            const PopupList = state.WindowPopup.PopupList.filter((windowPopup) => windowPopup.Id !== action.Id);
+            return Object.assign(Object.assign({}, state), { WindowPopup: Object.assign(Object.assign({}, state.WindowPopup), { PopupList }) });
+        }
         default:
             return state;
     }

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

@@ -12,6 +12,7 @@ import { CachedQuery } from '../../PredefinedConfig/QueryState';
 import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { MathOperation, SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
+import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 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";
@@ -37,7 +38,9 @@ export declare const SYSTEM_HIGHLIGHT_CELL_ADD = "SYSTEM_HIGHLIGHT_CELL_ADD";
 export declare const SYSTEM_HIGHLIGHT_CELL_DELETE = "SYSTEM_HIGHLIGHT_CELL_DELETE";
 export declare const SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = "SYSTEM_HIGHLIGHT_CELL_DELETE_ALL";
 export declare const SYSTEM_HIGHLIGHT_ROW_ADD = "SYSTEM_HIGHLIGHT_ROW_ADD";
+export declare const SYSTEM_HIGHLIGHT_ROWS_ADD = "SYSTEM_HIGHLIGHT_ROWS_ADD";
 export declare const SYSTEM_HIGHLIGHT_ROW_DELETE = "SYSTEM_HIGHLIGHT_ROW_DELETE";
+export declare const SYSTEM_HIGHLIGHT_ROWS_DELETE = "SYSTEM_HIGHLIGHT_ROWS_DELETE";
 export declare const SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = "SYSTEM_HIGHLIGHT_ROW_DELETE_ALL";
 export declare const SYSTEM_SET_NEW_COLUMN_LIST_ORDER = "SYSTEM_SET_NEW_COLUMN_LIST_ORDER";
 export declare const SYSTEM_SET_LAST_APPLIED_SHORTCUT = "SYSTEM_SET_LAST_APPLIED_SHORTCUT";
@@ -77,6 +80,12 @@ export interface SystemHighlightRowAddAction extends Redux.Action {
 export interface SystemHighlightRowDeleteAction extends Redux.Action {
     primaryKeyValue: RowHighlightInfo['primaryKeyValue'];
 }
+export interface SystemHighlightRowsAddAction extends Redux.Action {
+    rowsHighlightInfo: RowsHighlightInfo;
+}
+export interface SystemHighlightRowsDeleteAction extends Redux.Action {
+    primaryKeyValues: RowsHighlightInfo['primaryKeyValues'];
+}
 export interface SystemHighlightRowDeleteAllAction extends Redux.Action {
 }
 export interface SystemAlertAddAction extends Redux.Action {
@@ -209,7 +218,9 @@ export declare const SystemHighlightCellAdd: (cellHighlightInfo: CellHighlightIn
 export declare const SystemHighlightCellDelete: (primaryKeyValue: CellHighlightInfo['primaryKeyValue'], columnId: CellHighlightInfo['columnId']) => SystemHighlightCellDeleteAction;
 export declare const SystemHighlightCellDeleteAll: () => SystemHighlightCellDeleteAllAction;
 export declare const SystemHighlightRowAdd: (rowHighlightInfo: RowHighlightInfo) => SystemHighlightRowAddAction;
+export declare const SystemHighlightRowsAdd: (rowsHighlightInfo: RowsHighlightInfo) => SystemHighlightRowsAddAction;
 export declare const SystemHighlightRowDelete: (primaryKeyValue: RowHighlightInfo['primaryKeyValue']) => SystemHighlightRowDeleteAction;
+export declare const SystemHighlightRowsDelete: (primaryKeyValues: RowsHighlightInfo['primaryKeyValues']) => SystemHighlightRowsDeleteAction;
 export declare const SystemHighlightRowDeleteAll: () => SystemHighlightRowDeleteAllAction;
 export declare const SystemAlertAdd: (alert: AdaptableAlert, maxAlerts: number) => SystemAlertAddAction;
 export declare const SystemAlertDelete: (alert: AdaptableAlert) => SystemAlertDeleteAction;

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_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;
+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.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = 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_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = 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");
 /*
@@ -40,7 +40,9 @@ exports.SYSTEM_HIGHLIGHT_CELL_DELETE = 'SYSTEM_HIGHLIGHT_CELL_DELETE';
 exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = 'SYSTEM_HIGHLIGHT_CELL_DELETE_ALL';
 // Rows Highlight
 exports.SYSTEM_HIGHLIGHT_ROW_ADD = 'SYSTEM_HIGHLIGHT_ROW_ADD';
+exports.SYSTEM_HIGHLIGHT_ROWS_ADD = 'SYSTEM_HIGHLIGHT_ROWS_ADD';
 exports.SYSTEM_HIGHLIGHT_ROW_DELETE = 'SYSTEM_HIGHLIGHT_ROW_DELETE';
+exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = 'SYSTEM_HIGHLIGHT_ROWS_DELETE';
 exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = 'SYSTEM_HIGHLIGHT_ROW_DELETE_ALL';
 // Columns
 exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = 'SYSTEM_SET_NEW_COLUMN_LIST_ORDER';
@@ -88,10 +90,18 @@ exports.SystemHighlightRowAdd = (rowHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_ROW_ADD,
     rowHighlightInfo: rowHighlightInfo,
 });
+exports.SystemHighlightRowsAdd = (rowsHighlightInfo) => ({
+    type: exports.SYSTEM_HIGHLIGHT_ROWS_ADD,
+    rowsHighlightInfo: rowsHighlightInfo,
+});
 exports.SystemHighlightRowDelete = (primaryKeyValue) => ({
     type: exports.SYSTEM_HIGHLIGHT_ROW_DELETE,
     primaryKeyValue: primaryKeyValue,
 });
+exports.SystemHighlightRowsDelete = (primaryKeyValues) => ({
+    type: exports.SYSTEM_HIGHLIGHT_ROWS_DELETE,
+    primaryKeyValues: primaryKeyValues,
+});
 exports.SystemHighlightRowDeleteAll = () => ({
     type: exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL,
 });
@@ -378,6 +388,19 @@ exports.SystemReducer = (state = initialState, action) => {
                 HighlightedRows: [...state.HighlightedRows, actionTypedAdd.rowHighlightInfo],
             });
         }
+        case exports.SYSTEM_HIGHLIGHT_ROWS_ADD: {
+            const actionTypedAdd = action;
+            const rowHighlightInfos = actionTypedAdd.rowsHighlightInfo.primaryKeyValues.map((primaryKeyValue) => {
+                return {
+                    primaryKeyValue,
+                    highlightStyle: actionTypedAdd.rowsHighlightInfo.highlightStyle,
+                    timeout: actionTypedAdd.rowsHighlightInfo.timeout,
+                };
+            });
+            return Object.assign({}, state, {
+                HighlightedRows: [...state.HighlightedRows, ...rowHighlightInfos],
+            });
+        }
         case exports.SYSTEM_HIGHLIGHT_ROW_DELETE: {
             const actionTypedDelete = action;
             const actionId = actionTypedDelete.primaryKeyValue;
@@ -387,6 +410,14 @@ exports.SystemReducer = (state = initialState, action) => {
                 }),
             });
         }
+        case exports.SYSTEM_HIGHLIGHT_ROWS_DELETE: {
+            const actionTypedDelete = action;
+            return Object.assign({}, state, {
+                HighlightedRows: state.HighlightedRows.filter((rowHighlightInfo) => {
+                    return !actionTypedDelete.primaryKeyValues.includes(rowHighlightInfo.primaryKeyValue);
+                }),
+            });
+        }
         case exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL: {
             return Object.assign({}, state, {
                 HighlightedRows: [],

package/src/Redux/Store/AdaptableReduxMerger.d.ts

@@ -1,6 +1,7 @@
 import { ConfigState } from '../../PredefinedConfig/ConfigState';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 export declare function AddStateSource(stateObject: any, source: 'Config' | 'User'): any;
+export declare function ProcessKeepUserDefinedRevision(configState: any, currentUserState: any): any;
 export declare function MergeStateFunction(oldState: any, newState: any): any;
 export declare function MergeState(oldState: any, newState: any): any;
 declare type TypeReducer = (state: AdaptableState, action: {

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeReducer = exports.MergeState = exports.MergeStateFunction = exports.AddStateSource = void 0;
+exports.mergeReducer = exports.MergeState = exports.MergeStateFunction = exports.ProcessKeepUserDefinedRevision = exports.AddStateSource = void 0;
 const tslib_1 = require("tslib");
 const mergeWith_1 = tslib_1.__importDefault(require("lodash/mergeWith"));
 const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
@@ -47,6 +47,34 @@ function AddStateSource(stateObject = {}, source) {
     return stateObject;
 }
 exports.AddStateSource = AddStateSource;
+function ProcessKeepUserDefinedRevision(configState, currentUserState) {
+    const traverseStateObject = (configObject, stateObject) => {
+        Object.entries(configObject).forEach(([key, configValue]) => {
+            const stateValue = stateObject[key];
+            if (Array.isArray(configValue) && Array.isArray(stateValue)) {
+                const userDefinedItems = stateValue.filter((item) => {
+                    return isAdaptableObject_1.isAdaptableObject(item) && item.Source !== 'Config';
+                });
+                configObject[key] = configValue.concat(userDefinedItems);
+                // we probably don't need to call traverseStateObject on the array as well,
+                // so we do the traversing on the else branch only
+            }
+            else {
+                if (configValue !== null &&
+                    typeof configValue === 'object' &&
+                    typeof stateValue === 'object') {
+                    traverseStateObject(configValue, stateValue);
+                }
+            }
+        });
+    };
+    traverseStateObject(configState, currentUserState);
+    return configState;
+}
+exports.ProcessKeepUserDefinedRevision = ProcessKeepUserDefinedRevision;
+function deepClone(obj) {
+    return JSON.parse(JSON.stringify(obj));
+}
 function MergeStateFunction(oldState, newState) {
     // return MergeState(oldState, newState);
     var _a, _b, _c;
@@ -66,14 +94,22 @@ function MergeStateFunction(oldState, newState) {
     for (const configModuleName in config) {
         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
+    // any Module in state that has an older revision than the config will be replaced
     for (const stateModuleName in state) {
         if (config[stateModuleName] != undefined) {
             // explicitly use double equals, as we want to avoid null as well
             const stateRevision = (_b = state[stateModuleName].Revision) !== null && _b !== void 0 ? _b : 0;
             const configRevision = (_c = config[stateModuleName].Revision) !== null && _c !== void 0 ? _c : 0;
-            if (configRevision > stateRevision) {
-                state[stateModuleName] = config[stateModuleName];
+            const stateRevisionKey = typeof stateRevision === 'object' ? stateRevision.Key : stateRevision;
+            const configRevisionBehavior = typeof configRevision === 'object' ? configRevision.Behavior : 'Override';
+            const configRevisionKey = typeof configRevision === 'object' ? configRevision.Key : configRevision;
+            if (configRevisionKey > stateRevisionKey) {
+                if (configRevisionBehavior === 'Override') {
+                    state[stateModuleName] = config[stateModuleName];
+                }
+                else {
+                    state[stateModuleName] = ProcessKeepUserDefinedRevision(deepClone(config[stateModuleName]), state[stateModuleName]);
+                }
             }
         }
     }

package/src/Redux/Store/AdaptableStore.js

@@ -42,6 +42,7 @@ const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants")
 const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
+const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
 const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
 const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
 exports.INIT_STATE = 'INIT_STATE';
@@ -109,6 +110,7 @@ class AdaptableStore {
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
                 this.TheStore.dispatch(PopupRedux.PopupShowAlert({
+                    alertType: 'generic',
                     header: 'Configuration',
                     message: 'Error loading your configuration:' + e,
                     alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -258,7 +260,7 @@ exports.AdaptableStore = AdaptableStore;
 const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -273,6 +275,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const namedQueryReferences = adaptable.api.queryApi.getNamedQueryModuleReferences(actionTyped.namedQuery.Name);
                     if (namedQueryReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Named Query could not be deleted',
                             message: `It is still referenced in the following modules: ${namedQueryReferences.join(', ')}`,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -294,6 +297,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         const namedQueryReferences = adaptable.api.queryApi.getNamedQueryModuleReferences(previousNamedQueryName);
                         if (namedQueryReferences.length) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: 'Named Query could not be renamed',
                                 message: `It is currently referenced in the following modules: ${namedQueryReferences.join(', ')}`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -319,7 +323,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case SystemRedux.SYSTEM_FLASHING_CELL_ADD:
                 case SystemRedux.SYSTEM_FLASHING_CELL_DELETE: {
-                    const { flashingCell: FlashingCell, } = action;
+                    const { flashingCell: FlashingCell } = action;
                     const { dataChangedInfo } = FlashingCell;
                     let ret = next(action);
                     if (dataChangedInfo) {
@@ -380,15 +384,17 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SystemRedux.SYSTEM_ALERT_DELETE: {
                     const actionTyped = action;
                     let ret = next(action);
-                    if (((_c = actionTyped.alert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
-                        actionTyped.alert.dataChangedInfo) {
-                        let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
+                    const adaptableAlert = actionTyped.alert;
+                    if (((_c = adaptableAlert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
+                        AdaptableAlert_1.isAdaptableCellChangedAlert(adaptableAlert) &&
+                        adaptableAlert.dataChangedInfo) {
+                        const rowNode = adaptableAlert.dataChangedInfo.rowNode;
+                        adaptable.refreshCells([rowNode], [adaptableAlert.dataChangedInfo.column.columnId], true);
                     }
-                    if (((_d = actionTyped.alert.alertDefinition.AlertProperties) === null || _d === void 0 ? void 0 : _d.HighlightRow) &&
-                        actionTyped.alert.dataChangedInfo) {
-                        let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.api.gridApi.refreshRowNode(rowNode);
+                    if (((_d = adaptableAlert.alertDefinition.AlertProperties) === null || _d === void 0 ? void 0 : _d.HighlightRow) &&
+                        AdaptableAlert_1.isAdaptableRowChangedAlert(adaptableAlert) &&
+                        adaptableAlert.gridDataChangedInfo) {
+                        adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
                     }
                     return ret;
                 }
@@ -402,13 +408,16 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let alerts = actionTyped.alerts;
                     alerts.forEach((alert) => {
                         var _a, _b;
-                        if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) && alert.dataChangedInfo) {
+                        if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
+                            AdaptableAlert_1.isAdaptableCellChangedAlert(alert) &&
+                            alert.dataChangedInfo) {
                             let rowNode = alert.dataChangedInfo.rowNode;
                             adaptable.refreshCells([rowNode], [alert.dataChangedInfo.column.columnId], true);
                         }
-                        if (((_b = alert.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.HighlightRow) && alert.dataChangedInfo) {
-                            let rowNode = alert.dataChangedInfo.rowNode;
-                            adaptable.api.gridApi.refreshRowNode(rowNode);
+                        if (((_b = alert.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.HighlightRow) &&
+                            AdaptableAlert_1.isAdaptableRowChangedAlert(alert) &&
+                            alert.gridDataChangedInfo) {
+                            adaptable.api.gridApi.refreshRowNodes(alert.gridDataChangedInfo.rowNodes);
                         }
                     });
                     return ret;
@@ -420,14 +429,17 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case SystemRedux.SYSTEM_ALERT_REMOVE_HIGHLIGHT: {
                     let ret = next(action);
                     const actionTyped = action;
-                    if (actionTyped.alert.dataChangedInfo) {
-                        let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        if (actionTyped.alert.alertDefinition.AlertProperties.HighlightCell) {
-                            adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
-                        }
-                        if (actionTyped.alert.alertDefinition.AlertProperties.HighlightRow) {
-                            adaptable.api.gridApi.refreshRowNode(rowNode);
-                        }
+                    const adaptableAlert = actionTyped.alert;
+                    if (((_e = adaptableAlert.alertDefinition.AlertProperties) === null || _e === void 0 ? void 0 : _e.HighlightCell) &&
+                        AdaptableAlert_1.isAdaptableCellChangedAlert(adaptableAlert) &&
+                        adaptableAlert.dataChangedInfo) {
+                        const rowNode = adaptableAlert.dataChangedInfo.rowNode;
+                        adaptable.refreshCells([rowNode], [adaptableAlert.dataChangedInfo.column.columnId], true);
+                    }
+                    if (((_f = adaptableAlert.alertDefinition.AlertProperties) === null || _f === void 0 ? void 0 : _f.HighlightRow) &&
+                        AdaptableAlert_1.isAdaptableRowChangedAlert(adaptableAlert) &&
+                        adaptableAlert.gridDataChangedInfo) {
+                        adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
                     }
                     return ret;
                 }
@@ -481,6 +493,25 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     }
                     return ret;
                 }
+                case SystemRedux.SYSTEM_HIGHLIGHT_ROWS_ADD: {
+                    const actionTyped = action;
+                    const ret = next(action);
+                    const rowsHighlightInfo = actionTyped.rowsHighlightInfo;
+                    const rowNodes = adaptable.getRowNodesForPrimaryKeys(rowsHighlightInfo.primaryKeyValues);
+                    if (rowNodes.length) {
+                        adaptable.api.gridApi.refreshRowNodes(rowNodes);
+                    }
+                    return ret;
+                }
+                case SystemRedux.SYSTEM_HIGHLIGHT_ROWS_DELETE: {
+                    const actionTyped = action;
+                    const ret = next(action);
+                    const rowNodes = adaptable.getRowNodesForPrimaryKeys(actionTyped.primaryKeyValues);
+                    if (rowNodes.length) {
+                        adaptable.api.gridApi.refreshRowNodes(rowNodes);
+                    }
+                    return ret;
+                }
                 case SystemRedux.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL: {
                     const rowHighlightInfos = middlewareAPI.getState().System.HighlightedRows;
                     const ret = next(action);
@@ -540,6 +571,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const calculatedColumnReferences = adaptable.api.calculatedColumnApi.getCalculatedColumnModuleReferences(actionTyped.calculatedColumn);
                     if (calculatedColumnReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'CalculatedColumn could not be deleted',
                             message: `It is still referenced in the following modules: ${calculatedColumnReferences.join(', ')}`,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -563,6 +595,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const freeTextColumnReferences = adaptable.api.freeTextColumnApi.getFreeTextColumnModuleReferences(actionTyped.freeTextColumn);
                     if (freeTextColumnReferences.length) {
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'FreeTextColumn could not be deleted',
                             message: `It is still referenced in the following modules: ${freeTextColumnReferences.join(', ')}`,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -762,7 +795,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_e = adaptable.adaptableOptions.layoutOptions) === null || _e === void 0 ? void 0 : _e.autoSaveLayouts)) {
+                        if (!((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts)) {
                             middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
@@ -770,7 +803,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_f = adaptable.adaptableOptions.layoutOptions) === null || _f === void 0 ? void 0 : _f.autoSaveLayouts)) {
+                        if (!((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts)) {
                             // and the current layout is saved, make sure we also update the draft
                             if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
                                 middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
@@ -1001,6 +1034,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing get error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't get shared items: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1027,6 +1061,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[Entity.Uuid];
                         if (existingActiveSharedEntity) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: 'Team Sharing',
                                 message: `Couldn't share ${adaptable.api.internalApi.getModuleFriendlyName(existingActiveSharedEntity.Module)}, there is already an existing active share for it: ${existingActiveSharedEntity.Description}`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1049,6 +1084,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .then(() => {
                         if (shareSuccessful) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: 'Team Sharing',
                                 message: `${adaptable.api.internalApi.getModuleFriendlyName(Module)} Shared Successfully`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
@@ -1058,6 +1094,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing share error : ' + error.message, actionTyped.Entity);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't share item: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1081,6 +1118,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             .getSharedEntityDependants(actionTyped.Uuid, sharedEntities);
                         if (sharedEntityDependants.length) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                                alertType: 'generic',
                                 header: `Cannot remove the shared item as it is referenced in:`,
                                 message: sharedEntityDependants
                                     .map((sharedEntity) => `${adaptable.api.internalApi.getModuleFriendlyName(sharedEntity.Module)} ${sharedEntity.Description}`)
@@ -1098,6 +1136,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing remove error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't remove item: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1112,7 +1151,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);
@@ -1164,6 +1203,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .then(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()))
                         .catch(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()));
                     middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                        alertType: 'generic',
                         header: 'Team Sharing',
                         message: `Item Successfully Imported`,
                         alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
@@ -1185,14 +1225,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));
@@ -1202,6 +1242,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing update active item error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't update active item: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
@@ -1222,6 +1263,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing update error : ' + error.message);
                         middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't check for updates: " + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),

package/src/Strategy/AlertModule.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
-import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import * as AlertRedux from '../Redux/ActionsReducers/AlertRedux';
@@ -15,12 +14,15 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
     updateOldConfig(): void;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    protected handleDataSourceChanged(dataChangedInfo: DataChangedInfo): void;
+    private handleCellDataChanged;
+    private handleGridDataChanged;
     private handleReactiveAlertTriggered;
     private showAlertForDefinitions;
-    private getAlertDefinitionsForDataChange;
+    private getAlertDefinitionsForCellDataChange;
+    private getAlertDefinitionsForGridDataChange;
     private getBaseAlertDefinitionsForDataChange;
     private isAlertPredicateTriggered;
+    private isAlertDefinitionForRowChangeEvent;
     getTeamSharingAction(): TeamSharingImportInfo<AlertDefinition>;
     toView(alert: AlertDefinition): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];