@adaptabletools/adaptable 12.0.0-canary.3 → 12.0.0-canary.4

package/src/Api/Events/ActionRowSubmitted.d.ts

@@ -0,0 +1,34 @@
+import { BaseEventInfo } from './BaseEventInfo';
+import { AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
+import { RowNode } from '@ag-grid-community/all-modules';
+/**
+ * Info passed into ActionRowSubmitted Event - can be `CreatedActionRowInfo` or `EditedActionRowInfo` or `DeletedActionRowInfo`
+ */
+export declare type ActionRowSubmittedInfo = CreatedActionRowInfo | EditedActionRowInfo | DeletedActionRowInfo;
+/**
+ * Type of Action Row - Created, Edited or Deleted
+ */
+export declare type ActionRowType = 'rowCreated' | 'rowEdited' | 'rowDeleted';
+/**
+ *  Info passed into ActionRowSubmitted Event for Created Rows
+ */
+export interface CreatedActionRowInfo extends BaseEventInfo {
+    type: 'rowCreated';
+    formData: AdaptableFormData;
+    clonedRowNode?: RowNode;
+}
+/**
+ * Info passed into ActionRowSubmitted Event for Edited Rows
+ */
+export interface EditedActionRowInfo extends BaseEventInfo {
+    type: 'rowEdited';
+    formData: AdaptableFormData;
+    rowNode: RowNode;
+}
+/**
+ * Info passed into ActionRowSubmitted Event for Deleted Rows
+ */
+export interface DeletedActionRowInfo extends BaseEventInfo {
+    type: 'rowDeleted';
+    rowNode: RowNode;
+}

package/src/Api/Events/ActionRowSubmitted.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Api/GridApi.d.ts

@@ -464,18 +464,4 @@ export interface GridApi {
      * Opens Settings Panel with Grid Info section selected and visible
      */
     showGridInfoPopup(): void;
-    /**
-     * Open edit dialog for row with the given primary key value
-     * @param primaryKey - the primary key of the edited row
-     */
-    openEditRowForm(primaryKey: any): void;
-    /**
-     * Open create dialog for a new row
-     */
-    openCreateRowForm(): void;
-    /**
-     * Open create dialog for cloning an existing row
-     * @param clonedRowNodePrimaryKey - the primary key of the duplicated row
-     */
-    openCloneRowForm(clonedRowNodePrimaryKey?: any): void;
 }

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

@@ -0,0 +1,8 @@
+import { ActionApi, ActionColumn } from '../../../types';
+import { ApiBase } from './ApiBase';
+export declare class ActionApiImpl extends ApiBase implements ActionApi {
+    getAllActionColumn(): ActionColumn[];
+    displayEditActionRow(primaryKey: any): void;
+    displayCreateActionRow(duplicatedRowNodePrimaryKey?: any): void;
+    displayCloneActionRow(clonedRowNodePrimaryKey?: any): void;
+}

package/src/Api/Implementation/ActionApiImpl.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionApiImpl = void 0;
+const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const ApiBase_1 = require("./ApiBase");
+class ActionApiImpl extends ApiBase_1.ApiBase {
+    getAllActionColumn() {
+        var _a;
+        return (_a = this.getActionOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
+    }
+    displayEditActionRow(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,
+            },
+        }));
+    }
+    displayCreateActionRow(duplicatedRowNodePrimaryKey) {
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm();
+        this.dispatchAction(PopupRedux_1.PopupShowForm({
+            Id: 'create_row_form',
+            Form: createForm,
+        }));
+    }
+    displayCloneActionRow(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,
+            },
+        }));
+    }
+}
+exports.ActionApiImpl = ActionApiImpl;

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

@@ -38,8 +38,10 @@ import { DataChangeHistoryApi } from '../DataChangeHistoryApi';
 import { FlashingCellApi } from '../FlashingCellApi';
 import { ChartingApi } from '../ChartingApi';
 import { StatusBarApi } from '../StatusBarApi';
+import { ActionApi } from '../../../types';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
+    actionApi: ActionApi;
     applicationApi: ApplicationApi;
     alertApi: AlertApi;
     flashingCellApi: FlashingCellApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -40,11 +40,13 @@ const QueryLanguageApiImpl_1 = require("./QueryLanguageApiImpl");
 const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
 const ChartingApiImpl_1 = require("./ChartingApiImpl");
 const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
+const ActionApiImpl_1 = require("./ActionApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
         this.destroyed = false;
         this.adaptable = adaptable;
+        this.actionApi = new ActionApiImpl_1.ActionApiImpl(adaptable);
         this.applicationApi = new ApplicationApiImpl_1.ApplicationApiImpl(adaptable);
         this.alertApi = new AlertApiImpl_1.AlertApiImpl(adaptable);
         this.flashingCellApi = new FlashingCellApiImpl_1.FlashingCellApiImpl(adaptable);

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

@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ContainerOptions, DashboardOptions, EditOptions, FilterOptions, GeneralOptions, LayoutOptions, MenuOptions, SearchOptions, StateOptions, TeamSharingOptions, UserInterfaceOptions } from '../../types';
+import { ActionOptions, ContainerOptions, DashboardOptions, EditOptions, FilterOptions, GeneralOptions, LayoutOptions, MenuOptions, SearchOptions, StateOptions, TeamSharingOptions, UserInterfaceOptions } from '../../types';
 import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
 import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
@@ -46,6 +46,7 @@ export declare abstract class ApiBase {
     protected getModuleInfoByModuleId(module: AdaptableModule): ModuleInfo;
     protected showModulePopup(module: AdaptableModule, moduleParams?: ModuleParams): void;
     protected getOptions(): AdaptableOptions;
+    protected getActionOptions(): ActionOptions;
     protected getColumnOptions(): ColumnOptions;
     protected getContainerOptions(): ContainerOptions;
     protected getNotificationsOptions(): NotificationsOptions;

package/src/Api/Implementation/ApiBase.js

@@ -74,6 +74,9 @@ class ApiBase {
     getOptions() {
         return this.adaptable.adaptableOptions;
     }
+    getActionOptions() {
+        return this.getOptions().actionOptions;
+    }
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -76,8 +76,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     isActionColumn(columnId) {
         var _a;
-        return (((_a = this.adaptable.api.userInterfaceApi
-            .getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
+        return (((_a = this.adaptable.api.actionApi.getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) !=
+            null);
     }
     isFormatNumericStyleColumn(column) {
         if (column) {

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

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

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

@@ -103,9 +103,6 @@ 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,7 +7,6 @@ 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;
@@ -373,49 +372,6 @@ 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/StatusBarApiImpl.d.ts

@@ -1,8 +1,9 @@
 import { AdaptableStatusBar } from '../../PredefinedConfig/StatusBarState';
 import { StatusBarApi } from '../StatusBarApi';
 import { ApiBase } from './ApiBase';
+import { GridOptions } from '@ag-grid-community/all-modules';
 export declare class StatusBarApiImpl extends ApiBase implements StatusBarApi {
-    getStatusPanels(): AdaptableStatusBar[];
-    getAgGridStatusPanels(): import("@ag-grid-community/core").StatusPanelDef[];
-    setStatusPanels(statusPanels: AdaptableStatusBar[]): void;
+    getAdaptableStatusBars(): AdaptableStatusBar[];
+    getAgGridStatusPanels(): GridOptions['statusBar']['statusPanels'];
+    setStatusBarPanels(statusPanels: AdaptableStatusBar[]): void;
 }

package/src/Api/Implementation/StatusBarApiImpl.js

@@ -4,13 +4,13 @@ exports.StatusBarApiImpl = void 0;
 const StatusBarRedux_1 = require("../../Redux/ActionsReducers/StatusBarRedux");
 const ApiBase_1 = require("./ApiBase");
 class StatusBarApiImpl extends ApiBase_1.ApiBase {
-    getStatusPanels() {
+    getAdaptableStatusBars() {
         return StatusBarRedux_1.getStatusPanelsSelector(this.getAdaptableState());
     }
     getAgGridStatusPanels() {
         return this.adaptable.getAgGridStatusPanels();
     }
-    setStatusPanels(statusPanels) {
+    setStatusBarPanels(statusPanels) {
         this.getAdaptableApi().internalApi.dispatchReduxAction(StatusBarRedux_1.StatusBarSetPanels(statusPanels));
     }
 }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -27,7 +27,8 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         var _a, _b, _c;
         return (!this.getAdaptableApi()
             .internalApi.getEntitlementService()
-            .isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) && ((_a = this.adaptable.adaptableOptions.teamSharingOptions) === null || _a === void 0 ? void 0 : _a.enableTeamSharing) &&
+            .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));
     }

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

@@ -3,7 +3,7 @@ import { UserInterfaceApi } from '../UserInterfaceApi';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
-import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
+import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { AdaptableObjectTag, GridCell } from '../../types';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     getColorPalette(): string[];
@@ -25,5 +25,4 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
-    getAllActionColumn(): ActionColumn[];
 }

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -162,9 +162,5 @@ 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/StatusBarApi.d.ts

@@ -4,7 +4,14 @@ export interface StatusBarApi {
     /**
      * Retrieves the current AG Grid Status Bar Panels
      */
-    getAgGridStatusPanels: () => GridOptions['statusBar']['statusPanels'];
-    getStatusPanels: () => AdaptableStatusBar[];
-    setStatusPanels: (statusPanels: AdaptableStatusBar[]) => void;
+    getAgGridStatusPanels(): GridOptions['statusBar']['statusPanels'];
+    /**
+     * Retrieves the current Adaptable Status Bar Panels
+     */
+    getAdaptableStatusBars: () => AdaptableStatusBar[];
+    /**
+     * Sets the current Adaptable Status Bar Panels
+     * @param statusPanels the Adaptable Status Bar Panels
+     */
+    setStatusBarPanels: (statusPanels: AdaptableStatusBar[]) => void;
 }

package/src/Api/UserInterfaceApi.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
-import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
+import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
 /**
@@ -74,8 +74,4 @@ export interface UserInterfaceApi {
      * Retrieves any Object Tags (provided in User Interface Options)
      */
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
-    /**
-     * Retrieves any Action Columns (provided in User Interface Options)
-     */
-    getAllActionColumn(): ActionColumn[];
 }

package/src/PredefinedConfig/Common/AdaptableAlert.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAdaptableRowChangedAlert = exports.isAdaptableCellChangedAlert = void 0;
-exports.isAdaptableCellChangedAlert = (alert) => {
+const isAdaptableCellChangedAlert = (alert) => {
     return alert.alertType === 'cellChanged';
 };
-exports.isAdaptableRowChangedAlert = (alert) => {
+exports.isAdaptableCellChangedAlert = isAdaptableCellChangedAlert;
+const isAdaptableRowChangedAlert = (alert) => {
     return alert.alertType === 'rowChanged';
 };
+exports.isAdaptableRowChangedAlert = isAdaptableRowChangedAlert;

package/src/PredefinedConfig/Common/AdaptableColumn.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidOrderForColumnGroups = void 0;
 // this is only implemented for 1 level groups
-exports.isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
+const isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
     const getGroups = (columns) => {
         let prevGroup = '';
         let count = 0;
@@ -24,3 +24,4 @@ exports.isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
     }
     return true;
 };
+exports.isValidOrderForColumnGroups = isValidOrderForColumnGroups;

package/src/PredefinedConfig/Common/AdaptableForm.d.ts

@@ -56,4 +56,4 @@ export interface AdaptableFormField {
     }[];
 }
 export declare type AdaptableFormFieldType = 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
-export declare function getDefaultAdaptableFormData<T extends BaseContext = BaseContext>(formDef?: AdaptableForm<T>): Record<string, any>;
+export declare function getDefaultAdaptableFormData<T extends BaseContext = BaseContext>(formDef?: AdaptableForm<T>): AdaptableFormData;

package/src/PredefinedConfig/Common/AdaptableIcon.d.ts

@@ -1,27 +1,33 @@
 import { CSSProperties } from 'react';
 /**
- * Defines an icon to be used in AdapTable (e.g. in Dashboard Header and Buttons)
+ * Defines an icon to be used in AdapTable (e.g. in Dashboard Header, Buttons, Menu, etc.)
  */
-export interface AdaptableIcon {
-    /**
-     * url specifying where icon can be found (mandatory)
-     */
+export declare type AdaptableIcon = AdaptableInternalIcon | AdaptableExternalIcon;
+/**
+ * Defines an icon from the internal AdapTable icon set
+ */
+export interface AdaptableInternalIcon extends AdaptableBaseIcon {
+    name: AdaptableInternalIconName;
+    size?: number;
+}
+/**
+ * Defines an icon from an external source
+ */
+export interface AdaptableExternalIcon extends AdaptableBaseIcon {
     src: string;
+}
+/**
+ * Base interface for AdaptableIcon
+ */
+interface AdaptableBaseIcon {
     /**
-     * CSS Properties
+     * The class name of the icon
      */
-    cssProperties?: CSSProperties;
+    className?: string;
     /**
-     * The style for the icon - has height and width properties
+     * CSS Properties
      */
-    style?: {
-        /**
-         * Width of the icon
-         */
-        width?: number | string;
-        /**
-         * Height of the icon
-         */
-        height?: number | string;
-    };
+    style?: CSSProperties;
 }
+export declare type AdaptableInternalIconName = string;
+export {};

package/src/PredefinedConfig/Common/AdaptablePredicate.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableScope } from './AdaptableScope';
 import { AdaptableColumn } from './AdaptableColumn';
-import { AdaptableApi } from '../../types';
+import { AdaptableApi, AdaptableIcon } from '../../types';
 import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Predicate object used by AdapTableQL - essentially a boolean function
@@ -50,9 +50,7 @@ export interface AdaptablePredicateDef {
     /**
      * Icon to show (primarily used in Filter dropdown)
      */
-    icon?: {
-        path: string;
-    } | {
+    icon?: AdaptableIcon | {
         text: string;
     };
     /**