@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

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

@@ -4,11 +4,7 @@ import { IRowNode } from '@ag-grid-community/core';
 /**
  * Info passed into ActionRowSubmitted Event - can be `CreatedActionRowInfo` or `EditedActionRowInfo` or `DeletedActionRowInfo`
  */
-export declare type ActionRowSubmittedInfo<TData = any> = CreatedActionRowInfo<TData> | EditedActionRowInfo<TData> | DeletedActionRowInfo<TData>;
-/**
- * Type of Action Row - Created, Edited or Deleted
- */
-export declare type ActionRowType = 'rowCreated' | 'rowEdited' | 'rowDeleted';
+export type ActionRowSubmittedInfo<TData = any> = CreatedActionRowInfo<TData> | EditedActionRowInfo<TData> | DeletedActionRowInfo<TData>;
 /**
  *  Info passed into ActionRowSubmitted Event for Created Rows
  */

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

@@ -7,19 +7,14 @@ export interface AdaptableSearchState {
      * Current DataSet (if one selected)
      */
     dataSet: DataSet | undefined;
-    /**
-     * Current Query
-     * @deprecated use gridFilter instead
-     */
-    currentQuery: string | undefined;
     /**
      * Current Grid Filter
      */
     gridFilter: string | undefined;
     /**
-     * AST for Current Query
+     * AST for Grid Filter
      */
-    queryAST: any;
+    gridFilterAST: any;
     /**
      * Currently applied Column Filters
      */

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

@@ -5,7 +5,7 @@ import { AppIdentifier, ContextMetadata } from '@finos/fdc3';
 /**
  * EventInfo returned by FDC3 Message events
  */
-export declare type Fdc3MessageInfo = Fdc3MessageSentInfo | Fdc3MessageReceivedInfo;
+export type Fdc3MessageInfo = Fdc3MessageSentInfo | Fdc3MessageReceivedInfo;
 /**
  * Event Info for FDC3 Sent Message Event
  */

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

@@ -1,3 +1,4 @@
+import { GridFilter } from '../../types';
 import { BaseEventInfo } from './BaseEventInfo';
 /**
  * EventInfo returned by the GridFilterApplied event
@@ -6,7 +7,7 @@ export interface GridFilterAppliedInfo extends BaseEventInfo {
     /**
      * Current Grid Filter
      */
-    gridFilter: string | undefined;
+    gridFilter: GridFilter | undefined;
     /**
      * AST for Current Grid Filter Expression
      */

package/src/Api/ExportApi.d.ts

@@ -65,10 +65,6 @@ export interface ExportApi {
      * @returns report schedule
      */
     getReportSchedules(): ReportSchedule[];
-    /**
-     * @deprecated use runReport instead
-     */
-    sendReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     /**
      * Sends a Report to a given destination
      * @param reportName name of Report to send

package/src/Api/GridFilterApi.d.ts

@@ -1,21 +1,39 @@
+import { GridFilter } from '../types';
 /**
  * Provides run-time access to Grid Filter section of Adaptable State.
  */
 export interface GridFilterApi {
     /**
-     * Retrieves the Grid Filter from the current layout
-     * @returns grid filter
+     *  Retrieves the Grid Filter from the current Layout
+     * @returns Grid Filter
+     */
+    getCurrentGridFilter(): GridFilter | undefined;
+    /**
+     * Retrieves the Grid Filter's Expression from the current layout
+     * @returns Grid Filter Expression
      */
     getCurrentGridFilterExpression(): string | undefined;
     /**
-     * Sets the grid filter on the current layout
-     * @param gridFilter filter string
+     * Sets the Grid Filter (for the current layout)
+     * @param expression filter string
+     */
+    setGridFilterExpression(expression: string): void;
+    /**
+     * Clears the Grid Filter (for the current Layout)
      */
-    setGridFilterExpression(gridFilter: string): void;
+    clearGridFilter(): void;
     /**
-     * Opens the grid filter editor
+     * Opens the Expression Editor
      *
-     * @param expression grid filter expression
+     * @param expression current Grid Filter expression
+     */
+    openExpressionEditorForGridFilter(expression?: string): void;
+    /**
+     * Suspends the Grid Filter
+     */
+    suspendGridFilter(): void;
+    /**
+     * Unsuspends the Grid Filter
      */
-    expandGridFilterEditor(expression?: string): void;
+    unSuspendGridFilter(): void;
 }

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

@@ -62,4 +62,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getPrimaryKeyColumn(): AdaptableColumn<any>;
     getDefaultAggFunc(columnId: string): string;
     isSpecialColumn(columnId: string): boolean;
+    openColumnInfoSettingsPanel(): void;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -1,5 +1,6 @@
 import { ApiBase } from './ApiBase';
 import * as GeneralConstants from '../../Utilities/Constants/GeneralConstants';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
 export class ColumnApiImpl extends ApiBase {
@@ -329,4 +330,7 @@ export class ColumnApiImpl extends ApiBase {
             this.isFreeTextColumn(columnId) ||
             this.isActionColumn(columnId));
     }
+    openColumnInfoSettingsPanel() {
+        this.showModulePopup(ModuleConstants.ColumnInfoModuleId);
+    }
 }

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

@@ -33,7 +33,7 @@ export declare class ColumnFilterApiImpl extends ApiBase implements ColumnFilter
      *
      * @param filter
      */
-    isFilterActive(filter: ColumnFilter): boolean;
+    isColumnFilterActive(filter: ColumnFilter): boolean;
     setColumnFilterForColumn(columnId: string, columnFilterConfig: ColumnFilterConfig): void;
     suspendColumnFilter(columnFilter: ColumnFilter): void;
     unSuspendColumnFilter(columnFilter: ColumnFilter): void;

package/src/Api/Implementation/ColumnFilterApiImpl.js

@@ -91,7 +91,7 @@ export class ColumnFilterApiImpl extends ApiBase {
     }
     clearColumnFilters() {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterClearAll());
-        this.adaptable.clearGridFiltering();
+        this.adaptable.clearColumnFiltering();
     }
     clearAndSetColumnFilters(columnFilters) {
         this.clearColumnFilters();
@@ -114,7 +114,7 @@ export class ColumnFilterApiImpl extends ApiBase {
      *
      * @param filter
      */
-    isFilterActive(filter) {
+    isColumnFilterActive(filter) {
         if (!filter || !filter.Predicate || !filter.Predicate.PredicateId) {
             return false;
         }
@@ -166,7 +166,7 @@ export class ColumnFilterApiImpl extends ApiBase {
         let columnFilterForColumn = this.getColumnFilterForColumn(columnId);
         if (columnFilterForColumn) {
             this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilterForColumn));
-            this.adaptable.clearColumnFiltering([columnId]);
+            this.adaptable.clearColumnFilteringForColumns([columnId]);
         }
     }
 }

package/src/Api/Implementation/ConfigApiImpl.js

@@ -96,9 +96,8 @@ export class ConfigApiImpl extends ApiBase {
         const gridFilter = this.adaptable.api.gridFilterApi.getCurrentGridFilterExpression();
         const adaptableSearchState = {
             dataSet: this.adaptable.api.dataSetApi.getCurrentDataSet(),
-            currentQuery: gridFilter,
             gridFilter: gridFilter,
-            queryAST: gridFilter
+            gridFilterAST: gridFilter
                 ? this.adaptable.api.expressionApi.getASTForExpression(gridFilter)
                 : null,
             columnFilters: this.adaptable.api.columnFilterApi.getColumnFilters(),

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

@@ -15,9 +15,7 @@ export declare class DashboardApiImpl extends ApiBase implements DashboardApi {
     getCustomDashboardButtonByLabel(buttonLabel: string): AdaptableButton<DashboardButtonContext> | undefined;
     setModuleButtons(moduleButtons: AdaptableModuleButtons): void;
     setDashboardTitle(title: string): void;
-    getCustomToolbarContentsDiv(customToolbarName: string): HTMLElement | null;
     getCustomToolbarHTMLElement(customToolbarName: string): HTMLElement | null;
-    setCustomToolbarContents(customToolbarName: string, contents: string): void;
     setCustomToolbarHTMLContent(customToolbarName: string, htmlContent: string): void;
     getCustomToolbarByName(customToolbarName: string): CustomToolbar;
     getTabByName(tabName: string): DashboardTab;

package/src/Api/Implementation/DashboardApiImpl.js

@@ -4,7 +4,6 @@ import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as React from 'react';
 import { SystemDashboardRefresh } from '../../Redux/ActionsReducers/SystemRedux';
 import { DashboardInternalApi } from '../Internal/DashboardInternalApi';
-import { logDeprecation } from '../../Utilities/logDeprecation';
 export class DashboardApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -37,15 +36,6 @@ export class DashboardApiImpl extends ApiBase {
     setDashboardTitle(title) {
         this.dispatchAction(DashboardRedux.DashboardSetTitle(title));
     }
-    getCustomToolbarContentsDiv(customToolbarName) {
-        logDeprecation(this.adaptable.logger, 'DashboardApi', 'getCustomToolbarContentsDiv', 'getCustomToolbarHTMLElement');
-        let customToolbar = this.getCustomToolbarByName(customToolbarName);
-        if (customToolbar) {
-            let divId = this.internalApi.getCustomToolbarRenderContainerId(customToolbarName);
-            return document.getElementById(divId);
-        }
-        return null;
-    }
     getCustomToolbarHTMLElement(customToolbarName) {
         let customToolbar = this.getCustomToolbarByName(customToolbarName);
         if (!customToolbar) {
@@ -64,10 +54,6 @@ export class DashboardApiImpl extends ApiBase {
             return document.getElementById(this.internalApi.getCustomToolbarComponentContainerId(customToolbarName));
         }
     }
-    setCustomToolbarContents(customToolbarName, contents) {
-        logDeprecation(this.adaptable.logger, 'DashboardApi', 'setCustomToolbarContents', 'setCustomToolbarHTMLContent');
-        this.setCustomToolbarHTMLContent(customToolbarName, contents);
-    }
     setCustomToolbarHTMLContent(customToolbarName, htmlContent) {
         let customRenderedContainer = this.getCustomToolbarHTMLElement(customToolbarName);
         if (customRenderedContainer) {

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

@@ -20,7 +20,6 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getAvailableExportDestinations(): ExportDestination[];
     getReports(): Report[];
     getReportSchedules(): ReportSchedule[];
-    sendReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     runReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     runSystemReport(systemReportName: 'Visual Data' | 'All Data' | 'Current Data' | 'Selected Cells' | 'Selected Rows', destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     selectReport(reportName: string): void;

package/src/Api/Implementation/ExportApiImpl.js

@@ -72,9 +72,6 @@ export class ExportApiImpl extends ApiBase {
     getReportSchedules() {
         return this.getAdaptableState().Schedule.ReportSchedules;
     }
-    sendReport(reportName, destination) {
-        this.runReport(reportName, destination);
-    }
     runReport(reportName, destination) {
         let report = this.getReportByName(reportName);
         if (this.checkItemExists(report, reportName, 'Report')) {

package/src/Api/Implementation/GridApiImpl.js

@@ -105,10 +105,10 @@ export class GridApiImpl extends ApiBase {
         return rowNode ? this.getNormalisedValueFromRowNode(rowNode, columnId) : undefined;
     }
     hideFilterForm() {
-        this.adaptable.hideFilterForm();
+        this.adaptable.hideColumnFilterForm();
     }
     applyGridFiltering() {
-        this.adaptable.applyGridFiltering();
+        this.adaptable.applyColumnFiltering();
     }
     clearGridFiltering() {
         // slightly round the houses but we have to call ColumnFilterAPI as it does it properly

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

@@ -2,10 +2,15 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { GridFilterApi } from '../GridFilterApi';
 import { GridFilterInternalApi } from '../Internal/GridFilterInternalApi';
 import { ApiBase } from './ApiBase';
+import { GridFilter } from '../../types';
 export declare class GridFilterApiImpl extends ApiBase implements GridFilterApi {
     internalApi: GridFilterInternalApi;
     constructor(adaptable: IAdaptable);
+    getCurrentGridFilter(): GridFilter | undefined;
     getCurrentGridFilterExpression(): string | undefined;
     setGridFilterExpression(filter: string): void;
-    expandGridFilterEditor(expression?: string): void;
+    clearGridFilter(): void;
+    openExpressionEditorForGridFilter(expression?: string): void;
+    suspendGridFilter(): void;
+    unSuspendGridFilter(): void;
 }

package/src/Api/Implementation/GridFilterApiImpl.js

@@ -8,14 +8,21 @@ export class GridFilterApiImpl extends ApiBase {
         super(adaptable);
         this.internalApi = new GridFilterInternalApi(adaptable);
     }
+    getCurrentGridFilter() {
+        var _a;
+        return (_a = this.getLayoutApi().getCurrentLayout()) === null || _a === void 0 ? void 0 : _a.GridFilter;
+    }
     getCurrentGridFilterExpression() {
-        var _a, _b, _c;
-        return (_c = (_b = (_a = this.getLayoutApi().getCurrentLayout()) === null || _a === void 0 ? void 0 : _a.GridFilter) === null || _b === void 0 ? void 0 : _b.Expression) !== null && _c !== void 0 ? _c : '';
+        const gridFilter = this.getCurrentGridFilter();
+        return gridFilter && !gridFilter.IsSuspended ? gridFilter.Expression : '';
     }
     setGridFilterExpression(filter) {
         this.dispatchAction(LayoutRedux.LayoutGridFilterSet(filter));
     }
-    expandGridFilterEditor(expression) {
+    clearGridFilter() {
+        this.dispatchAction(LayoutRedux.LayoutGridFilterClear());
+    }
+    openExpressionEditorForGridFilter(expression) {
         const preparedQuery = expression !== null && expression !== void 0 ? expression : this.getCurrentGridFilterExpression();
         this.getAdaptableApi().internalApi.showPopupWindow({
             id: WINDOW_GRID_FILTER_EDITOR,
@@ -27,4 +34,16 @@ export class GridFilterApiImpl extends ApiBase {
             },
         });
     }
+    suspendGridFilter() {
+        const gridFilter = this.getCurrentGridFilter();
+        if (gridFilter && !gridFilter.IsSuspended) {
+            this.dispatchAction(LayoutRedux.LayoutGridFilterSuspend());
+        }
+    }
+    unSuspendGridFilter() {
+        const gridFilter = this.getCurrentGridFilter();
+        if (gridFilter && gridFilter.IsSuspended) {
+            this.dispatchAction(LayoutRedux.LayoutGridFilterUnSuspend());
+        }
+    }
 }

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

@@ -1,7 +1,7 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { NamedQuery, NamedQueryState } from '../../types';
 import { NamedQueryInternalApi } from '../Internal/NamedQueryInternalApi';
-import { NamedQueryApi } from '../NamedQueryApi';
+import { NamedQueryApi, NamedQueryValidationResult } from '../NamedQueryApi';
 import { ApiBase } from './ApiBase';
 export declare class NamedQueryApiImpl extends ApiBase implements NamedQueryApi {
     internalApi: NamedQueryInternalApi;
@@ -11,10 +11,7 @@ export declare class NamedQueryApiImpl extends ApiBase implements NamedQueryApi
     getNamedQueryState(): NamedQueryState;
     getNamedQueries(): NamedQuery[];
     getNamedQueryByName(namedQueryName: string): NamedQuery | undefined;
-    isValidNamedQueryName(namedQuery: NamedQuery): {
-        valid: boolean;
-        message: string;
-    };
+    isValidNamedQuery(namedQuery: NamedQuery): NamedQueryValidationResult;
     openNamedQuerySettingsPanel(): void;
     runNamedQuery(namedQuery: NamedQuery): void;
     runQueryByName(queryName: string): void;

package/src/Api/Implementation/NamedQueryApiImpl.js

@@ -23,9 +23,9 @@ export class NamedQueryApiImpl extends ApiBase {
     getNamedQueryByName(namedQueryName) {
         return this.getNamedQueries().find((se) => se.Name == namedQueryName);
     }
-    isValidNamedQueryName(namedQuery) {
+    isValidNamedQuery(namedQuery) {
         if (IsNullOrEmptyOrWhiteSpace(namedQuery === null || namedQuery === void 0 ? void 0 : namedQuery.Name)) {
-            return { valid: false, message: 'Query name cannot be blank' };
+            return { valid: false, message: 'Named Query name cannot be blank' };
         }
         // check that there is no other existing named query with the same name
         const duplicate = this.getNamedQueries().find((q) => q.Name === namedQuery.Name && q.Uuid !== namedQuery.Uuid);

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

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NotesOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NotesOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions, GridFilterOptions } from '../../types';
 import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
 import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
@@ -31,6 +31,7 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getLayoutOptions(): LayoutOptions;
     getMenuOptions(): MenuOptions;
     getColumnFilterOptions(): ColumnFilterOptions;
+    getGridFilterOptions(): Readonly<GridFilterOptions<any>>;
     getExpressionOptions(): ExpressionOptions;
     getQuickSearchOptions(): QuickSearchOptions;
     getFormatColumnOptions(): FormatColumnOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -75,6 +75,9 @@ export class OptionsApiImpl extends ApiBase {
     getColumnFilterOptions() {
         return this.getOptions().columnFilterOptions;
     }
+    getGridFilterOptions() {
+        return this.getOptions().gridFilterOptions;
+    }
     getExpressionOptions() {
         return this.getOptions().expressionOptions;
     }

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -61,10 +61,10 @@ export class UserInterfaceApiImpl extends ApiBase {
         return undefined;
     }
     getPermittedValuesForColumn(column) {
-        if (ArrayExtensions.IsNullOrEmpty(this.getPermittedValuesItems())) {
+        const allPermittedValues = this.getPermittedValuesItems();
+        if (ArrayExtensions.IsNullOrEmpty(allPermittedValues)) {
             return undefined;
         }
-        const allPermittedValues = this.getPermittedValuesItems();
         let permittedValuesColumn = this.getPermittedValuesForScope(column, allPermittedValues);
         if (!permittedValuesColumn) {
             return undefined;

package/src/Api/Internal/ActionRowInternalApi.d.ts

@@ -12,6 +12,7 @@ export declare class ActionRowInternalApi extends ApiBase {
     private getFormDescription;
     private buildFormParamContext;
     private buildActionRowFields;
+    private showColumnInActionRowForm;
     private buidActionRowButtons;
     private prepareEditData;
     private isColumnEditable;

package/src/Api/Internal/ActionRowInternalApi.js

@@ -47,15 +47,29 @@ export class ActionRowInternalApi extends ApiBase {
             type: type,
         };
     }
-    buildActionRowFields(type, rowNode) {
+    buildActionRowFields(actionRowType, rowNode) {
         const relevantColumns = this.getAdaptableApi()
             .columnApi.getColumns()
             .filter((column) => {
             // if there is NO rowNode, do NOT display the non-editable fields as they will be empty
             return !!rowNode || this.isColumnEditable(column, rowNode);
         })
-            .filter((column) => !this.getAdaptableApi().columnApi.internalApi.isActionRowButtonColumn(column.columnId));
-        return relevantColumns.map((column) => this.buildFormField(type, column, rowNode));
+            .filter((column) => !this.getAdaptableApi().columnApi.internalApi.isActionRowButtonColumn(column.columnId) &&
+            this.showColumnInActionRowForm(column, actionRowType));
+        return relevantColumns.map((column) => this.buildFormField(actionRowType, column, rowNode));
+    }
+    showColumnInActionRowForm(adaptableColumn, actionRowType) {
+        const showColumnFn = this.getActionRowOptions().actionRowFormOptions.showColumninActionRowForm;
+        if (typeof showColumnFn === 'function') {
+            return showColumnFn({
+                adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
+                adaptableColumn,
+                actionRowType
+            });
+        }
+        return true;
     }
     buidActionRowButtons(type, rowNode, formFields) {
         // 1. check if there are custom user provided buttons

package/src/Api/Internal/AlertInternalApi.d.ts

@@ -8,8 +8,6 @@ import { GridDataChangedInfo } from '../Events/GridDataChanged';
 import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
-import { ButtonStyle } from '../../PredefinedConfig/Common/ButtonStyle';
 import { IRowNode } from '@ag-grid-community/core';
 export declare class AlertInternalApi extends ApiBase {
     getExpressionForAlertRule(alertRule: AlertRule): string | undefined;
@@ -129,11 +127,7 @@ export declare class AlertInternalApi extends ApiBase {
      * @param alert AdaptableAlert to check
      */
     getAlertTypeForAdaptableAlert(alert: AdaptableAlert): 'cellChanged' | 'rowChanged' | 'generic';
-    getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertFormContext>, 'buttons'> & {
-        buttons?: (Omit<AdaptableButton<AlertFormContext>, 'buttonStyle'> & {
-            buttonStyle?: ButtonStyle;
-        })[];
-    }) | undefined;
+    getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): AdaptableForm<AlertFormContext> | undefined;
     getAdaptableAlerts(): AdaptableAlert[];
     getAdaptableCellChangedAlerts(): AdaptableCellChangedAlert[];
     getAdaptableRowChangedAlerts(): AdaptableRowChangedAlert[];

package/src/Api/Internal/ColumnFilterInternalApi.d.ts

@@ -40,11 +40,11 @@ export declare class ColumnFilterInternalApi extends ApiBase {
      */
     evaluateColumnFilter(columnFilter: ColumnFilter, node: IRowNode): boolean;
     /**
-     * Checks if the filter action should trigger grid filtering.
+     * Checks if the filter action should trigger Column Filtering
      *
      * @param action Filtering Action
      */
-    shouldNewColumnFilterTriggerGridFiltering(action: LayoutColumnFilterAction | Redux.Action): boolean;
+    shouldNewColumnFilterTriggerColumnFiltering(action: LayoutColumnFilterAction | Redux.Action): boolean;
     /**
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -112,11 +112,11 @@ export class ColumnFilterInternalApi extends ApiBase {
         return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
     }
     /**
-     * Checks if the filter action should trigger grid filtering.
+     * Checks if the filter action should trigger Column Filtering
      *
      * @param action Filtering Action
      */
-    shouldNewColumnFilterTriggerGridFiltering(action) {
+    shouldNewColumnFilterTriggerColumnFiltering(action) {
         // trigger filter change only:
         // - new -> new filter is active
         // - clear -> previous filters was active
@@ -128,13 +128,13 @@ export class ColumnFilterInternalApi extends ApiBase {
         // filter -> suspend changes
         var _a, _b;
         const isNewAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_ADD &&
-            this.adaptable.api.columnFilterApi.isFilterActive(action.columnFilter);
+            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
-            this.adaptable.api.columnFilterApi.isFilterActive(action.columnFilter);
+            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
             this.adaptable.api.columnFilterApi
                 .getColumnFilters()
-                .some((columnFilter) => this.adaptable.api.columnFilterApi.isFilterActive(columnFilter));
+                .some((columnFilter) => this.adaptable.api.columnFilterApi.isColumnFilterActive(columnFilter));
         let isEditTrigger = false;
         if (action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {
             const newFilter = action.columnFilter;
@@ -144,16 +144,16 @@ export class ColumnFilterInternalApi extends ApiBase {
                 isEditTrigger = true;
                 // new filter is active
             }
-            else if (this.adaptable.api.columnFilterApi.isFilterActive(newFilter)) {
+            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(newFilter)) {
                 isEditTrigger = true;
             }
-            else if (this.adaptable.api.columnFilterApi.isFilterActive(previous)) {
+            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(previous)) {
                 // previous filter was active
                 isEditTrigger = true;
             }
         }
         const isSetAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_SET &&
-            this.adaptable.api.columnFilterApi.isFilterActive(action.columnFilter);
+            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isSuspendChanged = [
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND,
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL,
@@ -194,7 +194,7 @@ export class ColumnFilterInternalApi extends ApiBase {
         return ArrayExtensions.areArraysNotEqual(oldFilters, newFilters);
     }
     getPredicateDefShortcuts(predicateDef) {
-        const shortcuts = this.getColumnFilterOptions().quickFilterWildcards;
+        const shortcuts = this.getColumnFilterOptions().quickFilterOptions.quickFilterWildcards;
         let predicateShortcuts = predicateDef.shortcuts;
         const predicateId = predicateDef.id;
         if ((shortcuts === null || shortcuts === void 0 ? void 0 : shortcuts[predicateId]) && Array.isArray(shortcuts[predicateId])) {

package/src/Api/Internal/ColumnInternalApi.d.ts

@@ -23,15 +23,5 @@ export declare class ColumnInternalApi extends ApiBase {
      * @param columnId columnId to look up
      */
     getAgGridColumnForAdaptableColumn(columnId: string): Column;
-    /**
-     * Does Column use AdapTable's Filter Form
-     * @param columnId Column to Check
-     */
-    usesAdaptableFilterForm(columnId: string): boolean;
-    /**
-     * Does Column use AdapTable's Quick Filter
-     * @param columnId Column to Check
-     */
-    usesAdaptableQuickFilter(columnId: string): boolean;
     isActionRowButtonColumn(columnId: string): boolean;
 }

package/src/Api/Internal/ColumnInternalApi.js

@@ -36,34 +36,6 @@ export class ColumnInternalApi extends ApiBase {
     getAgGridColumnForAdaptableColumn(columnId) {
         return this.adaptable.getAgGridColumnForColumnId(columnId);
     }
-    /**
-     * Does Column use AdapTable's Filter Form
-     * @param columnId Column to Check
-     */
-    usesAdaptableFilterForm(columnId) {
-        const useAdaptableFilterForm = this.getColumnFilterOptions().useAdaptableFilterForm;
-        if (useAdaptableFilterForm == null || useAdaptableFilterForm == false) {
-            return false;
-        }
-        if (Array.isArray(useAdaptableFilterForm) && !useAdaptableFilterForm.includes(columnId)) {
-            return false;
-        }
-        return true;
-    }
-    /**
-     * Does Column use AdapTable's Quick Filter
-     * @param columnId Column to Check
-     */
-    usesAdaptableQuickFilter(columnId) {
-        const useAdaptableQuickFilter = this.getColumnFilterOptions().useAdaptableQuickFilter;
-        if (useAdaptableQuickFilter == null || useAdaptableQuickFilter == false) {
-            return false;
-        }
-        if (Array.isArray(useAdaptableQuickFilter) && !useAdaptableQuickFilter.includes(columnId)) {
-            return false;
-        }
-        return true;
-    }
     isActionRowButtonColumn(columnId) {
         return columnId === ADAPTABLE_ROW_ACTION_BUTTONS;
     }

package/src/Api/Internal/Fdc3InternalApi.d.ts

@@ -7,10 +7,10 @@ import { Fdc3IntentType, Fdc3StandardIntentType } from '../../PredefinedConfig/C
 import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
 import { AdaptableIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
-export declare type WithContext<K> = K & {
+export type WithContext<K> = K & {
     contextType: Fdc3ContextType;
 };
-export declare type WithIntent<K> = K & {
+export type WithIntent<K> = K & {
     intentType: Fdc3IntentType;
 };
 export declare class Fdc3InternalApi extends ApiBase {