@adaptabletools/adaptable 10.0.3 → 10.0.4-canary.0

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -124,18 +124,14 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         return this.getPermittedValuesForScope(column, editLookUpItems);
     }
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem, columnId, data) {
-        if (!editLookUpItem) {
-            return undefined;
-        }
-        const column = this.adaptable.api.columnApi.getColumnFromId(columnId);
-        if (!column) {
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem, gridCell) {
+        if (!editLookUpItem || !gridCell || !gridCell.column) {
             return undefined;
         }
         let editLookUpValues = editLookUpItem.values;
         // first do the function then get hardcoded items
         if (editLookUpValues != null && typeof editLookUpValues === 'function') {
-            return editLookUpValues(column, data);
+            return editLookUpValues(gridCell.column, gridCell);
         }
         else {
             let arr = editLookUpValues;
@@ -145,7 +141,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         // if no hard-coded values or function provided then just get the distinct values for the column
         // this will use the columnapi method that first looks for permitted values and then distinct values
-        return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(columnId);
+        return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(gridCell.column.columnId);
     }
     addColumnMenuItem(columnMenuItem) {
         var _a;

package/src/Api/InternalApi.d.ts

@@ -78,7 +78,7 @@ export interface InternalApi {
     setGridCell(gridCell: GridCell): void;
     setToolbarTitle(): string;
     getQueryPreviewData(): any;
-    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'columnId' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
+    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
     setLastAppliedShortCut(gridCell: GridCell | undefined): void;
     setDefaultDashboardTab(): void;
     updateCurrentDraftLayout(layout: Layout): void;

package/src/Api/UserInterfaceApi.d.ts

@@ -2,6 +2,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 '../PredefinedConfig/Selection/GridCell';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -44,9 +45,9 @@ export interface UserInterfaceApi {
     /**
      * Retrieves actual Look Up Values from an EditLookUpItem
      * @param editLookUpItem editLookUpItem to check
-     * @param columnId Column to check
+     * @param  gridCell: the currently edited Grid Cell
      */
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, columnId: string, rowData: any): any[] | undefined;
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
     /**
      * Adds menu item to Column Menu
      * @param userMenuItem Menu Item to add

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

@@ -6,15 +6,15 @@ export interface AdaptableColumnBase extends AdaptableObject {
     /**
      * Name of Column in underlying grid (e.g. field or colId)
      */
-    ColumnId: string;
+    columnId: string;
     /**
      * How Column is referred to in Adaptable UI; 'Caption' or 'Header' property in underlying grid
      */
-    FriendlyName: string;
+    friendlyName: string;
     /**
      * DataType of the column
      */
-    DataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
+    dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
 }
 export declare const isValidOrderForColumnGroups: ({ oldColumns, newColumns, }: {
     oldColumns: AdaptableColumn[];
@@ -24,10 +24,10 @@ export declare const isValidOrderForColumnGroups: ({ oldColumns, newColumns, }:
  * Defines a Column Group
  */
 export interface AdaptableColumnGroup {
-    AllowGroupSplit: boolean;
-    ColumnGroupId: string;
-    FriendlyName: string;
-    GroupCount: number;
+    allowGroupSplit: boolean;
+    columnGroupId: string;
+    friendlyName: string;
+    groupCount: number;
 }
 /**
  * Defines an Adaptable Column - created at run-time based on vendor grid column definition
@@ -36,89 +36,89 @@ export interface AdaptableColumn extends AdaptableColumnBase {
     /**
      * Is this the Primary Key column
      */
-    IsPrimaryKey: boolean;
+    isPrimaryKey: boolean;
     /**
      * Column width
      */
-    Width?: number;
+    width?: number;
     /**
      * Flex details of the column
      */
-    Flex?: number;
+    flex?: number;
     /**
      * Is column editable
      */
-    ReadOnly: boolean;
+    readOnly: boolean;
     /**
      * Is Column currently visible
      */
-    Visible: boolean;
+    visible: boolean;
     /**
      * Is Column sortable
      */
-    Sortable: boolean;
+    sortable: boolean;
     /**
      * Is Column able to be filtered
      */
-    Filterable: boolean;
+    filterable: boolean;
     /**
      * Can Column be moved at run-time to a new position
      */
-    Moveable: boolean;
+    moveable: boolean;
     /**
      * Can Column be removed from the grid
      */
-    Hideable: boolean;
+    hideable: boolean;
     /**
      * Can Column form a Row Group
      */
-    Groupable: boolean;
+    groupable: boolean;
     /**
      * Can Column be used in a Pivot Grid
      */
-    Pivotable: boolean;
+    pivotable: boolean;
     /**
      * Is Column able to display aggregations (e.g. 'sum') when grouped
      */
-    Aggregatable: boolean;
+    aggregatable: boolean;
     /**
      * Can the Column be in included in Queries / Expressions
      */
-    Queryable: boolean;
+    queryable: boolean;
     /**
      * Available aggregations for the Column
      */
-    AvailableAggregationFunctions?: string[];
+    availableAggregationFunctions?: string[];
     /**
      * Custom aggregation function for the Column
      */
-    AggregationFunction?: string;
+    aggregationFunction?: string;
     /**
      * Is Column currently grouped
      */
-    IsGrouped: boolean;
+    isGrouped: boolean;
     /**
      * Is Column pinned or locked into position
      */
-    IsFixed: boolean;
+    isFixed: boolean;
     /**
      * Is it a Sparkline Column
      */
-    IsSparkline: boolean;
+    isSparkline: boolean;
     /**
      * Has colummn been excluded from Quick Search results
      */
-    IsExcludedFromQuickSearch: boolean;
+    isExcludedFromQuickSearch: boolean;
     /**
      * The parent column group, if the column belongs to one
      */
-    ColumnGroup?: AdaptableColumnGroup;
+    columnGroup?: AdaptableColumnGroup;
 }
 export interface AdaptableColumnProperties {
-    Sortable: boolean;
-    Filterable: boolean;
-    Moveable: boolean;
-    Groupable: boolean;
-    Pivotable: boolean;
-    Aggregatable: boolean;
+    sortable: boolean;
+    filterable: boolean;
+    moveable: boolean;
+    groupable: boolean;
+    pivotable: boolean;
+    aggregatable: boolean;
 }

package/src/PredefinedConfig/Common/AdaptableColumn.js

@@ -8,14 +8,14 @@ exports.isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
         let count = 0;
         columns.forEach((column) => {
             var _a, _b;
-            if (column.ColumnGroup &&
-                column.ColumnGroup.GroupCount > 1 &&
-                !column.ColumnGroup.AllowGroupSplit) {
-                if (prevGroup !== column.ColumnGroup.ColumnGroupId) {
+            if (column.columnGroup &&
+                column.columnGroup.groupCount > 1 &&
+                !column.columnGroup.allowGroupSplit) {
+                if (prevGroup !== column.columnGroup.columnGroupId) {
                     count++;
                 }
             }
-            prevGroup = (_b = (_a = column.ColumnGroup) === null || _a === void 0 ? void 0 : _a.ColumnGroupId) !== null && _b !== void 0 ? _b : '';
+            prevGroup = (_b = (_a = column.columnGroup) === null || _a === void 0 ? void 0 : _a.columnGroupId) !== null && _b !== void 0 ? _b : '';
         });
         return count;
     };

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -467,7 +467,7 @@ exports.SystemPredicateDefs = [
         columnScope: { All: true },
         moduleScope: ['alert'],
         handler: ({ value, column, api, node }) => {
-            return (column === null || column === void 0 ? void 0 : column.IsPrimaryKey) ? api.columnApi.getDistinctRawValuesForColumn(column.ColumnId, node).includes(value)
+            return (column === null || column === void 0 ? void 0 : column.isPrimaryKey) ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node).includes(value)
                 : false;
         },
     },
@@ -478,7 +478,7 @@ exports.SystemPredicateDefs = [
         moduleScope: ['alert'],
         handler: ({ value, api, column, node }) => {
             const distinctValues = column
-                ? api.columnApi.getDistinctRawValuesForColumn(column.ColumnId, node)
+                ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node)
                 : [];
             return !distinctValues.includes(value);
         },
@@ -490,7 +490,7 @@ exports.SystemPredicateDefs = [
         moduleScope: ['alert'],
         handler: ({ value, api, column, node }) => {
             const distinctValues = column
-                ? api.columnApi.getDistinctRawValuesForColumn(column.ColumnId, node)
+                ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node)
                 : [];
             return distinctValues.includes(value);
         },

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

@@ -1,4 +1,5 @@
 import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableColumn } from './AdaptableColumn';
 /**
  * Defines a Cell Edit - includes full details of old and new values, the column and the enclosing Row
  */
@@ -16,9 +17,9 @@ export interface DataChangedInfo {
      */
     newValue: any;
     /**
-     * Id of the Column in which the cell is situated
+     * Column in which cell is situated
      */
-    columnId: string;
+    column: AdaptableColumn;
     /**
      * Primary Key Column's value for the row where edited cell is situated
      */

package/src/PredefinedConfig/Selection/GridCell.d.ts

@@ -1,4 +1,5 @@
 import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableColumn } from '../Common/AdaptableColumn';
 /**
  * Defines a Cell in Adaptable - every cell is an intersection of a Column Id and a Primary Key Value
  */
@@ -6,7 +7,7 @@ export interface GridCell {
     /**
      * Column in which cell is situtated
      */
-    columnId: string;
+    column: AdaptableColumn;
     /**
      * Actual raw value of cell
      */

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -497,6 +497,6 @@ exports.SystemReducer = (state = initialState, action) => {
             return state;
     }
 };
-const getDataChangeHistoryKey = ({ columnId, primaryKeyValue }) => {
+const getDataChangeHistoryKey = ({ column: columnId, primaryKeyValue, }) => {
     return JSON.stringify({ columnId, primaryKeyValue });
 };

package/src/Redux/Store/AdaptableStore.js

@@ -386,7 +386,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     if (((_c = actionTyped.alert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
                         actionTyped.alert.dataChangedInfo) {
                         let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.columnId], true);
+                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
                     }
                     return ret;
                 }
@@ -402,7 +402,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         var _a;
                         if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) && alert.dataChangedInfo) {
                             let rowNode = alert.dataChangedInfo.rowNode;
-                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.columnId], true);
+                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.column.columnId], true);
                         }
                     });
                     return ret;
@@ -416,7 +416,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let ret = next(action);
                     if (actionTyped.alert.dataChangedInfo) {
                         let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.columnId], true);
+                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
                     }
                     return ret;
                 }

package/src/Strategy/AdaptableModuleBase.js

@@ -118,26 +118,26 @@ class AdaptableModuleBase {
             return false;
         }
         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(functionType)) {
-            if (functionType == 'sort' && !column.IsSparkline) {
-                return column.Sortable;
+            if (functionType == 'sort' && !column.isSparkline) {
+                return column.sortable;
             }
             else if (functionType == 'editable') {
-                return !column.ReadOnly;
+                return !column.readOnly;
             }
             else if (functionType == 'style') {
-                return !column.IsSparkline;
+                return !column.isSparkline;
             }
             else if (functionType == 'sparkline') {
-                return column.IsSparkline;
+                return column.isSparkline;
             }
             else if (functionType == 'numeric') {
-                return column.DataType == Enums_1.DataType.Number;
+                return column.dataType == Enums_1.DataType.Number;
             }
             else if (functionType == 'filter') {
-                return column.Filterable;
+                return column.filterable;
             }
             else if (functionType == 'quickfilter') {
-                return this.api.columnApi.usesAdaptableQuickFilter(column.ColumnId);
+                return this.api.columnApi.usesAdaptableQuickFilter(column.columnId);
             }
         }
         return true;

package/src/Strategy/AlertModule.js

@@ -22,7 +22,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (this.api.internalApi.getAdaptableOptions().notificationsOptions
                 .dataChangeDetectionPolicy === 'formattedValue') {
-                const { oldValue, newValue, columnId } = dataChangedInfo;
+                const { oldValue, newValue } = dataChangedInfo;
+                const columnId = dataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
                 const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
@@ -50,7 +51,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(alertDefinition.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -192,7 +193,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
-            if (!this.api.columnApi.isCalculatedColumn(column.ColumnId)) {
+            if (!this.api.columnApi.isCalculatedColumn(column.columnId)) {
                 const flashingAlertDefinitions = this.api.alertApi.getFlashingAlertDefinitions();
                 const flashingAlertForCurrentColumn = flashingAlertDefinitions.find((flashingAlertDefinition) => {
                     return this.api.scopeApi.isColumnInScope(column, flashingAlertDefinition.Scope);
@@ -205,7 +206,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return [
                     this.createColumnMenuItemReduxAction('Add Flashing Alert', this.moduleInfo.Glyph, AlertRedux.FlashingAlertDefinitionAdd({
                         Scope: {
-                            ColumnIds: [column.ColumnId],
+                            ColumnIds: [column.columnId],
                         },
                         Rule: {
                             Predicate: { PredicateId: 'Any' },
@@ -229,7 +230,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     }
                 }
                 const flashingAlertForRow = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue);
-                const flashingAlertForCell = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.ColumnId);
+                const flashingAlertForCell = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingAlertForRow && flashingAlertForRow.flashTarget === 'row') {
                     items.push(this.createColumnMenuItemReduxAction('Clear Flashing Alert for Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingAlertDelete(flashingAlertForRow)));
                 }
@@ -272,12 +273,12 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
             // might be better to do a single alert with all the messages?
-            this.api.alertApi.showAlert(this.api.columnApi.getFriendlyNameFromColumnId(dataChangedInfo.columnId), this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
+            this.api.alertApi.showAlert(dataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
         });
     }
     showFlashingAlertsForDefinitions(dataChangedInfo, flashingAlertDefinitions = []) {
-        const allColumnIds = this.api.columnApi.getColumns().map((c) => c.ColumnId);
-        const columnDataType = this.api.columnApi.getColumnDataTypeFromColumnId(dataChangedInfo.columnId);
+        const allColumnIds = this.api.columnApi.getColumns().map((c) => c.columnId);
+        const columnDataType = dataChangedInfo.column.dataType;
         const numeric = columnDataType === 'Number';
         const isComparableType = numeric || columnDataType === 'Date';
         let up = false;
@@ -292,7 +293,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         flashingAlertDefinitions.forEach((flashingAlertDefinition) => {
             const flashTarget = this.api.alertApi.getFlashingAlertFlashTarget(flashingAlertDefinition);
-            const flashColumnIds = { [dataChangedInfo.columnId]: true };
+            const flashColumnIds = { [dataChangedInfo.column.columnId]: true };
             if (flashTarget === 'row') {
                 allColumnIds.forEach((colId) => {
                     flashColumnIds[colId] = true;
@@ -319,7 +320,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getBaseAlertDefinitionsForDataChange(dataChangedEvent, definitions, defaultNoPredicateReturn = false) {
         let relatedAlertDefinitions = definitions
-            .filter((v) => this.api.scopeApi.isColumnInScope(this.api.columnApi.getColumnFromId(dataChangedEvent.columnId), v.Scope))
+            .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
             .filter((alertDefinition) => !AdaptableQuery_1.isReactiveQuery(alertDefinition.Rule));
         let triggeredAlerts = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(relatedAlertDefinitions)) {
@@ -353,7 +354,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // TODO send real display value
             displayValue: null,
             node: dataChangedEvent.rowNode,
-            column: this.api.columnApi.getColumnFromId(dataChangedEvent.columnId),
+            column: dataChangedEvent.column,
         }, defaultNoPredicateReturn);
     }
     getTeamSharingAction() {

package/src/Strategy/BulkUpdateModule.js

@@ -20,7 +20,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                !menuContext.adaptableColumn.ReadOnly &&
+                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -70,7 +70,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
         }
         let selectedColumn = selectedCellInfo.columns[0];
-        if (selectedColumn && selectedColumn.ReadOnly) {
+        if (selectedColumn && selectedColumn.readOnly) {
             return {
                 IsValid: false,
                 Alert: {
@@ -102,9 +102,9 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let columnId = '';
         if (!this.api.internalApi.isGridInPivotMode()) {
             if (selectedCellInfo != null && selectedCellInfo.columns.length > 0) {
-                columnId = selectedCellInfo.columns[0].ColumnId;
+                columnId = selectedCellInfo.columns[0].columnId;
                 let typedBulkUpdateValue;
-                switch (selectedCellInfo.columns[0].DataType) {
+                switch (selectedCellInfo.columns[0].dataType) {
                     case Enums_1.DataType.Number:
                         typedBulkUpdateValue = Number(bulkUpdateValue);
                         break;
@@ -119,7 +119,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                         oldValue: selectedCell.rawValue,
                         newValue: typedBulkUpdateValue,
-                        columnId: selectedCell.columnId,
+                        column: selectedCell.column,
                         primaryKeyValue: selectedCell.primaryKeyValue,
                         rowNode: selectedCell.rowNode,
                         trigger: 'edit',

package/src/Strategy/CalculatedColumnModule.js

@@ -40,7 +40,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (column && this.isModuleEditable()) {
             if (this.api.calculatedColumnApi
                 .getAllCalculatedColumn()
-                .find((cc) => cc.ColumnId == column.ColumnId)) {
+                .find((cc) => cc.ColumnId == column.columnId)) {
                 let popupParam = {
                     column: column,
                     action: 'Edit',

package/src/Strategy/CellSummaryModule.js

@@ -38,14 +38,14 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             let allValues = [];
             let numericColumns = [];
             selectedCellInfo.columns.map((c) => {
-                if (c && c.DataType == Enums_1.DataType.Number) {
-                    numericColumns.push(c.ColumnId);
+                if (c && c.dataType == Enums_1.DataType.Number) {
+                    numericColumns.push(c.columnId);
                 }
             });
             selectedCellInfo.gridCells.forEach((selectedCell) => {
                 let value = selectedCell.rawValue;
                 allValues.push(value);
-                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(numericColumns, selectedCell.columnId)) {
+                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(numericColumns, selectedCell.column.columnId)) {
                     let valueAsNumber = Number(value);
                     // possible that its not a number despite it being a numeric column
                     if (!isNaN(Number(valueAsNumber))) {

package/src/Strategy/ConditionalStyleModule.js

@@ -22,7 +22,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (this.api.scopeApi.scopeHasColumns(conditionalStyle.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(conditionalStyle.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -73,7 +73,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.conditionalStyleApi.editConditionalStyles(oldConditionalStyles);
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && !column.IsSparkline) {
+        if (column && this.isModuleEditable() && !column.isSparkline) {
             let conditionalStyles = this.api.conditionalStyleApi.getConditionalStylesForColumn(column);
             let firstConditionalStyle = ArrayExtensions_1.default.IsNotNullOrEmpty(conditionalStyles)
                 ? conditionalStyles.find((cs) => this.api.scopeApi.isColumnInScopeColumns(column, cs.Scope))
@@ -160,7 +160,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             value: value,
             oldValue: null,
             displayValue: column
-                ? this.api.gridApi.getDisplayValueFromRowNode(node, column.ColumnId)
+                ? this.api.gridApi.getDisplayValueFromRowNode(node, column.columnId)
                 : value,
             node: node,
             column: column,

package/src/Strategy/CustomSortModule.js

@@ -19,10 +19,10 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return false;
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && column.Sortable) {
+        if (column && this.isModuleEditable() && column.sortable) {
             let customSort = this.api.customSortApi
                 .getAllCustomSort()
-                .find((x) => x.ColumnId == column.ColumnId);
+                .find((x) => x.ColumnId == column.columnId);
             let label = customSort ? 'Edit ' : 'Create ';
             // dont show a menu item if there is a custom sort that uses a comparer function
             const columnSortComparer = this.api.internalApi.getCustomSortComparer(column);

package/src/Strategy/ExportModule.js

@@ -26,7 +26,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.api.scopeApi.scopeHasColumns(report.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(report.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }

package/src/Strategy/FilterModule.js

@@ -32,7 +32,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemClickFunction = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn &&
-                menuContext.adaptableColumn.Filterable &&
+                menuContext.adaptableColumn.filterable &&
                 menuContext.isSingleSelectedColumn &&
                 menuContext.gridCell != null) {
                 let isMultiple = menuContext.selectedCellInfo.gridCells.length > 1;
@@ -42,7 +42,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     })
                     : [menuContext.gridCell.primaryKeyValue];
                 let clickFunction = () => {
-                    this.api.filterApi.createColumnFilterForCell(menuContext.adaptableColumn.ColumnId, pkValues);
+                    this.api.filterApi.createColumnFilterForCell(menuContext.adaptableColumn.columnId, pkValues);
                 };
                 menuItemClickFunction = this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction);
             }
@@ -53,14 +53,14 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let baseMenuItems = [];
         if (column && this.api.gridApi.isQuickFilterAvailable()) {
             const isFilterVisible = this.api.filterApi.isQuickFilterVisible();
-            if (this.isModuleEditable() && this.api.columnApi.usesAdaptableQuickFilter(column.ColumnId)) {
+            if (this.isModuleEditable() && this.api.columnApi.usesAdaptableQuickFilter(column.columnId)) {
                 baseMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Quick Filter Bar' : 'Show Quick Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible ? FilterRedux.QuickFilterBarHide() : FilterRedux.QuickFilterBarShow()));
             }
         }
         if (column && this.canCreateColumnMenuItem(column, 'ReadOnly', 'filter')) {
             let existingColumnFilter = this.api.filterApi
                 .getAllColumnFilter()
-                .find((x) => x.ColumnId == column.ColumnId);
+                .find((x) => x.ColumnId == column.columnId);
             if (existingColumnFilter) {
                 baseMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', this.moduleInfo.Glyph, FilterRedux.ColumnFilterClear(existingColumnFilter)));
             }