@adaptabletools/adaptable 11.0.0-canary.0 → 11.0.0-canary.4

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: {},

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;
@@ -305,8 +316,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 /*******************
                  * FLASHING ALERT ACTIONS
                  *******************/
-                case SystemRedux.SYSTEM_FLASHING_ALERT_ADD:
-                case SystemRedux.SYSTEM_FLASHING_ALERT_DELETE: {
+                case SystemRedux.SYSTEM_FLASHING_CELL_ADD:
+                case SystemRedux.SYSTEM_FLASHING_CELL_DELETE: {
                     const { flashingCell: FlashingCell, } = action;
                     const { dataChangedInfo } = FlashingCell;
                     let ret = next(action);
@@ -693,7 +704,6 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case DashboardRedux.DASHBOARD_SET_IS_HIDDEN:
                 case DashboardRedux.DASHBOARD_SET_FLOATING_POSITION:
                 case DashboardRedux.DASHBOARD_SET_TABS:
-                case DashboardRedux.DASHBOARD_CREATE_DEFAULT_TAB:
                 case DashboardRedux.DASHBOARD_CLOSE_TOOLBAR: {
                     const oldDashboardState = middlewareAPI.getState().Dashboard;
                     let returnAction = next(action);

package/src/Strategy/AlertModule.js

@@ -19,7 +19,7 @@ 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;
             }

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

@@ -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/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/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/Utilities/ExpressionFunctions/aggregationExpressionFunctions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregationExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
-const parseInt_1 = tslib_1.__importDefault(require("lodash-es/parseInt"));
+const parseInt_1 = tslib_1.__importDefault(require("lodash/parseInt"));
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const operators_1 = require("rxjs/operators");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const operators_1 = require("rxjs/operators");
-const toNumber_1 = tslib_1.__importDefault(require("lodash-es/toNumber"));
+const toNumber_1 = tslib_1.__importDefault(require("lodash/toNumber"));
 const evaluator_1 = require("../../parser/src/evaluator");
 // string functions may be case (in)sensitive, see internalApi.isTextComparisonCaseSensitive()
 // if case is insensitive, we convert ALL involved strings to lower case

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -4,7 +4,7 @@ exports.observableExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const parseInt_1 = tslib_1.__importDefault(require("lodash-es/parseInt"));
+const parseInt_1 = tslib_1.__importDefault(require("lodash/parseInt"));
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 // numeric value(digits) followed by a single 's', 'm' or 'h' letter (case insensitive)
@@ -417,8 +417,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().queryLanguageOptions
-        .maxTimeframeSize;
+    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().queryLanguageOptions.maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;
     }

package/src/Utilities/Extensions/StringExtensions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringExtensions = exports.IsNumeric = exports.ReplaceEmptySpacesWithUnderscore = exports.Humanize = exports.CapitaliseFirstLetter = exports.AbbreviateString = exports.NotIncludes = exports.Includes = exports.ToLowerCase = exports.RemoveTrailingComma = exports.CamelCaseToHumanText = exports.IsNotNullOrEmptyOrWhiteSpace = exports.IsNullOrEmptyOrWhiteSpace = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = void 0;
 const tslib_1 = require("tslib");
-const startCase_1 = tslib_1.__importDefault(require("lodash-es/startCase"));
+const startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
 function IsNull(stringToCheck) {
     return stringToCheck == null || stringToCheck == undefined;
 }

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableHelper = exports.addAdaptableObjectUuidAndSource = exports.runAdaptableComparerFunction = exports.checkAdaptableOptions = exports.getAppropriateAccessLevel = exports.AdaptableObjectExistsInState = exports.checkValidPrimaryKey = exports.initPredefinedConfigWithUuids = exports.assignAdaptableOptions = void 0;
 const tslib_1 = require("tslib");
-const cloneDeepWith_1 = tslib_1.__importDefault(require("lodash-es/cloneDeepWith"));
-const isPlainObject_1 = tslib_1.__importDefault(require("lodash-es/isPlainObject"));
+const cloneDeepWith_1 = tslib_1.__importDefault(require("lodash/cloneDeepWith"));
+const isPlainObject_1 = tslib_1.__importDefault(require("lodash/isPlainObject"));
 const LoggingHelper_1 = require("./LoggingHelper");
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");

package/src/Utilities/ObjectFactory.js

@@ -85,9 +85,11 @@ exports.CreateEmptyAlertDefinition = CreateEmptyAlertDefinition;
 function CreateEmptyFlashingCellDefinition() {
     return {
         Uuid: Uuid_1.createUuid(),
-        Scope: { All: true },
+        Scope: { ColumnIds: [] },
         Rule: {
-            Predicate: undefined,
+            Predicate: {
+                PredicateId: 'Any',
+            },
         },
     };
 }

package/src/Utilities/Services/LicenseService.js

@@ -6,7 +6,7 @@ const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
-const clamp_1 = tslib_1.__importDefault(require("lodash-es/clamp"));
+const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
 const decode_1 = require("../license/decode");
 const EMAIL = 'sales@adaptabletools.com';

package/src/Utilities/Services/ReportService.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportService = void 0;
 const tslib_1 = require("tslib");
-const groupBy_1 = tslib_1.__importDefault(require("lodash-es/groupBy"));
+const groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const GeneralConstants_1 = require("../Constants/GeneralConstants");

package/src/View/AdaptableView.js

@@ -27,7 +27,7 @@ class AdaptableView extends React.Component {
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
             React.createElement(ExportCustomDestinationFormPopups_1.ExportCustomDestinationFormPopups, { api: this.props.AdaptableApi }),
             React.createElement(react_toastify_1.ToastContainer, { limit: this.props.AdaptableApi.internalApi.getAdaptableOptions().notificationsOptions
-                    .maxNotifications, closeButton: false }),
+                    .maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(ProgressIndicator_1.ProgressIndicator, null)));
     }

package/src/View/Alert/Wizard/AlertRulesWizardSection.d.ts

@@ -2,7 +2,7 @@
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 declare type AlertRulesWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;
-    module: 'alert' | 'flashingCell';
+    module: 'alert';
 };
 export declare const AlertRulesWizardSection: (props: AlertRulesWizardSectionProps) => JSX.Element;
 export declare const renderAlertRulesSummary: (alertDefinition: AlertDefinition) => JSX.Element;

package/src/View/Alert/Wizard/BaseAlertRulesWizardSection.d.ts

@@ -1,10 +1,9 @@
 import * as React from 'react';
 import { AlertDefinition } from '../../../types';
-import { FlashingCellDefinition } from '../../../../types';
 export interface BaseAlertRulesWizardSectionProps<T> {
     onChange: (data: T) => void;
-    module: 'alert' | 'flashingCell';
+    module: 'alert';
     wholeRowScope?: boolean;
     children?: React.ReactNode;
 }
-export declare const BaseAlertRulesWizardSection: <T extends AlertDefinition | FlashingCellDefinition>(props: BaseAlertRulesWizardSectionProps<T>) => JSX.Element;
+export declare const BaseAlertRulesWizardSection: <T extends AlertDefinition>(props: BaseAlertRulesWizardSectionProps<T>) => JSX.Element;

package/src/View/Alert/Wizard/BaseAlertRulesWizardSection.js

@@ -8,9 +8,7 @@ const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 exports.BaseAlertRulesWizardSection = (props) => {
     const { data, api, moduleInfo } = OnePageAdaptableWizard_1.useOnePageWizardContext();
     const wholeRowScope = props.wholeRowScope != null ? props.wholeRowScope : api.scopeApi.scopeIsAll(data.Scope);
-    const predicateDefs = props.module == 'alert'
-        ? api.alertApi.getAlertPredicateDefsForScope(data.Scope)
-        : api.flashingCellApi.getFlashingCellPredicateDefsForScope(data.Scope);
+    const predicateDefs = api.alertApi.getAlertPredicateDefsForScope(data.Scope);
     return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "Any", data: data, predicateDefs: predicateDefs, onChange: props.onChange, showAggregation: !wholeRowScope ? false : true, showObservable: !wholeRowScope ? false : true, showBoolean: true, showPredicate: true, descriptions: {
             selectPredicate: 'Select an Alert Rule - to be applied when data changes',
             useBooleanQuery: (React.createElement(React.Fragment, null,

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -16,6 +16,7 @@ const Tabs_1 = require("../../../components/Tabs");
 const ValueSelector_1 = require("../../Components/ValueSelector");
 const Tag_1 = require("../../../components/Tag");
 const getCalculatedColumnSettingTags_1 = require("../Utilities/getCalculatedColumnSettingTags");
+const SpecialColumnSettingsWizardStep_1 = require("../../SpecialColumnSettingsWizardStep");
 exports.renderCalculatedColumnSettingsSummary = (data) => {
     var _a;
     const options = getCalculatedColumnSettingTags_1.getCalculatedColumnSettingTags(data.CalculatedColumnSettings);
@@ -72,17 +73,15 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
     const ColumnName = data.FriendlyName;
     const ColumnId = data.ColumnId;
     let { DataType: dataType } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
-    const { Width, Filterable, ShowToolTip, Resizable, Groupable, Sortable, Pivotable, Aggregatable, } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
-    const onSettingsChange = (values) => {
-        props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), values) }));
+    const { Width, ShowToolTip } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
+    const handleSpecialColumnSettingsChange = (settings) => {
+        props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
     };
     React.useEffect(() => {
         var _a;
         if (!dataType) {
             const computedDataType = calculatedColumnExpressionService.GetCalculatedColumnDataType((_a = data.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
-            onSettingsChange({
-                DataType: computedDataType,
-            });
+            handleSpecialColumnSettingsChange(Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.CalculatedColumnSettings), { DataType: computedDataType }));
         }
     }, []);
     return (React.createElement(rebass_1.Box, { "data-name": 'calculated-column-settings' },
@@ -111,23 +110,11 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
                                     onClick: () => handleDataTypeChange(item.value),
                                 })) }, dataType ? dataType : 'Select Data Type')),
                         React.createElement(FormLayout_1.FormRow, { label: "Width" },
-                            React.createElement(Input_1.default, { type: "number", width: 300, value: Width || '', onChange: (e) => onSettingsChange({ Width: Number(e.target.value) }) })),
+                            React.createElement(Input_1.default, { type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
+                                    Width: Number(e.target.value),
+                                }) })),
                         React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => onSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
+                            React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
-        React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false },
-            React.createElement(Tabs_1.Tabs.Tab, null, " Column Properties"),
-            React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                    React.createElement(FormLayout_1.default, { style: { width: '100%' }, columns: [{ name: 'first', size: '30%' }, { name: 'second' }] },
-                        React.createElement(FormLayout_1.FormRow, null,
-                            React.createElement(CheckBox_1.CheckBox, { checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !api.internalApi.getAdaptableOptions().filterOptions
-                                    .enableFilterOnSpecialColumns }, "Filterable"),
-                            React.createElement(CheckBox_1.CheckBox, { checked: Resizable, onChange: (Resizable) => onSettingsChange({ Resizable }) }, "Resizable")),
-                        React.createElement(FormLayout_1.FormRow, null,
-                            React.createElement(CheckBox_1.CheckBox, { checked: Groupable, onChange: (Groupable) => onSettingsChange({ Groupable }) }, "Groupable"),
-                            React.createElement(CheckBox_1.CheckBox, { checked: Sortable, onChange: (Sortable) => onSettingsChange({ Sortable }) }, "Sortable")),
-                        React.createElement(FormLayout_1.FormRow, null,
-                            React.createElement(CheckBox_1.CheckBox, { checked: Pivotable, onChange: (Pivotable) => onSettingsChange({ Pivotable }) }, "Pivotable"),
-                            React.createElement(CheckBox_1.CheckBox, { checked: Aggregatable, onChange: (Aggregatable) => onSettingsChange({ Aggregatable }) }, "Aggregatable"))))))));
+        React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.js

@@ -14,15 +14,26 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const CalculatedColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/CalculatedColumnRedux"));
 exports.CalculatedColumnWizard = (props) => {
+    var _a;
     const adaptable = AdaptableContext_1.useAdaptable();
+    const allCalculatedColumns = react_redux_1.useSelector((state) => state.CalculatedColumn.CalculatedColumns);
     const [calculatedColumn, setCalculatedColumn] = react_1.useState(() => {
-        return (props === null || props === void 0 ? void 0 : props.data) ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyCalculatedColumn(adaptable.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns);
+        var _a;
+        if (props.data) {
+            return Helper_1.cloneObject(props.data);
+        }
+        if ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) {
+            const calculatedColumn = allCalculatedColumns.find((calculatedColumn) => calculatedColumn.ColumnId === props.popupParams.column.columnId);
+            if (calculatedColumn) {
+                return calculatedColumn;
+            }
+        }
+        return ObjectFactory_1.default.CreateEmptyCalculatedColumn(adaptable.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns);
     });
     const dispatch = react_redux_1.useDispatch();
-    const isEdit = Boolean(props.data);
+    const isEdit = Boolean(props.data) || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
     const handleFinish = () => {
-        if (props.data) {
+        if (isEdit) {
             dispatch(CalculatedColumnRedux.CalculatedColumnEdit(calculatedColumn));
         }
         else {