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

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

@@ -7,8 +7,8 @@ import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 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 { CellHighlightInfo, RowHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+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;
@@ -16,10 +16,10 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridData(): any[];
     getFilteredData(): any[];
     loadGridData(dataSource: any): void;
-    updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
-    addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
+    updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<void>;
+    addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<void>;
     undoCellEdit(dataChangedInfo: DataChangedInfo): boolean;
-    deleteGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
+    deleteGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<void>;
     setCellValue(columnId: string, newValue: any, primaryKeyValue: any): void;
     setCellsValue(gridCells: {
         columnId: any;
@@ -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;
@@ -75,15 +75,19 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     redrawGrid(): void;
     fireSearchChangedEvent(searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort'): void;
     fireCellChangedEvent(dataChangedInfo: DataChangedInfo): void;
-    fireGridDataChangedEvent(dataRows: any[], rowTigger: 'Add' | 'Edit' | 'Delete'): void;
+    fireGridDataChangedEvent(dataRows: any[], rowNodes: RowNode[], rowTrigger: 'Add' | 'Edit' | 'Delete'): void;
     jumpToRow(primaryKeyValue: any): void;
     jumpToColumn(columnId: string): void;
     jumpToCell(primaryKeyValue: any, columnId: string): void;
     highlightCell(cellHighlightInfo: CellHighlightInfo): void;
-    unhighlightCell(cellHighlightInfo: CellHighlightInfo): void;
-    unhighlightAllCells(): void;
+    unHighlightCell(primaryKeyValue: CellHighlightInfo['primaryKeyValue'], columnId: CellHighlightInfo['columnId']): void;
+    unHighlightAllCells(): void;
+    highlightRow(rowHighlightInfo: RowHighlightInfo): void;
+    unHighlightRow(primaryKeyValue: RowHighlightInfo['primaryKeyValue']): void;
+    unHighlightAllRows(): void;
     refreshCells(rowNodes: RowNode[], columnIds: string[]): void;
-    refreshRow(primaryKey: string): void;
+    refreshRowByPrimaryKey(primaryKey: any): void;
+    refreshRowNode(rowNode: RowNode): void;
     areCellsEditable(gridCells: GridCell[]): boolean;
     getRowCount(): number;
     getVisibleRowCount(): number;
@@ -94,4 +98,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     deselectAll(): void;
     destroy(): void;
     getGridContainerElement(): HTMLElement | null;
+    showGridInfoPopup(): void;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 class GridApiImpl extends ApiBase_1.ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
@@ -21,13 +22,13 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     loadGridData(dataSource) {
         this.adaptable.loadDataSource(dataSource);
     }
-    updateGridData(dataRows, dataUpdateConfig) {
-        this.adaptable.updateRows(dataRows, dataUpdateConfig);
-        this.fireGridDataChangedEvent(dataRows, 'Edit');
+    async updateGridData(dataRows, dataUpdateConfig) {
+        const rowNodes = await this.adaptable.updateRows(dataRows, dataUpdateConfig);
+        this.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
     }
-    addGridData(dataRows, dataUpdateConfig) {
-        this.adaptable.addRows(dataRows, dataUpdateConfig);
-        this.fireGridDataChangedEvent(dataRows, 'Add');
+    async addGridData(dataRows, dataUpdateConfig) {
+        const rowNodes = await this.adaptable.addRows(dataRows, dataUpdateConfig);
+        this.fireGridDataChangedEvent(dataRows, rowNodes, 'Add');
     }
     undoCellEdit(dataChangedInfo) {
         // for the reason of this hacky solution see the comments in DataService
@@ -35,10 +36,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.setCellValue(dataChangedInfo.column.columnId, dataChangedInfo.oldValue, dataChangedInfo.primaryKeyValue);
         return true;
     }
-    deleteGridData(dataRows, dataUpdateConfig) {
+    async deleteGridData(dataRows, dataUpdateConfig) {
         if (this.checkArrayExists(dataRows)) {
-            this.adaptable.deleteRows(dataRows, dataUpdateConfig);
-            this.fireGridDataChangedEvent(dataRows, 'Delete');
+            const rowNodes = await this.adaptable.deleteRows(dataRows, dataUpdateConfig);
+            this.fireGridDataChangedEvent(dataRows, rowNodes, 'Delete');
         }
     }
     setCellValue(columnId, newValue, primaryKeyValue) {
@@ -87,8 +88,8 @@ 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() {
-        return this.adaptable.adaptableOptions.vendorGrid;
+    getAgGridInstance() {
+        return this.adaptable.adaptableOptions.agGridOptions;
     }
     getColumnSorts() {
         return this.getAdaptableState().Grid.ColumnSorts;
@@ -247,12 +248,13 @@ class GridApiImpl extends ApiBase_1.ApiBase {
             this.adaptable.api.eventApi.emit('CellChanged', cellChangedInfo);
         }
     }
-    fireGridDataChangedEvent(dataRows, rowTigger) {
+    fireGridDataChangedEvent(dataRows, rowNodes, rowTrigger) {
         if (this.adaptable.isInitialised) {
             const gridDataChangedInfo = {
                 adaptableApi: this.adaptable.api,
-                rowTigger: rowTigger,
+                rowTrigger: rowTrigger,
                 dataRows: dataRows,
+                rowNodes,
             };
             this.adaptable.api.eventApi.emit('GridDataChanged', gridDataChangedInfo);
         }
@@ -272,21 +274,38 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(SystemRedux_1.SystemHighlightCellAdd(cellHighlightInfo));
         if (cellHighlightInfo.timeout) {
             setTimeout(() => {
-                this.unhighlightCell(cellHighlightInfo);
+                this.unHighlightCell(cellHighlightInfo.primaryKeyValue, cellHighlightInfo.columnId);
             }, cellHighlightInfo.timeout);
         }
     }
-    unhighlightCell(cellHighlightInfo) {
-        this.dispatchAction(SystemRedux_1.SystemHighlightCellDelete(cellHighlightInfo));
+    unHighlightCell(primaryKeyValue, columnId) {
+        this.dispatchAction(SystemRedux_1.SystemHighlightCellDelete(primaryKeyValue, columnId));
     }
-    unhighlightAllCells() {
+    unHighlightAllCells() {
         this.dispatchAction(SystemRedux_1.SystemHighlightCellDeleteAll());
     }
+    highlightRow(rowHighlightInfo) {
+        this.dispatchAction(SystemRedux_1.SystemHighlightRowAdd(rowHighlightInfo));
+        if (rowHighlightInfo.timeout) {
+            setTimeout(() => {
+                this.unHighlightRow(rowHighlightInfo.primaryKeyValue);
+            }, rowHighlightInfo.timeout);
+        }
+    }
+    unHighlightRow(primaryKeyValue) {
+        this.dispatchAction(SystemRedux_1.SystemHighlightRowDelete(primaryKeyValue));
+    }
+    unHighlightAllRows() {
+        this.dispatchAction(SystemRedux_1.SystemHighlightRowDeleteAll());
+    }
     refreshCells(rowNodes, columnIds) {
         this.adaptable.refreshCells(rowNodes, columnIds, true);
     }
-    refreshRow(primaryKey) {
+    refreshRowByPrimaryKey(primaryKey) {
         const rowNode = this.getRowNodeForPrimaryKey(primaryKey);
+        this.refreshRowNode(rowNode);
+    }
+    refreshRowNode(rowNode) {
         this.adaptable.redrawRow(rowNode);
     }
     areCellsEditable(gridCells) {
@@ -299,8 +318,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 +352,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.destroy();
     }
     getGridContainerElement() {
-        return this.adaptable.getGridContainerElement();
+        return this.adaptable.getAgGridContainerElement();
+    }
+    showGridInfoPopup() {
+        this.showModulePopup(ModuleConstants.GridInfoModuleId);
     }
 }
 exports.GridApiImpl = GridApiImpl;

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

@@ -25,7 +25,7 @@ import { IDataService } from '../../Utilities/Services/Interface/IDataService';
 import { IEntitlementService } from '../../Utilities/Services/Interface/IEntitlementService';
 import { IQueryLanguageService } from '../../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../../Utilities/Services/Interface/IAlertService';
-import { AdaptableFlashingAlert } from '../../PredefinedConfig/Common/AdaptableFlashingAlert';
+import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { ITeamSharingService } from '../../Utilities/Services/Interface/ITeamSharingService';
 import { ColumnValuesComparer } from '../../AdaptableOptions/GeneralOptions';
 import { ButtonStyle } from '../../PredefinedConfig/Common/ButtonStyle';
@@ -45,7 +45,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     }) | undefined;
     setChartVisibility(chartVisbility: ChartVisibility): void;
     getAdaptableAlerts(): AdaptableAlert[];
-    getAdaptableFlashingAlertFor(primaryKey: string, columnId?: string): AdaptableFlashingAlert | null;
+    getAdaptableFlashingCellFor(primaryKey: string, columnId?: string): AdaptableFlashingCell | null;
     addSystemStatusMessageInfo(systemStatusMessageInfo: SystemStatusMessageInfo): void;
     getSystemStatusMessageInfos(): SystemStatusMessageInfo[];
     showPopupConfirmation(confirmation: UIConfirmation): void;
@@ -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

@@ -8,6 +8,7 @@ const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/DashboardRedux"));
+const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/AlertRedux"));
 const DeadRedux = tslib_1.__importStar(require("../../Redux/DeadRedux"));
 const ApiBase_1 = require("./ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
@@ -68,9 +69,9 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getAdaptableAlerts() {
         return this.getSystemState().AdaptableAlerts;
     }
-    getAdaptableFlashingAlertFor(primaryKey, columnId) {
+    getAdaptableFlashingCellFor(primaryKey, columnId) {
         var _a;
-        const { AdaptableFlashingAlerts, AdaptableFlashingAlertsMap } = this.getSystemState();
+        const { AdaptableFlashingCells: AdaptableFlashingAlerts, AdaptableFlashingCellsMap: AdaptableFlashingAlertsMap, } = this.getSystemState();
         const forPrimaryKey = (_a = AdaptableFlashingAlerts[primaryKey]) !== null && _a !== void 0 ? _a : {};
         const toFlashingAlert = (uuid) => { var _a; return uuid ? (_a = AdaptableFlashingAlertsMap[uuid]) !== null && _a !== void 0 ? _a : null : null; };
         if (!columnId) {
@@ -205,8 +206,8 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getAdaptableInstance() {
         return this.adaptable;
     }
-    getVendorGridInstance() {
-        return this.adaptable.adaptableOptions.vendorGrid;
+    getAgGridInstance() {
+        return this.adaptable.adaptableOptions.agGridOptions;
     }
     getPredefinedConfig() {
         return this.adaptable.adaptableOptions.predefinedConfig;
@@ -259,7 +260,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.buildStandaloneColumnHeader(column);
     }
     clearFlashingCellState() {
-        this.dispatchAction(DeadRedux.FlashingCellClear());
+        this.dispatchAction(AlertRedux.AlertClearFlashingCells());
     }
     clearUpdatedRowState() {
         this.dispatchAction(DeadRedux.UpdatedRowClear());
@@ -272,7 +273,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);
@@ -203,6 +211,18 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
                 let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
                     Name: GeneralConstants_1.DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),
+                    AggregationColumns: defaultLayoutColumns.reduce((acc, col) => {
+                        if (col.aggregationFunction) {
+                            acc[col.columnId] = col.aggregationFunction;
+                        }
+                        return acc;
+                    }, {}),
+                    PinnedColumnsMap: defaultLayoutColumns.reduce((acc, col) => {
+                        if (col.pinned) {
+                            acc[col.columnId] = col.pinned;
+                        }
+                        return acc;
+                    }, {}),
                 }, gridState.Columns);
                 this.saveLayout(defaultLayout);
                 return defaultLayout;
@@ -212,5 +232,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() {
@@ -165,14 +165,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
     applySchedule(schedule, scheduleType) {
         if (scheduleType == 'Reminder') {
             const reminderSchedule = schedule;
-            const reminder = reminderSchedule.Reminder;
+            //   const reminder: Reminder = reminderSchedule.Reminder;
             const alert = {
-                header: reminder.Header,
-                message: reminder.Message,
+                header: reminderSchedule.Header,
+                message: reminderSchedule.Message,
                 alertDefinition: {
-                    MessageType: reminder.MessageType,
+                    MessageType: reminderSchedule.MessageType,
                     AlertProperties: {
-                        DisplayNotification: reminder.DisplayNotification,
+                        DisplayNotification: reminderSchedule.DisplayNotification,
                     },
                     Rule: undefined,
                     Scope: undefined,
@@ -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/SmartEditApiImpl.d.ts

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { SmartEditApi } from '../SmartEditApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
-    setSmartEditOperation(mathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide' | 'Replace'): void;
+    setSmartEditOperation(mathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide'): void;
     getSmartEditOperation(): string;
     setSmartEditValue(smartEditValue: number): void;
     getSmartEditValue(): number;

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -18,7 +18,7 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.api.internalApi.addSystemStatusMessageInfo(systemStatusMessageInfo);
         // publish the event
         this.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
-        if (this.getNotificationsOptions().showSystemStatusMessageAsAlert) {
+        if (this.getNotificationsOptions().showSystemStatusMessageNotifications) {
             let fullMessage = statusMessage;
             if (StringExtensions_1.default.IsNotNullOrEmpty(statusFurtherInformation)) {
                 fullMessage += '\n' + statusFurtherInformation;

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -13,13 +13,13 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ToolPanelModuleId, popupParams);
     }
     openAdapTableToolPanel() {
-        let gridOptions = this.getOptions().vendorGrid;
+        let gridOptions = this.getOptions().agGridOptions;
         if (gridOptions) {
-            gridOptions.api.openToolPanel('AdaptableToolPanel');
+            gridOptions.api.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {
-        let gridOptions = this.getOptions().vendorGrid;
+        let gridOptions = this.getOptions().agGridOptions;
         if (gridOptions) {
             gridOptions.api.closeToolPanel();
         }

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

@@ -22,7 +22,7 @@ import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { AdaptableMessageType, DataChangedInfo, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
-import { AdaptableFlashingAlert } from '../PredefinedConfig/Common/AdaptableFlashingAlert';
+import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
 import { AdaptableState } from '../PredefinedConfig/AdaptableState';
@@ -50,7 +50,7 @@ export interface InternalApi {
     setChartVisibility(chartVisbility: ChartVisibility): void;
     getAdaptableAlerts(): AdaptableAlert[];
     showPopupConfirmation(confirmation: UIConfirmation): void;
-    getAdaptableFlashingAlertFor(primaryKey: string, columnId?: string): AdaptableFlashingAlert | null;
+    getAdaptableFlashingCellFor(primaryKey: string, columnId?: string): AdaptableFlashingCell | null;
     addSystemStatusMessageInfo(systemStatusMessageInfo: SystemStatusMessageInfo): void;
     getSystemStatusMessageInfos(): SystemStatusMessageInfo[];
     showLoadingScreen(): void;
@@ -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;
@@ -112,8 +112,8 @@ export interface InternalApi {
     dispatchReduxAction(action: Action): void;
     waitForTeamSharingImportEnd(): Promise<boolean>;
     getUserDefinedHeaderName(columnId: string): string;
-    createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
-    destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
+    createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
+    destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
     initializeDataChangeHistory(): void;
     isTextComparisonCaseSensitive(): boolean;
     executeWithProgressIndicator(label: string, executeFn: () => unknown): void;

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/SmartEditApi.d.ts

@@ -4,16 +4,16 @@ import { GridCell } from '../PredefinedConfig/Selection/GridCell';
  **/
 export interface SmartEditApi {
     /**
-     * Sets operation to use in Smart Edit
+     * Sets Smart Edit operation: ('Add','Subtract','Multiply','Divide'
      * @param operation operation to run
      */
-    setSmartEditOperation(operation: 'Add' | 'Subtract' | 'Multiply' | 'Divide' | 'Replace'): void;
+    setSmartEditOperation(operation: 'Add' | 'Subtract' | 'Multiply' | 'Divide'): void;
     /**
-     * Gets current Smart Edit Operation ('Add','Subtract','Multiply','Divide' or 'Replace')
+     * Gets current Smart Edit Operation
      */
     getSmartEditOperation(): string;
     /**
-     * Sets Smart Edit Value (e.g. to multiply by 10 then smartEditValue is 10)
+     * Sets Smart Edit Value
      * @param smartEditValue the value to use in Smart Edit Operation
      */
     setSmartEditValue(smartEditValue: number): void;

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;
     /**