@adaptabletools/adaptable 10.0.3 → 10.0.4-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "10.0.3",
+  "version": "10.0.4-canary.0",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "main": "index.js",
   "typings": "index.d.ts",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1637681957931;
+declare const _default: 1637745164610;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1637681957931;
+exports.default = 1637745164610;

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -101,15 +101,14 @@ export interface PermittedValues extends BasePermittedValues {
  * Used to define permitted values for inline column editor
  */
 export interface EditLookUpPermittedValues extends BasePermittedValues {
-    values?: any[] | ((column: AdaptableColumn, rowData: any) => any[]);
+    values?: any[] | ((column: AdaptableColumn, gridCell: GridCell) => any[]);
 }
 /**
  * Used to define values inside the floating filter and floating filter (quick filter)
  */
 export interface FilterPermittedValues extends BasePermittedValues {
     /**
-     * Prevents adaptable from filtering the list of values client-side.
-     * When true, values is called each time filtering is done, via the search bar.
+     * Prevents AdapTable from filtering the list of values client-side; When true, values is called each time the search bar is changed
      * @default false
      */
     suppressClientSideFiltering?: boolean;
@@ -122,7 +121,7 @@ export interface CustomSortPermittedValues extends BasePermittedValues {
     values: (column: AdaptableColumn) => any[] | Promise<any[]>;
 }
 /**
- * User to define permitted values for when updating cells via bulk update
+ * User to define permitted values when updating cells via bulk update
  */
 export interface BulkUpdatePermittedValues extends BasePermittedValues {
     values: (column: AdaptableColumn, selectedGridCells: GridCell[]) => any[] | Promise<any[]>;

package/src/Api/CalculatedColumnApi.d.ts

@@ -63,4 +63,19 @@ export interface CalculatedColumnApi {
      * @param calculatedColumn CalculatedColumn to be checked
      */
     getCalculatedColumnModuleReferences(calculatedColumn: CalculatedColumn): string[];
+    /**
+     * Returns all Calculated Columns whose Expression contains the ColumnId
+     * @param columnId ColumnId to check
+     */
+    getCalculatedColumnsReferencingColumnId(columnId: string): CalculatedColumn[];
+    /**
+     * Gets any ColumnIds referenced in a Calculated Column
+     * @param calculatedColumn Calculated Column to check
+     */
+    getReferencedColumnIdsForCalculatedColumn(calculatedColumn: CalculatedColumn): string[];
+    /**
+     * Gets any ColumnIds referenced in a Calculated Column
+     * @param calculatedColumnId CalculatedColumnId to check
+     */
+    getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId: string): string[];
 }

package/src/Api/ColumnApi.d.ts

@@ -269,4 +269,10 @@ export interface ColumnApi {
      * @param columnId Column to Check
      */
     usesAdaptableQuickFilter(columnId: string): boolean;
+    /**
+     * Checks if a column is referenced in a given Expression
+     * @param columnId Column to Check
+     * @param expression Expression to Lookup
+     */
+    isColumnReferencedInExpression(columnId: string, expression: string): boolean;
 }

package/src/Api/Implementation/AlertApiImpl.js

@@ -117,7 +117,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         }
         if (actionName === 'highlight-cell') {
             this.adaptable.api.gridApi.highlightCell({
-                columnId: dataChangedInfo.columnId,
+                columnId: dataChangedInfo.column.columnId,
                 primaryKeyValue: dataChangedInfo.primaryKeyValue,
                 highlightType: alertDefinition.MessageType,
                 timeout: this.getNotificationsOptions().cellHighlightDuration,
@@ -125,11 +125,11 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             return;
         }
         if (actionName === 'jump-to-cell') {
-            this.adaptable.api.gridApi.jumpToCell(dataChangedInfo.primaryKeyValue, dataChangedInfo.columnId);
+            this.adaptable.api.gridApi.jumpToCell(dataChangedInfo.primaryKeyValue, dataChangedInfo.column.columnId);
             return;
         }
         if (actionName === 'jump-to-column') {
-            this.adaptable.api.gridApi.jumpToColumn(dataChangedInfo.columnId);
+            this.adaptable.api.gridApi.jumpToColumn(dataChangedInfo.column.columnId);
             return;
         }
         if (actionName === 'suspend') {
@@ -212,7 +212,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
             // 4: Jump to the Cell
             if (alertProperties.JumpToCell && dataChangedInfo) {
-                this.adaptable.jumpToCell(dataChangedInfo.columnId, dataChangedInfo.rowNode);
+                this.adaptable.jumpToCell(dataChangedInfo.column.columnId, dataChangedInfo.rowNode);
             }
             // 5: Hight the cell - though that is taken care of in the Style Service
             if (alertProperties.HighlightCell && dataChangedInfo) {
@@ -221,7 +221,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                     alertNode = this.adaptable.getRowNodeForPrimaryKey(dataChangedInfo.primaryKeyValue);
                 }
                 if (alertNode) {
-                    this.adaptable.api.gridApi.refreshCells([alertNode], [dataChangedInfo.columnId]);
+                    this.adaptable.api.gridApi.refreshCells([alertNode], [dataChangedInfo.column.columnId]);
                     setTimeout(() => {
                         this.dispatchAction(SystemRedux.SystemAlertRemoveHighlight(alertToShow));
                     }, this.adaptable.adaptableOptions.notificationsOptions.cellHighlightDuration);

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

@@ -13,4 +13,7 @@ export declare class CalculatedColumnApiImpl extends ApiBase implements Calculat
     deleteCalculatedColumn(column: string): void;
     showCalculatedColumnPopup(): void;
     getCalculatedColumnModuleReferences(calculatedColumn: CalculatedColumn): string[];
+    getCalculatedColumnsReferencingColumnId(columnId: string): CalculatedColumn[];
+    getReferencedColumnIdsForCalculatedColumn(calculatedColumn: CalculatedColumn): string[];
+    getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId: string): string[];
 }

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -60,5 +60,28 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         });
         return references;
     }
+    getCalculatedColumnsReferencingColumnId(columnId) {
+        var calcColumns = [];
+        this.getAllCalculatedColumn().forEach((calculatedColumn) => {
+            var _a;
+            if (this.adaptable.api.columnApi.isColumnReferencedInExpression(columnId, (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression)) {
+                calcColumns.push(calculatedColumn);
+            }
+        });
+        return calcColumns;
+    }
+    getReferencedColumnIdsForCalculatedColumn(calculatedColumn) {
+        var _a;
+        const columnIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+        return columnIds;
+    }
+    getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId) {
+        const calculatedColumn = this.adaptable.api.calculatedColumnApi
+            .getAllCalculatedColumn()
+            .find((cc) => cc.ColumnId == calculatedColumnId);
+        if (calculatedColumn) {
+            return this.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
+        }
+    }
 }
 exports.CalculatedColumnApiImpl = CalculatedColumnApiImpl;

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

@@ -64,4 +64,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getAllColumnFriendlyNames(): string[];
     usesAdaptableFilterForm(columnId: string): boolean;
     usesAdaptableQuickFilter(columnId: string): boolean;
+    isColumnReferencedInExpression(columnId: string, expression: string): boolean;
 }

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);
@@ -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,20 +176,13 @@ 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;
@@ -202,7 +195,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         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 +223,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 &&
@@ -352,7 +345,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,7 +366,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getAllColumnFriendlyNames() {
         return this.getColumns().map((c) => {
-            return c.FriendlyName;
+            return c.friendlyName;
         });
     }
     usesAdaptableFilterForm(columnId) {
@@ -398,5 +391,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/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; });

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.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) {
@@ -290,8 +290,7 @@ 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;
                 }

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

@@ -73,7 +73,7 @@ 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;

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,
         });
@@ -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) => csc.columnId == column.columnId);
     }
     getLabelForButton(button, context) {
         if (!button.label) {

package/src/Api/Implementation/LayoutApiImpl.js

@@ -188,9 +188,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 +201,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;

package/src/Api/Implementation/ScopeApiImpl.js

@@ -14,10 +14,10 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             // do we need a true check here?
             return true;
         }
-        if ('DataTypes' in scope && scope.DataTypes.includes(column.DataType)) {
+        if ('DataTypes' in scope && scope.DataTypes.includes(column.dataType)) {
             return true;
         }
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         return false;
@@ -31,10 +31,10 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return columns;
         }
         return columns.filter((c) => {
-            if ('DataTypes' in scope && scope.DataTypes.includes(c.DataType)) {
+            if ('DataTypes' in scope && scope.DataTypes.includes(c.dataType)) {
                 return true;
             }
-            if ('ColumnIds' in scope && scope.ColumnIds.includes(c.ColumnId)) {
+            if ('ColumnIds' in scope && scope.ColumnIds.includes(c.columnId)) {
                 return true;
             }
             return false;
@@ -140,7 +140,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     }
     isColumnInNumericScope(column, scope) {
         // if column is not even numeric then return false
-        if (column == null || column == undefined || column.DataType !== 'Number') {
+        if (column == null || column == undefined || column.dataType !== 'Number') {
             return false;
         }
         // if no scope then return false
@@ -148,7 +148,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
@@ -159,7 +159,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     }
     isColumnInStringsScope(column, scope) {
         // if column is not even string then return false
-        if (column == null || column == undefined || column.DataType !== 'String') {
+        if (column == null || column == undefined || column.dataType !== 'String') {
             return false;
         }
         // if no scope then return false
@@ -167,7 +167,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
@@ -178,7 +178,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     }
     isColumnInDateScope(column, scope) {
         // if column is not even numeric then return false
-        if (column == null || column == undefined || column.DataType !== 'Date') {
+        if (column == null || column == undefined || column.dataType !== 'Date') {
             return false;
         }
         // if no scope then return false
@@ -186,7 +186,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
@@ -213,7 +213,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             'DataTypes' in b &&
             a.ColumnIds.every((columnId) => {
                 var _a;
-                return b.DataTypes.includes((_a = this.adaptable.api.columnApi.getColumnFromId(columnId)) === null || _a === void 0 ? void 0 : _a.DataType);
+                return b.DataTypes.includes((_a = this.adaptable.api.columnApi.getColumnFromId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
             })) {
             return true;
         }

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

@@ -4,6 +4,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { 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 {
     getColorPalette(): string[];
     getStyleClassNames(): string[] | undefined;
@@ -18,7 +19,7 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
     getAllEditLookUpItems(): EditLookUpPermittedValues[];
     getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, columnId: string, data: any): any[] | undefined;
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
     addColumnMenuItem(columnMenuItem: UserMenuItem): void;
     addContextMenuItem(contextMenuItem: UserMenuItem): void;
     getEditableCellStyle(): AdaptableStyle | undefined;