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

package/src/Api/PluginsApi.d.ts

@@ -7,12 +7,41 @@ import { FinanceApi } from './FinanceApi';
  * API methods dealing with AdapTable plugins
  */
 export interface PluginsApi {
+    /**
+     * Retrieves the Plugin State (internal only)
+     */
     getPluginsState(): PluginsState;
+    /**
+     * Gets the State for a given Plugin
+     * @param pluginId plugin state to retrieve
+     */
     getPluginState(pluginId: string): any;
+    /**
+     * Registers a Plugin (internal method)
+     * @param pluginId Plugin to register
+     * @param initialPluginState any state the Plugin requires
+     */
     registerPlugin(pluginId: string, initialPluginState: any): void;
+    /**
+     * Sets the initial state for a given plugin (internal method)
+     * @param pluginId Plugin to set state for
+     * @param pluginState State to set
+     */
     setPluginState(pluginId: string, pluginState: any): void;
+    /**
+     * Returns ipushpull API class in Adaptable API
+     */
     getipushpullPluginApi(): IPushPullApi;
+    /**
+     * Returns Glue42 API class in Adaptable API
+     */
     getGlue42PluginApi(): Glue42Api;
+    /**
+     * Returns OpenFin API class in Adaptable API
+     */
     getOpenFinPluginApi(): OpenFinApi;
+    /**
+     * Returns Finance API class in Adaptable API
+     */
     getFinancePluginApi(): FinanceApi;
 }

package/src/Api/UserInterfaceApi.d.ts

@@ -25,13 +25,16 @@ export interface UserInterfaceApi {
      */
     getPermittedValuesForColumn(column: AdaptableColumn): any[];
     /**
-     * Retrieves Permitted values for filtering by column values in Floating Filter and dropdown Filter.
+     * Retrieves Permitted values for filtering by column values in Floating Filter and Quick Filter Bar
      */
     getFilterPermittedValuesForColumn(column: AdaptableColumn): FilterPermittedValues | undefined;
     /**
-     * Retrieves Permitted values for Custom sort.
+     * Retrieves Permitted values for Custom Sort Module
      */
     getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
+    /**
+     * Retrieves Permitted values for Bulk Update Module
+     */
     getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
     /**
      * Retrieves `editLookUpItems` property from User Interface Options

package/src/PredefinedConfig/AlertState.d.ts

@@ -10,17 +10,15 @@ import { AdaptableStyle } from './Common/AdaptableStyle';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableAggregationQuery, AdaptableBooleanQuery, AdaptableObservableQuery } from './Common/AdaptableQuery';
 import { ButtonStyle } from './Common/ButtonStyle';
-import { AlertButtonContext } from '../AdaptableOptions/NotificationsOptions';
+import { AlertButtonContext } from '../types';
 /**
  * Predefined Configuration for Alert Module
  */
 export interface AlertState extends ConfigState {
     /**
      * Alert Definitions - will trigger Alerts when rule is met
-     * @defaultValue  null
      */
     AlertDefinitions?: AlertDefinition[];
-    FlashingAlertDefinitions?: any[];
 }
 /**
  * The Alert Definition object used in the Alert function
@@ -116,7 +114,7 @@ export interface AlertProperties {
     LogToConsole?: boolean;
     /**
      * Automatically prevent any cell edit which triggered the Alert (i.e. validation)
-     * @default false
+     * @defaultValue false
      */
     PreventEdit?: boolean;
 }

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -8,7 +8,6 @@ import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
 export interface CalculatedColumnState extends ConfigState {
     /**
      * Collection of Calculated Columns
-     * @defaultValue  empty
      */
     CalculatedColumns?: CalculatedColumn[];
 }

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

@@ -22,7 +22,7 @@ export interface FDC3Context {
         [key: string]: string | undefined;
     };
     /**
-     * @hidden
+     * @internal
      * Custom properties and metadata. This can be extended in specific context object.
      */
     [key: string]: unknown;
@@ -32,23 +32,15 @@ export interface FDC3Context {
  */
 export interface InstrumentContext extends FDC3Context {
     /**
-     * The context type is always 'instrument'.
+     * Context type is always 'instrument'
      */
     type: 'instrument';
     /**
-     * Free text name of the instrument.
+     * Free text name of instrument
      */
     name: string;
     /**
-     * The instrument data. Can contain some or all of:
-     * * `ticker`: a ticker
-     * * `ISIN`: [ISIN](https://www.isin.org/isin/)
-     * * `CUSIP`: [CUSIP](https://www.cusip.com/cusip/index.htm)
-     * * `SEDOL`: [SEDOL](https://www.londonstockexchange.com/products-and-services/reference-data/sedol-master-file/sedol-master-file.htm)
-     * * `RIC`: [Reuters Instrument Code (RIC)](https://en.wikipedia.org/wiki/Reuters_Instrument_Code)
-     * * `BBG`: [Bloomberg Ticker](https://www.bloomberg.com/professional/product/market-data/)
-     * * `PERMID`: [PERMID](https://permid.org/)
-     * * `FIGI`: [FIGI](https://www.openfigi.com/about/figi)
+     * The instrument data
      */
     id: {
         [key: string]: string;

package/src/PredefinedConfig/CustomSortState.d.ts

@@ -6,7 +6,6 @@ import { SuspendableObject } from './Common/SuspendableObject';
 export interface CustomSortState extends ConfigState {
     /**
      * Collection of Custom Sort objects.
-     * @defaultValue []
      */
     CustomSorts?: CustomSort[];
 }

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -20,10 +20,12 @@ export declare type FlashingCellRule = XOR<{
 export interface FlashingCellState extends ConfigState {
     /**
      * Flashing Cell Definitions - will colour cells/rows when rule is met
-     * @defaultValue  null
      */
     FlashingCellDefinitions?: FlashingCellDefinition[];
 }
+/**
+ * What should flash? row, cell or aggregated cell
+ */
 export declare type FlashTargetTypes = 'row' | 'cell' | 'aggFuncCell';
 /**
  * The Flashing Cell Definition

package/src/PredefinedConfig/FreeTextColumnState.d.ts

@@ -39,7 +39,7 @@ export interface FreeTextColumn extends AdaptableObject {
      * Whether Column is String, Number, Boolean or Date
      * @defaultValue 'String'
      */
-    DataType?: 'String' | 'Number' | 'Boolean' | 'Date';
+    DataType: 'String' | 'Number' | 'Boolean' | 'Date';
     /**
      * Additional optional properties for Column (e.g. filterable, resizable)
      */

package/src/PredefinedConfig/LayoutState.d.ts

@@ -7,12 +7,10 @@ import { ColumnSort } from './Common/ColumnSort';
 export interface LayoutState extends ConfigState {
     /**
      * Layout which will be loaded when AdapTable starts - must match `Name` property in Layout
-     * @defaultValue ''
      */
     CurrentLayout?: string;
     /**
      * Collection of Layout objects - listed in Layout toolbar and Tool Panel
-     * @defaultValue null
      */
     Layouts?: Layout[];
 }

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -23,7 +23,7 @@ import { QueryState } from './QueryState';
  */
 export interface PredefinedConfig {
     /**
-     * Supplies a collection of *Alert Definition* objects which will fire when their definition is triggered, and where Alerts are displayed
+     * Collection of `AlertDefinitions` which will fire Alerts when the rule is met
      */
     Alert?: AlertState;
     /**
@@ -58,6 +58,10 @@ export interface PredefinedConfig {
      *  Stores Filters in AdapTable - both System and Column (predicate) Filters
      */
     Filter?: FilterState;
+    /***
+     * Objects which define which cells flash in response to data changes
+     */
+    FlashingCell?: FlashingCellState;
     /**
      * Supplies a collection of *FormatColumn* objects that will style an entire column in a single way (and not subject to a rule like with Conditional Style).
      */
@@ -98,5 +102,4 @@ export interface PredefinedConfig {
      * Sets the order and visibility of the Tool Panel controls in the AdapTable ToolPanel (on right of grid)
      */
     ToolPanel?: ToolPanelState;
-    FlashingCell?: FlashingCellState;
 }

package/src/Redux/ActionsReducers/ApplicationRedux.js

@@ -37,19 +37,25 @@ exports.ApplicationReducer = (state = initialState, action) => {
             const actionTypedAdd = action;
             applicationDataEntries = [].concat(state.ApplicationDataEntries);
             applicationDataEntries.push(actionTypedAdd.applicationDataEntry);
-            return Object.assign({}, state, { ApplicationDataEntries: applicationDataEntries });
+            return Object.assign({}, state, {
+                ApplicationDataEntries: applicationDataEntries,
+            });
         case exports.APPLICATION_DATA_ENTRY_EDIT:
             const actionTypedUpdate = action;
             applicationDataEntries = [].concat(state.ApplicationDataEntries);
             index = applicationDataEntries.findIndex((fe) => fe.Key == actionTypedUpdate.applicationDataEntry.Key);
             applicationDataEntries[index] = actionTypedUpdate.applicationDataEntry;
-            return Object.assign({}, state, { ApplicationDataEntries: applicationDataEntries });
+            return Object.assign({}, state, {
+                ApplicationDataEntries: applicationDataEntries,
+            });
         case exports.APPLICATION_DATA_ENTRY_DELETE:
             const actionTypedDelete = action;
             applicationDataEntries = [].concat(state.ApplicationDataEntries);
             index = applicationDataEntries.findIndex((a) => a.Key == actionTypedDelete.applicationDataEntry.Key);
             applicationDataEntries.splice(index, 1);
-            return Object.assign({}, state, { ApplicationDataEntries: applicationDataEntries });
+            return Object.assign({}, state, {
+                ApplicationDataEntries: applicationDataEntries,
+            });
         default:
             return state;
     }

package/src/Redux/ActionsReducers/FlashingCellRedux.js

@@ -64,28 +64,24 @@ exports.FlashingCellReducer = (state = initialState, action) => {
     let flashingCellDefinitions;
     switch (action.type) {
         case exports.FLASHING_ALERT_DEFINITION_SET: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinitions;
+            const actionFlashingCellDefinition = action.flashingCellDefinitions;
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: actionFlashingCellDefinition });
         }
         case exports.FLASHING_ALERT_DEFINITION_ADD: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinition;
+            const actionFlashingCellDefinition = action.flashingCellDefinition;
             AdaptableHelper_1.default.addUuidAndSource(actionFlashingCellDefinition);
             flashingCellDefinitions = [].concat(state.FlashingCellDefinitions);
             flashingCellDefinitions.push(actionFlashingCellDefinition);
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: flashingCellDefinitions });
         }
         case exports.FLASHING_ALERT_DEFINITION_EDIT: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinition;
+            const actionFlashingCellDefinition = action.flashingCellDefinition;
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: state.FlashingCellDefinitions.map((abObject) => abObject.Uuid === actionFlashingCellDefinition.Uuid
                     ? actionFlashingCellDefinition
                     : abObject) });
         }
         case exports.FLASHING_ALERT_DEFINITION_DELETE: {
-            const actionFlashingCellDefinition = action
-                .flashingCellDefinition;
+            const actionFlashingCellDefinition = action.flashingCellDefinition;
             return Object.assign(Object.assign({}, state), { FlashingCellDefinitions: state.FlashingCellDefinitions.filter((abObject) => abObject.Uuid !== actionFlashingCellDefinition.Uuid) });
         }
         case exports.FLASHING_ALERT_DEFINITION_SUSPEND: {

package/src/Redux/ActionsReducers/GridRedux.js

@@ -177,7 +177,9 @@ exports.GridReducer = (state = initialState, action) => {
             const removeColumn = action.column;
             return Object.assign(Object.assign({}, state), { Columns: state.Columns.filter((abObject) => abObject.Uuid !== removeColumn.Uuid) });
         case exports.GRID_SET_SORT:
-            return Object.assign({}, state, { ColumnSorts: action.columnSorts });
+            return Object.assign({}, state, {
+                ColumnSorts: action.columnSorts,
+            });
         case exports.GRID_CLEAR_SORT:
             return Object.assign({}, state, { ColumnSorts: undefined });
         case exports.GRID_SET_SELECTED_CELLS:

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -131,6 +131,8 @@ exports.PopupReducer = (state = initialState, action) => {
                 Header: actionTyped.prompt.Header,
                 Message: actionTyped.prompt.Msg,
                 ConfirmAction: actionTyped.prompt.ConfirmAction,
+                ConfirmActionCreator: actionTyped.prompt.ConfirmActionCreator,
+                DefaultValue: actionTyped.prompt.DefaultValue,
             };
             return Object.assign({}, state, { PromptPopup: newPromptPopup });
         }
@@ -140,6 +142,8 @@ exports.PopupReducer = (state = initialState, action) => {
                 Header: '',
                 Message: '',
                 ConfirmAction: null,
+                ConfirmActionCreator: null,
+                DefaultValue: '',
             };
             return Object.assign({}, state, { PromptPopup: newPromptPopup });
         }
@@ -167,7 +171,9 @@ exports.PopupReducer = (state = initialState, action) => {
                 ConfirmationComment: null,
                 MessageType: actionTyped.confirmation.MessageType,
             };
-            return Object.assign({}, state, { ConfirmationPopup: newConfirmationPopup });
+            return Object.assign({}, state, {
+                ConfirmationPopup: newConfirmationPopup,
+            });
         }
         case exports.POPUP_CONFIRM_CONFIRMATION: {
             let actionTyped = action;
@@ -184,7 +190,9 @@ exports.PopupReducer = (state = initialState, action) => {
                 ConfirmationComment: actionTyped.comment,
                 MessageType: null,
             };
-            return Object.assign({}, state, { ConfirmationPopup: newConfirmationPopup });
+            return Object.assign({}, state, {
+                ConfirmationPopup: newConfirmationPopup,
+            });
         }
         case exports.POPUP_CANCEL_CONFIRMATION: {
             //we dispatch the Action of CancelAction in the middelware in order to keep the reducer pure
@@ -200,7 +208,9 @@ exports.PopupReducer = (state = initialState, action) => {
                 ConfirmationComment: null,
                 MessageType: null,
             };
-            return Object.assign({}, state, { ConfirmationPopup: newConfirmationPopup });
+            return Object.assign({}, state, {
+                ConfirmationPopup: newConfirmationPopup,
+            });
         }
         case exports.POPUP_SHOW_ALERT: {
             let showAlertAction = action;

package/src/Redux/ActionsReducers/QuickSearchRedux.js

@@ -40,7 +40,9 @@ exports.QuickSearchReducer = (state = initialState, action) => {
                 QuickSearchText: action.quickSearchText,
             });
         case exports.QUICK_SEARCH_SET_STYLE:
-            return Object.assign({}, state, { Style: action.style });
+            return Object.assign({}, state, {
+                Style: action.style,
+            });
         default:
             return state;
     }

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -400,7 +400,9 @@ exports.SystemReducer = (state = initialState, action) => {
                 systemStatusMessages.splice(0, 1);
             }
             systemStatusMessages.push(actionTypedAdd.systemStatusMessageInfo);
-            return Object.assign({}, state, { SystemStatusMessages: systemStatusMessages });
+            return Object.assign({}, state, {
+                SystemStatusMessages: systemStatusMessages,
+            });
         }
         case exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL: {
             return Object.assign({}, state, { SystemStatusMessages: [] });

package/src/Redux/ActionsReducers/ThemeRedux.js

@@ -50,7 +50,9 @@ exports.ThemeReducer = (state = initialState, action) => {
                 UserThemes: action.UserThemes,
             });
         case exports.THEME_SELECT:
-            return Object.assign({}, state, { CurrentTheme: action.Theme });
+            return Object.assign({}, state, {
+                CurrentTheme: action.Theme,
+            });
         default:
             return state;
     }

package/src/Redux/Store/AdaptableStore.js

@@ -182,6 +182,7 @@ class AdaptableStore {
         // If the user has remote storage set then we use Remote Engine, otherwise we use Local Enginge
         // not sure we can do this as we need to be backwardly compatible with existing users so need to stick with adaptable id (which should be unique)
         // const localStorageKey =  'adaptable-adaptable-state-' + adaptable.adaptableOptions.primaryKey;
+        const predefinedConfig = adaptable.adaptableOptions.predefinedConfig;
         storageEngine = AdaptableReduxLocalStorageEngine_1.createEngine({
             adaptableId: adaptable.adaptableOptions.adaptableId,
             adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
@@ -318,7 +319,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case SystemRedux.SYSTEM_FLASHING_CELL_ADD:
                 case SystemRedux.SYSTEM_FLASHING_CELL_DELETE: {
-                    const { flashingCell: FlashingCell, } = action;
+                    const { flashingCell: FlashingCell } = action;
                     const { dataChangedInfo } = FlashingCell;
                     let ret = next(action);
                     if (dataChangedInfo) {
@@ -1086,7 +1087,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case TeamSharingRedux.TEAMSHARING_IMPORT_ITEM: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    const [importStepActions, needsOverwriteConfirmation,] = adaptable.api.internalApi
+                    const [importStepActions, needsOverwriteConfirmation] = adaptable.api.internalApi
                         .getTeamSharingService()
                         .buildSharedEntityImportActions(actionTyped.SharedEntity);
                     const processImportAction = TeamSharingRedux.TeamSharingProcessImport(importStepActions);
@@ -1159,14 +1160,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .getSharedEntities(adaptableId)
                         .then((sharedEntities) => {
                         // check if remote server has a newer revision
-                        const [localRevision, remoteRevision,] = adaptable.api.internalApi
+                        const [localRevision, remoteRevision] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .getSharedEntityLocalAndRemoteRevisions(ChangedAdaptableObject.Uuid, sharedEntities);
                         if (remoteRevision > localRevision) {
                             // if remote has a newer version, we will NOT overwrite it
                             return;
                         }
-                        const [updatedSharedEntities, newActiveEntities,] = adaptable.api.internalApi
+                        const [updatedSharedEntities, newActiveEntities] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .updateActiveSharedEntity(ChangedAdaptableObject, UserName, sharedEntities);
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingLinkItem(...newActiveEntities));

package/src/Strategy/AlertModule.js

@@ -23,8 +23,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 // do NOT handle reverted changes
                 return;
             }
-            if (this.api.internalApi.getAdaptableOptions().notificationsOptions
-                .dataChangeDetectionPolicy === 'formattedValue') {
+            if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
+                'formattedValue') {
                 const { oldValue, newValue } = dataChangedInfo;
                 const columnId = dataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
@@ -64,7 +64,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     updateOldConfig() {
         // 1. Make all (new) Flashing Alerts have a Predicate if none exists
-        const flashingAlertDefinitions = this.api.alertApi.getAlertState().FlashingAlertDefinitions;
+        const alertState = this.api.alertApi.getAlertState();
+        const flashingAlertDefinitions = alertState.FlashingAlertDefinitions;
         const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
         if (ArrayExtensions_1.ArrayExtensions.IsEmpty(flashingCellDefinitions) &&
             ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingAlertDefinitions)) {

package/src/Strategy/ConditionalStyleModule.js

@@ -191,6 +191,10 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 getScopeViewItems_1.getScopeViewItems(conditionalStyle.Scope),
                 getStyleViewItems_1.getStyleViewItems(),
                 getRuleViewItems_1.getRuleViewItems(conditionalStyle.Rule, this.api),
+                {
+                    name: 'Settings',
+                    values: [`Include grouped rows: ${conditionalStyle.IncludeGroupedRows ? 'Yes' : 'No'}`],
+                },
             ],
             abObject: conditionalStyle,
         };

package/src/Strategy/FlashingCellModule.js

@@ -24,8 +24,8 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             // TODO: think about flashing row value only
             // - flash for the underlying small data changes, but the visual does not
-            if (this.api.internalApi.getAdaptableOptions().notificationsOptions
-                .dataChangeDetectionPolicy === 'formattedValue') {
+            if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
+                'formattedValue') {
                 const { oldValue, newValue } = dataChangedInfo;
                 const columnId = dataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -7,12 +7,12 @@ import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
 import { AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class FreeTextColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
-    getModuleAdaptableObjects(): AdaptableObject[];
+    getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
+    updateOldConfig(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FreeTextColumn>;
     toView(freeTextColumn: FreeTextColumn): AdaptableObjectView;

package/src/Strategy/FreeTextColumnModule.js

@@ -21,6 +21,16 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
+    updateOldConfig() {
+        // make sure all default to type string
+        const allFreeTextColumns = this.getModuleAdaptableObjects();
+        for (const freeTextColumn of allFreeTextColumns) {
+            if (!freeTextColumn.DataType) {
+                const updatedFreeTextColumn = Object.assign(Object.assign({}, freeTextColumn), { DataType: 'String' });
+                this.api.freeTextColumnApi.editFreeTextColumn(updatedFreeTextColumn);
+            }
+        }
+    }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi

package/src/Strategy/LayoutModule.js

@@ -48,12 +48,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (column) {
                 if (!isReadOnlyLayout) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => {
-                        let newname = prompt('Enter a new Caption for the Column');
-                        if (newname) {
-                            this.api.layoutApi.setColumnCaption(column.columnId, newname);
-                        }
-                    }));
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
                 }
                 if (column.hideable) {
                     returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {

package/src/Strategy/ToolPanelModule.js

@@ -15,8 +15,7 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!super.isModuleAvailable()) {
             return false;
         }
-        const toolPanelOptions = this.api.internalApi.getAdaptableOptions()
-            .toolPanelOptions;
+        const toolPanelOptions = this.api.internalApi.getAdaptableOptions().toolPanelOptions;
         return (toolPanelOptions &&
             toolPanelOptions.showAdaptableToolPanel &&
             toolPanelOptions.showAdaptableToolPanel == true);
@@ -25,7 +24,10 @@ class ToolPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;
         if (deprecatedToolPanelConfigs === null || deprecatedToolPanelConfigs === void 0 ? void 0 : deprecatedToolPanelConfigs.length) {
             LoggingHelper_1.LogAdaptableWarning(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
-            const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({ Name: toolPanel, State: 'collapsed' }));
+            const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({
+                Name: toolPanel,
+                State: 'collapsed',
+            }));
             this.api.internalApi.dispatchReduxAction(ToolPanelRedux_1.ToolPanelSetToolPanels(migratedToolPanelConfigs));
         }
         else if (!this.api.toolPanelApi.getToolPanelState().ToolPanels) {

package/src/Strategy/Utilities/getFormatColumnSettingsViewItems.js

@@ -6,7 +6,7 @@ exports.getFormatColumnSettingsViewItems = (calculatedColumn) => {
     const values = [
         `Cell alignment: ${(_a = calculatedColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
         calculatedColumn.HeaderName && `Header name: ${calculatedColumn.HeaderName}`,
-        `Include grouped rows: ${calculatedColumn.IncludeGroupedRows ? 'yes' : 'no'}`,
+        `Include grouped rows: ${calculatedColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
     ].filter(Boolean);
     return {
         name: 'Settings',

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

@@ -1,6 +1,5 @@
 import { AdaptableApi } from '../../../types';
 export declare const getRuleViewItems: (rule: any, api: AdaptableApi) => {
     name: string;
-    label: string;
     values: string[];
 };

package/src/Strategy/Utilities/getRuleViewItems.js

@@ -5,7 +5,6 @@ const AdaptableQuery_1 = require("../../PredefinedConfig/Common/AdaptableQuery")
 exports.getRuleViewItems = (rule, api) => {
     return {
         name: 'Condition',
-        label: 'Condition',
         values: [
             rule.Predicate
                 ? api.predicateApi.predicateToString(rule.Predicate)

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -19,20 +19,22 @@ exports.DefaultAdaptableOptions = {
     autogeneratePrimaryKey: false,
     userName: GeneralConstants.USER_NAME,
     predefinedConfig: undefined,
-    notificationsOptions: {
+    alertOptions: {
         alertForms: undefined,
         maxAlertsInStore: 20,
+        cellHighlightDuration: 3000,
+        dataChangeDetectionPolicy: 'rawValue',
+        actionHandlers: undefined,
+    },
+    notificationsOptions: {
         maxNotifications: 3,
         position: 'BottomRight',
         duration: 3000,
-        cellHighlightDuration: 3000,
-        dataChangeDetectionPolicy: 'rawValue',
         showProgressBar: false,
         closeWhenClicked: false,
         pauseWhenHovering: false,
         isDraggable: false,
         transition: 'Slide',
-        actionHandlers: undefined,
         showApplicationIcon: false,
         showSystemStatusMessageNotifications: false,
         maxSystemMessagesInStore: 100,

package/src/Utilities/ExpressionFunctions/dateUtils.d.ts

@@ -0,0 +1 @@
+export declare const normalizeDateParams: (args: [string | number | Date, string | number | Date]) => [number | Date, number | Date];

package/src/Utilities/ExpressionFunctions/dateUtils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeDateParams = void 0;
+exports.normalizeDateParams = (args) => {
+    let [first, second] = args;
+    if (typeof first === 'string') {
+        first = new Date(first);
+    }
+    if (typeof second === 'string') {
+        second = new Date(second);
+    }
+    return [first, second];
+};