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

package/index.css

@@ -3339,7 +3339,8 @@ input[type="number"].ab-Input:hover::-webkit-inner-spin-button:active {
 
 .ab-Tag {
   display: inline-flex;
-  font-size: var(--ab-cmp-Tag__font-size); }
+  font-size: var(--ab-cmp-Tag__font-size);
+  max-width: 100%; }
 
 .ab-AdaptableOptions {
   background: var(--ab-cmp-adaptable-options__background-color); }
@@ -3610,6 +3611,10 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
 .ab-Adaptable-Object-List__Item__edit-property {
       visibility: hidden; }
 
+.ab-Adaptable-Object-List__Item__values {
+      min-width: 0;
+      word-break: break-all; }
+
 .ab-Adaptable-Object-List__Item__buttons {
       padding-left: var(--ab-space-2);
       min-width: 80px;

package/package.json

@@ -1,15 +1,41 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.0.0-canary.2",
+  "version": "11.0.0-canary.3",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
-  "main": "index.js",
-  "typings": "index.d.ts",
+  "keywords": [
+    "web-components",
+    "datagrid",
+    "fintech",
+    "grid",
+    "data",
+    "table",
+    "data-table",
+    "openfin",
+    "ag-grid",
+    "infinite-table",
+    "adaptable",
+    "blotter"
+  ],
+  "homepage": "http://www.adaptabletools.com/",
+  "license": "SEE LICENSE IN LICENSE.md",
+  "author": {
+    "name": "Jonny Wolfson",
+    "email": "jonny.wolfson@adaptabletools.com"
+  },
+  "maintainers": [
+    {
+      "name": "JonnyAdaptableTools",
+      "email": "jonny.wolfson@adaptabletools.com"
+    }
+  ],
+  "main": "agGrid.js",
+  "typings": "types.d.ts",
   "dependencies": {
     "@infinite-table/infinite-react": "0.0.1-canary.11",
     "date-fns": "2.22.1",
     "debug": "^4.3.1",
     "isomorphic-fetch": "^2.2.1",
-    "lodash-es": "^4.17.15",
+    "lodash": "^4.17.15",
     "normalize.css": "^8.0.1",
     "prop-types": "^15.6.2",
     "re-resizable": "^6.9.1",
@@ -31,31 +57,5 @@
   },
   "peerDependencies": {
     "@ag-grid-community/all-modules": ">=26.2.0"
-  },
-  "keywords": [
-    "web-components",
-    "datagrid",
-    "fintech",
-    "grid",
-    "data",
-    "table",
-    "data-table",
-    "openfin",
-    "ag-grid",
-    "infinite-table",
-    "adaptable",
-    "blotter"
-  ],
-  "maintainers": [
-    {
-      "name": "JonnyAdaptableTools",
-      "email": "jonny.wolfson@adaptabletools.com"
-    }
-  ],
-  "author": {
-    "name": "Jonny Wolfson",
-    "email": "jonny.wolfson@adaptabletools.com"
-  },
-  "homepage": "http://www.adaptabletools.com/",
-  "license": "SEE LICENSE IN LICENSE.md"
+  }
 }

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1643751455083;
+declare const _default: 1643989382977;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1643751455083;
+exports.default = 1643989382977;

package/src/AdaptableOptions/EntitlementOptions.d.ts

@@ -11,7 +11,7 @@ export interface EntitlementOptions {
      */
     moduleEntitlements?: Entitlement[] | ((adaptableModule: AdaptableModule, userName: string, adaptableId: string, defaultAccessLevel: AccessLevel) => AccessLevel | undefined);
     /**
-     * AccessLevel to use when an Entitlement is not explicitly set; may be provided as a hardcoded value or as a function to invoke
+     * AccessLevel to use when an Entitlement is not explicitly set; can be hardcoded value or a function to invoke
      *
      * @defaultValue 'Full'
      * @gridInfoItem

package/src/AdaptableOptions/ToolPanelOptions.d.ts

@@ -25,7 +25,6 @@ export interface ToolPanelOptions {
      * Key of icon to be used (beside the label) for Adaptable ToolPanel Component
      *
      * @defaultValue 'menu'
-     * @see https://www.ag-grid.com/javascript-grid/side-bar/#sidebardef-configuration
      * @gridInfoItem
      */
     iconKey?: string;

package/src/Api/GridApi.d.ts

@@ -41,19 +41,19 @@ export interface GridApi {
      * @param dataRows rows which have been updated - send whole row and Adaptable will take care of the rest
      * @param config batch option and callback function to run post update
      */
-    updateGridData(dataRows: any[], config?: DataUpdateConfig): void;
+    updateGridData(dataRows: any[], config?: DataUpdateConfig): Promise<RowNode[]>;
     /**
      * Adds rows to Adaptable (and AG Grid)
      * @param dataRows rows to add; ensure all 'mandatory' fields are included and Primary Key is unique
      * @param config batch option and callback function to run post addition
      */
-    addGridData(dataRows: any[], config?: DataUpdateConfig): void;
+    addGridData(dataRows: any[], config?: DataUpdateConfig): Promise<RowNode[]>;
     /**
      * Deletes rows from Adaptable (and AG Grid)
      * @param dataRows rows which should be deleted
      * @param config batch option and callback function to run post deletion
      */
-    deleteGridData(dataRows: any[], config?: DataUpdateConfig): void;
+    deleteGridData(dataRows: any[], config?: DataUpdateConfig): Promise<RowNode[]>;
     /**
      * Updates cell in Adaptable (first performs Cell & Server Validation)
      * @param columnId column to update

package/src/Api/Implementation/DashboardApiImpl.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/DashboardRedux"));
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const isEqual_1 = tslib_1.__importDefault(require("lodash-es/isEqual"));
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const react_dom_1 = tslib_1.__importDefault(require("react-dom"));

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -45,10 +45,8 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
         return this.getFlashingCellDefinitions().filter((fc) => !fc.IsSuspended);
     }
     getFlashingCellFlashTarget(flashingCellDefinition) {
-        const flashTarget = flashingCellDefinition.FlashTarget === 'cell' || !flashingCellDefinition.FlashTarget
-            ? 'cell'
-            : 'row';
-        return flashTarget;
+        var _a;
+        return (_a = flashingCellDefinition.FlashTarget) !== null && _a !== void 0 ? _a : 'cell';
     }
     showFlashingCell(flashingCellToShow) {
         this.addUidToAdaptableObject(flashingCellToShow);

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -16,10 +16,10 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridData(): any[];
     getFilteredData(): any[];
     loadGridData(dataSource: any): void;
-    updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<void>;
-    addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<void>;
+    updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
+    addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     undoCellEdit(dataChangedInfo: DataChangedInfo): boolean;
-    deleteGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<void>;
+    deleteGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     setCellValue(columnId: string, newValue: any, primaryKeyValue: any): void;
     setCellsValue(gridCells: {
         columnId: any;

package/src/Api/Implementation/GridApiImpl.js

@@ -25,10 +25,12 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     async updateGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.updateRows(dataRows, dataUpdateConfig);
         this.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
+        return rowNodes;
     }
     async addGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.addRows(dataRows, dataUpdateConfig);
         this.fireGridDataChangedEvent(dataRows, rowNodes, 'Add');
+        return rowNodes;
     }
     undoCellEdit(dataChangedInfo) {
         // for the reason of this hacky solution see the comments in DataService
@@ -40,7 +42,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         if (this.checkArrayExists(dataRows)) {
             const rowNodes = await this.adaptable.deleteRows(dataRows, dataUpdateConfig);
             this.fireGridDataChangedEvent(dataRows, rowNodes, 'Delete');
+            return rowNodes;
         }
+        return [];
     }
     setCellValue(columnId, newValue, primaryKeyValue) {
         const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);

package/src/Api/Implementation/LayoutApiImpl.js

@@ -10,7 +10,7 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectF
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
-const isEqual_1 = tslib_1.__importDefault(require("lodash-es/isEqual"));
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");

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

@@ -35,7 +35,7 @@ export interface DataChangedInfo {
     /**
      * What triggered the change - user, background change or a reverted change?
      */
-    trigger?: 'edit' | 'tick' | 'undo';
+    trigger?: 'edit' | 'tick' | 'undo' | 'aggChange';
 }
 export interface DataChangedScope {
     wholeRow: boolean;

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -24,6 +24,7 @@ export interface FlashingCellState extends ConfigState {
      */
     FlashingCellDefinitions?: FlashingCellDefinition[];
 }
+export declare type FlashTargetTypes = 'row' | 'cell' | 'aggFuncCell';
 /**
  * The Flashing Cell Definition
  */
@@ -40,7 +41,7 @@ export interface FlashingCellDefinition extends SuspendableObject {
      * Should a cell or whole row flash
      * @defaultValue  'cell'
      */
-    FlashTarget?: 'row' | 'cell';
+    FlashTarget?: FlashTargetTypes | FlashTargetTypes[];
     /**
      * Style for 'Down' value changes
      *  @defaultValue  Red BackColour

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;

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)

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/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/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 {