@adaptabletools/adaptable 11.0.7 → 11.1.0

package/src/PredefinedConfig/Common/AdaptableAlert.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAdaptableRowChangedAlert = exports.isAdaptableCellChangedAlert = void 0;
+exports.isAdaptableCellChangedAlert = (alert) => {
+    return alert.alertType === 'cellChanged';
+};
+exports.isAdaptableRowChangedAlert = (alert) => {
+    return alert.alertType === 'rowChanged';
+};

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -495,5 +495,25 @@ exports.SystemPredicateDefs = [
             return distinctValues.includes(value);
         },
     },
+    {
+        id: 'AddedRow',
+        label: 'Added Row(s)',
+        columnScope: { All: true },
+        moduleScope: ['alert'],
+        handler: () => {
+            // handled in AlertModule as an eventHandler
+            return false;
+        },
+    },
+    {
+        id: 'RemovedRow',
+        label: 'Removed Row(s)',
+        columnScope: { All: true },
+        moduleScope: ['alert'],
+        handler: () => {
+            // handled in AlertModule as an eventHandler
+            return false;
+        },
+    },
 ];
 exports.SystemFilterPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('filter')).map((p) => p.id);

package/src/PredefinedConfig/Common/CellHighlightInfo.d.ts

@@ -12,7 +12,7 @@ export interface CellHighlightInfo {
      */
     primaryKeyValue: any;
     /**
-     * Time after which Cell should be unhilighted
+     * Time after which Cell should be unhighlighted
      */
     timeout?: number;
     /**

package/src/PredefinedConfig/Common/DataChangedInfo.d.ts

@@ -5,7 +5,7 @@ import { AdaptableColumn } from './AdaptableColumn';
  */
 export interface DataChangedInfo {
     /**
-     * Timestamp of change occurence (in milliseconds)
+     * Timestamp of change occurrence (in milliseconds)
      */
     changedAt: number;
     /**

package/src/PredefinedConfig/Common/Entitlement.d.ts

@@ -5,11 +5,11 @@ export interface Entitlement {
      */
     adaptableModule: AdaptableModule;
     /**
-     * Access Level for an Entitlement; options are: 'Full', ''ReadOnly', 'Hidden'
+     * Access Level for an Entitlement; options are: `Full` `ReadOnly` `Hidden`
      */
     accessLevel: AccessLevel;
 }
 /**
- * Defines Access Level for an Entitlement - can be 'ReadOnly', 'Hidden' or 'Full'
+ * Defines Access Level for an Entitlement - can be `ReadOnly`, `Hidden` or `Full`
  */
 export declare type AccessLevel = 'ReadOnly' | 'Hidden' | 'Full';

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -68,6 +68,9 @@ export interface UserMenuItem<CONTEXT_TYPE extends BaseMenuContext> {
      */
     subMenuItems?: UserMenuItem<CONTEXT_TYPE>[];
 }
+/**
+ * Base Context object used for both Column and Context Menu Context
+ */
 export interface BaseMenuContext {
     /**
      * The Adaptable Api - included as a convenience

package/src/PredefinedConfig/Common/RowsHighlightInfo.d.ts

@@ -0,0 +1,15 @@
+import { AdaptableStyle } from '../../../types';
+export interface RowsHighlightInfo {
+    /**
+     * Primary key valuse for the rows to be highlighted
+     */
+    primaryKeyValues: any[];
+    /**
+     * Timeout after which the highlight is removed
+     */
+    timeout?: number;
+    /**
+     * Highlight style
+     */
+    highlightStyle: AdaptableStyle;
+}

package/src/PredefinedConfig/Common/RowsHighlightInfo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/PredefinedConfig/ConfigState.d.ts

@@ -5,5 +5,8 @@ export interface ConfigState {
     /**
      * Version number of the Item - allows developers to update one section in Predefined Config while keeping others unchanged
      */
-    Revision?: number;
+    Revision?: number | {
+        Key: number;
+        UpdateStrategy: 'Override' | 'KeepUserDefined';
+    };
 }

package/src/PredefinedConfig/LayoutState.d.ts

@@ -41,7 +41,7 @@ export interface Layout extends AdaptableObject {
      */
     RowGroupedColumns?: string[];
     /**
-     * Values of opened row groups
+     * Opened Row Groups - set if `displayRowGroups` in LayoutOptions is 'dynamic'
      */
     ExpandedRowGroupValues?: any[];
     /**

package/src/PredefinedConfig/PopupState.d.ts

@@ -1,10 +1,11 @@
-import { ScreenPopup, AlertPopup, ConfirmationPopup, PromptPopup, LoadingPopup } from '../Utilities/Interface/MessagePopups';
+import { ScreenPopup, AlertPopup, ConfirmationPopup, PromptPopup, LoadingPopup, WindowPopup } from '../Utilities/Interface/MessagePopups';
 import { InternalState } from './InternalState';
 /**
  * Internal state to manage open popups - NOT persisted by Redux
  */
 export interface PopupState extends InternalState {
     ScreenPopup: ScreenPopup;
+    WindowPopup: WindowPopup;
     AlertPopup: AlertPopup;
     ConfirmationPopup: ConfirmationPopup;
     PromptPopup: PromptPopup;

package/src/Redux/ActionsReducers/FlashingCellRedux.js

@@ -64,28 +64,24 @@ exports.FlashingCellReducer = (state = initialState, action) => {
     let flashingCellDefinitions;
     switch (action.type) {
         case exports.FLASHING_CELL_DEFINITION_SET: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinitions;
+            const actionFlashingCellDefinition = action.flashingCellDefinitions;
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: actionFlashingCellDefinition });
         }
         case exports.FLASHING_CELL_DEFINITION_ADD: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinition;
+            const actionFlashingCellDefinition = action.flashingCellDefinition;
             AdaptableHelper_1.default.addUuidAndSource(actionFlashingCellDefinition);
             flashingCellDefinitions = [].concat(state.FlashingCellDefinitions);
             flashingCellDefinitions.push(actionFlashingCellDefinition);
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: flashingCellDefinitions });
         }
         case exports.FLASHING_CELL_DEFINITION_EDIT: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinition;
+            const actionFlashingCellDefinition = action.flashingCellDefinition;
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: state.FlashingCellDefinitions.map((abObject) => abObject.Uuid === actionFlashingCellDefinition.Uuid
                     ? actionFlashingCellDefinition
                     : abObject) });
         }
         case exports.FLASHING_CELL_DEFINITION_DELETE: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinition;
+            const actionFlashingCellDefinition = action.flashingCellDefinition;
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: state.FlashingCellDefinitions.filter((abObject) => abObject.Uuid !== actionFlashingCellDefinition.Uuid) });
         }
         case exports.FLASHING_CELL_DEFINITION_SUSPEND: {

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]);
+                }
             }
         }
     }