@adaptabletools/adaptable 11.3.0 → 12.0.0-canary.2

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.js

@@ -275,13 +275,13 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
     }
     applyCustomFormatters(value, options) {
-        var _a, _b;
+        var _a, _b, _c;
         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.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
+        const customFormattersFromOptions = (_c = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.userInterfaceOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
         // 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) => {

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;

package/src/Api/Implementation/GridApiImpl.js

@@ -90,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;
@@ -378,7 +378,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         if (!rowNode) {
             LoggingHelper_1.LogAdaptableWarning(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
         }
-        const editForm = this.adaptable.api.internalApi.getRowEditService().buildRowEditForm(rowNode);
+        const editForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowEditForm(rowNode);
         this.dispatchAction(PopupRedux_1.PopupShowForm({
             Id: 'edit_row_form',
             Form: editForm,
@@ -389,7 +391,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }));
     }
     openCreateRowForm(duplicatedRowNodePrimaryKey) {
-        const createForm = this.adaptable.api.internalApi.getRowEditService().buildRowCreateForm();
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm();
         this.dispatchAction(PopupRedux_1.PopupShowForm({
             Id: 'create_row_form',
             Form: createForm,

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';
@@ -114,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;

package/src/Api/Implementation/InternalApiImpl.js

@@ -360,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;
     }
@@ -380,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
@@ -406,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

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,13 +1,15 @@
 import { ApiBase } from './ApiBase';
+import { MathOperation } from '../../PredefinedConfig/Common/Enums';
 import { SmartEditApi } from '../SmartEditApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 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

@@ -28,5 +28,11 @@ class SmartEditApiImpl extends ApiBase_1.ApiBase {
     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;
 }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -8,20 +8,31 @@ const TeamSharingRedux_1 = require("../../Redux/ActionsReducers/TeamSharingRedux
 const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class TeamSharingApiImpl extends ApiBase_1.ApiBase {
-    getTeamSharingState() {
-        return this.getAdaptableState().TeamSharing;
+    async getSharedEntities() {
+        if (!this.isTeamSharingActivated()) {
+            LoggingHelper_1.ConsoleLogWarning('Team Sharing is not Activated so Entities cannot be loaded');
+            return [];
+        }
+        return this.adaptable.adaptableOptions.teamSharingOptions.getSharedEntities(this.adaptable.adaptableOptions.adaptableId);
     }
-    getSharedEntities() {
-        return this.getAdaptableState().TeamSharing.SharedEntities;
+    async setSharedEntities(sharedEntities) {
+        if (!this.isTeamSharingActivated()) {
+            LoggingHelper_1.ConsoleLogWarning('Team Sharing is not Activated so Entities cannot be shared');
+            return false;
+        }
+        await this.adaptable.adaptableOptions.teamSharingOptions.setSharedEntities(this.adaptable.adaptableOptions.adaptableId, sharedEntities);
+        return true;
     }
-    isTeamSharingActivated() {
+    isTeamSharingAvailable() {
+        var _a, _b, _c;
         return (!this.getAdaptableApi()
             .internalApi.getEntitlementService()
-            .isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
-            this.adaptable.adaptableOptions.teamSharingOptions &&
-            this.adaptable.adaptableOptions.teamSharingOptions.enableTeamSharing &&
-            !!this.adaptable.adaptableOptions.teamSharingOptions.getSharedEntities &&
-            !!this.adaptable.adaptableOptions.teamSharingOptions.setSharedEntities);
+            .isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) && ((_a = this.adaptable.adaptableOptions.teamSharingOptions) === null || _a === void 0 ? void 0 : _a.enableTeamSharing) &&
+            !!((_b = this.adaptable.adaptableOptions.teamSharingOptions) === null || _b === void 0 ? void 0 : _b.getSharedEntities) &&
+            !!((_c = this.adaptable.adaptableOptions.teamSharingOptions) === null || _c === void 0 ? void 0 : _c.setSharedEntities));
+    }
+    isTeamSharingActivated() {
+        return this.isTeamSharingAvailable();
     }
     hasTeamSharingFullRights() {
         return this.adaptable.api.internalApi
@@ -50,5 +61,12 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingShare(entity, module, sharedEntityConfig));
     }
+    unshareEntity(entityId) {
+        if (!this.isTeamSharingActivated()) {
+            LoggingHelper_1.ConsoleLogWarning('Team Sharing is not Activated so Entities cannot be unshared');
+            return;
+        }
+        this.dispatchAction(TeamSharingRedux.TeamSharingRemoveItem(entityId));
+    }
 }
 exports.TeamSharingApiImpl = TeamSharingApiImpl;

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

@@ -24,6 +24,6 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
-    getAllActionColumn(): ActionColumn[];
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
+    getAllActionColumn(): ActionColumn[];
 }

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -150,10 +150,6 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     getReadOnlyCellStyle() {
         return this.getUserInterfaceOptions().readOnlyCellStyle;
     }
-    getAllActionColumn() {
-        var _a;
-        return (_a = this.getUserInterfaceOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
-    }
     getAdaptableObjectTags() {
         const objectTags = this.getUserInterfaceOptions().objectTags;
         if (objectTags != null && typeof objectTags === 'function') {
@@ -166,5 +162,9 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
+    getAllActionColumn() {
+        var _a, _b;
+        return (_b = (_a = this.getUserInterfaceOptions().actionOptions) === null || _a === void 0 ? void 0 : _a.actionColumns) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.UserInterfaceApiImpl = UserInterfaceApiImpl;

package/src/Api/InternalApi.d.ts

@@ -17,7 +17,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SystemStatusMessageInfo } from '../types';
+import { AdaptableIcon, AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -117,9 +117,10 @@ export interface 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;
     dispatchReduxAction(action: Action): void;
     waitForTeamSharingImportEnd(): Promise<boolean>;
-    getUserDefinedHeaderName(columnId: string): string;
+    getLocalTeamSharingEntities(): SharedEntity[];
     createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
     initializeDataChangeHistory(): void;

package/src/Api/LayoutApi.d.ts

@@ -187,4 +187,20 @@ export interface LayoutApi {
      * @param adaptableObject object to check
      */
     isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
+    /**
+     * Removes a Column from the Current Layout
+     * @param columnId Column to remove
+     */
+    removeColumnFromCurrentLayout(columnId: string): void;
+    /**
+     * Removes a Column from all Layouts
+     * @param columnId Column to remove
+     */
+    removeColumnFromAllLayouts(columnId: string): void;
+    /**
+     * Removes a Column from a given Layout
+     * @param columnId Column to remove
+     * @param layoutName layout from which to remove Column
+     */
+    removeColumnFromLayout(columnId: string, layoutName: string): void;
 }

package/src/Api/PredicateApi.d.ts

@@ -1,4 +1,6 @@
+import { AdaptableColumnDataType } from '../../types';
 import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, ModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { SystemFilterPredicateId } from '../types';
 /**
  * Functions which manage the Predicate object in AdapTable
  */
@@ -52,4 +54,9 @@ export interface PredicateApi {
      * @param defaultReturn Whether to return the default
      */
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    /**
+     * Gets the correct Equality-type System Predicate for a particular DataType
+     * @param dataType DataType of Column
+     */
+    getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
 }

package/src/Api/SmartEditApi.d.ts

@@ -1,4 +1,5 @@
 import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
+import { MathOperation } from '../PredefinedConfig/Common/Enums';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { SmartEditCustomOperation } from '../types';
 /**
@@ -6,10 +7,15 @@ import { SmartEditCustomOperation } from '../types';
  **/
 export interface SmartEditApi {
     /**
-     * Sets Smart Edit operation: ('Add','Subtract','Multiply','Divide'
+     * Sets (shipped) Smart Edit Operation: 'Add','Subtract','Multiply','Divide'
      * @param operation operation to run
      */
-    setSmartEditOperation(operation: SmartEditOperation): void;
+    setSmartEditOperation(operation: MathOperation): void;
+    /**
+     * Sets current Smart Edit Operation to a Custom Operation
+     * @param customOperationName name of Custom Smart Edit Operation
+     */
+    setCustomSmartEditOperation(customOperationName: string): void;
     /**
      * Gets current Smart Edit Operation
      */