@adaptabletools/adaptable 11.2.4-canary.0 → 12.0.0-canary.0

package/src/Api/Implementation/FilterApiImpl.js

@@ -2,14 +2,9 @@
 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 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,172 +25,18 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
             ...this.adaptable.api.predicateApi.getCustomPredicateDefs(),
         ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
     }
-    getAllColumnFilter() {
-        return this.getFilterState().ColumnFilters;
-    }
-    getColumnFilterById(id) {
-        var _a;
-        return (_a = this.getAllColumnFilter()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
-    }
-    setColumnFilter(columnFilters) {
-        columnFilters.forEach((columnFilter) => {
-            if (!columnFilter.Predicate) {
-                LoggingHelper_1.LogAdaptableWarning('Column Filter has no Predicate', columnFilter);
-            }
-            else {
-                const isValidPredicate = this.adaptable.api.predicateApi.isValidPredicate(columnFilter.Predicate);
-                if (!isValidPredicate) {
-                    LoggingHelper_1.LogAdaptableWarning('Column Filter Predicate is not valid', columnFilter);
-                }
-                else {
-                    this.addUidToAdaptableObject(columnFilter);
-                    if (this.getAllColumnFilter().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
-                        this.dispatchAction(FilterRedux.ColumnFilterSet(columnFilter));
-                    }
-                    else {
-                        this.dispatchAction(FilterRedux.ColumnFilterAdd(columnFilter));
-                    }
-                }
-                return columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.map((columnFilter) => this.getColumnFilterById(columnFilter.Uuid));
-            }
-        });
-        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));
-    }
-    clearColumnFilterByColumns(columns) {
-        columns.forEach((c) => {
-            this.clearColumnFilterByColumn(c);
-        });
-    }
-    clearColumnFilterByColumn(column) {
-        let columnFiltersForColumn = this.getAllColumnFilterForColumn(column);
-        if (columnFiltersForColumn) {
-            columnFiltersForColumn.forEach((cf) => {
-                this.dispatchAction(FilterRedux.ColumnFilterClear(cf));
-            });
-            this.adaptable.clearColumnFiltering([column]);
-        }
-    }
-    clearAllColumnFilter() {
-        this.dispatchAction(FilterRedux.ColumnFilterClearAll());
-        this.adaptable.clearGridFiltering();
-    }
-    getAllColumnFilterForColumn(column) {
-        let columnFilters = this.getAllColumnFilter();
-        if (columnFilters) {
-            return columnFilters.filter((cf) => cf.ColumnId == column);
-        }
-        else {
-            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';
-                    }
-                }
-            }
-        }
-        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: columnId,
-            Predicate: {
-                PredicateId: predicateId,
-                Inputs: [...new Set(cellValues)],
-            },
-        };
-        const [savedFilter] = this.setColumnFilter([filter]) || [null];
-        return savedFilter;
-    }
-    columnFilterToString(columnFilter) {
-        const friendlyName = this.adaptable.api.columnApi.getFriendlyNameFromColumnId(columnFilter.ColumnId);
-        return ('[' +
-            friendlyName +
-            '] ' +
-            this.adaptable.api.predicateApi.predicateToString(columnFilter.Predicate));
-    }
-    columnFiltersToString(columnFilters) {
-        return columnFilters.map((cf) => this.columnFilterToString(cf)).join(', ');
-    }
-    evaluateColumnFilter(columnFilter, node) {
-        var _a, _b;
-        if (!columnFilter.Predicate) {
-            return true;
-        }
-        if ((_a = columnFilter.Predicate.Inputs) === null || _a === void 0 ? void 0 : _a.some((input) => StringExtensions_1.default.IsNullOrEmpty(input))) {
-            return true;
-        }
-        const column = this.adaptable.api.columnApi.getColumnFromId(columnFilter.ColumnId);
-        if (!column) {
-            return true;
-        }
-        const gridCell = this.adaptable.api.gridApi.getGridCellFromRowNode(node, columnFilter.ColumnId);
-        if (!gridCell) {
-            return true;
-        }
-        let value = gridCell.normalisedValue;
-        if (((_b = columnFilter.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId) === 'Contains' && column.dataType === 'Date') {
-            // although 'Contains' Predicate is NOT relevant for Date columns, we have to handle the special case of QuickSearching
-            // in that case, we have to evaluate the displayedValue of the cell, not the normalisedValue (it's a textual search after all)
-            value = gridCell.displayValue;
-        }
-        return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, {
-            value: value,
-            oldValue: null,
-            displayValue: gridCell.normalisedValue,
-            node,
-            column,
-        }, true);
-    }
     showQuickFilterBar() {
-        this.dispatchAction(FilterRedux.QuickFilterBarShow());
+        this.dispatchAction(SystemRedux.SystemQuickFilterBarShow());
     }
     hideQuickFilterBar() {
-        this.dispatchAction(FilterRedux.QuickFilterBarHide());
+        this.dispatchAction(SystemRedux.SystemQuickFilterBarHide());
     }
     isQuickFilterAvailable() {
         return this.adaptable.isQuickFilterAvailable();
     }
     isQuickFilterVisible() {
-        return this.isQuickFilterAvailable() && this.getFilterState().IsQuickFilterVisible;
+        return (this.isQuickFilterAvailable() &&
+            this.adaptable.api.internalApi.getSystemState().IsQuickFilterVisible);
     }
 }
 exports.FilterApiImpl = FilterApiImpl;

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

@@ -4,6 +4,7 @@ import { FormatColumnApi } from '../FormatColumnApi';
 import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableFormat } from '../../types';
 export declare class FormatColumnApiImpl extends ApiBase implements FormatColumnApi {
     getFormatColumnState(): FormatColumnState;
     getAllFormatColumn(config?: {
@@ -27,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;
@@ -44,4 +46,8 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
     isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
     fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
+    private applyCustomFormatters;
+    getNumberFormattedValue(value: any, options: AdaptableFormat['Options']): string;
+    getStringFormattedValue(value: any, options: AdaptableFormat['Options']): string;
+    getDateFormattedValue(value: any, options: AdaptableFormat['Options']): string;
 }

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -8,6 +8,7 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnState() {
         return this.getAdaptableState().FormatColumn;
@@ -105,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);
@@ -269,5 +274,34 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         };
         this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
     }
+    applyCustomFormatters(value, options) {
+        var _a, _b;
+        const columnCustomFormatters = (_a = options === null || options === void 0 ? void 0 : options.CustomDisplayFormats) !== null && _a !== void 0 ? _a : [];
+        if (!(columnCustomFormatters === null || columnCustomFormatters === void 0 ? void 0 : columnCustomFormatters.length)) {
+            return value;
+        }
+        const adaptableOptions = this.adaptable.adaptableOptions;
+        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);
+            }
+            return acc;
+        }, value);
+    }
+    getNumberFormattedValue(value, options) {
+        let preparedValue = this.applyCustomFormatters(value, options);
+        return FormatHelper_1.default.NumberFormatter(preparedValue, options);
+    }
+    getStringFormattedValue(value, options) {
+        let preparedValue = this.applyCustomFormatters(value, options);
+        return FormatHelper_1.default.StringFormatter(preparedValue, options);
+    }
+    getDateFormattedValue(value, options) {
+        let preparedValue = this.applyCustomFormatters(value, options);
+        return FormatHelper_1.default.DateFormatter(preparedValue, options);
+    }
 }
 exports.FormatColumnApiImpl = FormatColumnApiImpl;

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.layoutApi.clearAllColumnFilter();
     }
     getAgGridInstance() {
         return this.adaptable.adaptableOptions.gridOptions;
@@ -372,6 +373,45 @@ 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

@@ -3,7 +3,8 @@ import { LayoutApi } from '../LayoutApi';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
-import { LayoutAssociatedObject } from '../../types';
+import { ColumnFilter, LayoutAssociatedObject } from '../../types';
+import { RowNode } from '@ag-grid-community/all-modules';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutState(): LayoutState;
     shouldAutoSaveLayout: (layout?: Layout) => boolean;
@@ -42,4 +43,20 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     isCurrentLayoutDefault(): boolean;
     areExpandedRowGroupsSavedInLayouts(): boolean;
     isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
+    getAllColumnFilter(): ColumnFilter[];
+    getColumnFilterById(id: ColumnFilter['Uuid']): ColumnFilter;
+    setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
+    clearColumnFilter(columnFilter: ColumnFilter): void;
+    clearColumnFilterByColumns(columns: string[]): void;
+    clearColumnFilterByColumn(column: string): void;
+    clearAllColumnFilter(): void;
+    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
+    getAllColumnFilterForColumn(column: string): ColumnFilter[];
+    createColumnFilterForCell(columnId: string, primarykeyValues: any[]): ColumnFilter | null;
+    columnFilterToString(columnFilter: ColumnFilter): string;
+    columnFiltersToString(columnFilters: ColumnFilter[]): string;
+    evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
+    removeColumnFromCurrentLayout(columnId: string): void;
+    removeColumnFromAllLayouts(columnId: string): void;
+    removeColumnFromLayout(columnId: string, layoutName: string): void;
 }