@adaptabletools/adaptable 10.0.3 → 10.0.4-canary.0

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -29,7 +29,7 @@ class QuickFilterFormComponent extends React.Component {
             }
         };
         this.loadPermittedValues = async (filter = '') => {
-            const { values, suppressClientSideFilter } = await runIfNotResolvedIn_1.runIfNotResolvedIn(this.props.api.columnApi.getDistinctFilterDisplayValuesForColumn(this.props.currentColumn.ColumnId, filter), () => this._isMounted && this.setState({ isDistinctColumnValuesLoading: true }));
+            const { values, suppressClientSideFilter } = await runIfNotResolvedIn_1.runIfNotResolvedIn(this.props.api.columnApi.getDistinctFilterDisplayValuesForColumn(this.props.currentColumn.columnId, filter), () => this._isMounted && this.setState({ isDistinctColumnValuesLoading: true }));
             if (!this._isMounted) {
                 return;
             }
@@ -71,32 +71,32 @@ class QuickFilterFormComponent extends React.Component {
         }
     }
     getFilterFromProps(props = this.props) {
-        const filter = props.columnFilters.find((cf) => cf.ColumnId == props.currentColumn.ColumnId);
+        const filter = props.columnFilters.find((cf) => cf.ColumnId == props.currentColumn.columnId);
         const filterOptions = props.api.internalApi.getAdaptableOptions().filterOptions;
         if (filter) {
             return filter;
         }
-        if (!filter && props.currentColumn.DataType === 'Number') {
-            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultNumericColumnFilter), ['']);
+        if (!filter && props.currentColumn.dataType === 'Number') {
+            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultNumericColumnFilter), ['']);
         }
-        if (!filter && props.currentColumn.DataType === 'String') {
-            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultStringColumnFilter), ['']);
+        if (!filter && props.currentColumn.dataType === 'String') {
+            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultStringColumnFilter), ['']);
         }
-        if (!filter && props.currentColumn.DataType === 'Date') {
-            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultDateColumnFilter), ['']);
+        if (!filter && props.currentColumn.dataType === 'Date') {
+            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultDateColumnFilter), ['']);
         }
-        if (!filter && props.currentColumn.DataType === 'Boolean') {
-            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(this.props.currentColumn.ColumnId, 'BooleanToggle', [
+        if (!filter && props.currentColumn.dataType === 'Boolean') {
+            return ObjectFactory_1.ObjectFactory.CreateColumnFilter(this.props.currentColumn.columnId, 'BooleanToggle', [
                 'all',
             ]);
         }
-        return ObjectFactory_1.ObjectFactory.CreateColumnFilter(this.props.currentColumn.ColumnId, null, null);
+        return ObjectFactory_1.ObjectFactory.CreateColumnFilter(this.props.currentColumn.columnId, null, null);
     }
     render() {
         const { filter } = this.state;
         const predicateDefs = this.props.api.filterApi.getFilterPredicateDefsForColumn(this.props.currentColumn);
         const activePredicateDef = this.props.api.predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
-        if (!this.props.currentColumn || !this.props.currentColumn.Filterable) {
+        if (!this.props.currentColumn || !this.props.currentColumn.filterable) {
             return null;
         }
         let showEvent = 'mouseenter';
@@ -234,7 +234,7 @@ class QuickFilterFormComponent extends React.Component {
                         React.createElement(SimpleButton_1.default, { onClick: () => this.clearFilter() }, "Clear Filter"),
                         ((_a = this.props.api.internalApi.getAdaptableOptions().filterOptions) === null || _a === void 0 ? void 0 : _a.autoApplyFilter) ==
                             false && (React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => this.updateFilter(this.state.filter) }, "Apply Filter"))),
-                    React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: [], columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.DataType, uiSelectedColumnValues: this.state.filter.Predicate.Inputs, useVendorStyle: true, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) })));
+                    React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: [], columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.dataType, uiSelectedColumnValues: this.state.filter.Predicate.Inputs, useVendorStyle: true, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) })));
             } },
             React.createElement(SimpleButton_1.default, { style: {
                     flex: 1,

package/src/View/Components/NewScopeComponent.js

@@ -54,7 +54,7 @@ exports.renderScopeSummary = (scope, labels) => {
             React.createElement(OnePageAdaptableWizard_1.SummaryText, { mb: 0 }, scopeApi.scopeIsAll(scope) ? labels.scopeWholeRow : null)),
         React.createElement(rebass_1.Box, { style: { overflow: 'hidden' } }, 'ColumnIds' in scope ? (React.createElement(React.Fragment, null,
             React.createElement(OnePageAdaptableWizard_1.SummaryText, { mb: columnsInScope.length ? 2 : 0 }, labels.scopeColumns),
-            columnsInScope.length ? (React.createElement(ValueSelector_1.ValueOptionsTags, { options: columnsInScope, value: columnsInScope.map((c) => c.ColumnId), toLabel: (c) => c.FriendlyName, allowWrap: true, readOnly: true, renderLabel: (c) => React.createElement(OnePageAdaptableWizard_1.SummaryText, { mb: 0 }, c), toIdentifier: (c) => c.ColumnId })) : null)) : null),
+            columnsInScope.length ? (React.createElement(ValueSelector_1.ValueOptionsTags, { options: columnsInScope, value: columnsInScope.map((c) => c.columnId), toLabel: (c) => c.friendlyName, allowWrap: true, readOnly: true, renderLabel: (c) => React.createElement(OnePageAdaptableWizard_1.SummaryText, { mb: 0 }, c), toIdentifier: (c) => c.columnId })) : null)) : null),
         React.createElement(rebass_1.Box, null, 'DataTypes' in scope ? (React.createElement(React.Fragment, null,
             React.createElement(rebass_1.Text, { fontSize: 2, mb: 2 }, labels.scopeDataTypes),
             React.createElement(ValueSelector_1.ValueOptionsTags, { readOnly: true, options: scope.DataTypes, value: scope.DataTypes, toLabel: (c) => c, allowWrap: true, renderLabel: (c) => React.createElement(rebass_1.Text, { fontSize: 2 }, `DataType: ${c}`), toIdentifier: (c) => c }))) : null)));

package/src/View/Components/PreviewResultsPanel.js

@@ -20,7 +20,7 @@ class PreviewResultsPanel extends React.Component {
     render() {
         let previewHeader = this.props.showHeader && this.props.previewInfo != null
             ? 'Preview Results: ' +
-                (this.props.selectedColumn ? this.props.selectedColumn.FriendlyName : '')
+                (this.props.selectedColumn ? this.props.selectedColumn.friendlyName : '')
             : '';
         let successColor = UIHelper_1.default.getColorByMessageType('Success');
         const dataSource = this.props.previewInfo.previewResults.map((previewResult, index) => {

package/src/View/Components/RangesComponent.js

@@ -161,7 +161,7 @@ class RangesComponent extends React.Component {
     }
     onMinColumnSelectedChanged(columns) {
         const { columnComparison } = this.state;
-        columnComparison.MinValue = columns.length > 0 ? columns[0].ColumnId : undefined;
+        columnComparison.MinValue = columns.length > 0 ? columns[0].columnId : undefined;
         this.props.updateColumnComparison(columnComparison);
     }
     changeColumnComparisonMaxValue(event) {
@@ -174,7 +174,7 @@ class RangesComponent extends React.Component {
     }
     onMaxColumnSelectedChanged(columns) {
         const { columnComparison } = this.state;
-        columnComparison.MaxValue = columns.length > 0 ? columns[0].ColumnId : undefined;
+        columnComparison.MaxValue = columns.length > 0 ? columns[0].columnId : undefined;
         this.props.updateColumnComparison(columnComparison);
     }
     changeColumnComparisonColor(value) {

package/src/View/Components/Selectors/ColumnSelector.js

@@ -11,7 +11,7 @@ const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/Dr
 class ColumnSelector extends React.Component {
     render() {
         var _a;
-        const sortedColumns = ArrayExtensions_1.ArrayExtensions.sortArrayWithProperty(Enums_1.SortOrder.Asc, this.props.ColumnList, 'FriendlyName');
+        const sortedColumns = ArrayExtensions_1.ArrayExtensions.sortArrayWithProperty(Enums_1.SortOrder.Asc, this.props.ColumnList, 'friendlyName');
         const selectedColumnIds = this.props.SelectedColumnIds.filter((x) => StringExtensions_1.StringExtensions.IsNotNullOrEmpty(x));
         const placeHolder = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.placeHolder)
             ? this.props.placeHolder.toString()
@@ -21,10 +21,10 @@ class ColumnSelector extends React.Component {
         const isEmptySelectedColumnIds = this.props.SelectedColumnIds.filter((x) => StringExtensions_1.StringExtensions.IsNotNullOrEmpty(x)).length == 0;
         let sortedColumnOptions = sortedColumns.map((column) => {
             return {
-                label: column.FriendlyName,
-                value: column.ColumnId,
+                label: column.friendlyName,
+                value: column.columnId,
                 onClick: () => {
-                    const selected = sortedColumns.filter((c) => c.ColumnId === column.ColumnId);
+                    const selected = sortedColumns.filter((c) => c.columnId === column.columnId);
                     if (!selected.length) {
                         this.onClearButton();
                     }
@@ -35,7 +35,7 @@ class ColumnSelector extends React.Component {
             };
         });
         let currentColumnName = selectedColumnIds.length > 0
-            ? (_a = this.props.ColumnList.find((c) => c.ColumnId == selectedColumnIds[0])) === null || _a === void 0 ? void 0 : _a.FriendlyName : 'Select a column';
+            ? (_a = this.props.ColumnList.find((c) => c.columnId == selectedColumnIds[0])) === null || _a === void 0 ? void 0 : _a.friendlyName : 'Select a column';
         return (React.createElement("div", { "data-name": 'column-selector' },
             React.createElement(FormLayout_1.default, { columns: [1], style: this.props.style },
                 React.createElement(FormLayout_1.FormRow, null,

package/src/View/Components/Selectors/ColumnValueSelector.js

@@ -22,12 +22,12 @@ class ColumnValueSelector extends React.Component {
         super(props);
         this.loadPermittedValues = async () => {
             var _a;
-            if (!((_a = this.props.selectedColumn) === null || _a === void 0 ? void 0 : _a.ColumnId)) {
+            if (!((_a = this.props.selectedColumn) === null || _a === void 0 ? void 0 : _a.columnId)) {
                 return;
             }
             // JW "fixed" this by replacing display values with raw values but really we should do it nicer in some way
             // so that you we show the display value but we work on the raw value
-            const columnDisplayValuePairs = await runIfNotResolvedIn_1.runIfNotResolvedIn(this.props.api.columnApi.getDistinctBulkUpdateDisplayValuesForColumn(this.props.selectedColumn.ColumnId, this.props.selectedGridCells), () => this.setState({ isDistinctColumnValuesLoading: true }));
+            const columnDisplayValuePairs = await runIfNotResolvedIn_1.runIfNotResolvedIn(this.props.api.columnApi.getDistinctBulkUpdateDisplayValuesForColumn(this.props.selectedColumn.columnId, this.props.selectedGridCells), () => this.setState({ isDistinctColumnValuesLoading: true }));
             this.setState({ isDistinctColumnValuesLoading: false });
             const newSortedColumnValues = ArrayExtensions_1.ArrayExtensions.sortArray(columnDisplayValuePairs, Enums_1.SortOrder.Asc).map((v) => ({
                 label: v,
@@ -76,9 +76,9 @@ class ColumnValueSelector extends React.Component {
         const dd = (React.createElement("div", null,
             React.createElement(DropdownButton_1.default, { className: className, columns: ['label'], variant: "text", showClearButton: true, onClear: () => this.onSelectedValueChange([]), style: { fontSize: 'small' }, disabled: this.props.disabled, items: items, onExpand: this.handleSelectedValueExpand }, this.props.selectedColumnValue ? this.props.selectedColumnValue : placeholderText)));
         const input = (React.createElement(AdaptableInput_1.default, { type: this.props.selectedColumn
-                ? UIHelper_1.default.getDescriptionForDataType(this.props.selectedColumn.DataType)
+                ? UIHelper_1.default.getDescriptionForDataType(this.props.selectedColumn.dataType)
                 : 'text', placeholder: this.props.selectedColumn
-                ? UIHelper_1.default.getPlaceHolderforDataType(this.props.selectedColumn.DataType)
+                ? UIHelper_1.default.getPlaceHolderforDataType(this.props.selectedColumn.dataType)
                 : 'Enter Value', autoFocus: true, disabled: this.props.disabled, style: { width: fieldWidth }, value: this.props.selectedColumnValue, onChange: (e) => {
                 this.onSelectedValueChange([
                     { customOption: true, DisplayValue: e.target.value },

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -154,11 +154,11 @@ const AdaptableToolPanelComponent = (props) => {
         ];
         props.Columns.forEach((col, index) => {
             colItems.push({
-                id: col.ColumnId,
+                id: col.columnId,
                 onClick: () => {
-                    onSetColumnVisibility(col.ColumnId);
+                    onSetColumnVisibility(col.columnId);
                 },
-                label: (React.createElement(CheckBox_1.CheckBox, { as: "div", className: "ab-dd-checkbox", variant: "agGrid", my: 0, value: col.ColumnId, key: col.ColumnId, checked: col.Visible, onMouseDown: preventDefault }, col.FriendlyName)),
+                label: (React.createElement(CheckBox_1.CheckBox, { as: "div", className: "ab-dd-checkbox", variant: "agGrid", my: 0, value: col.columnId, key: col.columnId, checked: col.visible, onMouseDown: preventDefault }, col.friendlyName)),
             });
         });
         return (React.createElement(DropdownButton_1.default, { listMinWidth: 150, variant: "text", tone: "none", collapseOnItemClick: false, items: colItems, columns: ['label'], className: "ab-Toolpanel__columns", key: 'dropdown-cols', id: 'dropdown-cols', tooltip: "Select Columns" }, colsGlyph));
@@ -213,11 +213,11 @@ const AdaptableToolPanelComponent = (props) => {
         let changedColumn = props.api.columnApi.getColumnFromId(name);
         let columns = [].concat(props.Columns);
         changedColumn = Object.assign({}, changedColumn, {
-            Visible: !changedColumn.Visible,
+            Visible: !changedColumn.visible,
         });
-        let index = columns.findIndex((x) => x.ColumnId == name);
+        let index = columns.findIndex((x) => x.columnId == name);
         columns[index] = changedColumn;
-        props.onNewColumnListOrder(columns.filter((c) => c.Visible).map((c) => c.ColumnId));
+        props.onNewColumnListOrder(columns.filter((c) => c.visible).map((c) => c.columnId));
     };
     const onSetToolPanelVisibility = (name, checked) => {
         if (checked) {

package/src/View/ConditionalStyle/ConditionalStylePopup.js

@@ -61,7 +61,7 @@ class ConditionalStylePopupComponent extends React.Component {
                 if (this.props.popupParams.action == 'New') {
                     _editedConditionalStyle = ObjectFactory_1.ObjectFactory.CreateEmptyConditionalStyle();
                     _editedConditionalStyle.Scope = {
-                        ColumnIds: [column.ColumnId],
+                        ColumnIds: [column.columnId],
                     };
                     this.setState({
                         editedAdaptableObject: _editedConditionalStyle,

package/src/View/ConditionalStyle/ConditionalStyleSummary.js

@@ -57,7 +57,7 @@ class ConditionalStyleSummaryComponent extends React.Component {
     onNew() {
         let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyConditionalStyle();
         configEntity.Scope = {
-            ColumnIds: [this.props.summarisedColumn.ColumnId],
+            ColumnIds: [this.props.summarisedColumn.columnId],
         };
         this.setState({
             editedAdaptableObject: configEntity,

package/src/View/CustomSort/CustomSortEntityRow.js

@@ -14,10 +14,10 @@ class CustomSortEntityRow extends React.Component {
         let customSort = this.props.adaptableObject;
         const columnSortComparer = this.props.api.internalApi.getCustomSortComparer(this.props.column);
         let colItems = Helper_1.cloneObject(this.props.colItems);
-        colItems[0].Content = React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.column.FriendlyName });
+        colItems[0].Content = React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.column.friendlyName });
         colItems[1].Content = (React.createElement(EntityRowItem_1.EntityRowItem, { Content: customSort ? this.getCustomSortedValues(customSort) : 'Custom Sort Function' }));
         colItems[2].Content = (React.createElement(EntityListActionButtons_1.EntityListActionButtons, { showSuspend: true, suspendableObject: customSort, confirmDeleteAction: this.props.onDeleteConfirm, editClick: () => this.props.onEdit(customSort), shareClick: (config) => this.props.onShare(config), showShare: this.props.teamSharingActivated, overrideDisableEdit: columnSortComparer != undefined ||
-                this.props.column.FriendlyName.includes(GeneralConstants.MISSING_COLUMN), entityType: this.props.moduleInfo.FriendlyName, accessLevel: this.props.accessLevel, onSuspend: this.props.onSuspend, onUnSuspend: this.props.onUnSuspend }));
+                this.props.column.friendlyName.includes(GeneralConstants.MISSING_COLUMN), entityType: this.props.moduleInfo.FriendlyName, accessLevel: this.props.accessLevel, onSuspend: this.props.onSuspend, onUnSuspend: this.props.onUnSuspend }));
         return React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { isSuspended: customSort.IsSuspended, colItems: colItems });
     }
     getCustomSortedValues(customSort) {

package/src/View/CustomSort/CustomSortPopup.js

@@ -53,7 +53,7 @@ class CustomSortPopupComponent extends React.Component {
     componentDidMount() {
         if (this.props.popupParams) {
             if (this.props.popupParams.action && this.props.popupParams.column) {
-                let columnId = this.props.popupParams.column.ColumnId;
+                let columnId = this.props.popupParams.column.columnId;
                 if (this.props.popupParams.action == 'New') {
                     let newCustomSort = ObjectFactory_1.ObjectFactory.CreateEmptyCustomSort();
                     newCustomSort.ColumnId = columnId;

package/src/View/CustomSort/CustomSortSummary.js

@@ -36,11 +36,11 @@ class CustomSortSummaryComponent extends React.Component {
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
-        const customSort = this.props.CustomSorts.find((c) => c.ColumnId == this.props.summarisedColumn.ColumnId);
+        const customSort = this.props.CustomSorts.find((c) => c.ColumnId == this.props.summarisedColumn.columnId);
         const columnSortComparer = this.props.api.internalApi.getCustomSortComparer(this.props.summarisedColumn);
         let noCustomSort = customSort == null && columnSortComparer == null;
         let customSortRow;
-        if (!this.props.summarisedColumn.Sortable) {
+        if (!this.props.summarisedColumn.sortable) {
             customSortRow = (React.createElement(ModuleHeader_1.ModuleHeader, { key: this.props.moduleInfo.FriendlyName, moduleInfo: this.props.moduleInfo, moduleSummary: 'Column is not sortable', newButtonDisabled: true, onNew: () => this.onNew(), newButtonTooltip: this.props.moduleInfo.FriendlyName, accessLevel: this.props.accessLevel }));
         }
         else if (noCustomSort) {
@@ -59,7 +59,7 @@ class CustomSortSummaryComponent extends React.Component {
     }
     onNew() {
         let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyCustomSort();
-        configEntity.ColumnId = this.props.summarisedColumn.ColumnId;
+        configEntity.ColumnId = this.props.summarisedColumn.columnId;
         this.setState({
             editedAdaptableObject: configEntity,
             wizardStartIndex: 1,

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.js

@@ -29,16 +29,16 @@ exports.CustomSortColumnWizardSection = (props) => {
         const customSorts = api.customSortApi.getAllCustomSort();
         const columnSortComparers = ((_b = (_a = api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.customSortComparers) || [];
         const usedColumnIds = [
-            ...customSorts.map((column) => column.ColumnId),
+            ...customSorts.map((customSort) => customSort.ColumnId),
             ...columnSortComparers.map((comparer) => comparer.columnId),
         ];
         // filter out used colum ids, but include the current one
         return sortableColumns.filter((column) => {
-            if (!props.isNew && column.ColumnId === (data === null || data === void 0 ? void 0 : data.ColumnId)) {
+            if (!props.isNew && column.columnId === (data === null || data === void 0 ? void 0 : data.ColumnId)) {
                 return true;
             }
             return usedColumnIds.every((usedColumnId) => {
-                return column.ColumnId !== usedColumnId;
+                return column.columnId !== usedColumnId;
             });
         });
     }, []);

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -195,7 +195,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
 };
 const buildGridOptions = (mainAdaptableInstance, changeHistoryLog) => {
     var _a, _b;
-    const mainPrimaryKeyColumnHeader = (_b = (_a = mainAdaptableInstance.api.columnApi.getPrimaryKeyColumn()) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : 'Row ID';
+    const mainPrimaryKeyColumnHeader = (_b = (_a = mainAdaptableInstance.api.columnApi.getPrimaryKeyColumn()) === null || _a === void 0 ? void 0 : _a.friendlyName) !== null && _b !== void 0 ? _b : 'Row ID';
     const options = {
         suppressLoadingOverlay: true,
         overlayNoRowsTemplate: '<div style="font-size: var(--ab-font-size-2);color: var(--ab-color-text-on-primary);">No Data Changes</div>',
@@ -295,7 +295,7 @@ const mapChangeHistoryRowData = (changeHistoryLog = {}, mainAdaptableInstance) =
             primaryKey: `${changeKey}::${changeInfo.changedAt}`,
             changeKey,
             changeTriggerLabel: getChangeTriggerLabel(changeInfo),
-            changedColumnLabel: getColumnHeaderLabel(changeInfo.columnId, mainAdaptableInstance),
+            changedColumnLabel: getColumnHeaderLabel(changeInfo.column.columnId, mainAdaptableInstance),
             changeInfo,
         };
     });
@@ -305,7 +305,7 @@ const headerMap = new Map();
 const getColumnHeaderLabel = (columnId, mainAdaptableInstance) => {
     var _a, _b;
     if (!headerMap.has(columnId)) {
-        headerMap.set(columnId, (_b = (_a = mainAdaptableInstance.api.columnApi.getColumnFromId(columnId)) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : columnId);
+        headerMap.set(columnId, (_b = (_a = mainAdaptableInstance.api.columnApi.getColumnFromId(columnId)) === null || _a === void 0 ? void 0 : _a.friendlyName) !== null && _b !== void 0 ? _b : columnId);
     }
     return headerMap.get(columnId);
 };

package/src/View/Filter/FilterSummary.js

@@ -18,7 +18,7 @@ class FilterSummaryComponent extends React.Component {
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
-        let columnFilter = this.props.ColumnFilters.find((c) => c.ColumnId == this.props.summarisedColumn.ColumnId);
+        let columnFilter = this.props.ColumnFilters.find((c) => c.ColumnId == this.props.summarisedColumn.columnId);
         let description = this.getDescription(columnFilter);
         let summaryItems = [];
         summaryItems.push(React.createElement("b", null, React.createElement(ModuleProfile_1.ModuleProfile, { moduleInfo: this.props.moduleInfo })));
@@ -27,7 +27,7 @@ class FilterSummaryComponent extends React.Component {
         return React.createElement(SummaryRowItem_1.SummaryRowItem, { SummaryItems: summaryItems });
     }
     getDescription(columnFilter) {
-        if (this.props.summarisedColumn && !this.props.summarisedColumn.Filterable) {
+        if (this.props.summarisedColumn && !this.props.summarisedColumn.filterable) {
             return 'Column is not filterable';
         }
         if (columnFilter == null) {

package/src/View/FormatColumn/FormatColumnPopup.js

@@ -55,7 +55,7 @@ class FormatColumnPopupComponent extends React.Component {
                 if (this.props.popupParams.action == 'New') {
                     let newFormatColumn = ObjectFactory_1.ObjectFactory.CreateEmptyFormatColumn();
                     newFormatColumn.Scope = {
-                        ColumnIds: [column.ColumnId],
+                        ColumnIds: [column.columnId],
                     };
                     this.onNewFromColumn(newFormatColumn);
                 }

package/src/View/FormatColumn/FormatColumnSummary.js

@@ -51,7 +51,7 @@ class FormatColumnSummaryComponent extends React.Component {
     onNew() {
         let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyFormatColumn();
         configEntity.Scope = {
-            ColumnIds: [this.props.summarisedColumn.ColumnId],
+            ColumnIds: [this.props.summarisedColumn.columnId],
         };
         this.setState({
             editedAdaptableObject: configEntity,

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -104,7 +104,7 @@ exports.getFormatDisplayTypeForScope = (scope, api) => {
     // need to see if all columns are numeric or date
     if ('ColumnIds' in scope) {
         const columns = scope.ColumnIds.map((c) => api.columnApi.getColumnFromId(c));
-        const columnDataTypes = uniq_1.default(columns.map((c) => c.DataType));
+        const columnDataTypes = uniq_1.default(columns.map((c) => c.dataType));
         if (columnDataTypes.length == 1 && columnDataTypes[0] == 'Number') {
             return 'Number';
         }

package/src/View/FreeTextColumn/FreeTextColumnPopup.js

@@ -44,7 +44,7 @@ class FreeTextColumnPopupComponent extends React.Component {
         if (this.props.popupParams) {
             if (this.props.popupParams.action && this.props.popupParams.column) {
                 if (this.props.popupParams.action == 'Edit') {
-                    let editFreeTextColumn = this.props.FreeTextColumns.find((x) => x.ColumnId == this.props.popupParams.column.ColumnId);
+                    let editFreeTextColumn = this.props.FreeTextColumns.find((x) => x.ColumnId == this.props.popupParams.column.columnId);
                     let index = this.props.FreeTextColumns.indexOf(editFreeTextColumn);
                     this.onEdit(editFreeTextColumn);
                 }

package/src/View/FreeTextColumn/FreeTextColumnSummary.js

@@ -35,7 +35,7 @@ class FreeTextColumnSummaryComponent extends React.Component {
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
-        let freeTextColumn = this.props.FreeTextColumns.find((c) => c.ColumnId == this.props.summarisedColumn.ColumnId);
+        let freeTextColumn = this.props.FreeTextColumns.find((c) => c.ColumnId == this.props.summarisedColumn.columnId);
         let noFreeTextColumn = freeTextColumn == null;
         let FreeTextColumnRow;
         if (!noFreeTextColumn) {
@@ -52,7 +52,7 @@ class FreeTextColumnSummaryComponent extends React.Component {
         const specialColumnsAreFilterable = this.props.api.internalApi.getAdaptableOptions()
             .filterOptions.enableFilterOnSpecialColumns;
         let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn(specialColumnsAreFilterable);
-        configEntity.ColumnId = this.props.summarisedColumn.ColumnId;
+        configEntity.ColumnId = this.props.summarisedColumn.columnId;
         this.setState({
             editedAdaptableObject: configEntity,
             wizardStartIndex: 1,

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -47,7 +47,7 @@ exports.isValidFreeTextColumn = (data, api) => {
     if (!data.ColumnId) {
         return 'Column id cannot be empty';
     }
-    const columnsWithSameIdCount = columns.filter((c) => c.ColumnId === data.ColumnId).length;
+    const columnsWithSameIdCount = columns.filter((c) => c.columnId === data.ColumnId).length;
     const hasAlreadyExistingId = data.Uuid ? columnsWithSameIdCount > 1 : columnsWithSameIdCount > 0;
     if (hasAlreadyExistingId) {
         return 'A Column already exists with that id';

package/src/View/GridInfo/ColumnInfoComponent.js

@@ -31,36 +31,36 @@ class ColumnInfoComponent extends React.Component {
             { Content: '', Size: 2 },
         ];
         let selectedColumnId = this.state.SelectedColumn
-            ? this.state.SelectedColumn.ColumnId
+            ? this.state.SelectedColumn.columnId
             : null;
         let keyValuePairs = [
             {
                 Key: 'Column Id',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.ColumnId : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.columnId : null,
             },
             {
                 Key: 'Header',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.FriendlyName : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.friendlyName : null,
             },
             {
                 Key: 'Aggregatable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Aggregatable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.aggregatable : null,
             },
             {
                 Key: 'DataType',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.DataType : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.dataType : null,
             },
             {
                 Key: 'Groupable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Groupable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.groupable : null,
             },
             {
                 Key: 'Filterable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Filterable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.filterable : null,
             },
             {
                 Key: 'Hideable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Hideable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.hideable : null,
             },
             {
                 Key: 'Editable',
@@ -68,27 +68,27 @@ class ColumnInfoComponent extends React.Component {
             },
             {
                 Key: 'Moveable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Moveable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.moveable : null,
             },
             {
                 Key: 'Pivotable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Pivotable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.pivotable : null,
             },
             {
                 Key: 'Queryable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Queryable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.queryable : null,
             },
             {
                 Key: 'Sortable',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Sortable : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.sortable : null,
             },
             {
                 Key: 'Visible',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.Visible : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.visible : null,
             },
             {
                 Key: 'Grouped',
-                Value: this.state.SelectedColumn ? this.state.SelectedColumn.IsGrouped : null,
+                Value: this.state.SelectedColumn ? this.state.SelectedColumn.isGrouped : null,
             },
         ];
         let moduleService = this.props.api.internalApi.getModuleService();
@@ -125,14 +125,14 @@ class ColumnInfoComponent extends React.Component {
                     React.createElement(FreeTextColumnSummary_1.FreeTextColumnSummary, { key: ModuleConstants.FreeTextColumnModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.FreeTextColumnModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.FreeTextColumnModuleId) })));
             }
             if (this.isModuleAvailable(ModuleConstants.PlusMinusModuleId) &&
-                this.state.SelectedColumn.DataType == Enums_1.DataType.Number) {
+                this.state.SelectedColumn.dataType == Enums_1.DataType.Number) {
                 summaries.push(React.createElement("div", { key: ModuleConstants.PlusMinusModuleId, className: this.isModuleReadOnly(ModuleConstants.PlusMinusModuleId)
                         ? GeneralConstants.READ_ONLY_STYLE
                         : '' },
                     React.createElement(PlusMinusSummary_1.PlusMinusSummary, { key: ModuleConstants.PlusMinusModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.PlusMinusModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.PlusMinusModuleId) })));
             }
             if (this.isModuleAvailable(ModuleConstants.CalculatedColumnModuleId) &&
-                ArrayExtensions_1.ArrayExtensions.ContainsItem(this.props.api.calculatedColumnApi.getAllCalculatedColumn().map((cc) => cc.ColumnId), this.state.SelectedColumn.ColumnId)) {
+                ArrayExtensions_1.ArrayExtensions.ContainsItem(this.props.api.calculatedColumnApi.getAllCalculatedColumn().map((cc) => cc.ColumnId), this.state.SelectedColumn.columnId)) {
                 summaries.push(React.createElement("div", { key: ModuleConstants.CalculatedColumnModuleId, className: this.isModuleReadOnly(ModuleConstants.CalculatedColumnModuleId)
                         ? GeneralConstants.READ_ONLY_STYLE
                         : '' },

package/src/View/Layout/Wizard/LayoutEditor/ColumnList.js

@@ -24,7 +24,7 @@ exports.ColumnList = (props) => {
             source.droppableId !== destination.droppableId) {
             return;
         }
-        if (!source.column || !source.column.Moveable) {
+        if (!source.column || !source.column.moveable) {
             return;
         }
         if (destination.index === source.index) {
@@ -36,8 +36,8 @@ exports.ColumnList = (props) => {
             // cannot drop on this list while searching
             return;
         }
-        if (!source.column.IsFixed &&
-            newColumns.slice(newDropIndex).filter((c) => c.IsFixed).length) {
+        if (!source.column.isFixed &&
+            newColumns.slice(newDropIndex).filter((c) => c.isFixed).length) {
             // there are fixed cols after this one, so it's an invalid drop
             return;
         }
@@ -59,7 +59,7 @@ exports.ColumnList = (props) => {
     }, [onDragEnd]);
     const renderColumn = react_2.useCallback((c) => {
         const defaultRenderColumn = (c) => {
-            return React.createElement(React.Fragment, null, c.FriendlyName);
+            return React.createElement(React.Fragment, null, c.friendlyName);
         };
         return (props.renderItem || defaultRenderColumn)(c);
     }, [props.renderItem]);
@@ -68,11 +68,11 @@ exports.ColumnList = (props) => {
             React.createElement(rebass_1.Box, { px: 2, mb: 2 },
                 React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { placeholder: "Search a column", width: "100%", value: search, OnTextChange: setSearch })),
             columns.map((c, index) => {
-                return (React.createElement(react_beautiful_dnd_1.Draggable, { key: `${c.ColumnId}-column`, draggableId: c.ColumnId, index: index }, (provided, snapshot) => {
+                return (React.createElement(react_beautiful_dnd_1.Draggable, { key: `${c.columnId}-column`, draggableId: c.columnId, index: index }, (provided, snapshot) => {
                     const style = props.getItemStyle(c, snapshot, provided.draggableProps.style);
                     style.padding = 0;
                     if (search &&
-                        c.FriendlyName.toLowerCase().indexOf(search.toLowerCase()) == -1) {
+                        c.friendlyName.toLowerCase().indexOf(search.toLowerCase()) == -1) {
                         style.display = 'none';
                     }
                     return (React.createElement("div", Object.assign({ ref: provided.innerRef }, provided.draggableProps, provided.dragHandleProps, { className: "ab-LayoutEditor__ColumnList__column", style: style }), renderColumn(c)));

package/src/View/Layout/Wizard/LayoutEditor/ColumnSortList.js

@@ -39,7 +39,7 @@ exports.ColumnSortList = (props) => {
             return;
         }
         if (columnDrag) {
-            if (!source.column.Sortable) {
+            if (!source.column.sortable) {
                 return;
             }
             if (columnSorts.filter((c) => c.ColumnId === source.columnId)[0]) {

package/src/View/Layout/Wizard/LayoutEditor/PivotList.js

@@ -36,7 +36,7 @@ exports.PivotList = (props) => {
             return;
         }
         if (columnDrag) {
-            if (!source.column.Pivotable) {
+            if (!source.column.pivotable) {
                 return;
             }
             if (pivotColumns.filter((colId) => colId === source.columnId)[0]) {

package/src/View/Layout/Wizard/LayoutEditor/RowGroupsList.js

@@ -36,7 +36,7 @@ exports.RowGroupsList = (props) => {
             return;
         }
         if (columnDrag) {
-            if (!source.column.Groupable) {
+            if (!source.column.groupable) {
                 return;
             }
             if (rowGroups.filter((colId) => colId === source.columnId)[0]) {

package/src/View/Layout/Wizard/LayoutEditor/getItemStyle.js

@@ -10,9 +10,9 @@ exports.getItemStyle = (column, layout, dragSource, snapshot, draggableStyle) =>
         if (dragSource == droppableIds_1.LayoutEditorDroppableIds.ColumnList &&
             draggingOver === droppableIds_1.LayoutEditorDroppableIds.ColumnSortList &&
             //if col not sortable or is already in the sort order
-            (!column.Sortable ||
+            (!column.sortable ||
                 (layout.ColumnSorts &&
-                    layout.ColumnSorts.filter((sort) => sort.ColumnId === column.ColumnId)[0]))) {
+                    layout.ColumnSorts.filter((sort) => sort.ColumnId === column.columnId)[0]))) {
         }
         //dragging things on the first column, from any other column
         if (dragSource != droppableIds_1.LayoutEditorDroppableIds.ColumnList &&