@adaptabletools/adaptable 10.0.4-canary.1 → 10.0.4-canary.2

package/src/Api/GridApi.d.ts

@@ -8,7 +8,7 @@ import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
 import { CellHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { RowNode } from '@ag-grid-community/all-modules';
+import { GridOptions, RowNode } from '@ag-grid-community/all-modules';
 import { GridCellRange } from '../PredefinedConfig/Selection/GridCellRange';
 /**
  * Provides access to important properites of AdapTable e.g. sorting, selected cells etc.
@@ -20,7 +20,7 @@ export interface GridApi {
     getGridState(): GridState;
     /**
      * Repopulates grid with given data
-     * @param data any data from any datasource that is suitable for the underlying grid.
+     * @param data any data from any datasource that is suitable for AG Grid
      */
     setGridData(data: any): void;
     /**
@@ -33,23 +33,23 @@ export interface GridApi {
     getFilteredData(): any[];
     /**
      * Loads grid with given data
-     * @param data any data from any datasource that is suitable for the underlying grid.
+     * @param data any data from any datasource that is suitable for AG Grid
      */
     loadGridData(data: any): void;
     /**
-     * Updates Adaptable (and underlying grid) with rows that have changed
+     * Updates Adaptable (and AG Grid) with rows that have changed
      * @param dataRows rows which have been updated - send whole row and Adaptable will take care of the rest
      * @param config batch option and callback function to run post update
      */
     updateGridData(dataRows: any[], config?: DataUpdateConfig): void;
     /**
-     * Adds rows to Adaptable (and underlying grid)
+     * Adds rows to Adaptable (and AG Grid)
      * @param dataRows rows to add; ensure all 'mandatory' fields are included and Primary Key is unique
      * @param config batch option and callback function to run post addition
      */
     addGridData(dataRows: any[], config?: DataUpdateConfig): void;
     /**
-     * Deletes rows from Adaptable (and underlying grid)
+     * Deletes rows from Adaptable (and AG Grid)
      * @param dataRows rows which should be deleted
      * @param config batch option and callback function to run post deletion
      */
@@ -86,9 +86,9 @@ export interface GridApi {
      */
     getSelectedRowInfo(): SelectedRowInfo;
     /**
-     * Returns underlying Vendor Grid (object passed into Adaptable Options at start-up)
+     * Returns Ag Grid instance (passed into Adaptable Options at start-up)
      */
-    getVendorGrid(): any;
+    getAgGridInstance(): GridOptions;
     /**
      * Returns Column Sort information in Adaptable
      */
@@ -308,11 +308,11 @@ export interface GridApi {
      */
     fireSearchChangedEvent(searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort', searchAtDate?: Date): void;
     /**
-     * Fires Grid Data Changed Event - when any data in vendor grid data set has changed
+     * Fires Cell Changed Changed Event - when any data in AG Grid's dataset has changed
      */
     fireCellChangedEvent(cellChangedInfo: DataChangedInfo): void;
     /**
-     * Fires Grid Data Changed Event - when any data in vendor grid data set has changed
+     * Fires Grid Data Changed Event - when a row has changed in AG Grid
      */
     fireGridDataChangedEvent(dataRows: any[], rowTigger: 'Add' | 'Edit' | 'Delete'): void;
     /**

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

@@ -3,7 +3,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { DataType } from '../../PredefinedConfig/Common/Enums';
 import { ColumnApi } from '../ColumnApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { RowNode } from '@ag-grid-community/all-modules';
+import { Column, RowNode } from '@ag-grid-community/all-modules';
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getColumns(): AdaptableColumn[];
     getVisibleColumns(): AdaptableColumn[];
@@ -15,7 +15,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     selectColumns(columnIds: string[]): void;
     hideColumn(columnId: string): void;
     showColumn(columnId: string): void;
-    getVendorColumnType(columnId: string): string | string[];
+    getAgGridColumnType(columnId: string): string | string[];
     isRowGroupColumn(columnId: string): boolean;
     isCalculatedColumn(columnId: string): boolean;
     isFreeTextColumn(columnId: string): boolean;
@@ -35,7 +35,8 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     doesColumnExist(columnId: string): boolean;
     getColumnFromId(columnId: string, logWarning?: boolean): AdaptableColumn | undefined;
     getColumnIdsFromId(columnId: string, logWarning?: boolean): string[] | undefined;
-    getVendorGridColumnFieldForColumn(colId: string): string;
+    getAgGridColumnFieldForAdaptableColumn(colId: string): string;
+    getAgGridColumnForAdaptableColumn(columnId: string): Column;
     getColumnFromFriendlyName(columnName: string, logWarning?: boolean): AdaptableColumn;
     getColumnsOfType(dataType: DataType): AdaptableColumn[];
     getNumericColumns(): AdaptableColumn[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -44,8 +44,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     showColumn(columnId) {
         this.adaptable.showColumn(columnId);
     }
-    getVendorColumnType(columnId) {
-        return this.adaptable.getVendorColumnType(columnId);
+    getAgGridColumnType(columnId) {
+        return this.adaptable.getAgGridColumnType(columnId);
     }
     isRowGroupColumn(columnId) {
         // put this here as there might be other indicators we are not aware of
@@ -187,8 +187,12 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return undefined;
     }
-    getVendorGridColumnFieldForColumn(colId) {
-        return this.adaptable.getVendorGridColumnFieldForColumn(this.getColumnFromId(colId));
+    getAgGridColumnFieldForAdaptableColumn(colId) {
+        const agGridColumn = this.getAgGridColumnForAdaptableColumn(colId);
+        return agGridColumn.getColDef().field || '';
+    }
+    getAgGridColumnForAdaptableColumn(columnId) {
+        return this.adaptable.getAgGridColumnForAdaptableColumn(this.getColumnFromId(columnId));
     }
     getColumnFromFriendlyName(columnName, logWarning = true) {
         // just return null if no columns rather than logging a warning - otherwise get lots at startup
@@ -283,7 +287,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
                 suppressClientSideFilter: false,
             };
         }
-        const { gridCells, suppressClientSideFilter, } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
+        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
         return {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
                 return cv.displayValue;
@@ -370,8 +374,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         });
     }
     usesAdaptableFilterForm(columnId) {
-        const useAdaptableFilterForm = this.getFilterOptions()
-            .useAdaptableFilterForm;
+        const useAdaptableFilterForm = this.getFilterOptions().useAdaptableFilterForm;
         if (useAdaptableFilterForm == null || useAdaptableFilterForm == false) {
             return false;
         }
@@ -381,8 +384,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return true;
     }
     usesAdaptableQuickFilter(columnId) {
-        const useAdaptableQuickFilter = this.getFilterOptions()
-            .useAdaptableQuickFilter;
+        const useAdaptableQuickFilter = this.getFilterOptions().useAdaptableQuickFilter;
         if (useAdaptableQuickFilter == null || useAdaptableQuickFilter == false) {
             return false;
         }

package/src/Api/Implementation/ConfigApiImpl.js

@@ -179,18 +179,10 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Application)
                     : this.getAdaptableState().Application;
-            case 'BulkUpdate':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().BulkUpdate)
-                    : this.getAdaptableState().BulkUpdate;
             case 'CalculatedColumn':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CalculatedColumn)
                     : this.getAdaptableState().CalculatedColumn;
-            case 'CellSummary':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().SelectedCells)
-                    : this.getAdaptableState().CellSummary;
             case 'Chart':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Chart)
@@ -211,10 +203,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().DataSource)
                     : this.getAdaptableState().DataSource;
-            case 'Entitlement':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Entitlements)
-                    : this.getAdaptableState().Entitlements;
             case 'Export':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Export)
@@ -255,18 +243,10 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Shortcut)
                     : this.getAdaptableState().Shortcut;
-            case 'SmartEdit':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().SmartEdit)
-                    : this.getAdaptableState().SmartEdit;
             case 'SparklineColumn':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().SparklineColumn)
                     : this.getAdaptableState().SparklineColumn;
-            case 'SystemStatus':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().SystemStatus)
-                    : this.getAdaptableState().SystemStatus;
             case 'Theme':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Theme)
@@ -275,10 +255,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().ToolPanel)
                     : this.getAdaptableState().ToolPanel;
-            case 'UserInterface':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().UserInterface)
-                    : this.getAdaptableState().UserInterface;
         }
     }
     incrementUerStateRevision(stateKey) {

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

@@ -8,7 +8,7 @@ import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
 import { DataChangedInfo, AccessLevel, AdaptableModule } from '../../types';
 import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
-import { RowNode } from '@ag-grid-community/all-modules';
+import { GridOptions, RowNode } from '@ag-grid-community/all-modules';
 import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
 export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridState(): GridState;
@@ -34,7 +34,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     hideFilterForm(): void;
     applyGridFiltering(): void;
     clearGridFiltering(): void;
-    getVendorGrid(): any;
+    getAgGridInstance(): GridOptions;
     getColumnSorts(): ColumnSort[];
     getColumnSortForColumn(columnId: string): ColumnSort | undefined;
     setAdaptableSorting(columnSorts: ColumnSort[]): void;

package/src/Api/Implementation/GridApiImpl.js

@@ -87,7 +87,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         // slightly round the houses but we have to call FilterAPI as it does it properly
         this.adaptable.api.filterApi.clearAllColumnFilter();
     }
-    getVendorGrid() {
+    getAgGridInstance() {
         return this.adaptable.adaptableOptions.vendorGrid;
     }
     getColumnSorts() {
@@ -299,8 +299,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
                 }
                 let cellEditableFn = this.adaptable.adaptableOptions.editOptions.isCellEditable;
                 if (cellEditableFn) {
-                    let rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(gridCell.primaryKeyValue);
-                    let functionReturnValue = cellEditableFn(gridCell, rowNode);
+                    let functionReturnValue = cellEditableFn(gridCell);
                     if (!functionReturnValue) {
                         returnValue = false;
                     }
@@ -334,7 +333,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.destroy();
     }
     getGridContainerElement() {
-        return this.adaptable.getGridContainerElement();
+        return this.adaptable.getAgGridContainerElement();
     }
 }
 exports.GridApiImpl = GridApiImpl;

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

@@ -80,7 +80,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     setDefaultDashboardTab(): void;
     getPrimaryKey(): any;
     getAdaptableInstance(): IAdaptable;
-    getVendorGridInstance(): any;
+    getAgGridInstance(): any;
     getPredefinedConfig(): any;
     getState(): AdaptableState;
     getAdaptableOptions(): AdaptableOptions;

package/src/Api/Implementation/InternalApiImpl.js

@@ -205,7 +205,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getAdaptableInstance() {
         return this.adaptable;
     }
-    getVendorGridInstance() {
+    getAgGridInstance() {
         return this.adaptable.adaptableOptions.vendorGrid;
     }
     getPredefinedConfig() {
@@ -272,7 +272,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     }
     getCustomSortComparer(column) {
         var _a;
-        return (_a = this.getGeneralOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => csc.columnId == column.columnId);
+        return (_a = this.getGeneralOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.adaptable.api.scopeApi.isColumnInScope(column, csc.scope));
     }
     getLabelForButton(button, context) {
         if (!button.label) {

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

@@ -21,10 +21,12 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     createLayout(layoutToCreate: Layout): Layout | undefined;
     cloneAndSetLayout(layoutToClone: Layout, layoutName: string): Layout;
     cloneLayout(layoutToClone: Layout, layoutName: string): Layout;
+    setColumnCaption(columnId: string, caption: string): void;
     saveLayout(layoutToSave: Layout): void;
     areLayoutsEqual(layout1: Layout, layout2: Layout): boolean;
     getLayoutDescription(layout: Layout): string;
     private getColumnSort;
     createDefaultLayoutIfNeeded(): Layout | null;
     showLayoutPopup(): void;
+    isCurrentLayoutReadOnly(): boolean;
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -139,6 +139,14 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(LayoutRedux.LayoutAdd(newLayout));
         return this.getLayoutById(newLayout.Uuid);
     }
+    setColumnCaption(columnId, caption) {
+        if (StringExtensions_1.default.IsNotNullOrEmpty(columnId) && StringExtensions_1.default.IsNotNullOrEmpty(caption)) {
+            const currentLayoutName = this.getCurrentLayoutName();
+            if (StringExtensions_1.default.IsNotNullOrEmpty(currentLayoutName)) {
+                this.dispatchAction(LayoutRedux.LayoutSetColumnCaption(currentLayoutName, columnId, caption));
+            }
+        }
+    }
     saveLayout(layoutToSave) {
         if (!this.doesLayoutExist(layoutToSave)) {
             this.addUidToAdaptableObject(layoutToSave);
@@ -212,5 +220,12 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     showLayoutPopup() {
         this.showModulePopup(ModuleConstants.LayoutModuleId);
     }
+    isCurrentLayoutReadOnly() {
+        const currentLayout = this.getCurrentLayout();
+        if (currentLayout) {
+            return currentLayout.IsReadOnly;
+        }
+        return true;
+    }
 }
 exports.LayoutApiImpl = LayoutApiImpl;

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

@@ -11,8 +11,8 @@ export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     getPluginState(pluginId: string): any;
     registerPlugin(pluginId: string, initialPluginState: any): void;
     setPluginState(pluginId: string, newPluginState: any): void;
-    getPluginApi(pluginId: string): any | IPushPullApi | Glue42Api | OpenFinApi | FinanceApi | ChartApi;
-    getIpushpullPluginApi(): IPushPullApi;
+    private getPluginApi;
+    getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
     getOpenFinPluginApi(): OpenFinApi;
     getChartsPluginApi(): ChartApi;

package/src/Api/Implementation/PluginsApiImpl.js

@@ -41,7 +41,7 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
             return null;
         }
     }
-    getIpushpullPluginApi() {
+    getipushpullPluginApi() {
         return this.getPluginApi('ipushpull');
     }
     getGlue42PluginApi() {

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -76,7 +76,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllIPushPullSchedule() {
-        const ippApi = this.adaptable.api.pluginsApi.getPluginApi('ipushpull');
+        const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
         return ippApi ? ippApi.getIPushPullSchedules() : [];
     }
     getAllActiveIPushPullSchedule() {
@@ -105,7 +105,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllGlue42Schedule() {
-        const glue42Api = this.adaptable.api.pluginsApi.getPluginApi('glue42');
+        const glue42Api = this.adaptable.api.pluginsApi.getGlue42PluginApi();
         return glue42Api ? glue42Api.getGlue42Schedules() : [];
     }
     getAllActiveGlue42Schedule() {
@@ -134,7 +134,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getAllOpenFinSchedule() {
-        const openFinApi = this.adaptable.api.pluginsApi.getPluginApi('openfin');
+        const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
         return openFinApi ? openFinApi.getOpenFinSchedules() : [];
     }
     getAllActiveOpenFinSchedule() {
@@ -185,7 +185,7 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
             this.adaptable.api.exportApi.sendReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
         }
         else if (scheduleType == 'ipushpull') {
-            const ippApi = this.adaptable.api.pluginsApi.getPluginApi('ipushpull');
+            const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
             const iPushPullSchedule = schedule;
             if (iPushPullSchedule.Transmission == 'Snapshot') {
                 ippApi.sendSnapshot(iPushPullSchedule.IPushPullReport);
@@ -195,12 +195,12 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
             }
         }
         else if (scheduleType == 'Glue42') {
-            const glue42Api = this.adaptable.api.pluginsApi.getPluginApi('glue42');
+            const glue42Api = this.adaptable.api.pluginsApi.getGlue42PluginApi();
             const glue42Schedule = schedule;
             glue42Api.sendSnapshotToDo(glue42Schedule.Glue42Report);
         }
         else if (scheduleType == 'OpenFin') {
-            const openFinApi = this.adaptable.api.pluginsApi.getPluginApi('openfin');
+            const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
             const openFinSchedule = schedule;
             openFinApi.startLiveData(openFinSchedule.OpenFinReport);
         }

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -15,7 +15,7 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
     openAdapTableToolPanel() {
         let gridOptions = this.getOptions().vendorGrid;
         if (gridOptions) {
-            gridOptions.api.openToolPanel('AdaptableToolPanel');
+            gridOptions.api.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {

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

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { UserInterfaceApi } from '../UserInterfaceApi';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { UserMenuItem } from '../../PredefinedConfig/Common/Menu';
+import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../../types';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
@@ -20,8 +20,8 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getAllEditLookUpItems(): EditLookUpPermittedValues[];
     getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
-    addColumnMenuItem(columnMenuItem: UserMenuItem): void;
-    addContextMenuItem(contextMenuItem: UserMenuItem): void;
+    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
+    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAllActionColumn(): ActionColumn[];

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -152,13 +152,13 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         // this will use the columnapi method that first looks for permitted values and then distinct values
         return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(gridCell.column.columnId);
     }
-    addColumnMenuItem(columnMenuItem) {
+    addColumnMenuItem(userMenuItem) {
         var _a;
-        (_a = this.getMenuOptions().columnMenuItems) === null || _a === void 0 ? void 0 : _a.push(columnMenuItem);
+        (_a = this.getMenuOptions().columnMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
     }
-    addContextMenuItem(contextMenuItem) {
+    addContextMenuItem(userMenuItem) {
         var _a;
-        (_a = this.getMenuOptions().contextMenuItems) === null || _a === void 0 ? void 0 : _a.push(contextMenuItem);
+        (_a = this.getMenuOptions().contextMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
     }
     getEditableCellStyle() {
         return this.getUserInterfaceOptions().editableCellStyle;

package/src/Api/InternalApi.d.ts

@@ -84,7 +84,7 @@ export interface InternalApi {
     updateCurrentDraftLayout(layout: Layout): void;
     getPrimaryKey(): any;
     getAdaptableInstance(): IAdaptable;
-    getVendorGridInstance(): any;
+    getAgGridInstance(): any;
     getPredefinedConfig(): any;
     getState(): AdaptableState;
     getAdaptableOptions(): AdaptableOptions;

package/src/Api/LayoutApi.d.ts

@@ -121,4 +121,11 @@ export interface LayoutApi {
      * Opens Layout popup screen
      */
     showLayoutPopup(): void;
+    /**
+     * Sets a new Caption / Header for a Column (this Layout only)
+     * @param columnId Column to Update
+     * @param caption New Caption to display
+     */
+    setColumnCaption(columnId: string, caption: string): void;
+    isCurrentLayoutReadOnly(): boolean;
 }

package/src/Api/PluginsApi.d.ts

@@ -12,13 +12,7 @@ export interface PluginsApi {
     getPluginState(pluginId: string): any;
     registerPlugin(pluginId: string, initialPluginState: any): void;
     setPluginState(pluginId: string, pluginState: any): void;
-    getPluginApi(pluginId: string): any;
-    getPluginApi(pluginId: 'ipushpull'): IPushPullApi;
-    getPluginApi(pluginId: 'glue42'): Glue42Api;
-    getPluginApi(pluginId: 'finance'): FinanceApi;
-    getPluginApi(pluginId: 'openfin'): OpenFinApi;
-    getPluginApi(pluginId: 'charts'): ChartApi;
-    getIpushpullPluginApi(): IPushPullApi;
+    getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
     getOpenFinPluginApi(): OpenFinApi;
     getChartsPluginApi(): ChartApi;

package/src/Api/TeamSharingApi.d.ts

@@ -28,7 +28,7 @@ export interface TeamSharingApi {
      */
     checkForUpdates(): void;
     /**
-     * Fires the Team S
+     * Fires the Team Sharing Entity Changed Event
      * @param sharedEntity Entity that has been changed
      */
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;

package/src/Api/ThemeApi.d.ts

@@ -17,11 +17,11 @@ export interface ThemeApi {
      */
     loadTheme(theme: string): void;
     /**
-     * Sets AdapTable Light Theme - updates underlying vendor grid theme to match
+     * Sets AdapTable Light Theme - updates the AG Grid theme to match
      */
     loadLightTheme(): void;
     /**
-     * Sets AdapTable Dark Theme - updates underlying vendor grid theme to match
+     * Sets AdapTable Dark Theme - updates the AG Grid theme to match
      */
     loadDarkTheme(): void;
     /**

package/src/Api/UserInterfaceApi.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { UserMenuItem } from '../PredefinedConfig/Common/Menu';
+import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
 import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 /**
@@ -52,12 +52,12 @@ export interface UserInterfaceApi {
      * Adds menu item to Column Menu
      * @param userMenuItem Menu Item to add
      */
-    addColumnMenuItem(userMenuItem: UserMenuItem): void;
+    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
     /**
      * Adds menu item to Context Menu
      * @param userMenuItem Menu Item to add
      */
-    addContextMenuItem(userMenuItem: UserMenuItem): void;
+    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     /**
      * Returns Style set for Editable cells
      */

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -12,7 +12,6 @@ import { ExportState } from './ExportState';
 import { FormatColumnState } from './FormatColumnState';
 import { FreeTextColumnState } from './FreeTextColumnState';
 import { LayoutState } from './LayoutState';
-import { PercentBarState } from './DeprecatedState';
 import { ScheduleState } from './ScheduleState';
 import { PlusMinusState } from './PlusMinusState';
 import { QuickSearchState } from './QuickSearchState';
@@ -24,10 +23,7 @@ import { FilterState } from './FilterState';
 import { SparklineColumnState } from './SparklineColumnState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
-import { GradientColumnState } from './DeprecatedState';
 import { QueryState } from './QueryState';
-import { FlashingCellState } from './DeprecatedState';
-import { UpdatedRowState } from './DeprecatedState';
 /**
  * The main state object that Adaptable persists
  */
@@ -52,17 +48,13 @@ export interface AdaptableState {
     Filter: FilterState;
     FormatColumn: FormatColumnState;
     FreeTextColumn: FreeTextColumnState;
-    GradientColumn: GradientColumnState;
     Layout: LayoutState;
-    PercentBar: PercentBarState;
-    Schedule: ScheduleState;
     PlusMinus: PlusMinusState;
+    Query: QueryState;
     QuickSearch: QuickSearchState;
+    Schedule: ScheduleState;
     Shortcut: ShortcutState;
     TeamSharing: TeamSharingState;
     Theme: ThemeState;
     ToolPanel: ToolPanelState;
-    Query: QueryState;
-    FlashingCell: FlashingCellState;
-    UpdatedRow: UpdatedRowState;
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -12,7 +12,7 @@ import { AdaptableAggregationQuery, AdaptableBooleanQuery, AdaptableObservableQu
 import { ButtonStyle } from './Common/ButtonStyle';
 import { AlertButtonContext } from '../AdaptableOptions/NotificationsOptions';
 /**
- * Predefined Configuration for Alert function
+ * Predefined Configuration for Alert Module
  */
 export interface AlertState extends ConfigState {
     /**

package/src/PredefinedConfig/ApplicationState.d.ts

@@ -1,6 +1,6 @@
 import { ConfigState } from './ConfigState';
 /**
- * Predefined Configuration for the Application function
+ * Predefined Configuration for the Application Module
  **/
 export interface ApplicationState extends ConfigState {
     /**

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -3,7 +3,7 @@ import { AdaptableObject } from './Common/AdaptableObject';
 import { AdaptableScalarQuery } from './Common/AdaptableQuery';
 import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
 /**
- * Predefined Configuration for Calculated Column function
+ * Predefined Configuration for Calculated Column Module
  **/
 export interface CalculatedColumnState extends ConfigState {
     /**

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

@@ -4,11 +4,11 @@ import { AdaptableObject } from './AdaptableObject';
  */
 export interface AdaptableColumnBase extends AdaptableObject {
     /**
-     * Name of Column in underlying grid (e.g. field or colId)
+     * Name of Column in AG Grid (e.g. field or colId)
      */
     columnId: string;
     /**
-     * How Column is referred to in Adaptable UI; 'Caption' or 'Header' property in underlying grid
+     * How Column is referred to in Adaptable UI; `Caption` property in AG Grid
      */
     friendlyName: string;
     /**
@@ -30,7 +30,7 @@ export interface AdaptableColumnGroup {
     groupCount: number;
 }
 /**
- * Defines an Adaptable Column - created at run-time based on vendor grid column definition
+ * Defines an Adaptable Column - created at run-time based on AG Grid column definition
  */
 export interface AdaptableColumn extends AdaptableColumnBase {
     /**