@adaptabletools/adaptable 10.0.2 → 10.0.3

package/src/Api/GridApi.d.ts

@@ -23,6 +23,14 @@ export interface GridApi {
      * @param data any data from any datasource that is suitable for the underlying grid.
      */
     setGridData(data: any): void;
+    /**
+     * Retrieves all data from the grid
+     */
+    getGridData(): any[];
+    /**
+     * Retrieves filtered data from the grid
+     */
+    getFilteredData(): any[];
     /**
      * Loads grid with given data
      * @param data any data from any datasource that is suitable for the underlying grid.
@@ -55,6 +63,15 @@ export interface GridApi {
      *
      */
     setCellValue(columnId: string, newValue: any, primaryKeyValue: any, forceFilter: boolean): void;
+    /**
+     * Updates multiple cells
+     * @param gridCells cells to update
+     */
+    setCellsValue(gridCells: {
+        columnId: any;
+        newValue: any;
+        primaryKeyValue: any;
+    }[]): void;
     /**
      * Reverses a data change (if triggered by cell edit)
      * @param dataChangedInfo data change to undo
@@ -185,10 +202,10 @@ export interface GridApi {
     getPrimaryKeyValueForRowNode(rowNode: RowNode): any;
     /**
      * Retrieves Cell in given Row and Column
-     * @param rowwNode Row to use
+     * @param rowNode Row to use
      * @param columnId ColumnId to lookup
      */
-    getGridCellFromRowNode(rowwNode: RowNode, columnId: string): GridCell | undefined;
+    getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     /**
      * Retrieves Display Value for a given cell
      * @param primaryKeyValue (unique) value in Primary Key Column
@@ -209,10 +226,10 @@ export interface GridApi {
     getCellNormalisedValue(primaryKeyValue: any, columnId: string): any | undefined;
     /**
      * Retrieves Raw Value for Cell in given Row and Column
-     * @param rowwNode Row to use
+     * @param rowNode Row to use
      * @param columnId ColumnId to lookup
      */
-    getRawValueFromRowNode(rowwNode: RowNode, columnId: string): any | undefined;
+    getRawValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     /**
      * Retrieves Formatted Value for a given Raw Value in given Column
      * @param columnId ColumnId to lookup
@@ -221,16 +238,16 @@ export interface GridApi {
     getFormattedValueFromRawValue(columnId: string, rawValue: any): string | undefined;
     /**
      * Retrieves Display Value for Cell in given Row and Column
-     * @param rowwNode Row to use
+     * @param rowNode Row to use
      * @param columnId ColumnId to lookup
      */
-    getDisplayValueFromRowNode(rowwNode: RowNode, columnId: string): any | undefined;
+    getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     /**
      * Retrieves Normalised Value for Cell in given Row and Column
-     * @param rowwNode Row to use
+     * @param rowNode Row to use
      * @param columnId ColumnId to lookup
      */
-    getNormalisedValueFromRowNode(rowwNode: RowNode, columnId: string): any | undefined;
+    getNormalisedValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     /**
      * Sets the grid to Row Group
      * @param columnIds ColumnIds to row group
@@ -335,6 +352,11 @@ export interface GridApi {
      * @param columnIds ColumnIds which contain cells to refresh
      */
     refreshCells(rowNodes: RowNode[], columnIds: string[]): void;
+    /**
+     * Forces a render of a row
+     * @param primaryKey row primary key
+     */
+    refreshRow(primaryKey: any): void;
     /**
      * Returns number of rows in Data Source
      */
@@ -373,4 +395,8 @@ export interface GridApi {
      * Deselects all selected rows, cells and ranges
      */
     deselectAll(): void;
+    /**
+     * Returns the Grid Container in which the Adaptable Instance is present
+     */
+    getGridContainerElement(): HTMLElement | null;
 }

package/src/Api/Implementation/AlertApiImpl.d.ts

@@ -54,6 +54,6 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     unSuspendFlashingAlertDefinition(flashingAlertDefinition: FlashingAlertDefinition): FlashingAlertDefinition;
     addFlashingAlertDefinitions(flashingAlertDefinitions: FlashingAlertDefinition[]): FlashingAlertDefinition[];
     editFlashingAlertDefinitions(flashingAlertDefinitions: FlashingAlertDefinition[]): FlashingAlertDefinition[];
-    getAlertDescription(alert: AlertDefinition): string;
+    getAlertDescription(alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo): string;
     getAlertRuleDescription(alert: BaseAlertDefinition): string;
 }

package/src/Api/Implementation/AlertApiImpl.js

@@ -284,7 +284,6 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     }
     addFlashingAlertDefinition(flashingAlertDefinition) {
         this.dispatchAction(AlertRedux.FlashingAlertDefinitionAdd(flashingAlertDefinition));
-        console.log('flasing alert', flashingAlertDefinition);
         return this.getFlashingAlertDefinitionById(flashingAlertDefinition.Uuid);
     }
     editFlashingAlertDefinition(flashingAlertDefinition) {
@@ -311,9 +310,17 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         });
         return flashingAlertDefinitions === null || flashingAlertDefinitions === void 0 ? void 0 : flashingAlertDefinitions.map((alert) => this.getFlashingAlertDefinitionById(alert === null || alert === void 0 ? void 0 : alert.Uuid));
     }
-    getAlertDescription(alert) {
-        let scopeDescription = this.adaptable.api.scopeApi.getScopeDescription(alert.Scope);
-        let ruleDescription = this.getAlertRuleDescription(alert);
+    getAlertDescription(alertDefinition, dataChangedInfo) {
+        if (alertDefinition.MessageText != null) {
+            if (typeof alertDefinition.MessageText === 'function') {
+                return alertDefinition.MessageText(alertDefinition.Scope, alertDefinition.Rule, dataChangedInfo);
+            }
+            else {
+                return alertDefinition.MessageText;
+            }
+        }
+        let scopeDescription = this.adaptable.api.scopeApi.getScopeDescription(alertDefinition.Scope);
+        let ruleDescription = this.getAlertRuleDescription(alertDefinition);
         return scopeDescription + ' - ' + ruleDescription;
     }
     getAlertRuleDescription(alert) {

package/src/Api/Implementation/ColumnApiImpl.d.ts

@@ -2,6 +2,7 @@ import { ApiBase } from './ApiBase';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { DataType } from '../../PredefinedConfig/Common/Enums';
 import { ColumnApi } from '../ColumnApi';
+import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { RowNode } from '@ag-grid-community/all-modules';
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getColumns(): AdaptableColumn[];
@@ -49,6 +50,12 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getQueryableColumns(): AdaptableColumn[];
     private LogMissingColumnWarning;
     getDistinctDisplayValuesForColumn(columnId: string): any[];
+    getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string): Promise<{
+        values: any[];
+        suppressClientSideFilter: boolean;
+    }>;
+    getDistinctCustomSortDisplayValuesForColumn(columnId: string): Promise<any[]>;
+    getDistinctBulkUpdateDisplayValuesForColumn(columnId: string, selectedGridCells: GridCell[]): Promise<any[]>;
     getDistinctVisibleDisplayValuesForColumn(columnId: string): any[];
     getDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
     getDistinctVisibleRawValuesForColumn(columnId: string): any[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -51,7 +51,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         // put this here as there might be other indicators we are not aware of
         // perhaps with non auto groups ?
         //https://www.ag-grid.com/javascript-grid-grouping/
-        return columnId.startsWith(GeneralConstants_1.AG_GRID_GROUPED_COLUMN);
+        return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants_1.AG_GRID_GROUPED_COLUMN);
     }
     isCalculatedColumn(columnId) {
         return (this.adaptable.api.calculatedColumnApi
@@ -282,6 +282,42 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
             return cv.displayValue;
         });
     }
+    async getDistinctFilterDisplayValuesForColumn(columnId, filter) {
+        const abColumn = this.getColumnFromId(columnId);
+        if (abColumn == undefined) {
+            return {
+                values: [],
+                suppressClientSideFilter: false,
+            };
+        }
+        const { gridCells, suppressClientSideFilter, } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
+        return {
+            values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
+                return cv.displayValue;
+            }),
+            suppressClientSideFilter,
+        };
+    }
+    async getDistinctCustomSortDisplayValuesForColumn(columnId) {
+        const abColumn = this.getColumnFromId(columnId);
+        if (abColumn == undefined) {
+            return [];
+        }
+        const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, false);
+        return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
+            return cv.displayValue;
+        });
+    }
+    async getDistinctBulkUpdateDisplayValuesForColumn(columnId, selectedGridCells) {
+        const abColumn = this.getColumnFromId(columnId);
+        if (abColumn == undefined) {
+            return [];
+        }
+        const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, false, selectedGridCells);
+        return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
+            return cv.displayValue;
+        });
+    }
     getDistinctVisibleDisplayValuesForColumn(columnId) {
         const abColumn = this.getColumnFromId(columnId);
         if (abColumn == undefined) {

package/src/Api/Implementation/ConfigApiImpl.d.ts

@@ -43,7 +43,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     setAdaptableStateKey(adaptableStateKey: string, config?: {
         predefinedConfig: PredefinedConfig;
         flushCurrentState?: boolean;
-    }): PromiseLike<any>;
+    }): Promise<any>;
     getDescriptionForModule(module: AdaptableModule): string;
     getHelpPageForModule(module: AdaptableModule): string;
     getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): ConfigState | string;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -132,24 +132,35 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
         return adaptableSortState;
     }
     setAdaptableStateKey(adaptableStateKey, config) {
-        this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
-        const flushCurrentState = !config || config.flushCurrentState !== false;
-        // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
-        // the state to be persisted with a delay, which we dont want in this case
-        const flushStatePromise = flushCurrentState
-            ? this.adaptable.adaptableStore.saveStateNow(this.adaptable)
-            : Promise.resolve(true);
-        return flushStatePromise.then(() => {
-            let predefinedConfig = config === null || config === void 0 ? void 0 : config.predefinedConfig;
-            if (predefinedConfig) {
-                predefinedConfig = AdaptableHelper_1.initPredefinedConfigWithUuids(predefinedConfig);
-            }
-            const promise = this.adaptable.adaptableStore.loadStore(this.adaptable, adaptableStateKey, predefinedConfig);
-            promise.then(() => {
-                this.adaptable.prepareGrid();
-                this.adaptable.api.internalApi.hideLoadingScreen();
+        return new Promise((resolve, reject) => {
+            this.adaptable.api.internalApi.executeWithProgressIndicator(`Initialising...`, () => {
+                this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
+                const flushCurrentState = !config || config.flushCurrentState !== false;
+                // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
+                // the state to be persisted with a delay, which we dont want in this case
+                const flushStatePromise = flushCurrentState
+                    ? this.adaptable.adaptableStore.saveStateNow(this.adaptable)
+                    : Promise.resolve(true);
+                flushStatePromise.then(() => {
+                    let predefinedConfig = config === null || config === void 0 ? void 0 : config.predefinedConfig;
+                    if (predefinedConfig) {
+                        predefinedConfig = AdaptableHelper_1.initPredefinedConfigWithUuids(predefinedConfig);
+                    }
+                    const promise = this.adaptable.adaptableStore.loadStore(this.adaptable, adaptableStateKey, predefinedConfig);
+                    promise
+                        .then(() => {
+                        this.adaptable.prepareGrid();
+                        this.adaptable.api.internalApi.hideLoadingScreen();
+                    })
+                        .then(() => {
+                        // resolve main(result) promise
+                        resolve();
+                    }, () => {
+                        // reject main(result) promise
+                        reject();
+                    });
+                });
             });
-            return promise;
         });
     }
     getDescriptionForModule(module) {

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -68,7 +68,8 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
         }
     }
     createFreeTextColumn({ columnName, columnId, defaultValue = null, }) {
-        let freeTextColumn = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn();
+        let freeTextColumn = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn(this.adaptable.api.internalApi.getAdaptableOptions().filterOptions
+            .enableFilterOnSpecialColumns);
         freeTextColumn.ColumnId = columnId;
         freeTextColumn.FriendlyName = columnName || columnId;
         freeTextColumn.DefaultValue = defaultValue;

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -13,12 +13,19 @@ import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
 export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridState(): GridState;
     setGridData(dataSource: any): void;
+    getGridData(): any[];
+    getFilteredData(): any[];
     loadGridData(dataSource: any): void;
     updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
     addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
     undoCellEdit(dataChangedInfo: DataChangedInfo): boolean;
     deleteGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
     setCellValue(columnId: string, newValue: any, primaryKeyValue: any): void;
+    setCellsValue(gridCells: {
+        columnId: any;
+        newValue: any;
+        primaryKeyValue: any;
+    }[]): void;
     getSelectedCellInfo(): SelectedCellInfo;
     getSelectedRowInfo(): SelectedRowInfo;
     getCellDisplayValue(primaryKeyValue: any, columnId: string): any | undefined;
@@ -76,6 +83,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     unhighlightCell(cellHighlightInfo: CellHighlightInfo): void;
     unhighlightAllCells(): void;
     refreshCells(rowNodes: RowNode[], columnIds: string[]): void;
+    refreshRow(primaryKey: string): void;
     areCellsEditable(gridCells: GridCell[]): boolean;
     getRowCount(): number;
     getVisibleRowCount(): number;
@@ -85,4 +93,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     selectAll(): void;
     deselectAll(): void;
     destroy(): void;
+    getGridContainerElement(): HTMLElement | null;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -12,6 +12,12 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     setGridData(dataSource) {
         this.adaptable.setDataSource(dataSource);
     }
+    getGridData() {
+        return this.adaptable.getGridData();
+    }
+    getFilteredData() {
+        return this.adaptable.getFilteredData();
+    }
     loadGridData(dataSource) {
         this.adaptable.loadDataSource(dataSource);
     }
@@ -50,6 +56,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
         this.adaptable.api.internalApi.setGridCell(gridCell);
     }
+    setCellsValue(gridCells) {
+        gridCells === null || gridCells === void 0 ? void 0 : gridCells.forEach((gridCell) => this.setCellValue(gridCell.columnId, gridCell.newValue, gridCell.primaryKeyValue));
+    }
     getSelectedCellInfo() {
         return this.getGridState().SelectedCellInfo;
     }
@@ -161,7 +170,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return gridCell ? gridCell.displayValue : undefined;
     }
     getFormattedValueFromRawValue(columnId, rawValue) {
-        return this.adaptable.getDisplayValueFromRawValue(columnId, rawValue, true);
+        return this.adaptable.getDisplayValueFromRawValue(columnId, rawValue);
     }
     getNormalisedValueFromRowNode(rowNode, columnId) {
         const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
@@ -273,6 +282,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     refreshCells(rowNodes, columnIds) {
         this.adaptable.refreshCells(rowNodes, columnIds, true);
     }
+    refreshRow(primaryKey) {
+        const rowNode = this.getRowNodeForPrimaryKey(primaryKey);
+        this.adaptable.redrawRow(rowNode);
+    }
     areCellsEditable(gridCells) {
         let returnValue = true;
         gridCells.forEach((gridCell) => {
@@ -318,5 +331,8 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     destroy() {
         this.adaptable.destroy();
     }
+    getGridContainerElement() {
+        return this.adaptable.getGridContainerElement();
+    }
 }
 exports.GridApiImpl = GridApiImpl;

package/src/Api/Implementation/InternalApiImpl.d.ts

@@ -113,5 +113,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;
     isTextComparisonCaseSensitive(): boolean;
+    executeWithProgressIndicator(label: string, executeFn: () => void): void;
+    hideProgressIndicator(): void;
     dispatchReduxAction(action: Action): void;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -394,6 +394,22 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     isTextComparisonCaseSensitive() {
         return this.adaptable.adaptableOptions.generalOptions.caseSensitiveTextComparisons;
     }
+    executeWithProgressIndicator(label, executeFn) {
+        this.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorShow(label));
+        // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
+        setTimeout(() => {
+            try {
+                executeFn();
+            }
+            catch (error) {
+                this.hideProgressIndicator();
+                LoggingHelper_1.LogAdaptableError('Unexpected error while executing a function with a progress indicator', error);
+            }
+        }, 16);
+    }
+    hideProgressIndicator() {
+        this.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorHide());
+    }
     // General way to get to store from inside Adaptable...
     dispatchReduxAction(action) {
         this.dispatchAction(action);

package/src/Api/Implementation/UserInterfaceApiImpl.d.ts

@@ -3,19 +3,22 @@ import { UserInterfaceApi } from '../UserInterfaceApi';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { UserMenuItem } from '../../PredefinedConfig/Common/Menu';
-import { ActionColumn, CellValuesList } from '../../AdaptableOptions/UserInterfaceOptions';
+import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     getColorPalette(): string[];
     getStyleClassNames(): string[] | undefined;
-    getAllPermittedValuesItems(): CellValuesList[];
-    private getPermittedValuesItemsWithColumnScope;
-    private getPermittedValuesItemsWithDataTypeScope;
-    private getPermittedValuesItemsWithAllScope;
+    getAllPermittedValuesItems(): PermittedValues[];
     private getPermittedValuesForScope;
     getPermittedValuesForColumn(column: AdaptableColumn): any[] | undefined;
-    getAllEditLookUpItems(): CellValuesList[];
-    getEditLookUpItemForColumn(columnId: string): CellValuesList | undefined;
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: CellValuesList, columnId: string): any[] | undefined;
+    getAllFilterPermittedValuesItems(): FilterPermittedValues[];
+    getFilterPermittedValuesForColumn(column: AdaptableColumn): FilterPermittedValues | undefined;
+    getAllCustomSortPermittedValuesItems(): CustomSortPermittedValues[];
+    getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
+    getAllBulkUpdatePermittedValuesItems(): BulkUpdatePermittedValues[];
+    getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
+    getAllEditLookUpItems(): EditLookUpPermittedValues[];
+    getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, columnId: string, data: any): any[] | undefined;
     addColumnMenuItem(columnMenuItem: UserMenuItem): void;
     addContextMenuItem(contextMenuItem: UserMenuItem): void;
     getEditableCellStyle(): AdaptableStyle | undefined;

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -22,51 +22,32 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return this.getUserInterfaceOptions().styleClassNames;
     }
     getAllPermittedValuesItems() {
-        return this.getUserInterfaceOptions().permittedValues;
+        var _a, _b;
+        return (_b = (_a = this.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.permittedValues) !== null && _b !== void 0 ? _b : [];
     }
-    getPermittedValuesItemsWithColumnScope() {
-        return this.getAllPermittedValuesItems().filter((pv) => {
-            return 'ColumnIds' in pv.scope == true;
-        });
-    }
-    getPermittedValuesItemsWithDataTypeScope() {
-        return this.getAllPermittedValuesItems().filter((pv) => {
-            return 'DataTypes' in pv.scope == true;
-        });
-    }
-    getPermittedValuesItemsWithAllScope() {
-        return this.getAllPermittedValuesItems().filter((pv) => {
-            return 'All' in pv.scope == true;
-        });
-    }
-    getPermittedValuesForScope(column) {
+    getPermittedValuesForScope(column, permittedValues) {
         let permittedValuesItem;
-        this.getPermittedValuesItemsWithColumnScope().forEach((pv) => {
-            if (!permittedValuesItem) {
-                if (this.adaptable.api.scopeApi.isColumnInScope(column, pv.scope)) {
-                    permittedValuesItem = pv;
-                }
-            }
+        /**
+         * The previous implementation prioritized column-id, data-types and all
+         */
+        // columns id
+        permittedValuesItem = permittedValues.find((permittedValue) => {
+            return ('ColumnIds' in permittedValue.scope &&
+                this.adaptable.api.scopeApi.isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
         }
-        this.getPermittedValuesItemsWithDataTypeScope().forEach((pv) => {
-            if (!permittedValuesItem) {
-                if (this.adaptable.api.scopeApi.isColumnInScope(column, pv.scope)) {
-                    permittedValuesItem = pv;
-                }
-            }
+        permittedValuesItem = permittedValues.find((permittedValue) => {
+            return ('DataTypes' in permittedValue.scope &&
+                this.adaptable.api.scopeApi.isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
         }
-        this.getPermittedValuesItemsWithAllScope().forEach((pv) => {
-            if (!permittedValuesItem) {
-                if (this.adaptable.api.scopeApi.isColumnInScope(column, pv.scope)) {
-                    permittedValuesItem = pv;
-                }
-            }
+        permittedValuesItem = permittedValues.find((permittedValue) => {
+            return ('All' in permittedValue.scope &&
+                this.adaptable.api.scopeApi.isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
@@ -77,7 +58,8 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(this.getAllPermittedValuesItems())) {
             return undefined;
         }
-        let permittedValuesColumn = this.getPermittedValuesForScope(column);
+        const allPermittedValues = this.getAllPermittedValuesItems();
+        let permittedValuesColumn = this.getPermittedValuesForScope(column, allPermittedValues);
         if (!permittedValuesColumn) {
             return undefined;
         }
@@ -96,58 +78,53 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         return undefined;
     }
-    getAllEditLookUpItems() {
-        return this.getUserInterfaceOptions().editLookUpItems;
+    getAllFilterPermittedValuesItems() {
+        var _a, _b;
+        return (_b = (_a = this.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.filterPermittedValues) !== null && _b !== void 0 ? _b : [];
     }
-    getEditLookUpItemForColumn(columnId) {
-        const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
-        if (!abColumn) {
+    getFilterPermittedValuesForColumn(column) {
+        const allFilterPermittedValuesItems = this.getAllFilterPermittedValuesItems();
+        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
             return undefined;
         }
-        let editLookUpItem;
-        let editLookUpItems = this.getAllEditLookUpItems();
-        if (!editLookUpItems) {
+        return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
+    }
+    getAllCustomSortPermittedValuesItems() {
+        var _a, _b;
+        return (_b = (_a = this.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.customSortPermittedValues) !== null && _b !== void 0 ? _b : [];
+    }
+    getCustomSortPermittedValuesForColumn(column) {
+        const allFilterPermittedValuesItems = this.getAllCustomSortPermittedValuesItems();
+        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
             return undefined;
         }
-        // first we get any for the column as that is lower level
-        const columnEditLookItems = editLookUpItems.filter((pv) => {
-            return 'ColumnIds' in pv.scope == true;
-        });
-        columnEditLookItems.forEach((eli) => {
-            if (this.adaptable.api.scopeApi.isColumnInScopeColumns(abColumn, eli.scope)) {
-                editLookUpItem = eli;
-            }
-        });
-        if (editLookUpItem) {
-            return editLookUpItem;
+        return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
+    }
+    getAllBulkUpdatePermittedValuesItems() {
+        var _a, _b;
+        return (_b = (_a = this.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.bulkUpdatePermittedValues) !== null && _b !== void 0 ? _b : [];
+    }
+    getBulkUpdatePermittedValuesForColumn(column) {
+        const allFilterPermittedValuesItems = this.getAllBulkUpdatePermittedValuesItems();
+        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
+            return undefined;
         }
-        // then we get any for the DataType
-        const dateEditLookItems = editLookUpItems.filter((pv) => {
-            return 'DataTypes' in pv.scope == true;
-        });
-        dateEditLookItems.forEach((eli) => {
-            if (this.adaptable.api.scopeApi.isColumnInDateScope(abColumn, eli.scope)) {
-                editLookUpItem = eli;
-            }
-        });
-        if (editLookUpItem) {
-            return editLookUpItem;
+        return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
+    }
+    getAllEditLookUpItems() {
+        return this.getUserInterfaceOptions().editLookUpItems || [];
+    }
+    getEditLookUpItemForColumn(column) {
+        if (!column) {
+            return undefined;
         }
-        // then we get any for All
-        const allTypeEditLookItems = editLookUpItems.filter((pv) => {
-            return 'All' in pv.scope == true;
-        });
-        allTypeEditLookItems.forEach((eli) => {
-            if (this.adaptable.api.scopeApi.isColumnInScope(abColumn, eli.scope)) {
-                editLookUpItem = eli;
-            }
-        });
-        if (editLookUpItem) {
-            return editLookUpItem;
+        let editLookUpItems = this.getAllEditLookUpItems();
+        if (!editLookUpItems) {
+            return undefined;
         }
-        return undefined;
+        return this.getPermittedValuesForScope(column, editLookUpItems);
     }
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem, columnId) {
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem, columnId, data) {
         if (!editLookUpItem) {
             return undefined;
         }
@@ -158,7 +135,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         let editLookUpValues = editLookUpItem.values;
         // first do the function then get hardcoded items
         if (editLookUpValues != null && typeof editLookUpValues === 'function') {
-            return editLookUpValues(column);
+            return editLookUpValues(column, data);
         }
         else {
             let arr = editLookUpValues;

package/src/Api/InternalApi.d.ts

@@ -116,4 +116,6 @@ export interface InternalApi {
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;
     isTextComparisonCaseSensitive(): boolean;
+    executeWithProgressIndicator(label: string, executeFn: () => unknown): void;
+    hideProgressIndicator(): void;
 }