@adaptabletools/adaptable 22.0.0-canary.5 → 22.0.0-canary.7

package/src/Api/Internal/NamedQueryInternalApi.js

@@ -40,8 +40,8 @@ export class NamedQueryInternalApi extends 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.CreateInternalAlertDefinitionForMessages('Error'),
             };
             this.getAlertApi().displayAdaptableAlertNotification(alert);
@@ -56,8 +56,8 @@ export class NamedQueryInternalApi extends 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.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,6 +1,10 @@
 import { EMPTY_ARRAY } from '../../Utilities/Constants/GeneralConstants';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { changeIsSuspendInList, suspendAllInList, unsuspendAllInList } from './utils';
+/**
+ * @ReduxAction Many Format Columns have been added
+ */
+export const FORMAT_COLUMN_ADD_BATCH = 'FORMAT_COLUMN_ADD_BATCH';
 /**
  * @ReduxAction A Format Column has been added
  */
@@ -45,6 +49,10 @@ export const FORMAT_COLUMN_UNSUSPEND = 'FORMAT_COLUMN_UNSUSPEND';
  * @ReduxAction FormatColumn Module is unsuspended, or activated
  */
 export const FORMAT_COLUMN_UNSUSPEND_ALL = 'FORMAT_COLUMN_UNSUSPEND_ALL';
+export const FormatColumnsAdd = (formatColumns) => ({
+    type: FORMAT_COLUMN_ADD_BATCH,
+    formatColumns,
+});
 export const FormatColumnAdd = (formatColumn) => ({
     type: FORMAT_COLUMN_ADD,
     formatColumn,
@@ -92,6 +100,13 @@ const initialState = {
 export const FormatColumnReducer = (state = initialState, action) => {
     let formatColumns;
     switch (action.type) {
+        case FORMAT_COLUMN_ADD_BATCH: {
+            const actionFormatColumns = action.formatColumns;
+            actionFormatColumns.forEach(AdaptableHelper.addAdaptableObjectPrimitives);
+            formatColumns = [].concat(state.FormatColumns);
+            formatColumns.push(...actionFormatColumns);
+            return { ...state, FormatColumns: formatColumns };
+        }
         case FORMAT_COLUMN_ADD: {
             const actionFormatColumn = action.formatColumn;
             AdaptableHelper.addAdaptableObjectPrimitives(actionFormatColumn);

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

@@ -15,6 +15,7 @@ import { SelectedCellInfo } from '../../AdaptableState/Selection/SelectedCellInf
 import { SelectedRowInfo } from '../../AdaptableState/Selection/SelectedRowInfo';
 import { CellHighlightInfo, RowHighlightInfo, RowsHighlightInfo } from '../../types';
 import { IRowNode } from 'ag-grid-enterprise';
+import { ColumnHighlightInfo } from '../../AdaptableState/Common/ColumnHighlightInfo';
 export declare const SET_COLUMNS = "SET_COLUMNS";
 export declare const SET_SELECTED_CELLS = "SET_SELECTED_CELLS";
 export declare const SET_SELECTED_ROWS = "SET_SELECTED_ROWS";
@@ -23,6 +24,9 @@ export declare const SET_DASHBOARD_MODULE_BUTTONS = "SET_DASHBOARD_MODULE_BUTTON
 export declare const HIGHLIGHT_CELL_ADD = "HIGHLIGHT_CELL_ADD";
 export declare const HIGHLIGHT_CELL_DELETE = "HIGHLIGHT_CELL_DELETE";
 export declare const HIGHLIGHT_CELL_DELETE_ALL = "HIGHLIGHT_CELL_DELETE_ALL";
+export declare const HIGHLIGHT_COLUMN_ADD = "HIGHLIGHT_COLUMN_ADD";
+export declare const HIGHLIGHT_COLUMN_DELETE = "HIGHLIGHT_COLUMN_DELETE";
+export declare const HIGHLIGHT_COLUMN_DELETE_ALL = "HIGHLIGHT_COLUMN_DELETE_ALL";
 export declare const HIGHLIGHT_ROW_ADD = "HIGHLIGHT_ROW_ADD";
 export declare const HIGHLIGHT_ROWS_ADD = "HIGHLIGHT_ROWS_ADD";
 export declare const HIGHLIGHT_ROW_DELETE = "HIGHLIGHT_ROW_DELETE";
@@ -93,6 +97,14 @@ export interface HighlightCellDeleteAction extends Redux.Action {
 }
 export interface HighlightCellDeleteAllAction extends Redux.Action {
 }
+export interface HighlightColumnAddAction extends Redux.Action {
+    columnHighlightInfo: ColumnHighlightInfo;
+}
+export interface HighlightColumnDeleteAction extends Redux.Action {
+    columnId: ColumnHighlightInfo['columnId'];
+}
+export interface HighlightColumnDeleteAllAction extends Redux.Action {
+}
 export interface HighlightRowAddAction extends Redux.Action {
     rowHighlightInfo: RowHighlightInfo;
 }
@@ -121,6 +133,9 @@ export interface SystemExportEndAction extends Redux.Action {
 export declare const HighlightCellAdd: (cellHighlightInfo: CellHighlightInfo) => HighlightCellAddAction;
 export declare const HighlightCellDelete: (primaryKeyValue: CellHighlightInfo["primaryKeyValue"], columnId: CellHighlightInfo["columnId"]) => HighlightCellDeleteAction;
 export declare const HighlightCellDeleteAll: () => HighlightCellDeleteAllAction;
+export declare const HighlightColumnAdd: (columnHighlightInfo: ColumnHighlightInfo) => HighlightColumnAddAction;
+export declare const HighlightColumnDelete: (columnId: ColumnHighlightInfo["columnId"]) => HighlightColumnDeleteAction;
+export declare const HighlightColumnDeleteAll: () => HighlightColumnDeleteAllAction;
 export declare const HighlightRowAdd: (rowHighlightInfo: RowHighlightInfo) => HighlightRowAddAction;
 export declare const HighlightRowsAdd: (rowsHighlightInfo: RowsHighlightInfo) => HighlightRowsAddAction;
 export declare const HighlightRowDelete: (primaryKeyValue: RowHighlightInfo["primaryKeyValue"]) => HighlightRowDeleteAction;

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -22,6 +22,10 @@ export const SET_DASHBOARD_MODULE_BUTTONS = 'SET_DASHBOARD_MODULE_BUTTONS';
 export const HIGHLIGHT_CELL_ADD = 'HIGHLIGHT_CELL_ADD';
 export const HIGHLIGHT_CELL_DELETE = 'HIGHLIGHT_CELL_DELETE';
 export const HIGHLIGHT_CELL_DELETE_ALL = 'HIGHLIGHT_CELL_DELETE_ALL';
+// Column Highlight
+export const HIGHLIGHT_COLUMN_ADD = 'HIGHLIGHT_COLUMN_ADD';
+export const HIGHLIGHT_COLUMN_DELETE = 'HIGHLIGHT_COLUMN_DELETE';
+export const HIGHLIGHT_COLUMN_DELETE_ALL = 'HIGHLIGHT_COLUMN_DELETE_ALL';
 // Row Highlight
 export const HIGHLIGHT_ROW_ADD = 'HIGHLIGHT_ROW_ADD';
 export const HIGHLIGHT_ROWS_ADD = 'HIGHLIGHT_ROWS_ADD';
@@ -106,6 +110,17 @@ export const HighlightCellDelete = (primaryKeyValue, columnId) => ({
 export const HighlightCellDeleteAll = () => ({
     type: HIGHLIGHT_CELL_DELETE_ALL,
 });
+export const HighlightColumnAdd = (columnHighlightInfo) => ({
+    type: HIGHLIGHT_COLUMN_ADD,
+    columnHighlightInfo: columnHighlightInfo,
+});
+export const HighlightColumnDelete = (columnId) => ({
+    type: HIGHLIGHT_COLUMN_DELETE,
+    columnId,
+});
+export const HighlightColumnDeleteAll = () => ({
+    type: HIGHLIGHT_COLUMN_DELETE_ALL,
+});
 export const HighlightRowAdd = (rowHighlightInfo) => ({
     type: HIGHLIGHT_ROW_ADD,
     rowHighlightInfo: rowHighlightInfo,
@@ -349,6 +364,7 @@ const initialState = {
     SelectedCellInfo: null,
     SelectedRowInfo: null,
     CellHighlightInfo: EMPTY_ARRAY,
+    ColumnHighlightInfo: EMPTY_ARRAY,
     RowHighlightInfo: EMPTY_ARRAY,
     SettingsPanelModuleEntries: EMPTY_ARRAY,
     AdaptableAlerts: EMPTY_ARRAY,
@@ -448,6 +464,26 @@ export const InternalReducer = (state = initialState, action) => {
                 CellHighlightInfo: [],
             });
         }
+        case HIGHLIGHT_COLUMN_ADD: {
+            const actionTypedAdd = action;
+            return Object.assign({}, state, {
+                ColumnHighlightInfo: [...state.ColumnHighlightInfo, actionTypedAdd.columnHighlightInfo],
+            });
+        }
+        case HIGHLIGHT_COLUMN_DELETE: {
+            const actionTypedDelete = action;
+            const actionId = actionTypedDelete.columnId;
+            return Object.assign({}, state, {
+                ColumnHighlightInfo: state.ColumnHighlightInfo.filter((columnHighlightInfo) => {
+                    return columnHighlightInfo.columnId !== actionId;
+                }),
+            });
+        }
+        case HIGHLIGHT_COLUMN_DELETE_ALL: {
+            return Object.assign({}, state, {
+                ColumnHighlightInfo: [],
+            });
+        }
         case HIGHLIGHT_ROW_ADD: {
             const actionTypedAdd = action;
             return Object.assign({}, state, {

package/src/Redux/Store/AdaptableStore.js

@@ -254,7 +254,7 @@ export 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(InitState());
@@ -263,7 +263,7 @@ export 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.CreateInternalAlertDefinitionForMessages('Error'),
             }));
         }));
@@ -581,6 +581,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:
@@ -745,6 +746,27 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     });
                     return ret;
                 }
+                case InternalRedux.HIGHLIGHT_COLUMN_ADD: {
+                    const actionTyped = action;
+                    const ret = next(action);
+                    const columnHighlightInfo = actionTyped.columnHighlightInfo;
+                    adaptable.api.gridApi.refreshColumn(columnHighlightInfo.columnId);
+                    return ret;
+                }
+                case InternalRedux.HIGHLIGHT_COLUMN_DELETE: {
+                    const actionTyped = action;
+                    const ret = next(action);
+                    adaptable.api.gridApi.refreshColumn(actionTyped.columnId);
+                    return ret;
+                }
+                case InternalRedux.HIGHLIGHT_COLUMN_DELETE_ALL: {
+                    const columnHighlightInfos = middlewareAPI.getState().Internal.ColumnHighlightInfo;
+                    const ret = next(action);
+                    columnHighlightInfos.forEach((columnHighlightInfo) => {
+                        adaptable.api.gridApi.refreshColumn(columnHighlightInfo.columnId);
+                    });
+                    return ret;
+                }
                 case InternalRedux.HIGHLIGHT_ROW_ADD: {
                     const actionTyped = action;
                     const ret = next(action);
@@ -1292,7 +1314,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.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1362,7 +1384,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.CreateInternalAlertDefinitionForMessages('Error'),
                             };
                             adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1386,7 +1408,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.CreateInternalAlertDefinitionForMessages('Success'),
                             };
                             adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1397,7 +1419,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.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1422,10 +1444,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.CreateInternalAlertDefinitionForMessages('Warning'),
                             };
                             adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1442,7 +1465,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.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1464,8 +1487,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,
@@ -1511,7 +1534,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const alert = {
                         alertType: 'generic',
                         header: 'Team Sharing',
-                        message: `Item Successfully Imported`,
+                        message: 'Item imported successfully.',
                         alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
                     };
                     adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1551,7 +1574,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.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
@@ -1572,7 +1595,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.CreateInternalAlertDefinitionForMessages('Error'),
                         };
                         adaptable.api.alertApi.displayAdaptableAlertNotification(alert);

package/src/Strategy/BulkUpdateModule.js

@@ -39,8 +39,8 @@ export class BulkUpdateModule extends 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.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -50,8 +50,8 @@ export class BulkUpdateModule extends 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.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -61,8 +61,8 @@ export class BulkUpdateModule extends 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.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -74,8 +74,8 @@ export class BulkUpdateModule extends 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.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };

package/src/Strategy/PlusMinusModule.js

@@ -186,7 +186,7 @@ export class PlusMinusModule extends 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

@@ -24,7 +24,7 @@ export class QuickSearchModule extends 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

@@ -7,15 +7,19 @@ export class SettingsPanelModule extends 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()) {

package/src/Strategy/SmartEditModule.js

@@ -43,8 +43,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'Cannot edit while Grid is in Pivot Mode.',
+                    header: 'Smart Edit',
+                    message: 'Editing is not available in Pivot Mode.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -53,8 +53,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'No cells are selected.\nPlease select some cells.',
+                    header: 'Smart Edit',
+                    message: 'No cells selected. Please select one or more cells to continue.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -63,8 +63,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'Smart Edit only supports single column edit.\nPlease adjust cell selection.',
+                    header: 'Smart Edit',
+                    message: 'Smart Edit supports editing a single column at a time. Please adjust your selection.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -75,8 +75,8 @@ export class SmartEditModule extends AdaptableModuleBase {
                 return {
                     Alert: {
                         alertType: 'generic',
-                        header: 'Smart Edit Error',
-                        message: 'Smart Edit only supports editing of numeric columns.\nPlease adjust the cell selection.',
+                        header: 'Smart Edit',
+                        message: 'Smart Edit only applies to numeric columns. Please adjust your selection.',
                         alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                     },
                 };
@@ -87,8 +87,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'Smart Edit is not permitted on readonly cells.\nPlease adjust the cell selection.',
+                    header: 'Smart Edit',
+                    message: 'Smart Edit is not available for read-only cells. Please adjust your selection.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };

package/src/Utilities/Services/DataService.js

@@ -64,7 +64,7 @@ export class DataService {
         // why 2 and not 3 or 1? no good reason, only seems like a reasonable waiting time :)
         const UNDO_WAIT = 2000;
         const timeoutId = setTimeout(() => {
-            this.adaptable.logger.warn(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.column}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
+            this.adaptable.logger.warn(`Undo change was not handled within timeout: column="${change.column}", primaryKey="${change.primaryKeyValue}", from=${change.newValue} to=${change.oldValue}.`);
             this.extractUndoChange(change);
         }, UNDO_WAIT);
         this.undoChangeTimers.set(undoChangeKey, timeoutId);

package/src/Utilities/Services/Fdc3Service.js

@@ -78,7 +78,7 @@ export class Fdc3Service {
     getDesktopAgent() {
         if (globalThis.fdc3 == null && !this.loggedAgentError) {
             this.loggedAgentError = true;
-            this.adaptableApi.consoleError('FDC3 Desktop Agent not found. This should be provided by the wrapper application.');
+            this.adaptableApi.consoleError('FDC3 Desktop Agent not found. The host application must provide the FDC3 agent on globalThis.fdc3.');
         }
         return globalThis.fdc3;
     }
@@ -161,11 +161,11 @@ export class Fdc3Service {
         if (!this.getFdc3Options().enableLogging) {
             return;
         }
-        this.adaptableApi.consoleLog(`FDC3::${type} - `, params.join(' : '));
+        this.adaptableApi.consoleLog(`FDC3 ${type}: ${params.join(' : ')}`);
     }
     logFdc3Error(error) {
-        this.adaptableApi.consoleError(`FDC3 error`, error);
-        this.adaptableApi.alertApi.showAlertError('FDC3 Error', 'See console for details');
+        this.adaptableApi.consoleError('FDC3 operation failed.', error);
+        this.adaptableApi.alertApi.showAlertError('FDC3', 'An error occurred. See the browser console for details.');
     }
     getFdc3Api() {
         return this.adaptableApi.fdc3Api;

package/src/Utilities/Services/ModuleService.js

@@ -32,9 +32,7 @@ export class ModuleService {
         const registeredAgGridModuleNames = agGridModulesAdapter.getAgGridRegisteredModuleNames();
         const missingAgGridModuleNames = mandatoryAgGridModuleNames.filter((moduleName) => !registeredAgGridModuleNames.includes(moduleName));
         if (missingAgGridModuleNames.length) {
-            this.adaptableApi.consoleError(`AdapTable requires the following AG Grid modules to be registered: ${missingAgGridModuleNames.join(', ')}.
-
-        See for more information: ${AgGridRequiredModulesDocsLink}`);
+            this.adaptableApi.consoleError(`Adaptable requires these AG Grid modules: ${missingAgGridModuleNames.join(', ')}. Please register them. See: ${AgGridRequiredModulesDocsLink}`);
         }
         // log optional missing AG Grid dependencies for all modules
         this.getModuleCollection().forEach((adaptableModule) => {

package/src/Utilities/Services/ThemeService.js

@@ -70,15 +70,11 @@ export class ThemeService {
             return val;
         });
         if (abLoaded !== '777') {
-            logger.consoleError('Please import Adaptable styles from "@adaptabletools/adaptable/index.css"');
+            logger.consoleError('Adaptable styles not detected. Please import "@adaptabletools/adaptable/index.css".');
         }
         const isCustomUserTheme = !this.api.themeApi.internalApi.isSystemTheme(themeName);
         if (!isCustomUserTheme && abThemeLoaded !== themeName) {
-            logger.consoleWarn(`Theme "${themeName}" doesn't seem to be loaded! Make sure you import the css file for the "${themeName}" theme!
-
-If it's an AdapTable system theme, try
-
-import "@adaptabletools/adaptable/themes/${themeName}.css"`);
+            logger.consoleWarn(`Theme "${themeName}" does not appear to be loaded. Ensure the CSS file is imported, e.g.: import "@adaptabletools/adaptable/themes/${themeName}.css".`);
         }
     }
     // prefers-color-scheme

package/src/Utilities/Services/ValidationService.js

@@ -53,7 +53,7 @@ export class ValidationService {
             let alert = {
                 alertType: 'cellChanged',
                 header: 'Alert',
-                message: 'Perform Edit Alert Fired',
+                message: 'A validation rule was triggered for this edit.',
                 alertDefinition: failedRules[0],
                 cellDataChangedInfo: cellDataChangedInfo,
             };

package/src/Utilities/logDeprecation.js

@@ -11,13 +11,12 @@ const doOnce = (func, key) => {
 };
 export const logDeprecation = (logger, typeName, oldProp, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${typeName}.${newProp}()' instead. ` : '';
-    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`${typeName}.${oldProp}() is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
 };
 export const logDeprecationExternal = (logger, oldTypeName, oldProp, newTypeName, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${newTypeName}.${newProp}()' instead. ` : '';
-    doOnce(() => logger.consoleWarn(`'${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`${oldTypeName}.${oldProp}() is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
 };
 export const logDeprecationInternal = (logger, typeName, oldProp) => {
-    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. The method will be removed in the next major release.
-        Please contact support if you need the missing functionality.`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`${typeName}.${oldProp}() is deprecated and will be removed in the next major release. Contact support if you need this functionality.`), `Deprecated_${oldProp}`);
 };