@adaptabletools/adaptable 10.0.0 → 10.0.4-canary.0

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QuickFilterFormReact = exports.QuickFilterForm = void 0;
+exports.QuickFilterFormReact = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const debounce_1 = tslib_1.__importDefault(require("lodash-es/debounce"));
@@ -16,60 +16,87 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Ex
 const AdaptableInput_1 = tslib_1.__importDefault(require("../AdaptableInput"));
 const renderWithAdaptableContext_1 = require("../../renderWithAdaptableContext");
 const CheckBox_1 = require("../../../components/CheckBox");
+const isEqual_1 = tslib_1.__importDefault(require("lodash-es/isEqual"));
+const runIfNotResolvedIn_1 = require("../../../Utilities/runIfNotResolvedIn");
+const getDefaultColumnFilterPredicate_1 = require("./getDefaultColumnFilterPredicate");
 class QuickFilterFormComponent extends React.Component {
     constructor(props) {
         super(props);
-        this.getDistinctValues = (props = this.props) => {
-            return props.api.columnApi.getDistinctDisplayValuesForColumn(props.currentColumn.ColumnId);
+        this._isMounted = false;
+        this.handleFilterChange = (filter) => {
+            if (this.state.suppressClientSideFilter) {
+                this.loadPermittedValues(filter);
+            }
+        };
+        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 }));
+            if (!this._isMounted) {
+                return;
+            }
+            this.setState({
+                distinctColumnValues: values,
+                suppressClientSideFilter,
+                isDistinctColumnValuesLoading: false,
+            });
         };
         this.debouncedAddFilter = debounce_1.default(() => this.props.onAddColumnFilter(this.state.filter), 250);
         this.debouncedEditFilter = debounce_1.default(() => this.props.onEditColumnFilter(this.state.filter), 250);
-        const filter = this.getFilterFromProps(props);
-        const distinctColumnValues = filter.Predicate.PredicateId === 'Values' ? this.getDistinctValues() : [];
+        const filter = this.getFilterFromProps();
+        this._isMounted = true;
         this.state = {
             filter,
-            distinctColumnValues,
+            suppressClientSideFilter: false,
+            isDistinctColumnValuesLoading: false,
+            distinctColumnValues: [],
         };
     }
-    updateDistinctValues(props = this.props) {
-        this.setState({ distinctColumnValues: this.getDistinctValues(props) });
+    componentDidMount() {
+        var _a, _b;
+        if (((_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.Predicate.PredicateId) === 'Values') {
+            this.loadPermittedValues();
+        }
+    }
+    componentWillUnmount() {
+        this._isMounted = false;
     }
     UNSAFE_componentWillReceiveProps(nextProps) {
         const filter = this.getFilterFromProps(nextProps);
-        this.setState({
-            filter,
-        });
+        if (isEqual_1.default(filter, this.state.filter)) {
+            return;
+        }
+        this.setState({ filter });
         if ((filter === null || filter === void 0 ? void 0 : filter.Predicate) && filter.Predicate.PredicateId === 'Values') {
-            this.updateDistinctValues(nextProps);
+            this.setState({ isDistinctColumnValuesLoading: true });
+            this.loadPermittedValues();
         }
     }
-    getFilterFromProps(props) {
-        const filter = props.columnFilters.find((cf) => cf.ColumnId == props.currentColumn.ColumnId);
+    getFilterFromProps(props = this.props) {
+        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(this.props.currentColumn.ColumnId, 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(this.props.currentColumn.ColumnId, 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(this.props.currentColumn.ColumnId, 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';
@@ -179,11 +206,25 @@ class QuickFilterFormComponent extends React.Component {
             } }, 'No Column Values'));
     }
     renderValuesDropdown(filter) {
-        return (React.createElement(OverlayTrigger_1.default, { alignHorizontal: "left", showEvent: "mouseenter", hideEvent: "mouseleave", hideDelay: 300, ref: (api) => {
+        let showEvent = 'mouseenter';
+        if (this.props.quickFilterValuesTrigger === 'click') {
+            showEvent = 'click';
+        }
+        return (React.createElement(OverlayTrigger_1.default, { alignHorizontal: "left", showEvent: showEvent, 
+            // cannot hide on blur, because the form input receives the input when this is opened
+            hideEvent: "mouseleave", hideDelay: 300, ref: (api) => {
                 this.valuesDropdown = api;
             }, render: () => {
                 var _a;
-                return (React.createElement(rebass_1.Flex, { "data-name": "quick-filter-form", flexDirection: "column", style: {
+                return (React.createElement(rebass_1.Flex, { onMouseEnter: () => {
+                        var _a;
+                        if (showEvent === 'click') {
+                            // For showEvent=mouseneter this is not needed.
+                            // When mouseenter is triggered on the overlay, onShowFn is called, the overlay is no longer hidden.
+                            // But in this case because the trigger is click, another show is not triggered.
+                            (_a = this.valuesDropdown) === null || _a === void 0 ? void 0 : _a.show();
+                        }
+                    }, "data-name": "quick-filter-form", flexDirection: "column", style: {
                         fontSize: 'var(--ab-font-size-2)',
                         border: '1px solid var(--ab-color-primarydark)',
                         background: 'var(--ab-color-defaultbackground)',
@@ -193,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, { 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,
@@ -226,7 +267,7 @@ class QuickFilterFormComponent extends React.Component {
         };
         this.updateFilter(filter);
         if (predicateId === 'Values') {
-            this.updateDistinctValues();
+            this.loadPermittedValues();
             requestAnimationFrame(() => {
                 if (this.valuesDropdown) {
                     this.valuesDropdown.show();
@@ -276,8 +317,8 @@ function mapDispatchToProps(dispatch) {
         onEditColumnFilter: (columnFilter) => dispatch(FilterRedux.ColumnFilterEdit(columnFilter)),
     };
 }
-exports.QuickFilterForm = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(QuickFilterFormComponent);
+const QuickFilterForm = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(QuickFilterFormComponent);
 exports.QuickFilterFormReact = (FilterContext) => {
-    var _a;
-    return renderWithAdaptableContext_1.renderWithAdaptableContext(React.createElement(exports.QuickFilterForm, { api: FilterContext.Adaptable.api, quickFilterTrigger: (_a = FilterContext.Adaptable.adaptableOptions.filterOptions) === null || _a === void 0 ? void 0 : _a.quickFilterTrigger, currentColumn: FilterContext.Column, teamSharingActivated: false, embedColumnMenu: FilterContext.Adaptable.embedColumnMenu }), FilterContext.Adaptable);
+    var _a, _b;
+    return renderWithAdaptableContext_1.renderWithAdaptableContext(React.createElement(QuickFilterForm, { api: FilterContext.Adaptable.api, quickFilterTrigger: (_a = FilterContext.Adaptable.adaptableOptions.filterOptions) === null || _a === void 0 ? void 0 : _a.quickFilterTrigger, quickFilterValuesTrigger: (_b = FilterContext.Adaptable.adaptableOptions.filterOptions) === null || _b === void 0 ? void 0 : _b.quickFilterValuesTrigger, currentColumn: FilterContext.Column, teamSharingActivated: false, embedColumnMenu: FilterContext.Adaptable.embedColumnMenu }), FilterContext.Adaptable);
 };

package/src/View/Components/FilterForm/getDefaultColumnFilterPredicate.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+import { SystemFilterPredicateId } from '../../../PredefinedConfig/FilterState';
+export declare const getDefaultColumnFilterPredicate: (column: AdaptableColumn, defaultColumnFilter: "After" | "Before" | "Blanks" | "NonBlanks" | "Equals" | "NotEquals" | "GreaterThan" | "LessThan" | "Positive" | "Negative" | "Zero" | "Between" | "NotBetween" | "Is" | "IsNot" | "Contains" | "NotContains" | "StartsWith" | "EndsWith" | "Regex" | "Today" | "Yesterday" | "Tomorrow" | "ThisWeek" | "ThisMonth" | "ThisQuarter" | "ThisYear" | "InPast" | "InFuture" | "On" | "NotOn" | "NextWorkDay" | "LastWorkDay" | "True" | "False" | "Values" | "InRange" | "BooleanToggle" | ((column: AdaptableColumn) => SystemFilterPredicateId)) => SystemFilterPredicateId;

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

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultColumnFilterPredicate = void 0;
+exports.getDefaultColumnFilterPredicate = (column, defaultColumnFilter) => {
+    return typeof defaultColumnFilter === 'function'
+        ? defaultColumnFilter(column)
+        : defaultColumnFilter;
+};

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

@@ -4,7 +4,7 @@ import { ModuleParams } from '../SharedProps/ModuleViewPopupProps';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 /**
- * This is the main popup that we use - so all function popups will appear here.
+ * This is the main popup that we use - so all Module popups will appear here.
  */
 export interface AdaptablePopupProps extends React.ClassAttributes<AdaptablePopup> {
     showModal: boolean;

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

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
 import { DropdownButtonProps } from '../../../components/DropdownButton';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
+import { GridCell } from '../../../types';
 export interface ColumnValueSelectorProps extends React.HTMLProps<ColumnValueSelector> {
     selectedColumn: AdaptableColumn;
     selectedColumnValue: string;
@@ -12,19 +13,26 @@ export interface ColumnValueSelectorProps extends React.HTMLProps<ColumnValueSel
     newLabel?: string;
     existingLabel?: string;
     dropdownButtonProps?: DropdownButtonProps;
+    selectedGridCells: GridCell[];
 }
 declare enum NEW_OR_EXISTING {
     existing = "Existing value",
     new = "New value"
 }
-export declare class ColumnValueSelector extends React.Component<ColumnValueSelectorProps, {
+interface ColumnValueSelectorState {
     newOrExisting: NEW_OR_EXISTING;
-}> {
+    distinctColumnValues: any[];
+    isDistinctColumnValuesLoading: boolean;
+}
+export declare class ColumnValueSelector extends React.Component<ColumnValueSelectorProps, ColumnValueSelectorState> {
     static defaultProps: {
         newLabel: string;
         existingLabel: string;
     };
     constructor(props: ColumnValueSelectorProps);
+    componentDidUpdate(prevProps: ColumnValueSelectorProps): void;
+    loadPermittedValues: () => Promise<void>;
+    handleSelectedValueExpand: () => void;
     render(): JSX.Element;
     onSelectedValueChange(selected: any[]): void;
 }

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

@@ -10,6 +10,8 @@ const FieldWrap_1 = tslib_1.__importDefault(require("../../../components/FieldWr
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const UIHelper_1 = tslib_1.__importDefault(require("../../UIHelper"));
 const AdaptableInput_1 = tslib_1.__importDefault(require("../AdaptableInput"));
+const runIfNotResolvedIn_1 = require("../../../Utilities/runIfNotResolvedIn");
+const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
 var NEW_OR_EXISTING;
 (function (NEW_OR_EXISTING) {
     NEW_OR_EXISTING["existing"] = "Existing value";
@@ -18,35 +20,65 @@ var NEW_OR_EXISTING;
 class ColumnValueSelector extends React.Component {
     constructor(props) {
         super(props);
+        this.loadPermittedValues = async () => {
+            var _a;
+            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 }));
+            this.setState({ isDistinctColumnValuesLoading: false });
+            const newSortedColumnValues = ArrayExtensions_1.ArrayExtensions.sortArray(columnDisplayValuePairs, Enums_1.SortOrder.Asc).map((v) => ({
+                label: v,
+                value: v,
+                onClick: () => this.onSelectedValueChange([{ DisplayValue: v }]),
+            }));
+            this.setState({
+                distinctColumnValues: newSortedColumnValues,
+            });
+        };
+        this.handleSelectedValueExpand = () => {
+            // load only if not loaded
+            if (!this.state.distinctColumnValues.length) {
+                this.loadPermittedValues();
+            }
+        };
         this.state = {
             newOrExisting: NEW_OR_EXISTING.existing,
+            distinctColumnValues: [],
+            isDistinctColumnValuesLoading: false,
         };
     }
+    componentDidUpdate(prevProps) {
+        if (this.props.selectedColumn !== prevProps.selectedColumn ||
+            this.props.selectedGridCells !== prevProps.selectedGridCells) {
+            this.loadPermittedValues();
+        }
+    }
     render() {
         let placeholderText = 'Select';
-        let sortedColumnValues = [];
         let allowNew = this.props.allowNew != null ? this.props.allowNew : true;
         if (allowNew) {
             // placeholderText += ' or enter free text';
         }
+        const baseClassName = 'ab-column-value-selector';
+        const className = join_1.default('ab-column-value-selector', this.state.isDistinctColumnValuesLoading && `${baseClassName}--loading`);
         const fieldWidth = 150;
-        if (this.props.selectedColumn != null) {
-            // 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
-            let columnDisplayValuePairs = this.props.api.columnApi.getDistinctRawValuesForColumn(this.props.selectedColumn.ColumnId);
-            let test = ArrayExtensions_1.ArrayExtensions.sortArray(columnDisplayValuePairs, Enums_1.SortOrder.Asc);
-            sortedColumnValues = test.map((v) => ({
-                label: v,
-                value: v,
-                onClick: () => this.onSelectedValueChange([{ DisplayValue: v }]),
-            }));
-        }
+        const items = this.state.isDistinctColumnValuesLoading
+            ? [
+                {
+                    label: 'Loading',
+                    disabled: true,
+                },
+            ]
+            : this.state.distinctColumnValues;
         const dd = (React.createElement("div", null,
-            React.createElement(DropdownButton_1.default, { className: "ab-column-value-selector", columns: ['label'], variant: "text", showClearButton: true, onClear: () => this.onSelectedValueChange([]), style: { fontSize: 'small' }, disabled: this.props.disabled, items: sortedColumnValues }, this.props.selectedColumnValue ? this.props.selectedColumnValue : placeholderText)));
+            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/CustomSort/Wizard/CustomSortValuesWizardSection.js

@@ -5,7 +5,10 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const rebass_1 = require("rebass");
+const Loader_1 = require("../../../components/Loader");
 const Tabs_1 = require("../../../components/Tabs");
+const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
+const runIfNotResolvedIn_1 = require("../../../Utilities/runIfNotResolvedIn");
 const sortWithOrder_1 = require("../../../Utilities/sortWithOrder");
 const ValueSelector_1 = require("../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
@@ -21,8 +24,23 @@ exports.renderCustomSortValuesSummary = (data) => {
 };
 exports.CustomSortValuesWizardSection = (props) => {
     const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
-    const distinctValues = react_1.useMemo(() => {
-        return api.columnApi.getDistinctDisplayValuesForColumn(data.ColumnId);
+    const [distinctValues, setDistinctValues] = react_1.useState([]);
+    const [isDistinctValuesLoading, setIsDistinctValuesLoading] = react_1.useState(false);
+    react_1.useEffect(() => {
+        let isMounted = true;
+        (async () => {
+            // for sync and very fast resolving promises does not make sense to show a loader
+            setDistinctValues([]);
+            const newValues = await runIfNotResolvedIn_1.runIfNotResolvedIn(api.columnApi.getDistinctCustomSortDisplayValuesForColumn(data.ColumnId), () => isMounted && setIsDistinctValuesLoading(true));
+            if (!isMounted) {
+                return;
+            }
+            setIsDistinctValuesLoading(false);
+            setDistinctValues(newValues);
+        })();
+        return () => {
+            isMounted = false;
+        };
     }, [data.ColumnId]);
     const sortedValuesMap = react_1.useMemo(() => {
         if (!data.SortedValues || !data.SortedValues.length) {
@@ -37,14 +55,14 @@ exports.CustomSortValuesWizardSection = (props) => {
         return sortedValuesMap.has(option);
     }, [sortedValuesMap]);
     const options = react_1.useMemo(() => {
-        // if (!allowReorder) {
-        //   return distinctValues;
-        // }
         return sortWithOrder_1.sortWithOrderArray(distinctValues, data.SortedValues, { sortUnorderedItems: false });
     }, [allowReorder, distinctValues, data.SortedValues]);
-    return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' } },
+    const baseClassName = 'ab-CustomSortWizard__SortOrder';
+    const className = join_1.default(baseClassName, isDistinctValuesLoading && `${baseClassName}--loading`);
+    return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' }, className: className },
         React.createElement(Tabs_1.Tabs.Tab, null, "Sort Order"),
         React.createElement(Tabs_1.Tabs.Content, null,
+            isDistinctValuesLoading && React.createElement(Loader_1.Loader, null, "Loading"),
             React.createElement(ValueSelector_1.ValueSelector, { toIdentifier: (x) => `${x}`, toLabel: (x) => `${x}`, options: options, value: data.SortedValues, allowReorder: allowReorder, xSelectedLabel: () => {
                     return `Your Sort Order:`;
                 }, onChange: (SortedValues) => {

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