@adaptabletools/adaptable-cjs 22.0.0-canary.6 → 22.0.0-canary.7

package/src/Api/Implementation/ChartingApiImpl.js

@@ -126,8 +126,8 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         else {
             const alert = {
                 alertType: 'generic',
-                header: 'Save chart',
-                message: 'Do you want to save this Chart?',
+                header: 'Save Chart',
+                message: 'Would you like to save this chart?',
                 alertDefinition: {
                     ...ObjectFactory_1.default.CreateEmptyAlertDefinition(),
                     MessageType: 'Info',

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

@@ -11,6 +11,7 @@ export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi
     getCustomSortState(): CustomSortState;
     getCustomSorts(config?: LayoutExtendedConfig): CustomSort[];
     getCustomSortById(id: CustomSort['Uuid'], config?: LayoutExtendedConfig): CustomSort;
+    getCustomSortByName(name: string): CustomSort | undefined;
     getLiveCustomSorts(): CustomSort[];
     getLiveCustomSortComparers(): ColumnValuesComparer[];
     getActiveCustomSorts(config?: LayoutExtendedConfig): CustomSort[];

package/src/Api/Implementation/CustomSortApiImpl.js

@@ -21,6 +21,9 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
     getCustomSortById(id, config) {
         return this.getCustomSorts(config).find((customSort) => customSort.Uuid === id);
     }
+    getCustomSortByName(name) {
+        return this.getCustomSorts().find((customSort) => customSort.Name === name);
+    }
     getLiveCustomSorts() {
         let returnVals = [];
         const sortedColIds = this.getGridApi()

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

@@ -13,6 +13,7 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     getFlashingCellState(): FlashingCellState;
     getFlashingCellDefinitions(config?: LayoutExtendedConfig): FlashingCellDefinition[];
     getFlashingCellDefinitionById(id: FlashingCellDefinition['Uuid'], config?: LayoutExtendedConfig): FlashingCellDefinition;
+    getFlashingCellDefinitionByName(name: string): FlashingCellDefinition | undefined;
     getActiveFlashingCellDefinitions(config?: LayoutExtendedConfig): FlashingCellDefinition[];
     getSuspendedFlashingCellDefinitions(config?: LayoutExtendedConfig): FlashingCellDefinition[];
     getFlashingCellFlashTarget(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition['FlashTarget'];

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -23,6 +23,9 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     getFlashingCellDefinitionById(id, config) {
         return this.getFlashingCellDefinitions(config)?.find((fc) => fc?.Uuid === id);
     }
+    getFlashingCellDefinitionByName(name) {
+        return this.getFlashingCellDefinitions().find((fc) => fc.Name === name);
+    }
     getActiveFlashingCellDefinitions(config) {
         return this.getFlashingCellDefinitions(config).filter((fc) => !fc.IsSuspended);
     }

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

@@ -1,18 +1,19 @@
+import { AdaptableObjectLookupCriteria, FormatColumnConfig } from '../../../types';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
-import { ApiBase } from './ApiBase';
-import { FormatColumnApi } from '../FormatColumnApi';
 import { FormatColumn, FormatColumnState } from '../../AdaptableState/FormatColumnState';
-import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 import { AdaptableFormat } from '../../types';
-import { AdaptableObjectLookupCriteria, FormatColumnConfig } from '../../../types';
+import { FormatColumnApi } from '../FormatColumnApi';
 import { FormatColumnInternalApi } from '../Internal/FormatColumnInternalApi';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { ApiBase } from './ApiBase';
 export declare class FormatColumnApiImpl extends ApiBase implements FormatColumnApi {
     internalApi: FormatColumnInternalApi;
     constructor(_adaptable: IAdaptable);
     getFormatColumnState(): FormatColumnState;
     getFormatColumns(config?: FormatColumnConfig): FormatColumn[];
     getFormatColumnByUuId(id: FormatColumn['Uuid'], config?: FormatColumnConfig): FormatColumn;
+    getFormatColumnByName(name: string): FormatColumn | undefined;
     getActiveFormatColumns(config?: FormatColumnConfig): FormatColumn[];
     getDisplayFormatForColumn(column: AdaptableColumn, config?: FormatColumnConfig): AdaptableFormat | undefined;
     getSuspendedFormatColumns(config?: FormatColumnConfig): FormatColumn[];

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormatColumnApiImpl = void 0;
 const tslib_1 = require("tslib");
 const FormatColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FormatColumnRedux"));
-const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const FormatColumnInternalApi_1 = require("../Internal/FormatColumnInternalApi");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
+const FormatColumnInternalApi_1 = require("../Internal/FormatColumnInternalApi");
+const ApiBase_1 = require("./ApiBase");
 class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     internalApi;
     constructor(_adaptable) {
@@ -22,6 +22,9 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnByUuId(id, config) {
         return this.getFormatColumns(config).find((formatColumn) => formatColumn.Uuid === id);
     }
+    getFormatColumnByName(name) {
+        return this.getFormatColumns().find((formatColumn) => formatColumn.Name === name);
+    }
     getActiveFormatColumns(config) {
         return this.getFormatColumns(config).filter((formatColumn) => !formatColumn.IsSuspended);
     }
@@ -42,9 +45,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getFormatColumnByUuId(formatColumn.Uuid);
     }
     addFormatColumns(formatColumns) {
-        formatColumns.forEach((fc) => {
-            this.addFormatColumn(fc);
-        });
+        this.dispatchAction(FormatColumnRedux.FormatColumnsAdd(formatColumns));
         return formatColumns?.map((formatColumn) => this.getFormatColumnByUuId(formatColumn.Uuid));
     }
     editFormatColumn(formatColumn) {

package/src/Api/Implementation/LayoutApiImpl.js

@@ -407,7 +407,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         const currentLayout = this.getCurrentLayout();
         const customHeader = currentLayout.ColumnHeaders?.[column.columnId] ?? column.friendlyName;
         this.dispatchAction((0, PopupRedux_1.PopupShowPrompt)({
-            Header: `Change caption for '${column.friendlyName}'`,
+            Header: `Change Caption for "${column.friendlyName}"`,
             Msg: '',
             DefaultValue: customHeader,
             ConfirmActionCreator: (inputText) => {

package/src/Api/Implementation/NamedQueryApiImpl.js

@@ -30,14 +30,14 @@ class NamedQueryApiImpl extends ApiBase_1.ApiBase {
     }
     isValidNamedQuery(namedQuery) {
         if ((0, StringExtensions_1.IsNullOrEmptyOrWhiteSpace)(namedQuery?.Name)) {
-            return { valid: false, message: 'Named Query name cannot be blank' };
+            return { valid: false, message: 'A name is required for the Named Query.' };
         }
         // check that there is no other existing named query with the same name
         const duplicate = this.getNamedQueries().find((q) => q.Name === namedQuery.Name && q.Uuid !== namedQuery.Uuid);
         if (duplicate) {
             return {
                 valid: false,
-                message: 'A Named Query already exists with that name',
+                message: 'A Named Query with this name already exists.',
             };
         }
         return { valid: true, message: '' };

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

@@ -7,6 +7,7 @@ export declare class PlusMinusApiImpl extends ApiBase implements PlusMinusApi {
     getPlusMinusState(): PlusMinusState;
     getAllPlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
     getPlusMinusById(id: PlusMinusNudge['Uuid'], config?: LayoutExtendedConfig): PlusMinusNudge;
+    getPlusMinusNudgeByName(name: string): PlusMinusNudge | undefined;
     getAllActivePlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
     getAllSuspendedPlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
     runPlusMinusNudge(plusMinusNudge: PlusMinusNudge, cellsToUpdate: GridCell[], direction: 'up' | 'down'): void;

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -16,6 +16,9 @@ class PlusMinusApiImpl extends ApiBase_1.ApiBase {
     getPlusMinusById(id, config) {
         return this.getAllPlusMinus(config).find((plusMinus) => plusMinus?.Uuid === id);
     }
+    getPlusMinusNudgeByName(name) {
+        return this.getAllPlusMinus().find((plusMinus) => plusMinus.Name === name);
+    }
     getAllActivePlusMinus(config) {
         return this.getAllPlusMinus(config).filter((plusMinusNudge) => !plusMinusNudge.IsSuspended);
     }

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

@@ -11,6 +11,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     constructor(_adaptable: IAdaptable);
     getScheduleState(): ScheduleState;
     getSchedules(config?: LayoutExtendedConfig): BaseSchedule[];
+    getScheduleByName(name: string): BaseSchedule | undefined;
     getReminderSchedules(config?: LayoutExtendedConfig): ReminderSchedule[];
     getScheduleById(id: BaseSchedule['Uuid'], config?: LayoutExtendedConfig): BaseSchedule;
     getActiveReminderSchedules(config?: LayoutExtendedConfig): ReminderSchedule[];

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -20,6 +20,9 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         allSchedules.push(...this.getOpenFinSchedules(config));
         return allSchedules;
     }
+    getScheduleByName(name) {
+        return this.getSchedules().find((schedule) => schedule.Name === name);
+    }
     getReminderSchedules(config) {
         return (this.handleLayoutExtensionObjects(this.getScheduleState().Reminders, 'Schedule', config) ?? []);
     }

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

@@ -6,6 +6,7 @@ export declare class ShortcutApiImpl extends ApiBase implements ShortcutApi {
     getShortcutState(): ShortcutState;
     getShortcuts(config?: LayoutExtendedConfig): Shortcut[];
     getShortcutById(id: Shortcut['Uuid'], config?: LayoutExtendedConfig): Shortcut;
+    getShortcutByName(name: string): Shortcut | undefined;
     getActiveShortcuts(config?: LayoutExtendedConfig): Shortcut[];
     getSuspendedShortcuts(config?: LayoutExtendedConfig): Shortcut[];
     addShortcut(shortcut: Shortcut): Shortcut;

package/src/Api/Implementation/ShortcutApiImpl.js

@@ -15,6 +15,9 @@ class ShortcutApiImpl extends ApiBase_1.ApiBase {
     getShortcutById(id, config) {
         return this.getShortcuts(config).find((shortcut) => shortcut?.Uuid === id);
     }
+    getShortcutByName(name) {
+        return this.getShortcuts().find((shortcut) => shortcut.Name === name);
+    }
     getActiveShortcuts(config) {
         return this.getShortcuts(config).filter((shortcut) => !shortcut.IsSuspended);
     }

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -31,16 +31,16 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
             }
             switch (messageType) {
                 case 'Success':
-                    alertApi.showAlertSuccess('System Status Success', fullMessage);
+                    alertApi.showAlertSuccess('System Status', fullMessage);
                     return;
                 case 'Info':
-                    alertApi.showAlertInfo('System Status Info', fullMessage);
+                    alertApi.showAlertInfo('System Status', fullMessage);
                     return;
                 case 'Warning':
-                    alertApi.showAlertWarning('System Status Warning', fullMessage);
+                    alertApi.showAlertWarning('System Status', fullMessage);
                     return;
                 case 'Error':
-                    alertApi.showAlertError('System Status Error', fullMessage);
+                    alertApi.showAlertError('System Status', fullMessage);
                     return;
             }
         }

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -154,8 +154,8 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
         if (calculatedColumnReferences.length) {
             const alert = {
                 alertType: 'generic',
-                header: 'CalculatedColumn could not be deleted',
-                message: `It is still referenced in the following modules: ${calculatedColumnReferences.join(', ')}`,
+                header: 'Calculated Column',
+                message: `This Calculated Column cannot be deleted. It is still referenced by: ${calculatedColumnReferences.join(', ')}.`,
                 alertDefinition: (0, ObjectFactory_1.CreateInternalAlertDefinitionForMessages)('Error'),
             };
             this.getAlertApi().displayAdaptableAlertNotification(alert);

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -99,8 +99,8 @@ class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
         if (freeTextColumnReferences.length) {
             const alert = {
                 alertType: 'generic',
-                header: 'FreeTextColumn could not be deleted',
-                message: `It is still referenced in the following modules: ${freeTextColumnReferences.join(', ')}`,
+                header: 'Free Text Column',
+                message: `This Free Text Column cannot be deleted. It is still referenced by: ${freeTextColumnReferences.join(', ')}.`,
                 alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
             };
             this.getAlertApi().displayAdaptableAlertNotification(alert);

package/src/Api/Internal/LayoutInternalApi.js

@@ -96,7 +96,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
     }
     setupRowSummaries() {
         if (!this._adaptable.agGridModulesAdapter.isAgGridModuleRegistered('PinnedRowModule')) {
-            this.getAdaptableApi().consoleError(`Can NOT set Layout Row Summaries - missing required AG Grid module 'PinnedRowModule'`);
+            this.getAdaptableApi().consoleError('Layout Row Summaries require the AG Grid "PinnedRowModule". Please register this module.');
             return;
         }
         const rowSummaries = this.getAdaptableState().Internal?.RowSummary?.rowSummaries ?? [];

package/src/Api/Internal/NamedQueryInternalApi.js

@@ -44,8 +44,8 @@ class NamedQueryInternalApi extends ApiBase_1.ApiBase {
         if (namedQueryReferences.length) {
             const alert = {
                 alertType: 'generic',
-                header: 'Named Query could not be deleted',
-                message: `It is still referenced in the following modules: ${namedQueryReferences.join(', ')}`,
+                header: 'Named Query',
+                message: `This Named Query cannot be deleted. It is still referenced by: ${namedQueryReferences.join(', ')}.`,
                 alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
             };
             this.getAlertApi().displayAdaptableAlertNotification(alert);
@@ -60,8 +60,8 @@ class NamedQueryInternalApi extends ApiBase_1.ApiBase {
         if (namedQueryReferences.length) {
             const alert = {
                 alertType: 'generic',
-                header: 'Named Query could not be renamed',
-                message: `It is currently referenced in the following modules: ${namedQueryReferences.join(', ')}`,
+                header: 'Named Query',
+                message: `This Named Query cannot be renamed. It is currently referenced by: ${namedQueryReferences.join(', ')}.`,
                 alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
             };
             this.getAlertApi().displayAdaptableAlertNotification(alert);

package/src/Api/PlusMinusApi.d.ts

@@ -20,6 +20,12 @@ export interface PlusMinusApi {
      * @returns plus minus rule
      */
     getPlusMinusById(id: PlusMinusNudge['Uuid'], config?: LayoutExtendedConfig): PlusMinusNudge;
+    /**
+     * Retrieves a Plus Minus Nudge by its Name
+     * @param name Name of the Plus Minus Nudge
+     * @returns Plus Minus Nudge or undefined if not found
+     */
+    getPlusMinusNudgeByName(name: string): PlusMinusNudge | undefined;
     /**
      * Retrieves all active (not-suspended) Plus Minus Rules in Adaptable State with those with expressions first
      * @returns plus minus rules

package/src/Api/ScheduleApi.d.ts

@@ -23,6 +23,12 @@ export interface ScheduleApi {
      * @returns schedule
      */
     getScheduleById(id: BaseSchedule['Uuid'], config?: LayoutExtendedConfig): BaseSchedule;
+    /**
+     * Retrieves a Schedule by its Name
+     * @param name Name of the Schedule
+     * @returns Schedule or undefined if not found
+     */
+    getScheduleByName(name: string): BaseSchedule | undefined;
     /**
      * Retrieves all Reminder-based Schedules from Schedule State
      * @returns reminder schedules

package/src/Api/ShortcutApi.d.ts

@@ -19,6 +19,12 @@ export interface ShortcutApi {
      * @returns shortcut
      */
     getShortcutById(id: Shortcut['Uuid'], config?: LayoutExtendedConfig): Shortcut;
+    /**
+     * Retrieves a Shortcut by its Name
+     * @param name Name of the Shortcut
+     * @returns Shortcut or undefined if not found
+     */
+    getShortcutByName(name: string): Shortcut | undefined;
     /**
      * Gets all active (not-suspended) Shortcuts in Adaptable State
      * @returns shortcuts

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

@@ -1,5 +1,9 @@
 import { FormatColumnState, FormatColumn } from '../../AdaptableState/FormatColumnState';
 import * as Redux from 'redux';
+/**
+ * @ReduxAction Many Format Columns have been added
+ */
+export declare const FORMAT_COLUMN_ADD_BATCH = "FORMAT_COLUMN_ADD_BATCH";
 /**
  * @ReduxAction A Format Column has been added
  */
@@ -44,6 +48,9 @@ export declare const FORMAT_COLUMN_UNSUSPEND = "FORMAT_COLUMN_UNSUSPEND";
  * @ReduxAction FormatColumn Module is unsuspended, or activated
  */
 export declare const FORMAT_COLUMN_UNSUSPEND_ALL = "FORMAT_COLUMN_UNSUSPEND_ALL";
+export interface FormatColumnAddBatchAction extends Redux.Action {
+    formatColumns: FormatColumn[];
+}
 export interface FormatColumnAction extends Redux.Action {
     formatColumn: FormatColumn;
 }
@@ -70,6 +77,7 @@ export interface FormatColumnUnSuspendAllAction extends Redux.Action {
 export interface FormatColumnReadyAction extends Redux.Action {
     formatColumnState: FormatColumnState;
 }
+export declare const FormatColumnsAdd: (formatColumns: FormatColumn[]) => FormatColumnAddBatchAction;
 export declare const FormatColumnAdd: (formatColumn: FormatColumn) => FormatColumnAddAction;
 export declare const FormatColumnEdit: (formatColumn: FormatColumn) => FormatColumnEditAction;
 export declare const FormatColumnDelete: (formatColumn: FormatColumn) => FormatColumnDeleteAction;

package/src/Redux/ActionsReducers/FormatColumnRedux.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormatColumnReducer = exports.FormatColumnReady = exports.FormatColumnUnSuspendAll = exports.FormatColumnSuspendAll = exports.FormatColumnUnSuspend = exports.FormatColumnSuspend = exports.FormatColumnMoveDown = exports.FormatColumnMoveUp = exports.FormatColumnDeleteAll = exports.FormatColumnDelete = exports.FormatColumnEdit = exports.FormatColumnAdd = exports.FORMAT_COLUMN_UNSUSPEND_ALL = exports.FORMAT_COLUMN_UNSUSPEND = exports.FORMAT_COLUMN_SUSPEND_ALL = exports.FORMAT_COLUMN_SUSPEND = exports.FORMAT_COLUMN_READY = exports.FORMAT_COLUMN_DELETE_ALL = exports.FORMAT_COLUMN_DELETE = exports.FORMAT_COLUMN_EDIT = exports.FORMAT_COLUMN_MOVE_DOWN = exports.FORMAT_COLUMN_MOVE_UP = exports.FORMAT_COLUMN_ADD = void 0;
+exports.FormatColumnReducer = exports.FormatColumnReady = exports.FormatColumnUnSuspendAll = exports.FormatColumnSuspendAll = exports.FormatColumnUnSuspend = exports.FormatColumnSuspend = exports.FormatColumnMoveDown = exports.FormatColumnMoveUp = exports.FormatColumnDeleteAll = exports.FormatColumnDelete = exports.FormatColumnEdit = exports.FormatColumnAdd = exports.FormatColumnsAdd = exports.FORMAT_COLUMN_UNSUSPEND_ALL = exports.FORMAT_COLUMN_UNSUSPEND = exports.FORMAT_COLUMN_SUSPEND_ALL = exports.FORMAT_COLUMN_SUSPEND = exports.FORMAT_COLUMN_READY = exports.FORMAT_COLUMN_DELETE_ALL = exports.FORMAT_COLUMN_DELETE = exports.FORMAT_COLUMN_EDIT = exports.FORMAT_COLUMN_MOVE_DOWN = exports.FORMAT_COLUMN_MOVE_UP = exports.FORMAT_COLUMN_ADD = exports.FORMAT_COLUMN_ADD_BATCH = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const utils_1 = require("./utils");
+/**
+ * @ReduxAction Many Format Columns have been added
+ */
+exports.FORMAT_COLUMN_ADD_BATCH = 'FORMAT_COLUMN_ADD_BATCH';
 /**
  * @ReduxAction A Format Column has been added
  */
@@ -49,6 +53,11 @@ exports.FORMAT_COLUMN_UNSUSPEND = 'FORMAT_COLUMN_UNSUSPEND';
  * @ReduxAction FormatColumn Module is unsuspended, or activated
  */
 exports.FORMAT_COLUMN_UNSUSPEND_ALL = 'FORMAT_COLUMN_UNSUSPEND_ALL';
+const FormatColumnsAdd = (formatColumns) => ({
+    type: exports.FORMAT_COLUMN_ADD_BATCH,
+    formatColumns,
+});
+exports.FormatColumnsAdd = FormatColumnsAdd;
 const FormatColumnAdd = (formatColumn) => ({
     type: exports.FORMAT_COLUMN_ADD,
     formatColumn,
@@ -107,6 +116,13 @@ const initialState = {
 const FormatColumnReducer = (state = initialState, action) => {
     let formatColumns;
     switch (action.type) {
+        case exports.FORMAT_COLUMN_ADD_BATCH: {
+            const actionFormatColumns = action.formatColumns;
+            actionFormatColumns.forEach(AdaptableHelper_1.default.addAdaptableObjectPrimitives);
+            formatColumns = [].concat(state.FormatColumns);
+            formatColumns.push(...actionFormatColumns);
+            return { ...state, FormatColumns: formatColumns };
+        }
         case exports.FORMAT_COLUMN_ADD: {
             const actionFormatColumn = action.formatColumn;
             AdaptableHelper_1.default.addAdaptableObjectPrimitives(actionFormatColumn);

package/src/Redux/Store/AdaptableStore.js

@@ -260,7 +260,7 @@ class AdaptableStore {
             // END STATE LOAD
             this.loadStorageInProgress = false;
         }, (e) => {
-            adaptable.api.consoleError('Failed to load previous Adaptable State : ', e);
+            adaptable.api.consoleError('Failed to load saved Adaptable state.', e);
             //for now i'm still initializing Adaptable even if loading state has failed....
             //we may revisit that later
             this.TheStore.dispatch((0, exports.InitState)());
@@ -269,7 +269,7 @@ class AdaptableStore {
             this.TheStore.dispatch(PopupRedux.PopupShowAlert({
                 alertType: 'generic',
                 header: 'Configuration',
-                message: 'Error loading your configuration:' + e,
+                message: 'Failed to load your configuration: ' + e,
                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
             }));
         }));
@@ -588,6 +588,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Action: We set up all columns again
                  */
                 case QuickSearchRedux.QUICK_SEARCH_SET_CELL_MATCHING_STYLE:
+                case FormatColumnRedux.FORMAT_COLUMN_ADD_BATCH:
                 case FormatColumnRedux.FORMAT_COLUMN_ADD:
                 case FormatColumnRedux.FORMAT_COLUMN_EDIT:
                 case FormatColumnRedux.FORMAT_COLUMN_DELETE:
@@ -1320,7 +1321,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
-                            message: "Couldn't get shared items: " + error.message,
+                            message: 'Failed to retrieve shared items: ' + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1390,7 +1391,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             const alert = {
                                 alertType: 'generic',
                                 header: 'Team Sharing',
-                                message: `Couldn't share ${adaptable.ModuleService.getModuleFriendlyName(Module)}, there is already an existing active share for it: ${existingActiveSharedEntity.Description}`,
+                                message: `Cannot share ${adaptable.ModuleService.getModuleFriendlyName(Module)} — an active share already exists: ${existingActiveSharedEntity.Description}.`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                             };
                             adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1414,7 +1415,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             const alert = {
                                 alertType: 'generic',
                                 header: 'Team Sharing',
-                                message: `${adaptable.ModuleService.getModuleFriendlyName(Module)} Shared Successfully`,
+                                message: `${adaptable.ModuleService.getModuleFriendlyName(Module)} shared successfully.`,
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
                             };
                             adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1425,7 +1426,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
-                            message: "Couldn't share item: " + error.message,
+                            message: 'Failed to share item: ' + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1450,10 +1451,11 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         if (sharedEntityDependants.length) {
                             const alert = {
                                 alertType: 'generic',
-                                header: `Cannot remove the shared item as it is referenced in:`,
-                                message: sharedEntityDependants
-                                    .map((sharedEntity) => `${adaptable.ModuleService.getModuleFriendlyName(sharedEntity.Module)} ${sharedEntity.Description}`)
-                                    .join('\n'),
+                                header: 'Team Sharing',
+                                message: 'Cannot remove this shared item. It is referenced by: ' +
+                                    sharedEntityDependants
+                                        .map((sharedEntity) => `${adaptable.ModuleService.getModuleFriendlyName(sharedEntity.Module)} ${sharedEntity.Description}`)
+                                        .join(', '),
                                 alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Warning'),
                             };
                             adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1470,7 +1472,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
-                            message: "Couldn't remove item: " + error.message,
+                            message: 'Failed to remove shared item: ' + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1492,8 +1494,8 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         !adaptable.api.optionsApi.getTeamSharingOptions().suppressOverrideConfigWarning) {
                         let confirmation = {
                             CancelButtonText: 'Cancel Import',
-                            Header: 'Overwriting Existing Object',
-                            Msg: 'This import will overwrite an existing object in your State. Do you wish to continue?',
+                            Header: 'Overwrite Existing Item',
+                            Msg: 'This import will overwrite an existing item in your configuration. Do you wish to continue?',
                             ConfirmButtonText: 'Import',
                             CancelAction: null,
                             ConfirmAction: processImportAction,
@@ -1539,7 +1541,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const alert = {
                         alertType: 'generic',
                         header: 'Team Sharing',
-                        message: `Item Successfully Imported`,
+                        message: 'Item imported successfully.',
                         alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
                     };
                     adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1579,7 +1581,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
-                            message: "Couldn't update active item: " + error.message,
+                            message: 'Failed to update shared item: ' + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1600,7 +1602,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
-                            message: "Couldn't check for updates: " + error.message,
+                            message: 'Failed to check for updates: ' + error.message,
                             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);

package/src/Strategy/BulkUpdateModule.js

@@ -43,8 +43,8 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 IsValid: false,
                 Alert: {
                     alertType: 'generic',
-                    header: 'Bulk Update Error',
-                    message: 'Cannot edit while Grid is in Pivot Mode.',
+                    header: 'Bulk Update',
+                    message: 'Editing is not available in Pivot Mode.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -54,8 +54,8 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 IsValid: false,
                 Alert: {
                     alertType: 'generic',
-                    header: 'Bulk Update Error',
-                    message: 'No cells are selected.\nPlease select some cells.',
+                    header: 'Bulk Update',
+                    message: 'No cells selected. Please select one or more cells to continue.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -65,8 +65,8 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 IsValid: false,
                 Alert: {
                     alertType: 'generic',
-                    header: 'Bulk Update Error',
-                    message: 'Bulk Update only supports single column edit.\nPlease adjust cell selection.',
+                    header: 'Bulk Update',
+                    message: 'Bulk Update supports editing a single column at a time. Please adjust your selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -78,8 +78,8 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 IsValid: false,
                 Alert: {
                     alertType: 'generic',
-                    header: 'Bulk Update Error',
-                    message: 'Bulk Update is not permitted on readonly cells.\nPlease adjust the cell selection.',
+                    header: 'Bulk Update',
+                    message: 'Bulk Update is not available for read-only cells. Please adjust your selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };

package/src/Strategy/PlusMinusModule.js

@@ -190,7 +190,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     failedMessages.push(failedMessage);
                 }
             });
-            this.api.alertApi.showAlertError('Nudge(s) failed rule', failedMessages.toString());
+            this.api.alertApi.showAlertError('Plus/Minus', 'One or more nudge values were rejected by validation rules: ' + failedMessages.toString());
         }
     }
     getTeamSharingAction() {

package/src/Strategy/QuickSearchModule.js

@@ -28,7 +28,7 @@ class QuickSearchModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // Check for AG Grid QuickFilterModule if running Filter After Quick Search
         if (api.optionsApi.getQuickSearchOptions().filterGridAfterQuickSearch) {
             if (!api.internalApi.getAgGridModulesAdapter().isAgGridModuleRegistered('QuickFilterModule')) {
-                api.consoleError('The AG Grid "GridFilter" Module is required if running Quick Search as Filter; Quick Search will run but no Filters will be applied');
+                api.consoleError('Quick Search with filterGridAfterQuickSearch requires the AG Grid "QuickFilterModule". Quick Search will run but grid filters will not be applied.');
             }
         }
         const isServerSideRowModel = agGridApi.getGridOption('rowModelType') === 'serverSide';

package/src/Strategy/SettingsPanelModule.js

@@ -11,15 +11,19 @@ class SettingsPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.SettingsPanelModuleId, friendlyName, 'settings', null, 'Manage all Adaptable Settings', api);
     }
     createColumnMenuItems(column) {
-        return [
-            // To do : get the icon and name from settings in case they have changed?
-            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
-        ];
+        if (this.isModuleVisible()) {
+            return [
+                // To do : get the icon and name from settings in case they have changed?
+                this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            ];
+        }
     }
     createContextMenuItems(menuContext) {
-        return [
-            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
-        ];
+        if (this.isModuleVisible()) {
+            return [
+                this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            ];
+        }
     }
     createModuleMenuItem(source) {
         if (this.isModuleVisible()) {