@adaptabletools/adaptable 10.0.2 → 10.0.4-canary.2

package/src/Api/Implementation/ScopeApiImpl.js

@@ -14,10 +14,10 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             // do we need a true check here?
             return true;
         }
-        if ('DataTypes' in scope && scope.DataTypes.includes(column.DataType)) {
+        if ('DataTypes' in scope && scope.DataTypes.includes(column.dataType)) {
             return true;
         }
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         return false;
@@ -31,10 +31,10 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return columns;
         }
         return columns.filter((c) => {
-            if ('DataTypes' in scope && scope.DataTypes.includes(c.DataType)) {
+            if ('DataTypes' in scope && scope.DataTypes.includes(c.dataType)) {
                 return true;
             }
-            if ('ColumnIds' in scope && scope.ColumnIds.includes(c.ColumnId)) {
+            if ('ColumnIds' in scope && scope.ColumnIds.includes(c.columnId)) {
                 return true;
             }
             return false;
@@ -140,7 +140,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     }
     isColumnInNumericScope(column, scope) {
         // if column is not even numeric then return false
-        if (column == null || column == undefined || column.DataType !== 'Number') {
+        if (column == null || column == undefined || column.dataType !== 'Number') {
             return false;
         }
         // if no scope then return false
@@ -148,7 +148,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
@@ -159,7 +159,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     }
     isColumnInStringsScope(column, scope) {
         // if column is not even string then return false
-        if (column == null || column == undefined || column.DataType !== 'String') {
+        if (column == null || column == undefined || column.dataType !== 'String') {
             return false;
         }
         // if no scope then return false
@@ -167,7 +167,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
@@ -178,7 +178,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
     }
     isColumnInDateScope(column, scope) {
         // if column is not even numeric then return false
-        if (column == null || column == undefined || column.DataType !== 'Date') {
+        if (column == null || column == undefined || column.dataType !== 'Date') {
             return false;
         }
         // if no scope then return false
@@ -186,7 +186,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.ColumnId)) {
+        if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
@@ -213,7 +213,7 @@ class ScopeApiImpl extends ApiBase_1.ApiBase {
             'DataTypes' in b &&
             a.ColumnIds.every((columnId) => {
                 var _a;
-                return b.DataTypes.includes((_a = this.adaptable.api.columnApi.getColumnFromId(columnId)) === null || _a === void 0 ? void 0 : _a.DataType);
+                return b.DataTypes.includes((_a = this.adaptable.api.columnApi.getColumnFromId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
             })) {
             return true;
         }

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -80,6 +80,7 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
     }
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
         const systemStatusMessageDisplayedInfo = {
+            adaptableApi: this.adaptable.api,
             systemStatusMessageInfo: systemStatusMessageInfo,
         };
         this.adaptable.api.eventApi.emit('SystemStatusMessageDisplayed', systemStatusMessageDisplayedInfo);

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -35,6 +35,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     fireTeamSharingEntityChangedEvent(sharedEntity) {
         if (this.adaptable.isInitialised) {
             const teamSharingEntityChangedInfo = {
+                adaptableApi: this.adaptable.api,
                 sharedEntity: sharedEntity,
             };
             this.adaptable.api.eventApi.emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);

package/src/Api/Implementation/ThemeApiImpl.js

@@ -48,6 +48,7 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         }
         this.adaptable.applyAdaptableTheme(currentTheme);
         let themeChangedInfo = {
+            adaptableApi: this.adaptable.api,
             theme: currentTheme,
         };
         this.adaptable.api.eventApi.emit('ThemeChanged', themeChangedInfo);

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -15,7 +15,7 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
     openAdapTableToolPanel() {
         let gridOptions = this.getOptions().vendorGrid;
         if (gridOptions) {
-            gridOptions.api.openToolPanel('AdaptableToolPanel');
+            gridOptions.api.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {

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

@@ -2,22 +2,26 @@ import { ApiBase } from './ApiBase';
 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 { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
+import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
+import { GridCell } from '../../types';
 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;
-    addColumnMenuItem(columnMenuItem: UserMenuItem): void;
-    addContextMenuItem(contextMenuItem: UserMenuItem): void;
+    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, gridCell: GridCell): any[] | undefined;
+    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
+    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAllActionColumn(): ActionColumn[];

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;
         }
@@ -85,7 +67,11 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         // first do the function then get hardcoded items
         if (permittedValues != null && typeof permittedValues === 'function') {
             if (column) {
-                return permittedValues(column);
+                const permittedValuesParams = {
+                    adaptableApi: this.adaptable.api,
+                    column: column,
+                };
+                return permittedValues(permittedValuesParams);
             }
         }
         else {
@@ -96,69 +82,65 @@ 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;
-        }
-        // 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;
-        }
-        // 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;
-        }
-        return undefined;
+        return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
     }
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem, columnId) {
-        if (!editLookUpItem) {
+    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;
         }
-        const column = this.adaptable.api.columnApi.getColumnFromId(columnId);
+        return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
+    }
+    getAllEditLookUpItems() {
+        return this.getUserInterfaceOptions().editLookUpItems || [];
+    }
+    getEditLookUpItemForColumn(column) {
         if (!column) {
             return undefined;
         }
+        let editLookUpItems = this.getAllEditLookUpItems();
+        if (!editLookUpItems) {
+            return undefined;
+        }
+        return this.getPermittedValuesForScope(column, editLookUpItems);
+    }
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem, gridCell) {
+        if (!editLookUpItem || !gridCell || !gridCell.column) {
+            return undefined;
+        }
         let editLookUpValues = editLookUpItem.values;
         // first do the function then get hardcoded items
         if (editLookUpValues != null && typeof editLookUpValues === 'function') {
-            return editLookUpValues(column);
+            const editLookUpParams = {
+                adaptableApi: this.adaptable.api,
+                column: gridCell.column,
+                gridCell: gridCell,
+            };
+            return editLookUpValues(editLookUpParams);
         }
         else {
             let arr = editLookUpValues;
@@ -168,15 +150,15 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         // if no hard-coded values or function provided then just get the distinct values for the column
         // this will use the columnapi method that first looks for permitted values and then distinct values
-        return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(columnId);
+        return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(gridCell.column.columnId);
     }
-    addColumnMenuItem(columnMenuItem) {
+    addColumnMenuItem(userMenuItem) {
         var _a;
-        (_a = this.getMenuOptions().columnMenuItems) === null || _a === void 0 ? void 0 : _a.push(columnMenuItem);
+        (_a = this.getMenuOptions().columnMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
     }
-    addContextMenuItem(contextMenuItem) {
+    addContextMenuItem(userMenuItem) {
         var _a;
-        (_a = this.getMenuOptions().contextMenuItems) === null || _a === void 0 ? void 0 : _a.push(contextMenuItem);
+        (_a = this.getMenuOptions().contextMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
     }
     getEditableCellStyle() {
         return this.getUserInterfaceOptions().editableCellStyle;

package/src/Api/InternalApi.d.ts

@@ -78,13 +78,13 @@ export interface InternalApi {
     setGridCell(gridCell: GridCell): void;
     setToolbarTitle(): string;
     getQueryPreviewData(): any;
-    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'columnId' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
+    buildDataChangedInfo(config: Pick<DataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): DataChangedInfo;
     setLastAppliedShortCut(gridCell: GridCell | undefined): void;
     setDefaultDashboardTab(): void;
     updateCurrentDraftLayout(layout: Layout): void;
     getPrimaryKey(): any;
     getAdaptableInstance(): IAdaptable;
-    getVendorGridInstance(): any;
+    getAgGridInstance(): any;
     getPredefinedConfig(): any;
     getState(): AdaptableState;
     getAdaptableOptions(): AdaptableOptions;
@@ -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;
 }

package/src/Api/LayoutApi.d.ts

@@ -121,4 +121,11 @@ export interface LayoutApi {
      * Opens Layout popup screen
      */
     showLayoutPopup(): void;
+    /**
+     * Sets a new Caption / Header for a Column (this Layout only)
+     * @param columnId Column to Update
+     * @param caption New Caption to display
+     */
+    setColumnCaption(columnId: string, caption: string): void;
+    isCurrentLayoutReadOnly(): boolean;
 }

package/src/Api/PluginsApi.d.ts

@@ -12,13 +12,7 @@ export interface PluginsApi {
     getPluginState(pluginId: string): any;
     registerPlugin(pluginId: string, initialPluginState: any): void;
     setPluginState(pluginId: string, pluginState: any): void;
-    getPluginApi(pluginId: string): any;
-    getPluginApi(pluginId: 'ipushpull'): IPushPullApi;
-    getPluginApi(pluginId: 'glue42'): Glue42Api;
-    getPluginApi(pluginId: 'finance'): FinanceApi;
-    getPluginApi(pluginId: 'openfin'): OpenFinApi;
-    getPluginApi(pluginId: 'charts'): ChartApi;
-    getIpushpullPluginApi(): IPushPullApi;
+    getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
     getOpenFinPluginApi(): OpenFinApi;
     getChartsPluginApi(): ChartApi;

package/src/Api/TeamSharingApi.d.ts

@@ -28,7 +28,7 @@ export interface TeamSharingApi {
      */
     checkForUpdates(): void;
     /**
-     * Fires the Team S
+     * Fires the Team Sharing Entity Changed Event
      * @param sharedEntity Entity that has been changed
      */
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;

package/src/Api/ThemeApi.d.ts

@@ -17,11 +17,11 @@ export interface ThemeApi {
      */
     loadTheme(theme: string): void;
     /**
-     * Sets AdapTable Light Theme - updates underlying vendor grid theme to match
+     * Sets AdapTable Light Theme - updates the AG Grid theme to match
      */
     loadLightTheme(): void;
     /**
-     * Sets AdapTable Dark Theme - updates underlying vendor grid theme to match
+     * Sets AdapTable Dark Theme - updates the AG Grid theme to match
      */
     loadDarkTheme(): void;
     /**

package/src/Api/UserInterfaceApi.d.ts

@@ -1,7 +1,8 @@
 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 { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
+import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
+import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -17,37 +18,46 @@ export interface UserInterfaceApi {
     /**
      * Retrieves `permittedValues` property from User Interface Options
      */
-    getAllPermittedValuesItems(): CellValuesList[];
+    getAllPermittedValuesItems(): PermittedValues[];
     /**
      * Retrieves Permitted Values for a given Column
      * @param column column for which to retrieve Permitted Values
      */
     getPermittedValuesForColumn(column: AdaptableColumn): any[];
+    /**
+     * Retrieves Permitted values for filtering by column values in Floating Filter and dropdown Filter.
+     */
+    getFilterPermittedValuesForColumn(column: AdaptableColumn): FilterPermittedValues | undefined;
+    /**
+     * Retrieves Permitted values for Custom sort.
+     */
+    getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
+    getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
     /**
      * Retrieves `editLookUpItems` property from User Interface Options
      */
-    getAllEditLookUpItems(): CellValuesList[];
+    getAllEditLookUpItems(): EditLookUpPermittedValues[];
     /**
      * Retrieves EditLookUpItems for a given Column
      * @param columnId Column for which to retrieve EditLookUpItems
      */
-    getEditLookUpItemForColumn(columnId: string): CellValuesList | undefined;
+    getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     /**
      * Retrieves actual Look Up Values from an EditLookUpItem
      * @param editLookUpItem editLookUpItem to check
-     * @param columnId Column to check
+     * @param  gridCell: the currently edited Grid Cell
      */
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: CellValuesList, columnId: string): any[] | undefined;
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
     /**
      * Adds menu item to Column Menu
      * @param userMenuItem Menu Item to add
      */
-    addColumnMenuItem(userMenuItem: UserMenuItem): void;
+    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
     /**
      * Adds menu item to Context Menu
      * @param userMenuItem Menu Item to add
      */
-    addContextMenuItem(userMenuItem: UserMenuItem): void;
+    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     /**
      * Returns Style set for Editable cells
      */

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -12,7 +12,6 @@ import { ExportState } from './ExportState';
 import { FormatColumnState } from './FormatColumnState';
 import { FreeTextColumnState } from './FreeTextColumnState';
 import { LayoutState } from './LayoutState';
-import { PercentBarState } from './DeprecatedState';
 import { ScheduleState } from './ScheduleState';
 import { PlusMinusState } from './PlusMinusState';
 import { QuickSearchState } from './QuickSearchState';
@@ -24,10 +23,7 @@ import { FilterState } from './FilterState';
 import { SparklineColumnState } from './SparklineColumnState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
-import { GradientColumnState } from './DeprecatedState';
 import { QueryState } from './QueryState';
-import { FlashingCellState } from './DeprecatedState';
-import { UpdatedRowState } from './DeprecatedState';
 /**
  * The main state object that Adaptable persists
  */
@@ -52,17 +48,13 @@ export interface AdaptableState {
     Filter: FilterState;
     FormatColumn: FormatColumnState;
     FreeTextColumn: FreeTextColumnState;
-    GradientColumn: GradientColumnState;
     Layout: LayoutState;
-    PercentBar: PercentBarState;
-    Schedule: ScheduleState;
     PlusMinus: PlusMinusState;
+    Query: QueryState;
     QuickSearch: QuickSearchState;
+    Schedule: ScheduleState;
     Shortcut: ShortcutState;
     TeamSharing: TeamSharingState;
     Theme: ThemeState;
     ToolPanel: ToolPanelState;
-    Query: QueryState;
-    FlashingCell: FlashingCellState;
-    UpdatedRow: UpdatedRowState;
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -12,7 +12,7 @@ import { AdaptableAggregationQuery, AdaptableBooleanQuery, AdaptableObservableQu
 import { ButtonStyle } from './Common/ButtonStyle';
 import { AlertButtonContext } from '../AdaptableOptions/NotificationsOptions';
 /**
- * Predefined Configuration for Alert function
+ * Predefined Configuration for Alert Module
  */
 export interface AlertState extends ConfigState {
     /**
@@ -82,6 +82,10 @@ export interface AlertDefinition extends BaseAlertDefinition {
      * Type of Alert: 'Info', 'Success', 'Warning', 'Error'; influences Alert colour, icon and logging
      */
     MessageType: AdaptableMessageType;
+    /**
+     * Alert Message - can be string or function; if not provided AdapTable creates dynamically using Rule & Scope
+     */
+    MessageText?: string;
     /**
      * Series of properties which set what happens when Alert is triggered
      */

package/src/PredefinedConfig/ApplicationState.d.ts

@@ -1,6 +1,6 @@
 import { ConfigState } from './ConfigState';
 /**
- * Predefined Configuration for the Application function
+ * Predefined Configuration for the Application Module
  **/
 export interface ApplicationState extends ConfigState {
     /**