@adaptabletools/adaptable 10.0.4-canary.5 → 11.0.0-canary.3

package/src/Redux/Store/AdaptableStore.js

@@ -27,7 +27,6 @@ const FilterRedux = tslib_1.__importStar(require("../ActionsReducers/FilterRedux
 const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FormatColumnRedux"));
 const ApplicationRedux = tslib_1.__importStar(require("../ActionsReducers/ApplicationRedux"));
-const SparklineColumnRedux = tslib_1.__importStar(require("../ActionsReducers/SparklineColumnRedux"));
 const FreeTextColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FreeTextColumnRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux"));
 const DashboardRedux = tslib_1.__importStar(require("../ActionsReducers/DashboardRedux"));
@@ -122,16 +121,11 @@ class AdaptableStore {
             Popup: PopupRedux.PopupReducer,
             System: SystemRedux.SystemReducer,
             Plugins: PluginsRedux.PluginsReducer,
-            SparklineColumn: SparklineColumnRedux.SparklineColumnReducer,
             // Reducers for Persisted State
             Alert: AlertRedux.AlertReducer,
             FlashingCell: FlashingCellRedux.FlashingCellReducer,
             Application: ApplicationRedux.ApplicationReducer,
             CalculatedColumn: CalculatedColumnRedux.CalculatedColumnReducer,
-            // replaced by `charts` plugin
-            Chart: (state) => {
-                return state !== null && state !== void 0 ? state : null;
-            },
             ConditionalStyle: ConditionalStyleRedux.ConditionalStyleReducer,
             CustomSort: CustomSortRedux.CustomSortReducer,
             Dashboard: DashboardRedux.DashboardReducer,
@@ -166,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;
@@ -192,7 +197,6 @@ class AdaptableStore {
             ConfigConstants.GRID,
             ConfigConstants.POPUP,
             ConfigConstants.PLUGINS,
-            ConfigConstants.SPARKLINE_COLUMN,
         ];
         // this is now VERY BADLY NAMED!
         let rootReducer = AdaptableReduxMerger_1.mergeReducer(rootReducerWithResetManagement, exports.LOAD_STATE);
@@ -551,9 +555,6 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * Action: We set up all columns again
                  */
                 case QuickSearchRedux.QUICK_SEARCH_SET_STYLE:
-                case SparklineColumnRedux.SPARKLINE_COLUMNS_ADD:
-                case SparklineColumnRedux.SPARKLINE_COLUMNS_EDIT:
-                case SparklineColumnRedux.SPARKLINE_COLUMNS_DELETE:
                 case FormatColumnRedux.FORMAT_COLUMN_ADD:
                 case FormatColumnRedux.FORMAT_COLUMN_EDIT:
                 case FormatColumnRedux.FORMAT_COLUMN_DELETE:
@@ -688,7 +689,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case ScheduleRedux.OPENFIN_SCHEDULE_SUSPEND:
                 case ScheduleRedux.OPENFIN_SCHEDULE_UN_SUSPEND: {
                     let returnAction = next(action);
-                    let module = adaptable.modules.get(ModuleConstants.ScheduleModuleId);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.ScheduleModuleId));
                     module.setUpSechduleJobs();
                     return returnAction;
                 }
@@ -703,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);
@@ -767,7 +767,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * Action (4): Set the Preview Values (this will populate the preview screen)
                  */
                 case SystemRedux.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION: {
-                    let module = adaptable.modules.get(ModuleConstants.SmartEditModuleId);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
                     let state = middlewareAPI.getState();
                     let returnAction = next(action);
                     let apiReturn = module.CheckCorrectCellSelection();
@@ -805,7 +805,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     //all our logic needs to be executed AFTER the main reducers
                     //so our state is up to date which allow us not to care about the data within each different action
                     let returnAction = next(action);
-                    let module = adaptable.modules.get(ModuleConstants.SmartEditModuleId);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
                     let state = middlewareAPI.getState();
                     let apiReturn = module.BuildPreviewValues(state.System.SmartEditValue, state.System.SmartEditOperation);
                     middlewareAPI.dispatch(SystemRedux.SmartEditSetPreview(apiReturn));
@@ -817,7 +817,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * Action (2):  Sends these new values to the Smart Edit module (which will, in turn, apply them to Adaptable)
                  */
                 case SmartEditRedux.SMART_EDIT_COMPLETE: {
-                    let module = adaptable.modules.get(ModuleConstants.SmartEditModuleId);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
                     const actionTyped = action;
                     let thePreview = middlewareAPI.getState().System.SmartEditPreviewInfo;
                     let newValues = PreviewHelper_1.PreviewHelper.GetCellInfosFromPreview(thePreview, actionTyped.bypassValidationWarnings);
@@ -839,7 +839,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * BULK UPDATE ACTIONS
                  *******************/
                 case SystemRedux.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION: {
-                    let module = (adaptable.modules.get(ModuleConstants.BulkUpdateModuleId));
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.BulkUpdateModuleId));
                     let state = middlewareAPI.getState();
                     let returnAction = next(action);
                     let apiReturn = module.checkCorrectCellSelection();
@@ -866,7 +866,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     //all our logic needs to be executed AFTER the main reducers
                     //so our state is up to date which allow us not to care about the data within each different action
                     let returnAction = next(action);
-                    let module = (adaptable.modules.get(ModuleConstants.BulkUpdateModuleId));
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.BulkUpdateModuleId));
                     let state = middlewareAPI.getState();
                     let apiReturn = module.buildPreviewValues(state.System.BulkUpdateValue);
                     middlewareAPI.dispatch(SystemRedux.BulkUpdateSetPreview(apiReturn));
@@ -897,7 +897,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case PlusMinusRedux.PLUS_MINUS_RULE_EDIT:
                 case PlusMinusRedux.PLUS_MINUS_RULE_DELETE: {
                     let returnAction = next(action);
-                    let module = adaptable.modules.get(ModuleConstants.PlusMinusModuleId);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.PlusMinusModuleId));
                     if (module) {
                         module.checkListenToKeyDown();
                     }
@@ -924,7 +924,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case ShortcutRedux.SHORTCUT_EDIT:
                 case ShortcutRedux.SHORTCUT_DELETE: {
                     let returnAction = next(action);
-                    let module = adaptable.modules.get(ModuleConstants.ShortcutModuleId);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.ShortcutModuleId));
                     if (module) {
                         module.checkListenToKeyDown();
                     }
@@ -945,7 +945,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     return returnAction;
                 }
                 case ExportRedux.EXPORT_APPLY: {
-                    let module = adaptable.modules.get(ModuleConstants.ExportModuleId);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.ExportModuleId));
                     const actionTyped = action;
                     module.export(actionTyped.Report, actionTyped.ExportDestination);
                     return next(action);
@@ -1222,7 +1222,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * GRID (INTERNAL) ACTIONS
                  *******************/
                 case GridRedux.GRID_CREATE_CELLS_SUMMARY: {
-                    let module = (adaptable.modules.get(ModuleConstants.CellSummaryModuleId));
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.CellSummaryModuleId));
                     let returnAction = next(action);
                     let selectedCellInfo = middlewareAPI.getState().Grid.SelectedCellInfo;
                     let apiSummaryReturn = module.createCellSummary(selectedCellInfo);

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -43,7 +43,7 @@ export declare abstract class AdaptableModuleBase implements IModule {
     createColumnMenuItemClickFunction(Label: string, Icon: string, ClickFunction: () => void): MenuItemDoClickFunction;
     createColumnMenuItemReduxAction(Label: string, Icon: string, Action: Action): MenuItemDoReduxAction;
     createColumnMenuItemShowPopup(Label: string, ComponentName: string, Icon: string, PopupParams?: ModuleParams): MenuItemShowPopup;
-    canCreateColumnMenuItem(column: AdaptableColumn, minimumAccessLevel: AccessLevel, functionType?: 'sort' | 'editable' | 'style' | 'sparkline' | 'filter' | 'quickfilter' | 'numeric'): boolean;
+    canCreateColumnMenuItem(column: AdaptableColumn, minimumAccessLevel: AccessLevel, functionType?: 'sort' | 'editable' | 'style' | 'filter' | 'quickfilter' | 'numeric'): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Strategy/AdaptableModuleBase.js

@@ -127,9 +127,6 @@ class AdaptableModuleBase {
             else if (functionType == 'style') {
                 return !column.isSparkline;
             }
-            else if (functionType == 'sparkline') {
-                return column.isSparkline;
-            }
             else if (functionType == 'numeric') {
                 return column.dataType == Enums_1.DataType.Number;
             }

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;
             }
@@ -68,7 +68,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
         if (ArrayExtensions_1.ArrayExtensions.IsEmpty(flashingCellDefinitions) &&
             ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingAlertDefinitions)) {
-            this.api.flashingCellApi.setFlashingCellDefinition(flashingAlertDefinitions);
+            this.api.flashingCellApi.setFlashingCellDefinitions(flashingAlertDefinitions);
             // TODO: state does not clear
             this.api.internalApi.clearFlashingCellState();
         }

package/src/Strategy/CalculatedColumnModule.js

@@ -9,6 +9,7 @@ const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const getExpressionViewItems_1 = require("./Utilities/getExpressionViewItems");
 const CalculatedColumnWizard_1 = require("../View/CalculatedColumn/Wizard/CalculatedColumnWizard");
 const getCalculatedColumnSettingTags_1 = require("../View/CalculatedColumn/Utilities/getCalculatedColumnSettingTags");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CalculatedColumnModuleId, 'Calculated Column', 'calculated-column', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
@@ -63,19 +64,23 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     toView(calculateColumn) {
+        const settingsTags = getCalculatedColumnSettingTags_1.getCalculatedColumnSettingTags(calculateColumn.CalculatedColumnSettings);
+        let items = [
+            {
+                name: 'Settings',
+                label: 'Column Id',
+                values: [calculateColumn.ColumnId],
+            },
+            getExpressionViewItems_1.getExpressionViewItems(calculateColumn.Query),
+        ];
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(settingsTags)) {
+            items.push({
+                name: 'Settings',
+                values: settingsTags,
+            });
+        }
         return {
-            items: [
-                {
-                    name: 'Settings',
-                    label: 'Column Id',
-                    values: [calculateColumn.ColumnId],
-                },
-                getExpressionViewItems_1.getExpressionViewItems(calculateColumn.Query),
-                {
-                    name: 'Settings',
-                    values: getCalculatedColumnSettingTags_1.getCalculatedColumnSettingTags(calculateColumn.CalculatedColumnSettings),
-                },
-            ],
+            items: items,
             abObject: calculateColumn,
         };
     }

package/src/Strategy/ChartingModule.d.ts

@@ -0,0 +1,7 @@
+import { AdaptableModuleBase } from '@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase';
+import { IModule } from '@adaptabletools/adaptable/src/Strategy/Interface/IModule';
+import { AdaptableApi } from '@adaptabletools/adaptable/src/Api/AdaptableApi';
+export declare class ChartingModule extends AdaptableModuleBase implements IModule {
+    constructor(api: AdaptableApi);
+    isModuleAvailable(): boolean;
+}

package/src/Strategy/ChartingModule.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChartingModule = void 0;
+const tslib_1 = require("tslib");
+const AdaptableModuleBase_1 = require("@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase");
+const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
+class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create Charts in order to see Adaptable Data visually', api);
+    }
+    isModuleAvailable() {
+        return this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();
+    }
+}
+exports.ChartingModule = ChartingModule;

package/src/Strategy/ConditionalStyleModule.js

@@ -203,7 +203,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             getDeleteAction: (conditionalStyle) => ConditionalStyleRedux.ConditionalStyleDelete(conditionalStyle),
             getSuspendAction: (conditionalStyle) => ConditionalStyleRedux.ConditionalStyleSuspend(conditionalStyle),
             getUnSuspendAction: (conditionalStyle) => ConditionalStyleRedux.ConditionalStyleUnSuspend(conditionalStyle),
-            emptyView: "Click 'New' to create a new conditional style to be applied at row or column level when a rule set by you is met.",
+            emptyView: "Click 'New' to create a new Conditional Style Rule.  When this is met, row or cells in the Conditional Style's scope will be styled appropriately.",
             getEditWizard() {
                 return ConditionalStyleWizard_1.ConditionalStyleWizard;
             },

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

@@ -98,8 +98,9 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             getDeleteAction: FilterRedux.ColumnFilterClear,
             emptyView: `
-        There are currently no column filters applied.
-        Create column filters by using the filter dropdown in each column header.
+        There are currently no column filters applied. \n
+
+        Create column filters by using the filter dropdown the Quick Filter Bar or the Filter Form in the Column Header Menu.
       `,
         };
     }

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

@@ -13,6 +13,7 @@ const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getFlashingCellDurationViewItems_1 = require("./Utilities/getFlashingCellDurationViewItems");
 const getFlashingCellStyleViewItems_1 = require("./Utilities/getFlashingCellStyleViewItems");
 const FlashingCellWizard_1 = require("../View/FlashingCell/Wizard/FlashingCellWizard");
+const getFlashingTargetViewItems_1 = require("./Utilities/getFlashingTargetViewItems");
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, 'Flashing Cell', 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);
@@ -122,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;
                 });
@@ -140,20 +145,30 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             });
         });
     }
-    getFlashingCellDefinitionsForDataChange(dataChangedEvent) {
-        return this.getBaseAlertDefinitionsForDataChange(dataChangedEvent, 
-        // reactive flashing alert definitions are excluded as they are handled separately (asynchronously)
-        this.api.flashingCellApi.getActiveNonReactiveFlashingCellDefinitions(), 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);
@@ -164,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,9 +209,10 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     toView(flashingCell) {
         return {
             items: [
-                getScopeViewItems_1.getScopeViewItems(flashingCell.Scope),
-                getRuleViewItems_1.getRuleViewItems(flashingCell.Rule, this.api),
+                Object.assign(Object.assign({}, getScopeViewItems_1.getScopeViewItems(flashingCell.Scope)), { label: 'Trigger' }),
+                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(),
             ],
             abObject: flashingCell,

package/src/Strategy/FormatColumnModule.js

@@ -9,9 +9,9 @@ const FormatColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FormatColumnWizard_1 = require("../View/FormatColumn/Wizard/FormatColumnWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
-const FormatColumnStyleWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnStyleWizardSection");
 const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnFormatWizardSection");
 const getFormatColumnSettingsViewItems_1 = require("./Utilities/getFormatColumnSettingsViewItems");
+const getFormatColumnStyleViewItems_1 = require("./Utilities/getFormatColumnStyleViewItems");
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, 'Format Column', 'format-column', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -221,7 +221,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 getScopeViewItems_1.getScopeViewItems(formatColumn.Scope),
                 {
                     name: 'Style',
-                    view: () => FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary(formatColumn, this.api),
+                    view: () => getFormatColumnStyleViewItems_1.getFormatColumnStyleViewItems(formatColumn, this.api),
                 },
                 {
                     name: 'Display Format',

package/src/Strategy/Interface/IModule.d.ts

@@ -18,7 +18,6 @@ import { SuspendableObject } from '../../../types';
  * Application
  * GridInfo
  * StateManagement
- * Piechart
  * TeamSharing
  */
 export interface ModuleInfo {

package/src/Strategy/LayoutModule.js

@@ -36,6 +36,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         });
     }
     addColumnMenuItems(column) {
+        var _a, _b;
         let returnColumnMenuItems = [];
         if (this.isModuleEditable()) {
             const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
@@ -62,9 +63,20 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             let selectMenuItems = [];
             if (column) {
-                selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'column-chooser', () => {
-                    this.api.columnApi.selectColumn(column.columnId);
-                }));
+                const hasExistingSelection = (_b = (_a = this.api.gridApi.getSelectedCellInfo()) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length;
+                if (hasExistingSelection) {
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Preserve Selection)', 'column-add', () => {
+                        this.api.columnApi.addColumnToSelection(column.columnId);
+                    }));
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Reset Selection)', 'column-chooser', () => {
+                        this.api.columnApi.selectColumn(column.columnId);
+                    }));
+                }
+                else {
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'column-chooser', () => {
+                        this.api.columnApi.selectColumn(column.columnId);
+                    }));
+                }
             }
             selectMenuItems.push(this.createColumnMenuItemClickFunction('Whole Grid', this.moduleInfo.Glyph, () => {
                 this.api.gridApi.selectAll();

package/src/Strategy/QueryModule.d.ts

@@ -28,6 +28,6 @@ export declare class QueryModule extends AdaptableModuleBase implements IModule
     }[];
     getViewProperties(): {
         getDeleteAction: (namedQuery: NamedQuery) => QueryRedux.NamedQueryDeleteAction;
-        getEditWizard(): typeof NamedQueryWizard;
+        getEditWizard: () => typeof NamedQueryWizard;
     };
 }

package/src/Strategy/QueryModule.js

@@ -47,9 +47,7 @@ class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         return {
             getDeleteAction: QueryRedux.NamedQueryDelete,
-            getEditWizard() {
-                return NamedQueryWizard_1.NamedQueryWizard;
-            },
+            getEditWizard: () => NamedQueryWizard_1.NamedQueryWizard,
         };
     }
 }

package/src/Strategy/SetingsPanelModule.d.ts

@@ -7,4 +7,5 @@ export declare class SettingsPanelModule extends AdaptableModuleBase implements
     constructor(api: AdaptableApi);
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
 }

package/src/Strategy/SetingsPanelModule.js

@@ -7,7 +7,8 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 class SettingsPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.SettingsPanelModuleId, 'Settings Panel', 'settings', null, 'Manage all Adaptable Settings', api);
+        const friendlyName = api.internalApi.getAdaptableOptions().settingsPanelOptions.title;
+        super(ModuleConstants.SettingsPanelModuleId, friendlyName, 'settings', null, 'Manage all Adaptable Settings', api);
     }
     addColumnMenuItems(column) {
         return [
@@ -20,5 +21,10 @@ class SettingsPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
+    addModuleMenuItem(source) {
+        if (this.isModuleAvailable()) {
+            return this.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
+        }
+    }
 }
 exports.SettingsPanelModule = SettingsPanelModule;

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

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

package/src/Strategy/Utilities/getFlashingTargetViewItems.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFlashingTargetViewItems = void 0;
+exports.getFlashingTargetViewItems = (flashingCell) => {
+    return {
+        name: 'Target',
+        values: Array.isArray(flashingCell.FlashTarget)
+            ? flashingCell.FlashTarget
+            : [flashingCell.FlashTarget],
+    };
+};

package/src/Strategy/Utilities/getFormatColumnStyleViewItems.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import { AdaptableApi, FormatColumn } from '../../../types';
+export declare const getFormatColumnStyleViewItems: (formatColumn: FormatColumn, api: AdaptableApi) => JSX.Element;

package/src/Strategy/Utilities/getFormatColumnStyleViewItems.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFormatColumnStyleViewItems = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const FormatColumnStyleWizardSection_1 = require("../../View/FormatColumn/Wizard/FormatColumnStyleWizardSection");
+exports.getFormatColumnStyleViewItems = (formatColumn, api) => {
+    return React.createElement(rebass_1.Box, { mt: 2 }, FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary(formatColumn, api));
+};

package/src/Utilities/Constants/ConfigConstants.d.ts

@@ -4,7 +4,6 @@ export declare const POPUP = "Popup";
 export declare const TEAM_SHARING = "TeamSharing";
 export declare const BULK_UPDATE = "BulkUpdate";
 export declare const APPLICATION = "Application";
-export declare const SPARKLINE_COLUMN = "SparklineColumn";
 export declare const CELL_SUMMARY = "CellSummary";
 export declare const SYSTEM_FILTER = "SystemFilter";
 export declare const PLUGINS = "Plugins";

package/src/Utilities/Constants/ConfigConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLUGINS = exports.SYSTEM_FILTER = exports.CELL_SUMMARY = exports.SPARKLINE_COLUMN = exports.APPLICATION = exports.BULK_UPDATE = exports.TEAM_SHARING = exports.POPUP = exports.GRID = exports.SYSTEM = void 0;
+exports.PLUGINS = exports.SYSTEM_FILTER = exports.CELL_SUMMARY = exports.APPLICATION = exports.BULK_UPDATE = exports.TEAM_SHARING = exports.POPUP = exports.GRID = exports.SYSTEM = void 0;
 // constants used in Config
 exports.SYSTEM = 'System';
 exports.GRID = 'Grid';
@@ -8,7 +8,6 @@ exports.POPUP = 'Popup';
 exports.TEAM_SHARING = 'TeamSharing';
 exports.BULK_UPDATE = 'BulkUpdate';
 exports.APPLICATION = 'Application';
-exports.SPARKLINE_COLUMN = 'SparklineColumn';
 exports.CELL_SUMMARY = 'CellSummary';
 exports.SYSTEM_FILTER = 'SystemFilter';
 exports.PLUGINS = 'Plugins';