@adaptabletools/adaptable 10.0.3 → 10.0.4-canary.3

package/src/Api/Implementation/ColumnApiImpl.js

@@ -18,7 +18,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
             acc[colId] = true;
             return acc;
         }, {});
-        return this.getColumns().filter((c) => visibleCols[c.ColumnId]);
+        return this.getColumns().filter((c) => visibleCols[c.columnId]);
     }
     selectColumn(columnId) {
         this.adaptable.selectColumn(columnId);
@@ -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
@@ -78,33 +78,33 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return false;
     }
     isNumericColumn(column) {
-        return column.DataType == Enums_1.DataType.Number;
+        return column.dataType == Enums_1.DataType.Number;
     }
     isBooleanColumn(column) {
-        return column.DataType == Enums_1.DataType.Boolean;
+        return column.dataType == Enums_1.DataType.Boolean;
     }
     isDateColumn(column) {
-        return column.DataType == Enums_1.DataType.Date;
+        return column.dataType == Enums_1.DataType.Date;
     }
     getColumnDataTypeFromColumnId(columnId) {
         const column = this.getColumnFromId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
         if (!column) {
             return undefined;
         }
-        return column.DataType;
+        return column.dataType;
     }
     getFriendlyNameFromColumn(columnId, column) {
         if (columnId.includes(GeneralConstants.MISSING_COLUMN)) {
             return columnId;
         }
         if (column) {
-            return column.FriendlyName;
+            return column.friendlyName;
         }
         this.LogMissingColumnWarning(columnId);
         return columnId + GeneralConstants.MISSING_COLUMN;
     }
     getFriendlyNameFromColumnId(columnId) {
-        const foundColumn = this.getColumns().find((c) => c.ColumnId == columnId);
+        const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
         if (foundColumn) {
             return this.getFriendlyNameFromColumn(columnId, foundColumn);
         }
@@ -130,9 +130,9 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (friendlyName.includes(GeneralConstants.MISSING_COLUMN)) {
             return friendlyName.replace(GeneralConstants.MISSING_COLUMN, ''); // Ids should stay "pure"
         }
-        const foundColumn = this.getColumns().find((c) => c.FriendlyName == friendlyName);
+        const foundColumn = this.getColumns().find((c) => c.friendlyName == friendlyName);
         if (foundColumn) {
-            return foundColumn.ColumnId;
+            return foundColumn.columnId;
         }
         this.LogMissingColumnWarning(friendlyName);
         return friendlyName + GeneralConstants.MISSING_COLUMN;
@@ -149,7 +149,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getColumnsFromFriendlyNames(friendlyNames) {
         // not sure if this is right as might ignore bad cols
-        return friendlyNames.map((friendlyName) => this.getColumns().find((x) => x.FriendlyName == friendlyName));
+        return friendlyNames.map((friendlyName) => this.getColumns().find((x) => x.friendlyName == friendlyName));
     }
     getColumnsFromIds(columnIds, logWarning = true) {
         let returnCols = [];
@@ -166,7 +166,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (ArrayExtensions_1.default.IsNullOrEmpty(this.getColumns())) {
             return null;
         }
-        const foundColumn = this.getColumns().find((c) => c.ColumnId == columnId);
+        const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
         if (foundColumn) {
             return foundColumn;
         }
@@ -176,33 +176,30 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return undefined;
     }
     getColumnIdsFromId(columnId, logWarning = false) {
-        var _a;
         const col = this.getColumnFromId(columnId, logWarning);
         if (col) {
-            if (this.isCalculatedColumn(col.ColumnId)) {
-                const calculatedColumn = this.adaptable.api.calculatedColumnApi
-                    .getAllCalculatedColumn()
-                    .find((cc) => cc.ColumnId == col.ColumnId);
-                if (calculatedColumn) {
-                    const columnIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
-                    return columnIds;
-                }
+            if (this.isCalculatedColumn(col.columnId)) {
+                return this.adaptable.api.calculatedColumnApi.getReferencedColumnIdsForCalculatedColumnId(col.columnId);
             }
             else {
-                return [col.ColumnId];
+                return [col.columnId];
             }
         }
         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
         if (ArrayExtensions_1.default.IsNullOrEmpty(this.getColumns())) {
             return null;
         }
-        const foundColumn = this.getColumns().find((c) => c.FriendlyName == columnName);
+        const foundColumn = this.getColumns().find((c) => c.friendlyName == columnName);
         if (foundColumn) {
             return foundColumn;
         }
@@ -230,36 +227,36 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getNumericColumns() {
-        return this.getColumns().filter((c) => c.DataType == Enums_1.DataType.Number);
+        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Number);
     }
     getNumericArrayColumns() {
-        return this.getColumns().filter((c) => c.DataType == Enums_1.DataType.NumberArray);
+        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.NumberArray);
     }
     getStringColumns() {
-        return this.getColumns().filter((c) => c.DataType == Enums_1.DataType.String);
+        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.String);
     }
     getDateColumns() {
-        return this.getColumns().filter((c) => c.DataType == Enums_1.DataType.Date);
+        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Date);
     }
     getBooleanColumns() {
-        return this.getColumns().filter((c) => c.DataType == Enums_1.DataType.Boolean);
+        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Boolean);
     }
     getSortableColumns() {
-        return this.getColumns().filter((c) => c.Sortable);
+        return this.getColumns().filter((c) => c.sortable);
     }
     getGroupableColumns() {
-        return this.getColumns().filter((c) => c.Groupable);
+        return this.getColumns().filter((c) => c.groupable);
     }
     getPivotableColumns() {
-        return this.getColumns().filter((c) => c.Pivotable);
+        return this.getColumns().filter((c) => c.pivotable);
     }
     getAggregetableColumns() {
         return this.getColumns()
-            .filter((c) => c.Aggregatable)
-            .filter((c) => c.DataType == Enums_1.DataType.Number);
+            .filter((c) => c.aggregatable)
+            .filter((c) => c.dataType == Enums_1.DataType.Number);
     }
     getQueryableColumns() {
-        return this.getColumns().filter((c) => c.Queryable);
+        return this.getColumns().filter((c) => c.queryable);
     }
     LogMissingColumnWarning(columnId) {
         if (this.adaptable.adaptableOptions.generalOptions.showMissingColumnsWarning &&
@@ -290,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;
@@ -352,7 +349,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         // this does NOT into account Custom Sort - far too hard for now...
         let sortOrder = Enums_1.SortOrder.Asc;
         if (this.getFilterOptions().sortColumnValuesInFilter) {
-            let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.ColumnId);
+            let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.columnId);
             if (columnSort && columnSort.SortOrder == 'Desc') {
                 sortOrder = Enums_1.SortOrder.Desc;
             }
@@ -373,12 +370,11 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getAllColumnFriendlyNames() {
         return this.getColumns().map((c) => {
-            return c.FriendlyName;
+            return c.friendlyName;
         });
     }
     usesAdaptableFilterForm(columnId) {
-        const useAdaptableFilterForm = this.getFilterOptions()
-            .useAdaptableFilterForm;
+        const useAdaptableFilterForm = this.getFilterOptions().useAdaptableFilterForm;
         if (useAdaptableFilterForm == null || useAdaptableFilterForm == false) {
             return false;
         }
@@ -388,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;
         }
@@ -398,5 +393,9 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return true;
     }
+    isColumnReferencedInExpression(columnId, expression) {
+        const colIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression(expression);
+        return colIds.some((c) => c === columnId);
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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/DashboardApiImpl.js

@@ -18,6 +18,7 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         // so we debounced to only get tha latest call
         this.fireDashboardChangedEvent = (trigger, oldDashboardState, newDashboardState) => {
             const dashboardChangedInfo = {
+                adaptableApi: this.adaptable.api,
                 actionName: trigger,
                 oldDashboardState: oldDashboardState,
                 newDashboardState: newDashboardState,
@@ -39,7 +40,7 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
     getCustomDashboardButtonByLabel(buttonLabel) {
         const api = this.getAdaptableApi();
         const dashboardContext = {
-            api,
+            adaptableApi: api,
             dashboardState: api.dashboardApi.getDashboardState(),
         };
         return this.getDashboardOptions().customDashboardButtons.find((cb) => {

package/src/Api/Implementation/ExportApiImpl.js

@@ -103,7 +103,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         if (report.ReportRowScope == 'CustomRows' || report.ReportColumnScope == 'CustomColumns') {
             return false;
         }
-        let abColumn = this.adaptable.api.columnApi.getColumnFromId(dataChangedInfo.columnId);
         // Start with the DataChanged Column and go through all possibilities
         switch (report.ReportColumnScope) {
             case 'AllColumns':
@@ -111,21 +110,22 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
                 break;
             case 'ScopeColumns':
                 // use the Scope object which will tell us if the Column is relevant
-                if (!this.adaptable.api.scopeApi.isColumnInScopeColumns(abColumn, report.Scope)) {
+                if (!this.adaptable.api.scopeApi.isColumnInScopeColumns(dataChangedInfo.column, report.Scope)) {
                     return false;
                 }
                 break;
             case 'SelectedColumns':
                 let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
                 if (selectedCellInfo) {
-                    if (selectedCellInfo.columns.find((c) => c.ColumnId == dataChangedInfo.columnId) == null) {
+                    if (selectedCellInfo.columns.find((c) => c.columnId == dataChangedInfo.column.columnId) ==
+                        null) {
                         return false;
                     }
                 }
                 break;
             case 'VisibleColumns':
                 //  hope that visibile column property is updated whenever the layout changes... (need to check!)
-                if (!abColumn.Visible) {
+                if (!dataChangedInfo.column.visible) {
                     return false;
                 }
                 break;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -243,7 +243,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getCheckBoxStyleFormatColumn(column) {
         var _a;
-        if (column.DataType != 'Boolean') {
+        if (column.dataType != 'Boolean') {
             return undefined;
         }
         const checkBoxFormatColumns = (_a = this.getFormatColumnState().FormatColumns) === null || _a === void 0 ? void 0 : _a.filter((fc) => { var _a; return (_a = fc.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle; });
@@ -256,6 +256,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     }
     fireCheckboxColumnClickedEvent(columnId, rowData, primaryKeyValue, isChecked) {
         let checkboxColumnClickedInfo = {
+            adaptableApi: this.adaptable.api,
             column: this.adaptable.api.columnApi.getColumnFromId(columnId),
             rowData: rowData,
             primaryKeyValue: primaryKeyValue,

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -104,14 +104,19 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
         }
     }
     checkFreeTextColumnForDataChange(dataChangedInfo) {
-        let freeTextColumn = this.getAllFreeTextColumn().find((fc) => fc.ColumnId == dataChangedInfo.columnId);
+        let freeTextColumn = this.getAllFreeTextColumn().find((fc) => fc.ColumnId == dataChangedInfo.column.columnId);
         if (freeTextColumn) {
             let freeTextStoredValue = {
                 PrimaryKey: dataChangedInfo.primaryKeyValue,
                 FreeText: dataChangedInfo.newValue,
             };
             this.addEditFreeTextColumnStoredValue(freeTextColumn, freeTextStoredValue);
-            this.adaptable.refreshCells([dataChangedInfo.rowNode], [dataChangedInfo.columnId], false);
+            var colsToRefresh = [dataChangedInfo.column.columnId];
+            const refencedCalcColumns = this.adaptable.api.calculatedColumnApi.getCalculatedColumnsReferencingColumnId(dataChangedInfo.column.columnId);
+            refencedCalcColumns.forEach((calculatedColumn) => {
+                colsToRefresh.push(calculatedColumn.ColumnId);
+            });
+            this.adaptable.refreshCells([dataChangedInfo.rowNode], colsToRefresh, false);
         }
     }
     getFreeTextColumnModuleReferences(freeTextColumn) {

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

@@ -32,7 +32,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     undoCellEdit(dataChangedInfo) {
         // for the reason of this hacky solution see the comments in DataService
         this.adaptable.api.internalApi.getDataService().logUndoChange(dataChangedInfo);
-        this.setCellValue(dataChangedInfo.columnId, dataChangedInfo.oldValue, dataChangedInfo.primaryKeyValue);
+        this.setCellValue(dataChangedInfo.column.columnId, dataChangedInfo.oldValue, dataChangedInfo.primaryKeyValue);
         return true;
     }
     deleteGridData(dataRows, dataUpdateConfig) {
@@ -42,18 +42,18 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
     }
     setCellValue(columnId, newValue, primaryKeyValue) {
-        let gridCell = {
+        const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
+        if (!abColumn || abColumn.readOnly) {
+            return;
+        }
+        const gridCell = {
             primaryKeyValue: primaryKeyValue,
-            columnId: columnId,
             rawValue: newValue,
             displayValue: newValue,
             normalisedValue: newValue,
             rowNode: this.getRowNodeForPrimaryKey(primaryKeyValue),
+            column: abColumn,
         };
-        const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
-        if (!abColumn || abColumn.ReadOnly) {
-            return;
-        }
         this.adaptable.api.internalApi.setGridCell(gridCell);
     }
     setCellsValue(gridCells) {
@@ -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() {
@@ -230,6 +230,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
             const adaptableSearchState = this.adaptable.api.configApi.getAdaptableSearchState();
             const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
             const searchChangedInfo = {
+                adaptableApi: this.adaptable.api,
                 searchChangedTrigger,
                 adaptableSearchState: adaptableSearchState,
                 adaptableSortState: adaptableSortState,
@@ -240,6 +241,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     fireCellChangedEvent(dataChangedInfo) {
         if (this.adaptable.isInitialised) {
             const cellChangedInfo = {
+                adaptableApi: this.adaptable.api,
                 cellChange: dataChangedInfo,
             };
             this.adaptable.api.eventApi.emit('CellChanged', cellChangedInfo);
@@ -248,6 +250,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     fireGridDataChangedEvent(dataRows, rowTigger) {
         if (this.adaptable.isInitialised) {
             const gridDataChangedInfo = {
+                adaptableApi: this.adaptable.api,
                 rowTigger: rowTigger,
                 dataRows: dataRows,
             };
@@ -290,15 +293,13 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         let returnValue = true;
         gridCells.forEach((gridCell) => {
             if (returnValue) {
-                let abColumn = this.adaptable.api.columnApi.getColumnFromId(gridCell.columnId);
-                if (abColumn.ReadOnly) {
+                if (gridCell.column.readOnly) {
                     returnValue = false;
                     return;
                 }
                 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;
                     }
@@ -332,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

@@ -73,14 +73,14 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     setGridCells(gridCells: GridCell[]): void;
     setToolbarTitle(): string;
     setGridCell(gridCell: GridCell): void;
-    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'columnId' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
+    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
     private createDataChangedInfoFromGridCell;
     setLastAppliedShortCut(gridCell: GridCell | undefined): void;
     updateCurrentDraftLayout(layout: Layout): void;
     setDefaultDashboardTab(): void;
     getPrimaryKey(): any;
     getAdaptableInstance(): IAdaptable;
-    getVendorGridInstance(): any;
+    getAgGridInstance(): any;
     getPredefinedConfig(): any;
     getState(): AdaptableState;
     getAdaptableOptions(): AdaptableOptions;

package/src/Api/Implementation/InternalApiImpl.js

@@ -144,7 +144,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(GridRedux.GridAddColumns(AdaptableColumns));
     }
     removeAdaptableColumn(colId) {
-        const col = this.getAdaptableState().Grid.Columns.find((c) => c.ColumnId === colId);
+        const col = this.getAdaptableState().Grid.Columns.find((c) => c.columnId === colId);
         if (col) {
             this.dispatchAction(GridRedux.GridRemoveColumn(col));
         }
@@ -175,12 +175,12 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return Object.assign(Object.assign({}, config), { rowData: (_a = config.rowNode) === null || _a === void 0 ? void 0 : _a.data, changedAt: Date.now() });
     }
     createDataChangedInfoFromGridCell(gridCell) {
-        let currentValue = this.adaptable.getDisplayValue(gridCell.primaryKeyValue, gridCell.columnId);
+        let currentValue = this.adaptable.getDisplayValue(gridCell.primaryKeyValue, gridCell.column.columnId);
         const currentRowNode = this.adaptable.getRowNodeForPrimaryKey(gridCell.primaryKeyValue);
         const dataChangedInfo = this.buildDataChangedInfo({
             oldValue: currentValue,
             newValue: gridCell.rawValue,
-            columnId: gridCell.columnId,
+            column: gridCell.column,
             primaryKeyValue: gridCell.primaryKeyValue,
             rowNode: currentRowNode,
         });
@@ -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

@@ -50,6 +50,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     }
     fireLayoutChangedEvent(trigger, oldSate, newState) {
         const layoutChangedInfo = {
+            adaptableApi: this.adaptable.api,
             actionName: trigger,
             oldLayoutState: oldSate,
             newLayoutState: newState,
@@ -138,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);
@@ -188,9 +197,9 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         let gridState = this.getAdaptableApi().gridApi.getGridState();
         let layoutState = this.getLayoutState();
         const isLayoutDefined = (layoutName) => !!layoutState.Layouts.filter((layout) => layout.Name === layoutName)[0];
-        let defaultLayoutColumns = gridState.Columns.filter((column) => column.Visible);
+        let defaultLayoutColumns = gridState.Columns.filter((column) => column.visible);
         const columnsMap = gridState.Columns.reduce((acc, col) => {
-            acc[col.ColumnId] = col;
+            acc[col.columnId] = col;
             return acc;
         }, {});
         let shouldCreateDefaultLayout = this.getLayoutOptions().createDefaultLayout;
@@ -201,7 +210,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             if (!layoutState.Layouts || !isLayoutDefined(GeneralConstants_1.DEFAULT_LAYOUT)) {
                 let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
                     Name: GeneralConstants_1.DEFAULT_LAYOUT,
-                    Columns: defaultLayoutColumns.map((c) => c.ColumnId),
+                    Columns: defaultLayoutColumns.map((c) => c.columnId),
                 }, gridState.Columns);
                 this.saveLayout(defaultLayout);
                 return defaultLayout;
@@ -211,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() {