@adaptabletools/adaptable 10.0.3 → 10.0.4-canary.0

package/src/Strategy/FormatColumnModule.js

@@ -18,7 +18,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(formatColumn.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -148,7 +148,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         var _a;
         let returnColumnMenuItems = [];
-        if (column && this.isModuleEditable() && !column.IsSparkline) {
+        if (column && this.isModuleEditable() && !column.isSparkline) {
             // not fullproof as might be an All but its generally pretty good
             let formatColumn = this.api.formatColumnApi.getFormatColumnForColumn(column);
             let formatExists = formatColumn
@@ -165,8 +165,8 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 value: formatColumn,
             };
             returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
-            if (column.DataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.ColumnId)) {
-                let formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(column.ColumnId);
+            if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
+                let formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(column.columnId);
                 let hasCheckBox = formatColumn && ((_a = formatColumn.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle);
                 if (hasCheckBox) {
                     returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'check-box-outline', () => {
@@ -188,7 +188,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'check-box', () => {
                             let newFormatColumn = {
                                 Scope: {
-                                    ColumnIds: [column.ColumnId],
+                                    ColumnIds: [column.columnId],
                                 },
                                 ColumnStyle: {
                                     CheckBoxStyle: true,

package/src/Strategy/FreeTextColumnModule.js

@@ -24,7 +24,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi
                 .getAllFreeTextColumn()
-                .find((ftc) => ftc.ColumnId == column.ColumnId)) {
+                .find((ftc) => ftc.ColumnId == column.columnId)) {
                 let popupParam = {
                     column: column,
                     action: 'Edit',

package/src/Strategy/LayoutModule.js

@@ -42,15 +42,15 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 action: 'Edit',
                 source: 'ColumnMenu',
             }));
-            if (column && column.Hideable) {
+            if (column && column.hideable) {
                 returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {
-                    this.api.columnApi.hideColumn(column.ColumnId);
+                    this.api.columnApi.hideColumn(column.columnId);
                 }));
             }
             let selectMenuItems = [];
             if (column) {
                 selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'column-chooser', () => {
-                    this.api.columnApi.selectColumn(column.ColumnId);
+                    this.api.columnApi.selectColumn(column.columnId);
                 }));
             }
             selectMenuItems.push(this.createColumnMenuItemClickFunction('Whole Grid', this.moduleInfo.Glyph, () => {

package/src/Strategy/PlusMinusModule.js

@@ -22,7 +22,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.scopeApi.scopeHasColumns(plusMinusNudge.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(plusMinusNudge.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -52,7 +52,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.shouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && column.DataType == 'Number') {
+        if (column && this.isModuleEditable() && column.dataType == 'Number') {
             let popupParam = {
                 column: column,
                 action: 'New',
@@ -86,15 +86,14 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let failedPreventEdits = [];
         let side = direction == 'up' ? 1 : -1;
         cellsToUpdate.forEach((gridCell) => {
-            let selectedColumn = this.api.columnApi.getColumnFromId(gridCell.columnId);
-            if (selectedColumn &&
-                selectedColumn.DataType == Enums_1.DataType.Number &&
-                !selectedColumn.ReadOnly) {
+            if (gridCell.column &&
+                gridCell.column.dataType == Enums_1.DataType.Number &&
+                !gridCell.column.readOnly) {
                 let foundRule;
                 let replacementGridCell;
                 plusMinusNudges.forEach((pmr) => {
                     if (!foundRule) {
-                        if (this.api.scopeApi.isColumnInScope(selectedColumn, pmr.Scope)) {
+                        if (this.api.scopeApi.isColumnInScope(gridCell.column, pmr.Scope)) {
                             if (this.api.gridApi.areCellsEditable([gridCell])) {
                                 //for aggrid as we are getting strings sometimes
                                 if (typeof gridCell.rawValue != 'number') {
@@ -109,7 +108,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                     //   computedValue=   parseFloat(computedValue.toFixed(12));
                                     replacementGridCell = {
                                         primaryKeyValue: gridCell.primaryKeyValue,
-                                        columnId: gridCell.columnId,
+                                        column: gridCell.column,
                                         rawValue: computedValue,
                                         displayValue: computedValue,
                                         normalisedValue: computedValue,
@@ -124,7 +123,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     const dataChangedEvent = this.api.internalApi.buildDataChangedInfo({
                         oldValue: Number(gridCell.rawValue),
                         newValue: replacementGridCell.rawValue,
-                        columnId: gridCell.columnId,
+                        column: gridCell.column,
                         primaryKeyValue: gridCell.primaryKeyValue,
                         rowNode: gridCell.rowNode,
                         trigger: 'edit',

package/src/Strategy/SmartEditModule.js

@@ -23,8 +23,8 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                menuContext.adaptableColumn.DataType == Enums_1.DataType.Number &&
-                !menuContext.adaptableColumn.ReadOnly &&
+                menuContext.adaptableColumn.dataType == Enums_1.DataType.Number &&
+                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -75,7 +75,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         let column = selectedCellInfo.columns[0];
         if (column) {
-            if (column.DataType != Enums_1.DataType.Number) {
+            if (column.dataType != Enums_1.DataType.Number) {
                 return {
                     Alert: {
                         header: 'Smart Edit Error',
@@ -84,7 +84,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     },
                 };
             }
-            if (column.ReadOnly) {
+            if (column.readOnly) {
                 return {
                     Alert: {
                         header: 'Smart Edit Error',
@@ -114,7 +114,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (ArrayExtensions_1.default.IsNotNullOrEmpty(selectedCellInfo.columns)) {
                 let column = selectedCellInfo.columns[0];
                 if (column) {
-                    columnId = column.ColumnId;
+                    columnId = column.columnId;
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;
                         switch (smartEditOperation) {
@@ -138,7 +138,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         let dataChangedEvent = this.api.internalApi.buildDataChangedInfo({
                             oldValue: Number(selectedCell.rawValue),
                             newValue: newValue,
-                            columnId: selectedCell.columnId,
+                            column: selectedCell.column,
                             primaryKeyValue: selectedCell.primaryKeyValue,
                             rowNode: selectedCell.rowNode,
                             trigger: 'edit',

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -227,7 +227,7 @@ exports.booleanExpressionFunctions = {
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
             return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
                 var _a;
-                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getNormalisedValueFromRowNode(context.node, column.ColumnId);
+                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getNormalisedValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -23,7 +23,7 @@ exports.isTextSearchCaseInsensitive = (context) => !context.api.internalApi.isTe
 exports.getDataChangeLog$ = (context, columnNameFilter) => {
     let dataChangeLog$ = context.api.internalApi.getDataService().dataChangeLog$;
     // filter only the given column changes
-    dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((dataChangeLog) => dataChangeLog.columnId === columnNameFilter));
+    dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((dataChangeLog) => dataChangeLog.column.columnId === columnNameFilter));
     // filter based on the WHERE clause
     if (context.filterFn) {
         dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((value) => context.filterFn(value.rowNode)));
@@ -92,7 +92,7 @@ const validateColumnId = (columnId, api) => {
     if (!column) {
         throw new ExpressionEvaluationError_1.ExpressionEvaluationError('', `Column name "${columnId}" is not found`);
     }
-    if (!column.Queryable) {
+    if (!column.queryable) {
         throw new ExpressionEvaluationError_1.ExpressionEvaluationError('', `Column name "${columnId}" is not queryable`);
     }
 };

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -244,14 +244,15 @@ const getDataChangedInfoStub = (context) => {
     const rowNode = rowNodeStub;
     if (rowNode) {
         const primaryKeyValue = context.api.gridApi.getPrimaryKeyValueForRowNode(rowNode);
-        const columnId = (_a = context.api.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.ColumnId;
+        const columnId = (_a = context.api.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.columnId;
         const oldValue = context.api.gridApi.getCellRawValue(primaryKeyValue, columnId);
+        const column = context.api.columnApi.getColumnFromId(columnId);
         const newValue = oldValue;
         return {
             changedAt: Date.now(),
             rowNode,
             primaryKeyValue,
-            columnId,
+            column: column,
             oldValue,
             newValue,
         };

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -89,7 +89,7 @@ exports.scalarExpressionFunctions = {
             if (!column) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not found`);
             }
-            if (!column.Queryable) {
+            if (!column.queryable) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
             }
             return (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, columnId);

package/src/Utilities/Helpers/PreviewHelper.js

@@ -39,11 +39,11 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
             if (previewResult.validationRules.length == 0) {
                 newValues.push({
                     primaryKeyValue: previewResult.id,
-                    columnId: previewInfo.columnId,
                     rawValue: previewResult.computedValue,
                     displayValue: previewResult.computedValue,
                     normalisedValue: previewResult.computedValue,
                     rowNode: previewResult.rowNode,
+                    column: this.adaptable.api.columnApi.getColumnFromId(previewInfo.columnId),
                 });
             }
         }
@@ -54,7 +54,7 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
             .forEach((pr) => {
             newValues.push({
                 primaryKeyValue: pr.id,
-                columnId: previewInfo.columnId,
+                column: this.adaptable.api.columnApi.getColumnFromId(previewInfo.columnId),
                 rawValue: pr.computedValue,
                 displayValue: pr.computedValue,
                 normalisedValue: pr.computedValue,

package/src/Utilities/ObjectFactory.js

@@ -360,7 +360,7 @@ function CreateEmptyLayout(layout, adaptableColumns) {
     return Object.assign(Object.assign({}, layout), { Uuid: Uuid_1.createUuid(), Columns: layout.Columns || [], ColumnSorts: layout.ColumnSorts || [], 
         //  ColumnFlexMap: layout.ColumnFlexMap || {},
         ColumnWidthMap: layout.ColumnWidthMap || {}, RowGroupedColumns: layout.RowGroupedColumns ||
-            (adaptableColumns ? adaptableColumns.filter((c) => c.IsGrouped).map((c) => c.ColumnId) : []) });
+            (adaptableColumns ? adaptableColumns.filter((c) => c.isGrouped).map((c) => c.columnId) : []) });
 }
 exports.CreateEmptyLayout = CreateEmptyLayout;
 function CreateEmptyStyle() {

package/src/Utilities/Services/DataService.js

@@ -30,8 +30,8 @@ class DataService {
     // we need this temporary "shared memory" because the value change and the AG Grid cellChanged event are asynchronous
     // in the first phase we keep the undone change
     logUndoChange(change) {
-        const { primaryKeyValue, columnId, oldValue, newValue } = change;
-        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, columnId, oldValue, newValue);
+        const { primaryKeyValue, column, oldValue, newValue } = change;
+        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, column.columnId, oldValue, newValue);
         this.undoChangeLog.set(undoChangeKey, change);
         // normally the extractUndoChange() should be executed right after this method
         // just to be sure that no 'zombie' undo change remains here (if something goes wrong with the undo value change)
@@ -39,16 +39,16 @@ class DataService {
         // why 2 and not 3 or 1? no good reason, only seems like a reasonable waiting time :)
         const UNDO_WAIT = 2000;
         const timeoutId = setTimeout(() => {
-            LoggingHelper_1.LogAdaptableInfo(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.columnId}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
+            LoggingHelper_1.LogAdaptableInfo(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.column}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
             this.extractUndoChange(change);
         }, UNDO_WAIT);
         this.undoChangeTimers.set(undoChangeKey, timeoutId);
     }
     // in the second phase, when AG-Grid triggers the cellChange event, we check if it corresponds to an undone change
     extractUndoChange(change) {
-        const { primaryKeyValue, columnId, oldValue, newValue } = change;
+        const { primaryKeyValue, column, oldValue, newValue } = change;
         // this is post-undo, so we have to swap the new& old values
-        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, columnId, newValue, oldValue);
+        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, column.columnId, newValue, oldValue);
         const result = this.undoChangeLog.get(undoChangeKey);
         this.undoChangeLog.delete(undoChangeKey);
         const timeoutId = this.undoChangeTimers.get(undoChangeKey);

package/src/Utilities/Services/ReportService.js

@@ -160,14 +160,14 @@ class ReportService {
                 reportColumns = gridColumns;
                 break;
             case Enums_1.ReportColumnScope.VisibleColumns:
-                reportColumns = gridColumns.filter((c) => c.Visible);
+                reportColumns = gridColumns.filter((c) => c.visible);
                 break;
             case Enums_1.ReportColumnScope.SelectedColumns:
                 // we extract the selected columns from the grid columns to preserve the grid column order
                 const selectedColumnIds = this.adaptable.api.gridApi
                     .getSelectedCellInfo()
-                    .columns.map((column) => column.ColumnId);
-                reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.ColumnId));
+                    .columns.map((column) => column.columnId);
+                reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.columnId));
                 break;
             case Enums_1.ReportColumnScope.ScopeColumns:
                 if ('ColumnIds' in report.Scope) {
@@ -182,7 +182,7 @@ class ReportService {
                 break;
         }
         if (includePrimaryKey) {
-            const pkColumn = reportColumns.find((column) => column.ColumnId === this.adaptable.adaptableOptions.primaryKey);
+            const pkColumn = reportColumns.find((column) => column.columnId === this.adaptable.adaptableOptions.primaryKey);
             // TODO simplify after we fix the IsPrimaryKey bug
             // const pkColumn = reportColumns.find(column => column.IsPrimaryKey);
             if (!pkColumn && !!this.adaptable.api.columnApi.getPrimaryKeyColumn()) {
@@ -194,16 +194,16 @@ class ReportService {
     getReportData(report, includePrimaryKey = false) {
         var _a, _b;
         const columns = this.GetReportColumnsForReport(report, includePrimaryKey).map((column) => ({
-            ColumnId: column.ColumnId,
-            FriendlyName: column.FriendlyName,
-            DataType: column.DataType,
+            columnId: column.columnId,
+            friendlyName: column.friendlyName,
+            dataType: column.dataType,
         }));
         if (ArrayExtensions_1.default.IsNullOrEmpty(columns) &&
             report.ReportRowScope !== Enums_1.ReportRowScope.CustomRows) {
             return { columns: [], rows: [] };
         }
         const data = { columns, rows: [] };
-        const columnIds = columns.map((column) => column.ColumnId);
+        const columnIds = columns.map((column) => column.columnId);
         switch (report.ReportRowScope) {
             case Enums_1.ReportRowScope.AllRows:
                 this.adaptable.forAllRowNodesDo((rowNode) => {
@@ -240,7 +240,7 @@ class ReportService {
                     const rowPrimaryKeyValue = this.adaptable.getPrimaryKeyValueFromRowNode(rowNode);
                     const selectedRowCells = selectedCellsByPrimaryKey[rowPrimaryKeyValue];
                     if (selectedRowCells) {
-                        const selectedRowColumnIds = selectedRowCells.map((rowCell) => rowCell.columnId);
+                        const selectedRowColumnIds = selectedRowCells.map((rowCell) => rowCell.column.columnId);
                         const selectedColumnIds = columnIds.filter((columnId) => selectedRowColumnIds.includes(columnId));
                         const row = this.getRowObjectForColumnIds(rowNode, selectedColumnIds);
                         if (includePrimaryKey) {
@@ -275,8 +275,8 @@ class ReportService {
     }
     convertReportDataToArray(reportData) {
         return [
-            reportData.columns.map((column) => column.FriendlyName),
-            ...reportData.rows.map((row) => reportData.columns.map((column) => row[column.ColumnId])),
+            reportData.columns.map((column) => column.friendlyName),
+            ...reportData.rows.map((row) => reportData.columns.map((column) => row[column.columnId])),
         ];
     }
     getRowObjectForColumnIds(rowNode, columnIds) {

package/src/Utilities/Services/ValidationService.js

@@ -18,7 +18,7 @@ class ValidationService {
         }
         let editingRules = this.adaptable.api.alertApi
             .getAlertDefinitionsWithPreventEdit()
-            .filter((v) => this.adaptable.api.scopeApi.isColumnInScope(this.adaptable.api.columnApi.getColumnFromId(dataChangedInfo.columnId), v.Scope));
+            .filter((v) => this.adaptable.api.scopeApi.isColumnInScope(dataChangedInfo.column, v.Scope));
         let failedValidations = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
@@ -55,13 +55,12 @@ class ValidationService {
         return true;
     }
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
-        const column = this.adaptable.api.columnApi.getColumnFromId(dataChangedEvent.columnId);
         return this.adaptable.api.predicateApi.handlePredicate(alertDefinition.Rule.Predicate, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
-            displayValue: this.adaptable.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.columnId),
+            displayValue: this.adaptable.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
             node: dataChangedEvent.rowNode,
-            column,
+            column: dataChangedEvent.column,
         }, false);
     }
     performServerValidation(dataChangedInfo, config) {
@@ -82,7 +81,7 @@ class ValidationService {
                     if (!row) {
                         return;
                     }
-                    row[(_b = this.adaptable.api.columnApi.getVendorGridColumnFieldForColumn(dataChangedInfo.columnId)) !== null && _b !== void 0 ? _b : dataChangedInfo.columnId] = validationResult.NewValue;
+                    row[(_b = this.adaptable.api.columnApi.getVendorGridColumnFieldForColumn(dataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : dataChangedInfo.column.columnId] = validationResult.NewValue;
                     this.adaptable.api.gridApi.updateGridData([row]);
                     if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
                         this.adaptable.adaptableOptions.editOptions.displayServerValidationMessages) {

package/src/View/Alert/AlertPopup.js

@@ -64,7 +64,7 @@ class AlertPopupComponent extends React.Component {
                 if (this.props.popupParams.action == 'New') {
                     let alertDefinition = ObjectFactory_1.ObjectFactory.CreateEmptyAlertDefinition();
                     alertDefinition.Scope = {
-                        ColumnIds: [this.props.popupParams.column.ColumnId],
+                        ColumnIds: [this.props.popupParams.column.columnId],
                     };
                     this.setState({
                         editedAdaptableObject: alertDefinition,

package/src/View/Alert/Wizard/BaseAlertScopeWizardSection.js

@@ -49,7 +49,7 @@ exports.renderBaseAlertScopeSummary = (data) => {
                 : null)),
         React.createElement(rebass_1.Box, { style: { overflow: 'hidden' } }, 'ColumnIds' in data.Scope ? (React.createElement(React.Fragment, null,
             React.createElement(rebass_1.Text, { fontSize: 2, mb: columnsInScope.length ? 2 : 0 }, "Changes in selected columns will trigger an alert"),
-            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(rebass_1.Text, { fontSize: 2 }, 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(rebass_1.Text, { fontSize: 2 }, c), toIdentifier: (c) => c.columnId })) : null)) : null),
         React.createElement(rebass_1.Box, null, 'DataTypes' in data.Scope ? (React.createElement(React.Fragment, null,
             React.createElement(rebass_1.Text, { fontSize: 2, mb: 2 }, "Changes in columns of the selected data-types trigger an alert"),
             React.createElement(ValueSelector_1.ValueOptionsTags, { readOnly: true, options: data.Scope.DataTypes, value: data.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/BulkUpdate/BulkUpdatePopup.js

@@ -34,7 +34,7 @@ class BulkUpdatePopupComponent extends React.Component {
         let dataTypeErrorMessage = '';
         if (col && StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.BulkUpdateValue)) {
             // check that the update value is a number for a numeric column.  not issue for dates as we dont allow free text
-            if (col.DataType == Enums_1.DataType.Number) {
+            if (col.dataType == Enums_1.DataType.Number) {
                 if (isNaN(Number(this.props.BulkUpdateValue))) {
                     hasDataTypeError = true;
                     dataTypeErrorMessage = 'This column only accepts numbers';
@@ -50,14 +50,14 @@ class BulkUpdatePopupComponent extends React.Component {
             return null;
         }
         return (React.createElement(PanelWithImage_1.PanelWithImage, { header: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), variant: "primary", bodyProps: { padding: 2 }, style: { height: '100%' } },
-            col.DataType == Enums_1.DataType.Date ? (React.createElement(React.Fragment, null,
+            col.dataType == Enums_1.DataType.Date ? (React.createElement(React.Fragment, null,
                 React.createElement(HelpBlock_1.default, { marginTop: 2, marginBottom: 2 }, "Enter a date value. Alternatively, tick the checkbox and select from an existing column value."),
                 React.createElement(rebass_1.Box, null,
                     React.createElement(CheckBox_1.CheckBox, { marginLeft: 2, onChange: (checked) => this.onUseColumnValuesSelectorChanged(checked), checked: this.state.useSelector },
                         ' ',
                         "Select from existing column values")),
                 React.createElement(rebass_1.Flex, { padding: 2, flexDirection: "row", alignItems: "center" },
-                    React.createElement(rebass_1.Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 }, this.state.useSelector ? (React.createElement(ColumnValueSelector_1.ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (values) => this.onColumnValueSelectedChanged(values), allowNew: false, style: { width: '100%', maxWidth: 'inherit' } })) : (React.createElement(AdaptableInput_1.default, { style: { width: '100%' }, value: String(this.props.BulkUpdateValue), type: UIHelper_1.UIHelper.getDescriptionForDataType(col.DataType), placeholder: UIHelper_1.UIHelper.getPlaceHolderforDataType(col.DataType), onChange: (e) => this.onBulkUpdateValueChange(e) }))),
+                    React.createElement(rebass_1.Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 }, this.state.useSelector ? (React.createElement(ColumnValueSelector_1.ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (values) => this.onColumnValueSelectedChanged(values), allowNew: false, style: { width: '100%', maxWidth: 'inherit' } })) : (React.createElement(AdaptableInput_1.default, { style: { width: '100%' }, value: String(this.props.BulkUpdateValue), type: UIHelper_1.UIHelper.getDescriptionForDataType(col.dataType), placeholder: UIHelper_1.UIHelper.getPlaceHolderforDataType(col.dataType), onChange: (e) => this.onBulkUpdateValueChange(e) }))),
                     React.createElement(SimpleButton_1.default, { disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();

package/src/View/CalculatedColumn/CalculatedColumnPopup.js

@@ -46,7 +46,7 @@ class CalculatedColumnPopupComponent extends React.Component {
             if (this.props.popupParams.action && this.props.popupParams.column) {
                 if (this.props.popupParams.action == 'Edit') {
                     // only editing is possible - you cannot create a new calc column from the column menu
-                    let calculatedColumn = this.props.CalculatedColumns.find((x) => x.ColumnId == this.props.popupParams.column.ColumnId);
+                    let calculatedColumn = this.props.CalculatedColumns.find((x) => x.ColumnId == this.props.popupParams.column.columnId);
                     this.onEdit(calculatedColumn);
                 }
             }

package/src/View/CalculatedColumn/CalculatedColumnSummary.js

@@ -29,7 +29,7 @@ class CalculatedColumnSummaryComponent extends React.Component {
         let sharing = this.props.teamSharingActivated;
         this.props.CalculatedColumns.map((item, index) => {
             var _a;
-            if (item.ColumnId == this.props.summarisedColumn.ColumnId) {
+            if (item.ColumnId == this.props.summarisedColumn.columnId) {
                 detailRow = (React.createElement(ModuleDetail_1.ModuleDetail, { key: 'UF' + index, item1: this.props.moduleInfo.FriendlyName, item2: (_a = item.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression, configEnity: item, showShare: this.props.teamSharingActivated, moduleInfo: this.props.moduleInfo, onEdit: () => this.onEdit(item), onShare: (config) => this.props.onShare(item, config), onDelete: CalculatedColumnRedux.CalculatedColumnDelete(item), showBold: true, accessLevel: this.props.accessLevel }));
             }
         });

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -48,7 +48,7 @@ exports.isValidCalculatedColumnSettings = (data, api) => {
     if (!((_a = data.CalculatedColumnSettings) === null || _a === void 0 ? void 0 : _a.DataType)) {
         return 'No data type specified for column';
     }
-    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;
     return hasAlreadyExistingId ? 'A Column already exists with that id' : true;
 };

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

@@ -9,7 +9,7 @@ exports.NewColumnSelector = (props) => {
     const { columnFilterText, availableColumns, selected, onChange, singleSelect } = props;
     const filterFn = react_1.useMemo(() => {
         return columnFilterText
-            ? (c) => c.FriendlyName.toLowerCase().indexOf(columnFilterText.toLowerCase()) != -1
+            ? (c) => c.friendlyName.toLowerCase().indexOf(columnFilterText.toLowerCase()) != -1
             : null;
     }, [columnFilterText]);
     return (React.createElement(ValueSelector_1.ValueSelector, { value: selected, options: availableColumns, filter: filterFn, singleSelect: singleSelect, allowReorder: false, onChange: (colIds) => {
@@ -19,7 +19,7 @@ exports.NewColumnSelector = (props) => {
             else {
                 onChange(colIds);
             }
-        }, toIdentifier: (c) => c.ColumnId, toLabel: (c) => c.FriendlyName, noSelectionLabel: singleSelect ? 'Please select a column' : 'You have not selected any columns.', xSelectedLabel: singleSelect
+        }, toIdentifier: (c) => c.columnId, toLabel: (c) => c.friendlyName, noSelectionLabel: singleSelect ? 'Please select a column' : 'You have not selected any columns.', xSelectedLabel: singleSelect
             ? () => null
             : (count) => (count > 1 ? `You selected ${count} columns.` : 'You selected one column.') }));
 };

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

@@ -50,24 +50,24 @@ class FilterFormComponent extends React.Component {
         };
     }
     static createColumnFilterFromProps(props) {
-        let existingColumnFilter = props.columnFilters.find((cf) => cf.ColumnId == props.currentColumn.ColumnId);
+        let existingColumnFilter = props.columnFilters.find((cf) => cf.ColumnId == props.currentColumn.columnId);
         if (!existingColumnFilter) {
             const filterOptions = props.api.internalApi.getAdaptableOptions()
                 .filterOptions;
             if (filterOptions.defaultFilterFormTab == 'Values') {
-                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, 'Values', []);
+                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, 'Values', []);
             }
-            if (props.currentColumn.DataType === 'Number') {
-                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultNumericColumnFilter), ['']);
+            if (props.currentColumn.dataType === 'Number') {
+                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultNumericColumnFilter), ['']);
             }
-            if (props.currentColumn.DataType === 'String') {
-                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultStringColumnFilter), ['']);
+            if (props.currentColumn.dataType === 'String') {
+                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultStringColumnFilter), ['']);
             }
-            if (props.currentColumn.DataType === 'Date') {
-                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultDateColumnFilter), ['']);
+            if (props.currentColumn.dataType === 'Date') {
+                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, getDefaultColumnFilterPredicate_1.getDefaultColumnFilterPredicate(props.currentColumn, filterOptions.defaultDateColumnFilter), ['']);
             }
-            if (props.currentColumn.DataType === 'Boolean') {
-                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.ColumnId, 'BooleanToggle', [
+            if (props.currentColumn.dataType === 'Boolean') {
+                return ObjectFactory_1.ObjectFactory.CreateColumnFilter(props.currentColumn.columnId, 'BooleanToggle', [
                     'all',
                 ]);
             }
@@ -102,12 +102,12 @@ class FilterFormComponent extends React.Component {
         this._isMounted = false;
     }
     componentDidMount() {
-        if (this.props.currentColumn.DataType != Enums_1.DataType.Boolean) {
+        if (this.props.currentColumn.dataType != Enums_1.DataType.Boolean) {
             this.loadPermittedValues();
         }
     }
     async loadPermittedValues(filter = '') {
-        const { values: distinctColumnValues, suppressClientSideFilter } = await runIfNotResolvedIn_1.runIfNotResolvedIn(this.props.api.columnApi.getDistinctFilterDisplayValuesForColumn(this.props.currentColumn.ColumnId, filter), () => this._isMounted && this.setState({ isDistinctColumnValuesLoading: true }));
+        const { values: distinctColumnValues, 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;
         }
@@ -141,7 +141,7 @@ class FilterFormComponent extends React.Component {
                 React.createElement(Radio_1.default, { marginLeft: 2, flex: 1, checked: this.state.currentTab == 'predicates', onChange: () => this.setState({ currentTab: 'predicates' }) },
                     React.createElement(rebass_1.Flex, { fontSize: 'var( --ab-font-size-2)' }, "Filters")))),
             this.state.currentTab === 'values' && (React.createElement("div", null,
-                React.createElement(ListBoxFilterForm_1.ListBoxFilterForm, { suppressClientSideFilter: this.state.suppressClientSideFilter, isLoading: this.state.isDistinctColumnValuesLoading, onFilterChange: this.handleFilterChange, currentColumn: this.props.currentColumn, columns: this.props.columns, columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.DataType, uiSelectedColumnValues: uiSelectedColumnValues, useVendorStyle: useVendorStyle, 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: this.props.columns, columnDistinctValues: this.state.distinctColumnValues, dataType: this.props.currentColumn.dataType, uiSelectedColumnValues: uiSelectedColumnValues, useVendorStyle: useVendorStyle, onColumnValueSelectedChange: (list) => this.onColumnValuesChange(list) }))),
             this.state.currentTab === 'predicates' && (React.createElement("div", null,
                 ' ',
                 this.state.showTab && React.createElement("hr", null),
@@ -185,7 +185,7 @@ class FilterFormComponent extends React.Component {
                 } }))));
     }
     isFilterable() {
-        if (!this.props.currentColumn.Filterable) {
+        if (!this.props.currentColumn.filterable) {
             return 'Column is not filterable';
         }
         return '';