@adaptabletools/adaptable 10.0.1 → 10.0.4-canary.1

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));
@@ -180,7 +180,7 @@ const AdaptableToolPanelComponent = (props) => {
                 };
                 const iconProps = button.icon && Object.assign({}, defaultIconProps, button.icon);
                 const toolPanelContext = {
-                    api: props.api,
+                    adaptableApi: props.api,
                     toolPanelState: props.api.toolPanelApi.getToolPanelState(),
                 };
                 let buttonStyle = props.api.internalApi.getStyleForButton(button, toolPanelContext);
@@ -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/Components/ToolPanel/CustomToolPanelContent.js

@@ -48,7 +48,7 @@ exports.CustomToolPanelContent = (props) => {
             };
             const iconProps = button.icon && Object.assign({}, defaultIconProps, button.icon);
             const toolPanelContext = {
-                api,
+                adaptableApi: api,
                 toolPanelState: api.toolPanelApi.getToolPanelState(),
                 customToolPanel: customToolPanel,
             };

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/Dashboard/CustomToolbarWrapper.js

@@ -35,6 +35,7 @@ exports.CustomToolbarWrapper = (props) => {
     return (React.createElement(PanelDashboard_1.PanelDashboard, { className: `ab-CustomToolbar ab-DashboardToolbar__${props.customToolbar.name}`, "data-name": `ab-CustomToolbar ab-DashboardToolbar__${props.customToolbar.name}`, headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureButton: props.customToolbar.showConfigureButton != null &&
             props.customToolbar.showConfigureButton == true, showCloseButton: props.customToolbar.showCloseButton != null && props.customToolbar.showCloseButton == true, onConfigure: () => {
             const customToolbarConfiguredInfo = {
+                adaptableApi: api,
                 customToolbar: props.customToolbar,
             };
             api.eventApi.emit('CustomToolbarConfigured', customToolbarConfiguredInfo);
@@ -48,7 +49,7 @@ exports.CustomToolbarWrapper = (props) => {
                 // with the next opportunity we should abstract it
                 const dashboardContext = {
                     customToolbar: props.customToolbar,
-                    api,
+                    adaptableApi: api,
                     dashboardState: api.dashboardApi.getDashboardState(),
                 };
                 let buttonStyle = api.internalApi.getStyleForButton(button, dashboardContext);

package/src/View/Dashboard/Dashboard.js

@@ -84,8 +84,7 @@ const DashboardComponent = (props) => {
     };
     const renderDashboardButtons = () => {
         var _a;
-        let dashboardButtonsArray = (_a = props.api.dashboardApi
-            .getCustomDashboardButtons()) === null || _a === void 0 ? void 0 : _a.filter((c) => c);
+        let dashboardButtonsArray = (_a = props.api.dashboardApi.getCustomDashboardButtons()) === null || _a === void 0 ? void 0 : _a.filter((c) => c);
         let customDashboardButtons = null;
         if (dashboardButtonsArray) {
             customDashboardButtons = dashboardButtonsArray.map((button) => {
@@ -103,7 +102,7 @@ const DashboardComponent = (props) => {
                 //      delete iconProps.Uuid;
                 //    }
                 const dashboardContext = {
-                    api: props.api,
+                    adaptableApi: props.api,
                     dashboardState: props.api.dashboardApi.getDashboardState(),
                 };
                 let buttonStyle = props.api.internalApi.getStyleForButton(button, dashboardContext);

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

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

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -53,6 +53,9 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.undoDataChangeHistoryEntry(changeToBeUndone);
             }
         };
+        const currentVendorTheme = this.props.api.internalApi
+            .getAdaptableInstance()
+            .getVendorGridCurrentThemeName();
         return (React.createElement(PanelWithButton_1.PanelWithButton, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), border: "none", bodyProps: { padding: 0 } },
             React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
                 React.createElement(rebass_1.Flex, { style: {
@@ -64,7 +67,7 @@ class DataChangeHistoryPopupComponent extends React.Component {
                         statusPanel)),
                 React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup--grid", "data-name": 'data-change-history--grid', flex: 1, alignSelf: 'stretch', flexDirection: 'column' },
                     React.createElement("div", { id: adaptableContainerId }),
-                    React.createElement("div", { id: vendorContainerId, style: { height: '100%', width: '1000px' } }),
+                    React.createElement("div", { id: vendorContainerId, className: currentVendorTheme, style: { height: '100%', width: '1000px' } }),
                     React.createElement(DataChangeHistoryGrid_1.DataChangeHistoryGrid, { adaptableContainerId: adaptableContainerId, vendorContainerId: vendorContainerId, changeHistoryLog: this.props.changeHistoryLog, onUndoChange: handleChangeUndo })))));
     }
 }

package/src/View/Export/ExportCustomDestinationDialog.js

@@ -15,7 +15,7 @@ isOpen, onDismiss, }) {
     const adaptable = AdaptableContext_1.useAdaptable();
     const context = React.useMemo(() => {
         return {
-            api: adaptable.api,
+            adaptableApi: adaptable.api,
             report,
             reportData: undefined,
             customDestination,

package/src/View/Filter/FilterSummary.js

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

package/src/View/FormatColumn/FormatColumnPopup.js

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

package/src/View/FormatColumn/FormatColumnSummary.js

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

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

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

package/src/View/FreeTextColumn/FreeTextColumnPopup.js

@@ -44,7 +44,7 @@ class FreeTextColumnPopupComponent extends React.Component {
         if (this.props.popupParams) {
             if (this.props.popupParams.action && this.props.popupParams.column) {
                 if (this.props.popupParams.action == 'Edit') {
-                    let editFreeTextColumn = this.props.FreeTextColumns.find((x) => x.ColumnId == this.props.popupParams.column.ColumnId);
+                    let editFreeTextColumn = this.props.FreeTextColumns.find((x) => x.ColumnId == this.props.popupParams.column.columnId);
                     let index = this.props.FreeTextColumns.indexOf(editFreeTextColumn);
                     this.onEdit(editFreeTextColumn);
                 }
@@ -74,7 +74,9 @@ class FreeTextColumnPopupComponent extends React.Component {
                 this.state.editedAdaptableObject != null && (React.createElement(FreeTextColumnWizard_1.FreeTextColumnWizard, { moduleInfo: this.props.moduleInfo, data: this.state.editedAdaptableObject, configEntities: this.props.FreeTextColumns, wizardStartIndex: this.state.wizardStartIndex, onCloseWizard: () => this.onCloseWizard(), onFinishWizard: this.onFinishWizard })))));
     }
     onNew() {
-        const editedAdaptableObject = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn();
+        const specialColumnsAreFilterable = this.props.api.internalApi.getAdaptableOptions()
+            .filterOptions.enableFilterOnSpecialColumns;
+        const editedAdaptableObject = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn(specialColumnsAreFilterable);
         // we want to do this here, as we need a way to differentiate in the wizard
         // if it's a new or existing column
         delete editedAdaptableObject.Uuid;

package/src/View/FreeTextColumn/FreeTextColumnSummary.js

@@ -35,7 +35,7 @@ class FreeTextColumnSummaryComponent extends React.Component {
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
-        let freeTextColumn = this.props.FreeTextColumns.find((c) => c.ColumnId == this.props.summarisedColumn.ColumnId);
+        let freeTextColumn = this.props.FreeTextColumns.find((c) => c.ColumnId == this.props.summarisedColumn.columnId);
         let noFreeTextColumn = freeTextColumn == null;
         let FreeTextColumnRow;
         if (!noFreeTextColumn) {
@@ -49,8 +49,10 @@ class FreeTextColumnSummaryComponent extends React.Component {
             this.state.editedAdaptableObject && (React.createElement(FreeTextColumnWizard_1.FreeTextColumnWizard, { moduleInfo: this.props.moduleInfo, data: this.state.editedAdaptableObject, configEntities: this.props.FreeTextColumns, onCloseWizard: () => this.onCloseWizard(), onFinishWizard: this.onFinishWizard }))));
     }
     onNew() {
-        let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn();
-        configEntity.ColumnId = this.props.summarisedColumn.ColumnId;
+        const specialColumnsAreFilterable = this.props.api.internalApi.getAdaptableOptions()
+            .filterOptions.enableFilterOnSpecialColumns;
+        let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn(specialColumnsAreFilterable);
+        configEntity.ColumnId = this.props.summarisedColumn.columnId;
         this.setState({
             editedAdaptableObject: configEntity,
             wizardStartIndex: 1,

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

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