@adaptabletools/adaptable 10.0.1 → 10.0.4-canary.1

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/DateHelper.d.ts

@@ -6,5 +6,5 @@ export declare const isValidDate: (date: Date) => boolean;
  */
 export declare const isValueValidDate: (data: any) => boolean;
 export declare const dateToISO: (date: Date | number | string) => string;
-export declare const parseToISO: (date: string | Date | number, dateFormat: string) => string;
-export declare const parseDate: (date: string, dateFormat: string) => Date | undefined;
+export declare const parseToISO: (date: string | Date | number, dateFormat?: string) => string;
+export declare const parseDateValue: (dateValue: string | Date | number, dateFormat?: string) => Date | undefined;

package/src/Utilities/Helpers/DateHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDate = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
+exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
 const tslib_1 = require("tslib");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
 const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
@@ -25,26 +25,36 @@ exports.dateToISO = (date) => {
     return FormatHelper_1.DateFormatter(date, { Pattern: 'yyyy-MM-dd' });
 };
 exports.parseToISO = (date, dateFormat) => {
-    let dateInstance = date instanceof Date
-        ? date
-        : typeof date === 'number'
-            ? new Date(date)
-            : exports.parseDate(date, dateFormat);
-    let valid = dateInstance && exports.isValidDate(dateInstance);
-    if (!valid) {
-        dateInstance = new Date(date);
-        valid = exports.isValidDate(dateInstance);
-    }
-    return valid ? exports.dateToISO(dateInstance) : '';
+    const dateInstance = exports.parseDateValue(date, dateFormat);
+    return exports.isValidDate(dateInstance) ? exports.dateToISO(dateInstance) : '';
 };
-exports.parseDate = (date, dateFormat) => {
-    let d = parse_1.default(date, dateFormat, new Date());
-    if (!exports.isValidDate(d)) {
-        d = parseISO_1.default(date);
+exports.parseDateValue = (dateValue, dateFormat) => {
+    if (dateValue == undefined) {
+        return undefined;
+    }
+    if (dateValue instanceof Date) {
+        return !isNaN(dateValue.getTime()) ? dateValue : undefined;
+    }
+    let dateInstance;
+    if (typeof dateValue === 'number') {
+        dateInstance = new Date(dateValue);
+    }
+    else {
+        // typeof dateValue === 'string'
+        if (dateFormat) {
+            dateInstance = parse_1.default(dateValue, dateFormat, new Date());
+        }
+        else {
+            dateInstance = parseISO_1.default(dateValue);
+        }
+        if (!exports.isValidDate(dateInstance)) {
+            // last chance: try to use the native Date.parse(), https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse
+            dateInstance = new Date(Date.parse(dateValue));
+        }
     }
-    if (!exports.isValidDate(d)) {
-        LoggingHelper_1.LogAdaptableError(`Invalid date value "${date}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
-        d = undefined;
+    if (!exports.isValidDate(dateInstance)) {
+        LoggingHelper_1.LogAdaptableError(`Invalid date value "${dateValue}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
+        dateInstance = undefined;
     }
-    return d;
+    return dateInstance;
 };

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.d.ts

@@ -61,7 +61,7 @@ export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyConditionalStyle(): ConditionalStyle;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
-export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
+export declare function CreateEmptyFreeTextColumn(isFilterable: boolean): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
     Name: string;
 }, adaptableColumns?: AdaptableColumn[]): Layout;

package/src/Utilities/ObjectFactory.js

@@ -74,6 +74,8 @@ function CreateEmptyCalculatedColumn(isFilterable) {
             Sortable: true,
             Pivotable: true,
             Aggregatable: true,
+            SuppressMenu: false,
+            SuppressMovable: false,
         },
     };
 }
@@ -334,13 +336,23 @@ function CreateEmptyFormatColumn() {
     };
 }
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;
-function CreateEmptyFreeTextColumn() {
+function CreateEmptyFreeTextColumn(isFilterable) {
     return {
         Uuid: Uuid_1.createUuid(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
         DefaultValue: GeneralConstants_1.EMPTY_STRING,
         FreeTextStoredValues: [],
         TextEditor: 'Inline',
+        FreeTextColumnSettings: {
+            Filterable: isFilterable,
+            Resizable: true,
+            Groupable: true,
+            Sortable: true,
+            Pivotable: true,
+            Aggregatable: true,
+            SuppressMenu: false,
+            SuppressMovable: false,
+        },
     };
 }
 exports.CreateEmptyFreeTextColumn = CreateEmptyFreeTextColumn;
@@ -348,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) {
@@ -287,6 +287,7 @@ class ReportService {
     }
     PublishLiveLiveDataChangedEvent(reportDestination, liveDataTrigger, liveReport) {
         const liveDataChangedInfo = {
+            adaptableApi: this.adaptable.api,
             reportDestination: reportDestination,
             liveDataTrigger: liveDataTrigger,
             liveReport: liveReport,
@@ -329,7 +330,7 @@ class ReportService {
         return type === 'rawValue'
             ? cellRawValue
             : // type === formattedValue
-                this.adaptable.getFormattedValueFromRawValue(cellRawValue, columnId);
+                this.adaptable.getDisplayValueFromRawValue(columnId, cellRawValue);
     }
     computeCellExportValueFormat(columnType) {
         if (this.adaptable.adaptableOptions.exportOptions.exportFormatType === 'rawValue' ||

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/Utilities/runIfNotResolvedIn.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Calls the callback if the promise does not resolve in a amount of time.
+ *
+ * @param promise
+ * @param callback Called if promise does not resolve in the time defined by 'delay'
+ * @param delay Time after which if the promise was not resolved the callback (fn) is called.
+ */
+export declare const runIfNotResolvedIn: <T>(promise: Promise<T>, callback: () => void, delay?: number) => Promise<T>;

package/src/Utilities/runIfNotResolvedIn.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runIfNotResolvedIn = void 0;
+/**
+ * Calls the callback if the promise does not resolve in a amount of time.
+ *
+ * @param promise
+ * @param callback Called if promise does not resolve in the time defined by 'delay'
+ * @param delay Time after which if the promise was not resolved the callback (fn) is called.
+ */
+exports.runIfNotResolvedIn = async (promise, callback, delay = 100) => {
+    let isFulfilled = false;
+    promise === null || promise === void 0 ? void 0 : promise.then(() => {
+        isFulfilled = true;
+    });
+    (async () => {
+        await new Promise((resolve) => setTimeout(resolve, delay));
+        if (!isFulfilled) {
+            callback();
+        }
+    })();
+    return promise;
+};

package/src/View/AdaptableView.js

@@ -15,9 +15,9 @@ const ChartEnums_1 = require("../PredefinedConfig/Common/ChartEnums");
 const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
 const Toastify_1 = require("../components/Toastify");
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
-const ProgressIndicator_1 = require("./Export/ProgressIndicator");
 const License_1 = require("./License");
 const ExportCustomDestinationFormPopups_1 = require("./Export/ExportCustomDestinationFormPopups");
+const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
 class AdaptableView extends React.Component {
     render() {
         var _a, _b, _c, _d, _e;

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/AlertDisplayWizardSection.js

@@ -11,6 +11,7 @@ const rebass_1 = require("rebass");
 const AdaptablePopupAlert_1 = require("../../Components/Popups/AdaptablePopupAlert");
 const AlertButtonsEditor_1 = require("./AlertButtonsEditor");
 const CodeBlock_1 = require("../../../components/CodeBlock");
+const AdaptableInput_1 = tslib_1.__importDefault(require("../../Components/AdaptableInput"));
 const DEFAULT_BUTTONS = [
     {
         Label: 'OK',
@@ -58,22 +59,35 @@ exports.AlertDisplayWizardSection = (props) => {
     var _a, _b, _c, _d;
     const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
     const messageType = data.MessageType;
+    const messageText = api.alertApi.getAlertDescription(data);
     const adaptableAlert = {
         header: data.MessageType,
         message: '',
         alertDefinition: data,
     };
+    const onMessageTextChange = (e) => {
+        const { value } = e.target;
+        props.onChange(Object.assign(Object.assign({}, data), { MessageText: value }));
+    };
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs_1.Tabs, null,
             React.createElement(Tabs_1.Tabs.Tab, null, "Message Type"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(Radio_1.RadioGroup, { value: messageType, name: "messageType", orientation: "vertical", onRadioChange: (MessageType) => {
+                React.createElement(Radio_1.RadioGroup, { value: messageType, name: "messageType", orientation: "horizontal", onRadioChange: (MessageType) => {
                         props.onChange(Object.assign(Object.assign({}, data), { MessageType }));
                     } },
-                    React.createElement(Radio_1.default, { value: "Info" }, "Info"),
-                    React.createElement(Radio_1.default, { value: "Success" }, "Success"),
-                    React.createElement(Radio_1.default, { value: "Warning" }, "Warning"),
-                    React.createElement(Radio_1.default, { value: "Error" }, "Error")))),
+                    React.createElement(Radio_1.default, { marginLeft: 1, value: "Info" }, "Info"),
+                    React.createElement(Radio_1.default, { marginLeft: 4, value: "Success" }, "Success"),
+                    React.createElement(Radio_1.default, { marginLeft: 4, value: "Warning" }, "Warning"),
+                    React.createElement(Radio_1.default, { marginLeft: 4, value: "Error" }, "Error")))),
+        React.createElement(Tabs_1.Tabs, { mt: 2, mb: 3, autoFocus: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Message Text"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Text, { fontSize: 2, mt: 3, mb: 2 }, "The text to display as the Alert Message (leave blank to show automated Message based on Trigger and Condition)"),
+                ' ',
+                React.createElement(AdaptableInput_1.default, { marginTop: 2, type: 'text', autoFocus: false, value: messageText, 
+                    // onChange={(e: any) => onPredicateInputChange(e, index)}
+                    onChange: (e) => onMessageTextChange(e) }))),
         React.createElement(Tabs_1.Tabs, { mt: 2, mb: 3, autoFocus: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Display options"),
             React.createElement(Tabs_1.Tabs.Content, null,

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.d.ts

@@ -4,6 +4,7 @@ import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
+import { GridCell } from '../../types';
 interface BulkUpdatePopupProps extends ModuleViewPopupProps<BulkUpdatePopupComponent> {
     BulkUpdateValue: string;
     BulkUpdateValidationResult: BulkUpdateValidationResult;
@@ -11,6 +12,7 @@ interface BulkUpdatePopupProps extends ModuleViewPopupProps<BulkUpdatePopupCompo
     onBulkUpdateValueChange: (value: string) => SystemRedux.BulkUpdateChangeValueAction;
     onBulkUpdateCheckSelectedCells: () => SystemRedux.BulkUpdateCheckCellSelectionAction;
     onRunBulkUpdate: () => BulkUpdateRedux.BulkUpdateCompleteAction;
+    SelectedGridCells: GridCell[];
 }
 export interface BulkUpdatePopupState {
     isShowingError: boolean;

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, { 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();
@@ -65,7 +65,7 @@ class BulkUpdatePopupComponent extends React.Component {
                 React.createElement(HelpBlock_1.default, { marginTop: 2, marginBottom: 2 }, "Select an existing column value from the dropdown, or enter a new value"),
                 React.createElement(rebass_1.Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(rebass_1.Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
-                        React.createElement(ColumnValueSelector_1.ColumnValueSelector, { selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns), style: { width: '100%', maxWidth: 'inherit' } })),
+                        React.createElement(ColumnValueSelector_1.ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns), style: { width: '100%', maxWidth: 'inherit' } })),
                     React.createElement(SimpleButton_1.default, { disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All' ||
                             hasDataTypeError, variant: "raised", tone: "accent", marginRight: 2, onClick: () => {
@@ -96,10 +96,12 @@ class BulkUpdatePopupComponent extends React.Component {
     }
 }
 function mapStateToProps(state, ownProps) {
+    var _a;
     return {
         BulkUpdateValue: state.System.BulkUpdateValue,
         PreviewInfo: state.System.BulkUpdatePreviewInfo,
         BulkUpdateValidationResult: state.System.BulkUpdateValidationResult,
+        SelectedGridCells: (_a = state.Grid.SelectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells,
     };
 }
 function mapDispatchToProps(dispatch) {

package/src/View/BulkUpdate/BulkUpdateViewPanel.d.ts

@@ -4,6 +4,7 @@ import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
+import { GridCell } from '../../types';
 export interface BulkUpdateViewPanelComponentProps extends ViewPanelProps {
     BulkUpdateValue: string;
     BulkUpdateValidationResult: BulkUpdateValidationResult;
@@ -12,6 +13,7 @@ export interface BulkUpdateViewPanelComponentProps extends ViewPanelProps {
     onBulkUpdateValueChange: (value: string) => SystemRedux.BulkUpdateChangeValueAction;
     onBulkUpdateCheckSelectedCells: () => SystemRedux.BulkUpdateCheckCellSelectionAction;
     onRunBulkUpdate: () => BulkUpdateRedux.BulkUpdateCompleteAction;
+    SelectedGridCells: GridCell[];
 }
 declare class BulkUpdateViewPanelComponent extends React.Component<BulkUpdateViewPanelComponentProps, {}> {
     private cleanupEvent?;

package/src/View/BulkUpdate/BulkUpdateViewPanel.js

@@ -52,7 +52,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: join_1.default(shouldDisable ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__BulkUpdate__wrap`), flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null,
-                React.createElement(ColumnValueSelector_1.ColumnValueSelector, { newLabel: "New", existingLabel: "Existing", dropdownButtonProps: {
+                React.createElement(ColumnValueSelector_1.ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, newLabel: "New", existingLabel: "Existing", dropdownButtonProps: {
                         listMinWidth: 160,
                     }, className: `ab-${elementType}__BulkUpdate__select`, disabled: shouldDisable, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: selectedColumn, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns) })),
             React.createElement(rebass_1.Flex, null,
@@ -90,7 +90,9 @@ class BulkUpdateViewPanelComponent extends React.Component {
     }
 }
 function mapStateToProps(state, ownProps) {
+    var _a;
     return {
+        SelectedGridCells: (_a = state.Grid.SelectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells,
         BulkUpdateValue: state.System.BulkUpdateValue,
         BulkUpdateValidationResult: state.System.BulkUpdateValidationResult,
         PreviewInfo: state.System.BulkUpdatePreviewInfo,

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.') }));
 };