@adaptabletools/adaptable 11.2.4 → 12.0.0-canary.1

package/src/Api/Implementation/FilterApiImpl.js

@@ -2,14 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterApiImpl = void 0;
 const tslib_1 = require("tslib");
-const FilterRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FilterRedux"));
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 const ApiBase_1 = require("./ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class FilterApiImpl extends ApiBase_1.ApiBase {
-    getFilterState() {
-        return this.getAdaptableState().Filter;
-    }
     getAllSystemFilterIds() {
         return this.getFilterOptions().systemFilters;
     }
@@ -30,12 +28,23 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
             ...this.adaptable.api.predicateApi.getCustomPredicateDefs(),
         ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
     }
-    getAllColumnFilter() {
-        return this.getFilterState().ColumnFilters;
+    showQuickFilterBar() {
+        this.dispatchAction(SystemRedux.SystemQuickFilterBarShow());
     }
-    getColumnFilterById(id) {
+    hideQuickFilterBar() {
+        this.dispatchAction(SystemRedux.SystemQuickFilterBarHide());
+    }
+    isQuickFilterAvailable() {
+        return this.adaptable.isQuickFilterAvailable();
+    }
+    isQuickFilterVisible() {
+        return (this.isQuickFilterAvailable() &&
+            this.adaptable.api.internalApi.getSystemState().IsQuickFilterVisible);
+    }
+    getColumnFilters() {
         var _a;
-        return (_a = this.getAllColumnFilter()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
+        const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+        return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
     setColumnFilter(columnFilters) {
         columnFilters.forEach((columnFilter) => {
@@ -49,11 +58,11 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
                 }
                 else {
                     this.addUidToAdaptableObject(columnFilter);
-                    if (this.getAllColumnFilter().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
-                        this.dispatchAction(FilterRedux.ColumnFilterSet(columnFilter));
+                    if (this.getColumnFilters().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
+                        this.dispatchAction(LayoutRedux.LayoutColumnFilterSet(columnFilter));
                     }
                     else {
-                        this.dispatchAction(FilterRedux.ColumnFilterAdd(columnFilter));
+                        this.dispatchAction(LayoutRedux.LayoutColumnFilterAdd(columnFilter));
                     }
                 }
                 return columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.map((columnFilter) => this.getColumnFilterById(columnFilter.Uuid));
@@ -61,19 +70,8 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         });
         return null;
     }
-    clearAndSetColumnFilter(columnFilters) {
-        this.clearAllColumnFilter();
-        columnFilters.forEach((columnFilter) => {
-            if (this.getAllColumnFilter().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
-                this.dispatchAction(FilterRedux.ColumnFilterSet(columnFilter));
-            }
-            else {
-                this.dispatchAction(FilterRedux.ColumnFilterAdd(columnFilter));
-            }
-        });
-    }
     clearColumnFilter(columnFilter) {
-        this.dispatchAction(FilterRedux.ColumnFilterClear(columnFilter));
+        this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilter));
     }
     clearColumnFilterByColumns(columns) {
         columns.forEach((c) => {
@@ -84,17 +82,28 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         let columnFiltersForColumn = this.getAllColumnFilterForColumn(column);
         if (columnFiltersForColumn) {
             columnFiltersForColumn.forEach((cf) => {
-                this.dispatchAction(FilterRedux.ColumnFilterClear(cf));
+                this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(cf));
             });
             this.adaptable.clearColumnFiltering([column]);
         }
     }
-    clearAllColumnFilter() {
-        this.dispatchAction(FilterRedux.ColumnFilterClearAll());
+    clearColumnFilters() {
+        this.dispatchAction(LayoutRedux.LayoutColumnFilterClearAll());
         this.adaptable.clearGridFiltering();
     }
+    clearAndSetColumnFilter(columnFilters) {
+        this.clearColumnFilters();
+        columnFilters.forEach((columnFilter) => {
+            if (this.getColumnFilters().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
+                this.dispatchAction(LayoutRedux.LayoutColumnFilterSet(columnFilter));
+            }
+            else {
+                this.dispatchAction(LayoutRedux.LayoutColumnFilterAdd(columnFilter));
+            }
+        });
+    }
     getAllColumnFilterForColumn(column) {
-        let columnFilters = this.getAllColumnFilter();
+        let columnFilters = this.getColumnFilters();
         if (columnFilters) {
             return columnFilters.filter((cf) => cf.ColumnId == column);
         }
@@ -102,44 +111,30 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
             return [];
         }
     }
-    createColumnFilterForCell(columnId, primarykeyValues) {
-        let cellValues = [];
-        let predicateId;
-        if (primarykeyValues.length == 1) {
-            const normalisedValue = this.adaptable.api.gridApi.getCellNormalisedValue(primarykeyValues[0], columnId);
-            if (normalisedValue) {
-                cellValues.push(normalisedValue);
-                const dataType = this.adaptable.api.columnApi.getColumnDataTypeFromColumnId(columnId);
-                if (dataType) {
-                    if (dataType == 'Number') {
-                        predicateId = 'Equals';
-                    }
-                    else if (dataType == 'Date') {
-                        predicateId = 'On';
-                    }
-                    else if (dataType == 'String') {
-                        predicateId = 'Is';
-                    }
-                    else {
-                        predicateId = 'Equals';
-                    }
-                }
-            }
+    createValuesColumnFilterForCells(gridCells) {
+        if (!gridCells) {
+            return null;
         }
-        else {
-            primarykeyValues.forEach((pk) => {
-                const displayValue = this.adaptable.api.gridApi.getCellDisplayValue(pk, columnId);
-                if (displayValue && !cellValues.includes(displayValue)) {
-                    cellValues.push(displayValue);
-                }
-            });
-            predicateId = 'Values';
+        const filter = {
+            ColumnId: gridCells[0].column.columnId,
+            Predicate: {
+                PredicateId: 'Values',
+                Inputs: [...new Set(gridCells.map((gc) => gc.displayValue))],
+            },
+        };
+        const [savedFilter] = this.setColumnFilter([filter]) || [null];
+        return savedFilter;
+    }
+    createEqualityColumnFilterForCell(gridCell) {
+        if (!gridCell) {
+            return null;
         }
+        const column = gridCell.column;
         const filter = {
-            ColumnId: columnId,
+            ColumnId: column.columnId,
             Predicate: {
-                PredicateId: predicateId,
-                Inputs: [...new Set(cellValues)],
+                PredicateId: this.adaptable.api.predicateApi.getEqualityPredicateForDataType(column.dataType),
+                Inputs: [...new Set([gridCell.rawValue])],
             },
         };
         const [savedFilter] = this.setColumnFilter([filter]) || [null];
@@ -180,17 +175,9 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
             column,
         }, true);
     }
-    showQuickFilterBar() {
-        this.dispatchAction(FilterRedux.QuickFilterBarShow());
-    }
-    hideQuickFilterBar() {
-        this.dispatchAction(FilterRedux.QuickFilterBarHide());
-    }
-    isQuickFilterAvailable() {
-        return this.adaptable.isQuickFilterAvailable();
-    }
-    isQuickFilterVisible() {
-        return this.isQuickFilterAvailable() && this.getFilterState().IsQuickFilterVisible;
+    getColumnFilterById(id) {
+        var _a;
+        return (_a = this.getColumnFilters()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
     }
 }
 exports.FilterApiImpl = FilterApiImpl;

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

@@ -28,6 +28,7 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     suspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     unSuspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     applyFormatColumnDisplayFormats(): void;
+    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
     getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
     getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
     getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -106,6 +106,10 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     applyFormatColumnDisplayFormats() {
         throw 'This API method is deprecated - it is not needed anymore.';
     }
+    getActiveFormatColumnForColumn(column) {
+        const formatColumns = this.getAllActiveFormatColumn();
+        return this.getAppropriateFormatColumn(formatColumns, column);
+    }
     getFormatColumnForColumn(column) {
         const formatColumns = this.getAllFormatColumn();
         return this.getAppropriateFormatColumn(formatColumns, column);
@@ -277,8 +281,9 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
             return value;
         }
         const adaptableOptions = this.adaptable.adaptableOptions;
-        const customFormattersFromOptions = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
-        const customFormatters = columnCustomFormatters.map((customFormatter) => customFormattersFromOptions === null || customFormattersFromOptions === void 0 ? void 0 : customFormattersFromOptions.find((customFormatterOption) => customFormatterOption.id === customFormatter.Id));
+        const customFormattersFromOptions = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.userInterfaceOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
+        // formatters are applied in the order they are defined in the options
+        const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
         return customFormatters.reduce((acc, formatter) => {
             if (formatter && formatter.handler) {
                 return formatter.handler(acc);

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

@@ -84,7 +84,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isGroupRowNode(rowNode: RowNode): boolean;
     isQuickFilterAvailable(): boolean;
     redrawGrid(): void;
-    fireSearchChangedEvent(searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort'): void;
+    fireSearchChangedEvent(searchChangedTrigger: 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort'): void;
     fireCellChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
     fireGridDataChangedEvent(dataRows: any[], rowNodes: RowNode[], rowTrigger: 'Add' | 'Edit' | 'Delete'): void;
     jumpToRow(primaryKeyValue: any): void;
@@ -103,6 +103,9 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     refreshRowNode(rowNode: RowNode): void;
     refreshRowNodes(rowNodes: RowNode[]): void;
     areCellsEditable(gridCells: GridCell[]): boolean;
+    openEditRowForm(primaryKey: any): void;
+    openCreateRowForm(duplicatedRowNodePrimaryKey?: any): void;
+    openCloneRowForm(clonedRowNodePrimaryKey?: any): void;
     getRowCount(): number;
     getVisibleRowCount(): number;
     getRowsInViewport(): RowNode[];

package/src/Api/Implementation/GridApiImpl.js

@@ -7,6 +7,7 @@ const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Grid
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 class GridApiImpl extends ApiBase_1.ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
@@ -89,7 +90,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     clearGridFiltering() {
         // slightly round the houses but we have to call FilterAPI as it does it properly
-        this.adaptable.api.filterApi.clearAllColumnFilter();
+        this.adaptable.api.filterApi.clearColumnFilters();
     }
     getAgGridInstance() {
         return this.adaptable.adaptableOptions.gridOptions;
@@ -372,6 +373,49 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }
         return true;
     }
+    openEditRowForm(primaryKey) {
+        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
+        if (!rowNode) {
+            LoggingHelper_1.LogAdaptableWarning(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
+        }
+        const editForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowEditForm(rowNode);
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'edit_row_form',
+            Form: editForm,
+            // formProps are added to the formContext
+            FormProps: {
+                rowNode,
+            },
+        }));
+    }
+    openCreateRowForm(duplicatedRowNodePrimaryKey) {
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm();
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'create_row_form',
+            Form: createForm,
+        }));
+    }
+    openCloneRowForm(clonedRowNodePrimaryKey) {
+        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(clonedRowNodePrimaryKey);
+        if (!rowNode) {
+            LoggingHelper_1.LogAdaptableWarning(`Can NOT clone row: rowNode not found for primaryKey ${clonedRowNodePrimaryKey}`);
+        }
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm(rowNode);
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'create_row_form',
+            Form: createForm,
+            // formProps are added to the formContext
+            FormProps: {
+                clonedRowNode: rowNode,
+            },
+        }));
+    }
     getRowCount() {
         return this.adaptable.getRowCount();
     }

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

@@ -11,7 +11,7 @@ import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInf
 import { AdaptableModule, AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertButtonContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo } from '../../types';
+import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertButtonContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { IReportService } from '../../Utilities/Services/Interface/IReportService';
@@ -35,6 +35,8 @@ import { AdaptableFrameworkComponent } from '../../AdaptableOptions/AdaptableFra
 import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 import { IModuleCollection } from '../../Strategy/Interface/IModule';
 import { AdaptableObjectTag } from '../../PredefinedConfig/Common/AdaptableObject';
+import { EditLookUpPermittedValues } from '../../../types';
+import { IRowEditService } from '../../Utilities/Services/Interface/IRowEditService';
 export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getSystemState(): SystemState;
     getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertButtonContext>, 'buttons'> & {
@@ -97,6 +99,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
+    getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
@@ -111,10 +114,11 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getLabelForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getTooltipForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getStyleForButton(button: AdaptableButton<BaseContext>, context: BaseContext): ButtonStyle | undefined;
+    getIconForButton(button: AdaptableButton<BaseContext>, context: BaseContext): AdaptableIcon | undefined;
     isDocumentationLinksDisplayed(): boolean;
     getQueryPreviewData(): any;
+    getLocalTeamSharingEntities(): SharedEntity[];
     waitForTeamSharingImportEnd(): Promise<boolean>;
-    getUserDefinedHeaderName(columnId: string): string;
     createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;
@@ -133,4 +137,5 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     showSettingsPanel(module: AdaptableModule, moduleParams?: ModuleParams): void;
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
+    getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -288,6 +288,9 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getMetamodelService() {
         return this.adaptable.MetamodelService;
     }
+    getRowEditService() {
+        return this.adaptable.RowEditService;
+    }
     getModules() {
         return this.adaptable.adaptableModules;
     }
@@ -357,6 +360,17 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             return button.buttonStyle;
         }
     }
+    getIconForButton(button, context) {
+        if (!button.icon) {
+            return;
+        }
+        if (button.icon != null && typeof button.icon === 'function') {
+            return button.icon(button, context);
+        }
+        else {
+            return button.icon;
+        }
+    }
     isDocumentationLinksDisplayed() {
         return this.adaptable.adaptableOptions.userInterfaceOptions.showDocumentationLinks;
     }
@@ -377,6 +391,9 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         });
         return firstRowData;
     }
+    getLocalTeamSharingEntities() {
+        return this.getAdaptableState().TeamSharing.SharedEntities;
+    }
     waitForTeamSharingImportEnd() {
         // we have no deterministic means to ensure the teamsharing import is finished (because the import actions are opaque and may have side-effects)
         // therefore we will listen for state changes and
@@ -403,9 +420,6 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             });
         });
     }
-    getUserDefinedHeaderName(columnId) {
-        return this.adaptable.getUserDefinedHeaderName(columnId);
-    }
     createFrameworkComponent(containerDomNode, frameworkComponent, componentType) {
         const createComponentFn = () => 
         // delegate the logic to framework wrapper
@@ -519,10 +533,11 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         }
         if (typeof this.adaptable.adaptableOptions.userInterfaceOptions.objectTags === 'function') {
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
-            return (this.adaptable.adaptableOptions.userInterfaceOptions
-                .objectTags(this.adaptable.api)
-                // jw - not sure how to check here only for when its a object and then do check
-                .filter((tag) => typeof tag == 'string' ? tag : tag.value != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined));
+            return this.adaptable.adaptableOptions.userInterfaceOptions
+                .objectTags({
+                adaptableApi: this.adaptable.api,
+            })
+                .filter((tag) => typeof tag === 'string');
         }
     }
     getLayoutTags() {
@@ -545,7 +560,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             };
             const customGeneratedTags = this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts(autoGenerateTagsForLayoutsContext);
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
-            return customGeneratedTags.filter((tag) => typeof tag == 'string' ? tag : tag.value != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined);
+            return customGeneratedTags.filter((tag) => typeof tag === 'string');
         }
     }
     // General way to get to store from inside Adaptable...
@@ -557,10 +572,36 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(module, moduleParams);
     }
     getLabelForTag(adaptableObjectTag) {
-        return typeof adaptableObjectTag == 'string' ? adaptableObjectTag : adaptableObjectTag.label;
+        // not very interesting right now, but useful later when tag is not only a plain string
+        return adaptableObjectTag;
     }
     getValueForTag(adaptableObjectTag) {
-        return typeof adaptableObjectTag == 'string' ? adaptableObjectTag : adaptableObjectTag.value;
+        // not very interesting right now, but useful later when tag is not only a plain string
+        return adaptableObjectTag;
+    }
+    getEditLookUpValuesForColumn(editLookUpItem, column, gridCell) {
+        if (!editLookUpItem || !column) {
+            return undefined;
+        }
+        let editLookUpValues = editLookUpItem.values;
+        // first do the function then get hardcoded items
+        if (editLookUpValues != null && typeof editLookUpValues === 'function') {
+            const editLookUpContext = {
+                adaptableApi: this.adaptable.api,
+                column: column,
+                gridCell,
+            };
+            return editLookUpValues(editLookUpContext);
+        }
+        else {
+            let arr = editLookUpValues;
+            if (arr && ArrayExtensions_1.default.IsNotNullOrEmpty(arr)) {
+                return arr;
+            }
+        }
+        // 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(column.columnId);
     }
 }
 exports.InternalApiImpl = InternalApiImpl;

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

@@ -42,4 +42,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     isCurrentLayoutDefault(): boolean;
     areExpandedRowGroupsSavedInLayouts(): boolean;
     isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
+    removeColumnFromCurrentLayout(columnId: string): void;
+    removeColumnFromAllLayouts(columnId: string): void;
+    removeColumnFromLayout(columnId: string, layoutName: string): void;
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -321,5 +321,25 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             ? true
             : (_a = adaptableObject.Tags) === null || _a === void 0 ? void 0 : _a.map((tag) => tag).includes(this.getCurrentLayoutName());
     }
+    removeColumnFromCurrentLayout(columnId) {
+        this.removeColumnFromLayout(columnId, this.getCurrentLayoutName());
+    }
+    removeColumnFromAllLayouts(columnId) {
+        this.getAllLayout().forEach((layout) => {
+            this.removeColumnFromLayout(columnId, layout.Name);
+        });
+    }
+    removeColumnFromLayout(columnId, layoutName) {
+        const column = this.getAdaptableApi().columnApi.getColumnFromId(columnId);
+        if (column) {
+            const layout = this.getLayoutByName(layoutName);
+            if (layout) {
+                if (layout.Columns.includes(columnId)) {
+                    this.dispatchAction(LayoutRedux.LayouRemoveColumn(layoutName, columnId));
+                    this.getAdaptableApi().columnApi.hideColumn(columnId);
+                }
+            }
+        }
+    }
 }
 exports.LayoutApiImpl = LayoutApiImpl;

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

@@ -1,6 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { PredicateApi } from '../PredicateApi';
 import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, ModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptableColumnDataType, SystemFilterPredicateId } from '../../types';
 export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     getPredicateDefs(): AdaptablePredicateDef[];
     getSystemPredicateDefs(): AdaptablePredicateDef[];
@@ -12,4 +13,5 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     predicateToString(predicate: AdaptablePredicate): string | undefined;
     isValidPredicate(predicate: AdaptablePredicate | undefined): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -15,7 +15,7 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         return AdaptablePredicate_1.SystemPredicateDefs;
     }
     getCustomPredicateDefs() {
-        return this.adaptable.adaptableOptions.customPredicateDefs;
+        return this.getAdaptableQLOptions().customPredicateDefs;
     }
     getPredicateDefsByModuleScope(moduleScope) {
         return this.getPredicateDefs().filter((p) => p.moduleScope.includes(moduleScope));
@@ -78,5 +78,23 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
     }
+    getEqualityPredicateForDataType(dataType) {
+        let predicateId;
+        switch (dataType) {
+            case 'Number':
+                predicateId = 'Equals';
+                break;
+            case 'Date':
+                predicateId = 'On';
+                break;
+            case 'String':
+                predicateId = 'Is';
+                break;
+            default:
+                predicateId = 'Equals';
+                break;
+        }
+        return predicateId;
+    }
 }
 exports.PredicateApiImpl = PredicateApiImpl;

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

@@ -1,12 +1,15 @@
 import { ApiBase } from './ApiBase';
+import { MathOperation } from '../../PredefinedConfig/Common/Enums';
 import { SmartEditApi } from '../SmartEditApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
+import { SmartEditCustomOperation, SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
-    setSmartEditOperation(mathOperation: SmartEditOperation): void;
+    setSmartEditOperation(mathOperation: MathOperation): void;
     getSmartEditOperation(): SmartEditOperation;
     setSmartEditValue(smartEditValue: number): void;
     getSmartEditValue(): number;
     showSmartEditPopup(): void;
     applySmartEdit(gridCells: GridCell[]): void;
+    getSmartEditCustomOperations(): SmartEditCustomOperation[] | undefined;
+    setCustomSmartEditOperation(customOperationName: string): void;
 }

package/src/Api/Implementation/SmartEditApiImpl.js

@@ -25,5 +25,14 @@ class SmartEditApiImpl extends ApiBase_1.ApiBase {
     applySmartEdit(gridCells) {
         this.dispatchAction(SmartEditRedux.SmartEditApply(gridCells));
     }
+    getSmartEditCustomOperations() {
+        return this.getEditOptions().smartEditCustomOperations;
+    }
+    setCustomSmartEditOperation(customOperationName) {
+        const customOperation = this.getSmartEditCustomOperations().find((so) => so.name == customOperationName);
+        if (customOperation) {
+            this.dispatchAction(SystemRedux.SmartEditChangeOperation(customOperation));
+        }
+    }
 }
 exports.SmartEditApiImpl = SmartEditApiImpl;

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

@@ -1,13 +1,15 @@
 import { ApiBase } from './ApiBase';
 import { TeamSharingApi } from '../TeamSharingApi';
-import { TeamSharingState, SharedEntity, AdaptableModule, AdaptableObject, SharedEntityConfig } from '../../types';
+import { SharedEntity, AdaptableModule, AdaptableObject, SharedEntityConfig } from '../../types';
 export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingApi {
-    getTeamSharingState(): TeamSharingState;
-    getSharedEntities(): SharedEntity[];
+    getSharedEntities(): Promise<SharedEntity[]>;
+    setSharedEntities(sharedEntities: SharedEntity[]): Promise<boolean>;
+    isTeamSharingAvailable(): boolean;
     isTeamSharingActivated(): boolean;
     hasTeamSharingFullRights(): boolean;
     checkForUpdates(): void;
     showTeamSharingPopup(): void;
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;
     shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: SharedEntityConfig): void;
+    unshareEntity(entityId: string): void;
 }