@adaptabletools/adaptable 10.0.3 → 10.0.4-canary.0

package/src/agGrid/Adaptable.js

@@ -736,19 +736,19 @@ class Adaptable {
             const columnsInGroup = columnGroup.getLeafColumns();
             columnsInGroup.forEach((col) => {
                 const group = {
-                    ColumnGroupId: ColumnGroupId,
-                    FriendlyName,
-                    AllowGroupSplit: AllowGroupSplit,
-                    GroupCount: 0,
+                    columnGroupId: ColumnGroupId,
+                    friendlyName: FriendlyName,
+                    allowGroupSplit: AllowGroupSplit,
+                    groupCount: 0,
                 };
-                groupsCount[group.ColumnGroupId] = groupsCount[group.ColumnGroupId] || 0;
-                groupsCount[group.ColumnGroupId] += columnsInGroup.length;
+                groupsCount[group.columnGroupId] = groupsCount[group.columnGroupId] || 0;
+                groupsCount[group.columnGroupId] += columnsInGroup.length;
                 acc[col.getColId()] = group;
             });
             return acc;
         }, {});
         Object.keys(colsToGroups).forEach((colId) => {
-            colsToGroups[colId].GroupCount = groupsCount[colsToGroups[colId].ColumnGroupId];
+            colsToGroups[colId].groupCount = groupsCount[colsToGroups[colId].columnGroupId];
         });
         // TODO sort the visible columns by layout order
         vendorCols.forEach((vendorColumn) => {
@@ -840,7 +840,8 @@ class Adaptable {
             var _a;
             return ((_a = aa.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
                 aa.dataChangedInfo &&
-                aa.dataChangedInfo.columnId === col.ColumnId &&
+                aa.dataChangedInfo.column &&
+                aa.dataChangedInfo.column.columnId === col.columnId &&
                 aa.dataChangedInfo.rowNode === params.node;
         });
         const alert = activeAlerts[0];
@@ -868,7 +869,7 @@ class Adaptable {
     }
     getFlashingAlertCellStyle(col, params) {
         const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
-        return this.getFlashingAlertStyleFor(primaryKeyValue, col.ColumnId);
+        return this.getFlashingAlertStyleFor(primaryKeyValue, col.columnId);
     }
     getCellHighlightStyle(col, params) {
         var _a;
@@ -876,7 +877,7 @@ class Adaptable {
         const cellHightlight = this.api.internalApi
             .getSystemState()
             .HighlightedCells.find((cellHighlightInfo) => {
-            return (col.ColumnId === cellHighlightInfo.columnId &&
+            return (col.columnId === cellHighlightInfo.columnId &&
                 cellHighlightInfo.primaryKeyValue === primaryKeyValue);
         });
         if (cellHightlight) {
@@ -905,7 +906,7 @@ class Adaptable {
         if (!editableCellStyle) {
             return undefined;
         }
-        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.ColumnId);
+        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
             if (this.api.gridApi.areCellsEditable([gridCell])) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
@@ -918,7 +919,7 @@ class Adaptable {
         if (!editableCellStyle) {
             return undefined;
         }
-        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.ColumnId);
+        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
             if (!this.api.gridApi.areCellsEditable([gridCell])) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
@@ -958,7 +959,7 @@ class Adaptable {
             return null;
         }
         const isCellEditable = this.api.gridApi.areCellsEditable([
-            this.getGridCellFromRowNode(params.node, abColumn.ColumnId),
+            this.getGridCellFromRowNode(params.node, abColumn.columnId),
         ]);
         return isCellEditable ? editableCellStyle.ClassName : null;
     }
@@ -968,12 +969,12 @@ class Adaptable {
             return null;
         }
         const isCellReadonly = !this.api.gridApi.areCellsEditable([
-            this.getGridCellFromRowNode(params.node, abColumn.ColumnId),
+            this.getGridCellFromRowNode(params.node, abColumn.columnId),
         ]);
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
     isQuickSearchActive(abColumn, params) {
-        if (abColumn.IsExcludedFromQuickSearch) {
+        if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
         if (!params.node || params.node.group) {
@@ -983,7 +984,7 @@ class Adaptable {
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(quickSearchValue)) {
             return false;
         }
-        const columnFilter = ObjectFactory_1.default.CreateColumnFilter(abColumn.ColumnId, 'Contains', [quickSearchValue]);
+        const columnFilter = ObjectFactory_1.default.CreateColumnFilter(abColumn.columnId, 'Contains', [quickSearchValue]);
         return this.api.filterApi.evaluateColumnFilter(columnFilter, params.node);
     }
     getPrimaryKeyValueFromRowNode(rowNode) {
@@ -1347,7 +1348,7 @@ class Adaptable {
                                 const colId = column.getColId();
                                 const selectedColumn = this.api.columnApi.getColumnFromId(colId);
                                 if (selectedColumn &&
-                                    columns.find((c) => c.ColumnId == selectedColumn.ColumnId) == null) {
+                                    columns.find((c) => c.columnId == selectedColumn.columnId) == null) {
                                     columns.push(selectedColumn);
                                 }
                                 for (let rowIndex = y1; rowIndex <= y2; rowIndex++) {
@@ -1408,20 +1409,20 @@ class Adaptable {
     setValue(dataChangedInfo) {
         // note: because we use rownode set data value this will cause Validation to fire
         let newValue;
-        let dataType = this.api.columnApi.getColumnDataTypeFromColumnId(dataChangedInfo.columnId);
+        let dataType = dataChangedInfo.column.dataType;
         newValue =
             dataType == Enums_1.DataType.Number ? Number(dataChangedInfo.newValue) : dataChangedInfo.newValue;
         if (dataType == undefined) {
             return; // no point continuing as probably a wrong  column
         }
         if (dataChangedInfo.rowNode) {
-            dataChangedInfo.rowNode.setDataValue(dataChangedInfo.columnId, newValue);
+            dataChangedInfo.rowNode.setDataValue(dataChangedInfo.column.columnId, newValue);
         }
         else {
             if (this.useRowNodeLookUp) {
                 const rowNode = this.gridOptions.api.getRowNode(dataChangedInfo.primaryKeyValue);
                 if (rowNode != null) {
-                    rowNode.setDataValue(dataChangedInfo.columnId, newValue);
+                    rowNode.setDataValue(dataChangedInfo.column.columnId, newValue);
                     dataChangedInfo.rowNode = rowNode;
                 }
             }
@@ -1431,7 +1432,7 @@ class Adaptable {
                 this.gridOptions.api.getModel().forEachNode((rowNode) => {
                     if (!isUpdated) {
                         if (dataChangedInfo.primaryKeyValue == this.getPrimaryKeyValueFromRowNode(rowNode)) {
-                            rowNode.setDataValue(dataChangedInfo.columnId, newValue);
+                            rowNode.setDataValue(dataChangedInfo.column.columnId, newValue);
                             dataChangedInfo.rowNode = rowNode;
                             isUpdated = true;
                         }
@@ -1454,7 +1455,8 @@ class Adaptable {
                     rawValue: pv,
                     displayValue: pv,
                     normalisedValue: pv,
-                    columnId: column.ColumnId,
+                    columnId: column.columnId,
+                    column: column,
                     rowNode: undefined,
                 };
             });
@@ -1462,7 +1464,7 @@ class Adaptable {
         else {
             if (visibleRowsOnly) {
                 this.gridOptions.api.forEachNodeAfterFilter((rowNode) => {
-                    const gridCell = this.addDistinctColumnValue(rowNode, column.ColumnId);
+                    const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
                     if (gridCell && gridCell.rawValue != undefined && gridCell.rowNode !== skipRowNode) {
                         returnValues.push(gridCell);
                     }
@@ -1470,7 +1472,7 @@ class Adaptable {
             }
             else {
                 this.gridOptions.api.forEachNode((rowNode) => {
-                    const gridCell = this.addDistinctColumnValue(rowNode, column.ColumnId);
+                    const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
                     if (gridCell && gridCell.rawValue != undefined && gridCell.rowNode !== skipRowNode) {
                         returnValues.push(gridCell);
                     }
@@ -1533,7 +1535,7 @@ class Adaptable {
                     rawValue: pv,
                     displayValue: pv,
                     normalisedValue: pv,
-                    columnId: columnId,
+                    column: abColumn,
                     rowNode: undefined,
                 });
             });
@@ -1582,7 +1584,7 @@ class Adaptable {
     }
     shouldUseRawValueForColumn(column) {
         // we need to return false if the column has a cell rendeerer i think...
-        const colDef = this.gridOptions.api.getColumnDef(column.ColumnId);
+        const colDef = this.gridOptions.api.getColumnDef(column.columnId);
         if (colDef && colDef.cellRenderer != null) {
             return true;
         }
@@ -1627,7 +1629,7 @@ class Adaptable {
             rawValue: rawValue,
             displayValue: displayValue,
             normalisedValue: normalisedvalue,
-            columnId: columnId,
+            column: abColumn,
             primaryKeyValue: pkValue,
             rowNode: rowNode,
         };
@@ -2103,7 +2105,7 @@ class Adaptable {
                 height: 65,
                 Columns: this.api.columnApi.getColumns().map((col) => {
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: 200,
                         textAlign: 'start',
                     };
@@ -2120,7 +2122,7 @@ class Adaptable {
                 height: 30,
                 Columns: this.api.columnApi.getColumns().map((col) => {
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: 200,
                         textAlign: 'start',
                     };
@@ -2692,8 +2694,9 @@ class Adaptable {
         this.setColDefProperty(col, 'cellEditorParams', (params) => {
             if (editLookUpItem) {
                 return (params) => {
+                    const gridCell = this.getGridCellFromRowNode(params === null || params === void 0 ? void 0 : params.node, colId);
                     return {
-                        values: this.api.userInterfaceApi.getEditLookUpValuesForEditLookUpItem(editLookUpItem, colId, params === null || params === void 0 ? void 0 : params.data),
+                        values: this.api.userInterfaceApi.getEditLookUpValuesForEditLookUpItem(editLookUpItem, gridCell),
                     };
                 };
             }
@@ -2707,7 +2710,7 @@ class Adaptable {
                     return this.agGridHelper.createNumericStyleRendererFunc(formatColumn);
                 }
                 if (formatColumn.ColumnStyle.CheckBoxStyle) {
-                    return this.agGridHelper.createCheckboxRendererComp(abColumn.ColumnId, abColumn.ReadOnly);
+                    return this.agGridHelper.createCheckboxRendererComp(abColumn.columnId, abColumn.readOnly);
                 }
             }
             const sparkline = this.api.sparklineColumnApi.getSparklineByColumn(colId);
@@ -2776,13 +2779,13 @@ class Adaptable {
                 resultHeaderName = layoutCustomHeader;
             }
             // check if the deprecated formatColumn header is used
-            const formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(abColumn.ColumnId);
+            const formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(abColumn.columnId);
             if (!layoutCustomHeader && (formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.HeaderName) && !formatColumn.IsSuspended) {
                 // fallback to the formatColumn property if no Layout custom header is provided
                 resultHeaderName = formatColumn.HeaderName;
             }
             // required here for the initial layout rendering
-            abColumn.FriendlyName = resultHeaderName;
+            abColumn.friendlyName = resultHeaderName;
             return resultHeaderName;
         });
         const newColumnHeader = (_b = col === null || col === void 0 ? void 0 : col.getColDef()) === null || _b === void 0 ? void 0 : _b.headerName;
@@ -2901,7 +2904,7 @@ class Adaptable {
                 const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                     oldValue: params.oldValue,
                     newValue: params.newValue,
-                    columnId: params.column.getColId(),
+                    column: this.api.columnApi.getColumnFromId(params.column.getColId()),
                     primaryKeyValue: this.getPrimaryKeyValueFromRowNode(params.node),
                     rowNode: params.node,
                     trigger: 'edit',
@@ -2996,7 +2999,7 @@ class Adaptable {
                     const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                         oldValue: oldValue,
                         newValue: newValue,
-                        columnId: key,
+                        column: this.api.columnApi.getColumnFromId(key),
                         primaryKeyValue: primaryKeyValue,
                         rowNode: rowNode,
                         trigger: 'tick',
@@ -3018,13 +3021,14 @@ class Adaptable {
         if (!primaryKeyValue) {
             return;
         }
-        if (!this.api.columnApi.doesColumnExist(colId)) {
+        const abColumn = this.api.columnApi.getColumnFromId(colId);
+        if (!abColumn) {
             return;
         }
         const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
             oldValue: oldValue,
             newValue: newValue,
-            columnId: colId,
+            column: abColumn,
             primaryKeyValue: primaryKeyValue,
             rowNode: rowNode,
             trigger: 'edit',
@@ -3049,7 +3053,7 @@ class Adaptable {
         }
         dataChangedInfos.forEach((dataChangedInfo) => {
             if (dataChangedInfo.trigger === 'undo') {
-                LoggingHelper_1.LogAdaptableInfo(`Undo data change: PK(${dataChangedInfo.primaryKeyValue}) Col(${dataChangedInfo.columnId}) RevertedValue(${dataChangedInfo.oldValue}) OriginalValue(${dataChangedInfo.newValue})`);
+                LoggingHelper_1.LogAdaptableInfo(`Undo data change: PK(${dataChangedInfo.primaryKeyValue}) Col(${dataChangedInfo.column}) RevertedValue(${dataChangedInfo.oldValue}) OriginalValue(${dataChangedInfo.newValue})`);
             }
             if (dataChangedInfo.trigger === 'edit' || dataChangedInfo.trigger === 'undo') {
                 this.checkChangedCellCurrentlySelected(dataChangedInfo);
@@ -3088,7 +3092,7 @@ class Adaptable {
                 stylesWithExpression.forEach((conditionalStyle) => {
                     if (!dataChangedScope.wholeRow) {
                         const columnIds = this.api.queryLanguageApi.getColumnsFromExpression(conditionalStyle.Rule.BooleanExpression);
-                        if (columnIds.includes(dataChangedInfo.columnId)) {
+                        if (columnIds.includes(dataChangedInfo.column.columnId)) {
                             if (this.api.scopeApi.scopeIsAll(conditionalStyle.Scope)) {
                                 dataChangedScope.wholeRow = true;
                                 return;
@@ -3096,7 +3100,7 @@ class Adaptable {
                             else {
                                 this.api.scopeApi
                                     .getColumnsForScope(conditionalStyle.Scope)
-                                    .map((c) => c.ColumnId)
+                                    .map((c) => c.columnId)
                                     .forEach((colId) => {
                                     dataChangedScope.columnIds.add(colId);
                                 });
@@ -3114,10 +3118,10 @@ class Adaptable {
                 let affectedColumnIds = this.api.formatColumnApi.getColumnIdsFromColumnComparison(columnComparision);
                 if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(affectedColumnIds)) {
                     dataChangedInfos.forEach((dataChangedInfo) => {
-                        if (affectedColumnIds.includes(dataChangedInfo.columnId)) {
+                        if (affectedColumnIds.includes(dataChangedInfo.column.columnId)) {
                             this.api.scopeApi
                                 .getColumnsForScope(fc.Scope)
-                                .map((c) => c.ColumnId)
+                                .map((c) => c.columnId)
                                 .forEach((colId) => {
                                 dataChangedScope.columnIds.add(colId);
                             });
@@ -3131,7 +3135,7 @@ class Adaptable {
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
         if (selectedCellInfo && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.gridCells)) {
             let matchingCell = selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == dataChangedInfo.primaryKeyValue &&
-                gc.columnId == dataChangedInfo.columnId);
+                gc.column == dataChangedInfo.column);
             if (matchingCell) {
                 this.setSelectedCells();
             }
@@ -3215,7 +3219,7 @@ class Adaptable {
     getVendorGridColumnFieldForColumn(abColumn) {
         const agGridColumn = this.gridOptions.columnApi
             .getAllColumns()
-            .find((c) => c.getColId() === abColumn.ColumnId);
+            .find((c) => c.getColId() === abColumn.columnId);
         return agGridColumn.getColDef().field || '';
     }
     setRowGroupColumns(columnIds) {
@@ -3415,7 +3419,7 @@ class Adaptable {
     checkColumnsDataTypeSet() {
         // check that we have no unknown columns - if we do then ok
         const firstCol = this.api.columnApi.getColumns()[0];
-        if (firstCol && firstCol.DataType == Enums_1.DataType.Unknown) {
+        if (firstCol && firstCol.dataType == Enums_1.DataType.Unknown) {
             this.updateColumnsIntoStore();
         }
     }
@@ -3723,21 +3727,23 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     }
     exportToExcel(reportData, fileName) {
         const columnDefs = reportData.columns.map((column) => ({
-            field: column.ColumnId,
-            headerName: column.FriendlyName,
+            field: column.columnId,
+            headerName: column.friendlyName,
         }));
         const NESTED_COL_SEPARATOR = '.';
-        const nestedColumns = reportData.columns.filter((column) => column.ColumnId.includes(NESTED_COL_SEPARATOR));
+        const nestedColumns = reportData.columns.filter((column) => column.columnId.includes(NESTED_COL_SEPARATOR));
         if (nestedColumns.length) {
             // the rowData of nested fields (containing dots) was flattened during the report data extraction and we need to un-flatten it back
             // ex.
             // current state: { field: 'outerKey.innerKey', value: 2}
             // original (desired) state: { field: 'outerKey.innerKey', value: {outerKey: {innerKey: 2}}}
             reportData.rows.forEach((rowDataEntry) => nestedColumns.forEach((nestedColumn) => {
-                const cellExportValue = rowDataEntry[nestedColumn.ColumnId];
+                const cellExportValue = rowDataEntry[nestedColumn.columnId];
                 let intermediaryValue = rowDataEntry;
                 // augment the rowDataEntry with the new object
-                nestedColumn.ColumnId.split(NESTED_COL_SEPARATOR).forEach((nestedKey, index, nestedCols) => {
+                nestedColumn.columnId
+                    .split(NESTED_COL_SEPARATOR)
+                    .forEach((nestedKey, index, nestedCols) => {
                     // we reached the leaf node, so we set the cell value and break
                     if (index === nestedCols.length - 1) {
                         intermediaryValue[nestedKey] = cellExportValue;
@@ -3749,7 +3755,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                     intermediaryValue = intermediaryValue[nestedKey];
                 });
                 // delete the obsolete flattened property
-                delete rowDataEntry[nestedColumn.ColumnId];
+                delete rowDataEntry[nestedColumn.columnId];
             }));
         }
         const gridOptions = {

package/src/agGrid/agGridHelper.js

@@ -215,33 +215,33 @@ class agGridHelper {
         let ColumnGroup = colsToGroups === null || colsToGroups === void 0 ? void 0 : colsToGroups[ColumnId];
         const abColumn = {
             Uuid: Uuid_1.createUuid(),
-            ColumnId,
-            FriendlyName,
-            IsPrimaryKey: ColumnId === pkColumn,
-            DataType: this.getColumnDataType(vendorColumn, false),
-            Visible: vendorColumn.isVisible(),
-            ReadOnly: this.isColumnReadonly(colDef),
-            ColumnGroup,
-            Sortable: this.isColumnSortable(colDef),
-            Filterable: this.isColumnFilterable(colDef),
-            Groupable: this.isColumnGroupable(colDef),
-            Pivotable: this.isColumnPivotable(colDef),
-            Aggregatable: this.isColumnAggregetable(colDef),
-            AvailableAggregationFunctions: null,
-            AggregationFunction: null,
-            Moveable: this.isColumnMoveable(colDef),
-            Hideable: this.isColumnHideable(colDef),
-            Queryable: this.isColumnQueryable(colDef, ColumnId),
-            IsGrouped: this.isColumnGrouped(colDef),
-            IsFixed: this.isColumnFixed(colDef),
+            columnId: ColumnId,
+            friendlyName: FriendlyName,
+            isPrimaryKey: ColumnId === pkColumn,
+            dataType: this.getColumnDataType(vendorColumn, false),
+            visible: vendorColumn.isVisible(),
+            readOnly: this.isColumnReadonly(colDef),
+            columnGroup: ColumnGroup,
+            sortable: this.isColumnSortable(colDef),
+            filterable: this.isColumnFilterable(colDef),
+            groupable: this.isColumnGroupable(colDef),
+            pivotable: this.isColumnPivotable(colDef),
+            aggregatable: this.isColumnAggregetable(colDef),
+            availableAggregationFunctions: null,
+            aggregationFunction: null,
+            moveable: this.isColumnMoveable(colDef),
+            hideable: this.isColumnHideable(colDef),
+            queryable: this.isColumnQueryable(colDef, ColumnId),
+            isGrouped: this.isColumnGrouped(colDef),
+            isFixed: this.isColumnFixed(colDef),
             //TODO add IsPinned??
-            IsSparkline: this.adaptable.api.sparklineColumnApi.isSparklineColumn(colId),
-            IsExcludedFromQuickSearch: false,
+            isSparkline: this.adaptable.api.sparklineColumnApi.isSparklineColumn(colId),
+            isExcludedFromQuickSearch: false,
         };
-        if (abColumn.Aggregatable) {
-            abColumn.AvailableAggregationFunctions = this.getColumnAggregationFunctions(colDef);
+        if (abColumn.aggregatable) {
+            abColumn.availableAggregationFunctions = this.getColumnAggregationFunctions(colDef);
             if (typeof colDef.aggFunc === 'string') {
-                abColumn.AggregationFunction = colDef.aggFunc;
+                abColumn.aggregationFunction = colDef.aggFunc;
             }
         }
         // lets set this here one as the function cannot change the result so dont need to run it each time
@@ -249,7 +249,7 @@ class agGridHelper {
             .excludeColumnFromQuickSearch;
         if (excludeColumnFromQuickSearch) {
             if (excludeColumnFromQuickSearch(abColumn)) {
-                abColumn.IsExcludedFromQuickSearch = true;
+                abColumn.isExcludedFromQuickSearch = true;
             }
         }
         return abColumn;
@@ -435,8 +435,8 @@ class agGridHelper {
         let dataType = Enums_1.DataType.Unknown;
         // get the column type if already in store (and not unknown)
         const existingColumn = this.adaptable.api.columnApi.getColumnFromId(column.getId(), logWarning);
-        if (existingColumn && existingColumn.DataType != Enums_1.DataType.Unknown) {
-            return existingColumn.DataType;
+        if (existingColumn && existingColumn.dataType != Enums_1.DataType.Unknown) {
+            return existingColumn.dataType;
         }
         // check for column type
         const colType = column.getColDef().type;
@@ -574,7 +574,7 @@ class agGridHelper {
         return function compareItemsOfCustomSort(nodeA, nodeB) {
             let firstGroupedColumn = adaptable.getFirstGroupedColumn();
             if (firstGroupedColumn) {
-                const definedColumnComparator = adaptable.getActiveColumnComparator(firstGroupedColumn.ColumnId, adaptable.api.customSortApi.getCustomSortByColumn(firstGroupedColumn.ColumnId), adaptable.api.internalApi.getCustomSortComparer(firstGroupedColumn));
+                const definedColumnComparator = adaptable.getActiveColumnComparator(firstGroupedColumn.columnId, adaptable.api.customSortApi.getCustomSortByColumn(firstGroupedColumn.columnId), adaptable.api.internalApi.getCustomSortComparer(firstGroupedColumn));
                 if (definedColumnComparator) {
                     return definedColumnComparator(nodeA.key, nodeB.key);
                 }
@@ -610,10 +610,10 @@ class agGridHelper {
                 headerFontWeight: headerColStyle.fontWeight,
                 height: Number(headerColStyle.height.replace('px', '')),
                 Columns: this.adaptable.api.columnApi.getColumns().map((col) => {
-                    const headerColumn = document.querySelector(`.ag-header-cell[col-id='${col.ColumnId}']`);
+                    const headerColumn = document.querySelector(`.ag-header-cell[col-id='${col.columnId}']`);
                     const headerColumnStyle = window.getComputedStyle(headerColumn || headerFirstCol, null);
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: Number(headerColumnStyle.width.replace('px', '')),
                         textAlign: headerColumnStyle.textAlign,
                     };
@@ -629,10 +629,10 @@ class agGridHelper {
                 fontWeight: firstRowStyle.fontWeight,
                 height: Number(firstRowStyle.height.replace('px', '')),
                 Columns: this.adaptable.api.columnApi.getColumns().map((col) => {
-                    const cellElement = document.querySelector(`.ag-cell[col-id='${col.ColumnId}']`);
+                    const cellElement = document.querySelector(`.ag-cell[col-id='${col.columnId}']`);
                     const headerColumnStyle = window.getComputedStyle(cellElement || firstRow, null);
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: Number(headerColumnStyle.width.replace('px', '')),
                         textAlign: headerColumnStyle.textAlign,
                     };

package/src/agGrid/agGridMenuHelper.js

@@ -223,12 +223,12 @@ class agGridMenuHelper {
         let isSelectedCell = false;
         let clickedCell = undefined;
         if (adaptableColumn) {
-            clickedCell = this.adaptable.getGridCellFromRowNode(params.node, adaptableColumn.ColumnId);
+            clickedCell = this.adaptable.getGridCellFromRowNode(params.node, adaptableColumn.columnId);
         }
         let selectedCellInfo = this.adaptable.setSelectedCells();
         if (clickedCell && selectedCellInfo) {
             let matchedCell = selectedCellInfo.gridCells.find((gc) => gc != null &&
-                gc.columnId == clickedCell.columnId &&
+                gc.column == clickedCell.column &&
                 gc.primaryKeyValue == clickedCell.primaryKeyValue);
             isSelectedCell = matchedCell != null;
             if (isSelectedCell) {

package/src/components/ExpressionEditor/index.js

@@ -47,7 +47,7 @@ function ExpressionEditor(props) {
     // currently only boolean and scalar expressions support nested calculated columns (calc cols which reference other calc cols)
     const queryableColumns = type === 'scalar' || type === 'boolean'
         ? props.columns
-        : props.columns.filter((c) => !props.api.columnApi.isCalculatedColumn(c.ColumnId));
+        : props.columns.filter((c) => !props.api.columnApi.isCalculatedColumn(c.columnId));
     const dataTableEditor = (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start", style: { marginTop: 2 } },
             React.createElement(CheckBox_1.CheckBox, { checked: showColumnIds, onChange: (checked) => setShowColumnIds(checked), style: {
@@ -56,16 +56,16 @@ function ExpressionEditor(props) {
                     paddingTop: 'var(--ab-space-1)',
                     paddingBottom: 'var(--ab-space-1)',
                 } }, 'Show Column IDs')),
-        React.createElement(FormLayout_1.default, { className: "ab-ExpressionEditor__columns", gridColumnGap: "var(--ab-space-1)", gridRowGap: "var(--ab-space-1)", sizes: ['auto', '100px'], style: { alignItems: 'stretch' } }, queryableColumns.map((column) => (React.createElement(FormLayout_1.FormRow, { key: column.ColumnId, label: React.createElement(EditorButton_1.default, { width: "100%", height: "100%", style: {
+        React.createElement(FormLayout_1.default, { className: "ab-ExpressionEditor__columns", gridColumnGap: "var(--ab-space-1)", gridRowGap: "var(--ab-space-1)", sizes: ['auto', '100px'], style: { alignItems: 'stretch' } }, queryableColumns.map((column) => (React.createElement(FormLayout_1.FormRow, { key: column.columnId, label: React.createElement(EditorButton_1.default, { width: "100%", height: "100%", style: {
                     background: 'var(--ab-color-primary)',
                     cursor: 'grab',
                     marginRight: 'var(--ab-space-1)',
-                }, data: `[${column.ColumnId}]`, "data-name": "column", icon: "drag" },
-                React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, showColumnIds ? `[${column.ColumnId}]` : column.FriendlyName)) }, column.DataType === 'Number' ? (React.createElement(Input_1.default, { type: "number", "data-name": "column-input", value: data[column.ColumnId], onChange: (e) => setData(Object.assign(Object.assign({}, data), { [column.ColumnId]: Number(e.target.value) })), width: "100%", disabled: column.ReadOnly })) : column.DataType === 'String' ? (React.createElement(Input_1.default, { type: "text", "data-name": "column-input", value: data[column.ColumnId], onChange: (e) => setData(Object.assign(Object.assign({}, data), { [column.ColumnId]: e.target.value })), width: "100%", disabled: column.ReadOnly })) : column.DataType === 'Date' ? (React.createElement(AdaptableInput_1.default, { type: "date", "data-name": "column-input", value: data[column.ColumnId] && DateHelper_1.isValueValidDate(data[column.ColumnId])
-                ? new Date(data[column.ColumnId]).toISOString().substr(0, 10)
+                }, data: `[${column.columnId}]`, "data-name": "column", icon: "drag" },
+                React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, showColumnIds ? `[${column.columnId}]` : column.friendlyName)) }, column.dataType === 'Number' ? (React.createElement(Input_1.default, { type: "number", "data-name": "column-input", value: data[column.columnId], onChange: (e) => setData(Object.assign(Object.assign({}, data), { [column.columnId]: Number(e.target.value) })), width: "100%", disabled: column.readOnly })) : column.dataType === 'String' ? (React.createElement(Input_1.default, { type: "text", "data-name": "column-input", value: data[column.columnId], onChange: (e) => setData(Object.assign(Object.assign({}, data), { [column.columnId]: e.target.value })), width: "100%", disabled: column.readOnly })) : column.dataType === 'Date' ? (React.createElement(AdaptableInput_1.default, { type: "date", "data-name": "column-input", value: data[column.columnId] && DateHelper_1.isValueValidDate(data[column.columnId])
+                ? new Date(data[column.columnId]).toISOString().substr(0, 10)
                 : '', onChange: (e) => {
-                setData(Object.assign(Object.assign({}, data), { [column.ColumnId]: new Date(e.target.value) }));
-            }, style: { width: '100%' }, disabled: column.ReadOnly })) : column.DataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", checked: data[column.ColumnId], onChange: (checked) => setData(Object.assign(Object.assign({}, data), { [column.ColumnId]: checked })), disabled: column.ReadOnly })) : null))))));
+                setData(Object.assign(Object.assign({}, data), { [column.columnId]: new Date(e.target.value) }));
+            }, style: { width: '100%' }, disabled: column.readOnly })) : column.dataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", checked: data[column.columnId], onChange: (checked) => setData(Object.assign(Object.assign({}, data), { [column.columnId]: checked })), disabled: column.readOnly })) : null))))));
     const namedQueries = (React.createElement("div", null, props.namedQueries.map((namedQuery) => (React.createElement(rebass_1.Flex, { key: namedQuery.Uuid, flexDirection: "column", alignItems: "start", style: { padding: 3, marginTop: 'var(--ab-space-2)', marginBottom: 'var(--ab-space-2)' }, backgroundColor: "primarylight" },
         ' ',
         React.createElement(EditorButton_1.default, { width: "100%", height: "100%", style: {