@adaptabletools/adaptable 13.0.6 → 13.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "13.0.6",
+  "version": "13.0.8",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1667290792339;
+declare const _default: 1667373400182;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1667290792339;
+exports.default = 1667373400182;

package/src/AdaptableOptions/AdaptableQLOptions.d.ts

@@ -1,13 +1,9 @@
-import { ExpressionFunction } from '../parser/src/types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableModule, AdaptableQLModule, AdaptableQLModules } from '../PredefinedConfig/Common/Types';
+import { AdaptableQLModule, AdaptableQLModules } from '../PredefinedConfig/Common/Types';
 import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
-import { AdaptableColumn, AdaptableColumnBase } from '../PredefinedConfig/Common/AdaptableColumn';
-import { BooleanFunctionName } from '../Utilities/ExpressionFunctions/booleanExpressionFunctions';
-import { ScalarFunctionName } from '../Utilities/ExpressionFunctions/scalarExpressionFunctions';
-import { ObservableFunctionName } from '../Utilities/ExpressionFunctions/observableExpressionFunctions';
-import { AggregatedBooleanFunctionName } from '../Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions';
-import { AggregatedScalarFunctionName } from '../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
+import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { ExpressionOptions } from './ExpressionOptions';
+import { PredicateOptions } from './PredicateOptions';
 /**
  * Options for managing AdaptableQL - the Adaptable Query Language which evaluates Predicates and Expressions
  */
@@ -37,6 +33,11 @@ export interface AdaptableQLOptions {
      *
      */
     expressionOptions?: ExpressionOptions;
+    /**
+     * Options for managing Predicates in AdaptableQL
+     *
+     */
+    predicateOptions?: PredicateOptions;
     /**
      * Definitions for Custom provided Predicates
      */
@@ -48,194 +49,6 @@ export interface AdaptableQLOptions {
      */
     displayColumnFriendlyNamesForExpressions?: boolean;
 }
-/**
- * Options for managing Expressions using AdaptableQL
- */
-export interface ExpressionOptions {
-    /**
-     * System (built-in) Boolean Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemBooleanFunctions?: BooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => BooleanFunctionName[]);
-    /**
-     * Custom (user defined) Boolean Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (none)
-     * @gridInfoItem
-     */
-    customBooleanFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => Record<string, ExpressionFunction>);
-    /**
-     * System (built-in) Scalar Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemScalarFunctions?: ScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => ScalarFunctionName[]);
-    /**
-     * Custom (user defined) Scalar Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (none)
-     * @gridInfoItem
-     */
-    customScalarFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => Record<string, ExpressionFunction>);
-    /**
-     * System (built-in) Observable Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemObservableFunctions?: ObservableFunctionName[] | ((context: GlobalExpressionFunctionsContext<ObservableFunctionName>) => ObservableFunctionName[]);
-    /**
-     * System (built-in) AggregatedBoolean Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemAggregatedBooleanFunctions?: AggregatedBooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedBooleanFunctionName>) => AggregatedBooleanFunctionName[]);
-    /**
-     * System (built-in) AggregatedScalar Expression Functions available in AdaptableQL
-     *
-     * @defaultValue undefined (sets all)
-     * @gridInfoItem
-     */
-    systemAggregatedScalarFunctions?: AggregatedScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedScalarFunctionName>) => AggregatedScalarFunctionName[]);
-    /**
-     * Module specific ExpressionFunctions; if not defined, it falls back to the generally defined system and custom values
-     *
-     * @defaultValue undefined (defaults to available system & custom values)
-     * @gridInfoItem
-     */
-    moduleExpressionFunctions?: ModuleExpressionFunctionsMap | ((context: ModuleExpressionFunctionsContext) => ModuleExpressionFunctions | undefined);
-    /**
-     * Specifies if a given column can be included in Queries
-     */
-    isColumnQueryable?: (queryableColumnContext: QueryableColumnContext) => boolean;
-    /**
-     * Validate Expressions before they can be run or saved
-     *
-     * @defaultValue true
-     * @gridInfoItem
-     */
-    performExpressionValidation?: boolean;
-    /**
-     * Maximum time (in milliseconds) to hold a Data Change event in a trailing timeframe (see observableExpressionFunctions); value is capped at 86400000 (~24 hours) for performance reasons
-     *
-     * @defaultValue 28800000 (~8 hours)
-     * @gridInfoItem
-     */
-    maxTimeframeSize?: number;
-    /**
-     * Custom query variables allow values to be attached to variables so that a single value can easily be expressed multiple times within a query, or quickly changed to affect the results of a query. Variables are evaluated synchronously with each expression evaluation.
-     */
-    customQueryVariables?: Record<string, string | number | boolean | Date | ((context: CustomQueryVariableContext) => string | number | boolean | Date)>;
-}
-/**
- * Module specific Expression Functions
- */
-export declare type ModuleExpressionFunctionsMap = Partial<Record<AdaptableModule, ModuleExpressionFunctions>>;
-/**
- * Type specific Expression Functions
- */
-export interface ModuleExpressionFunctions {
-    /**
-     * System (built-in) Boolean Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemBooleanFunctions?: BooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => BooleanFunctionName[]);
-    /**
-     * Custom (user defined) Boolean Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (none)
-     * @gridInfoItem
-     */
-    customBooleanFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => Record<string, ExpressionFunction>);
-    /**
-     * System (built-in) Scalar Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemScalarFunctions?: ScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => ScalarFunctionName[]);
-    /**
-     * Custom (user defined) Scalar Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (none)
-     * @gridInfoItem
-     */
-    customScalarFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => Record<string, ExpressionFunction>);
-    /**
-     * System (built-in) Observable Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemObservableFunctions?: ObservableFunctionName[] | ((context: GlobalExpressionFunctionsContext<ObservableFunctionName>) => ObservableFunctionName[]);
-    /**
-     * System (built-in) AggregatedBoolean Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemAggregatedBooleanFunctions?: AggregatedBooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedBooleanFunctionName>) => AggregatedBooleanFunctionName[]);
-    /**
-     * System (built-in) AggregatedScalar Expression Functions available in AdaptableQL
-     *
-     * @defaultValue null (sets all)
-     * @gridInfoItem
-     */
-    systemAggregatedScalarFunctions?: AggregatedScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedScalarFunctionName>) => AggregatedScalarFunctionName[]);
-}
-/**
- * Context provided to global expression functions properties property callback
- */
-export interface GlobalExpressionFunctionsContext<T> extends BaseContext {
-    /**
-     * The names of all expression functions available in this context
-     */
-    availableExpressionFunctionNames: T[];
-}
-/**
- * Context provided to ExpressionOptions.moduleExpressionFunctions property callback
- */
-export interface ModuleExpressionFunctionsContext extends BaseContext {
-    /**
-     * The Adaptable Module requesting the expression functions
-     */
-    module: AdaptableModule;
-    /**
-     * The global boolean expression functions
-     */
-    availableBooleanFunctionNames: BooleanFunctionName[];
-    /**
-     * The global scalar expression functions
-     */
-    availableScalarFunctionNames: ScalarFunctionName[];
-    /**
-     * The global observable expression functions
-     */
-    availableObservableFunctionNames: ObservableFunctionName[];
-    /**
-     * The global aggregated boolean expression functions
-     */
-    availableAggregatedBooleanFunctionNames: AggregatedBooleanFunctionName[];
-    /**
-     * The global aggregated scalar expression functions
-     */
-    availableAggregatedScalarFunctionNames: AggregatedScalarFunctionName[];
-}
-/**
- * Context passed when evaluating `ExpressionOptions.customQueryVariables`
- */
-export interface CustomQueryVariableContext extends BaseContext {
-    /**
-     * Optional variable arguments
-     */
-    args?: any[];
-}
 /**
  * Context passed when evaluating `AdaptableQLOptions.evaluateExpressionExternally()`
  */
@@ -253,12 +66,3 @@ export interface EvaluateExpressionExternallyContext extends BaseContext {
      */
     referencedColumns?: AdaptableColumn[];
 }
-/**
- * Context passed when evaluating Queryable Columns
- */
-export interface QueryableColumnContext extends BaseContext {
-    /**
-     * Basic Column Info - just ColumnId, DataType and FriendlyName
-     */
-    adaptableColumn: AdaptableColumnBase;
-}

package/src/AdaptableOptions/ExpressionOptions.d.ts

@@ -0,0 +1,204 @@
+import { ExpressionFunction } from '../parser/src/types';
+import { BooleanFunctionName } from '../Utilities/ExpressionFunctions/booleanExpressionFunctions';
+import { ScalarFunctionName } from '../Utilities/ExpressionFunctions/scalarExpressionFunctions';
+import { ObservableFunctionName } from '../Utilities/ExpressionFunctions/observableExpressionFunctions';
+import { AggregatedBooleanFunctionName } from '../Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions';
+import { AggregatedScalarFunctionName } from '../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
+import { AdaptableModule, BaseContext, AdaptableColumnBase } from '../types';
+/**
+ * Options for managing Expressions using AdaptableQL
+ */
+export interface ExpressionOptions {
+    /**
+     * System (built-in) Boolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemBooleanFunctions?: BooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => BooleanFunctionName[]);
+    /**
+     * Custom (user defined) Boolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (none)
+     * @gridInfoItem
+     */
+    customBooleanFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => Record<string, ExpressionFunction>);
+    /**
+     * System (built-in) Scalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemScalarFunctions?: ScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => ScalarFunctionName[]);
+    /**
+     * Custom (user defined) Scalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (none)
+     * @gridInfoItem
+     */
+    customScalarFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => Record<string, ExpressionFunction>);
+    /**
+     * System (built-in) Observable Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemObservableFunctions?: ObservableFunctionName[] | ((context: GlobalExpressionFunctionsContext<ObservableFunctionName>) => ObservableFunctionName[]);
+    /**
+     * System (built-in) AggregatedBoolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemAggregatedBooleanFunctions?: AggregatedBooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedBooleanFunctionName>) => AggregatedBooleanFunctionName[]);
+    /**
+     * System (built-in) AggregatedScalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue undefined (sets all)
+     * @gridInfoItem
+     */
+    systemAggregatedScalarFunctions?: AggregatedScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedScalarFunctionName>) => AggregatedScalarFunctionName[]);
+    /**
+     * Module specific ExpressionFunctions; if not defined, it falls back to the generally defined system and custom values
+     *
+     * @defaultValue undefined (defaults to available system & custom values)
+     * @gridInfoItem
+     */
+    moduleExpressionFunctions?: ModuleExpressionFunctionsMap | ((context: ModuleExpressionFunctionsContext) => ModuleExpressionFunctions | undefined);
+    /**
+     * Specifies if a given column can be included in Queries
+     */
+    isColumnQueryable?: (queryableColumnContext: QueryableColumnContext) => boolean;
+    /**
+     * Validate Expressions before they can be run or saved
+     *
+     * @defaultValue true
+     * @gridInfoItem
+     */
+    performExpressionValidation?: boolean;
+    /**
+     * Maximum time (in milliseconds) to hold a Data Change event in a trailing timeframe (see observableExpressionFunctions); value is capped at 86400000 (~24 hours) for performance reasons
+     *
+     * @defaultValue 28800000 (~8 hours)
+     * @gridInfoItem
+     */
+    maxTimeframeSize?: number;
+    /**
+     * Custom query variables allow values to be attached to variables so that a single value can easily be expressed multiple times within a query, or quickly changed to affect the results of a query. Variables are evaluated synchronously with each expression evaluation.
+     */
+    customQueryVariables?: Record<string, string | number | boolean | Date | ((context: CustomQueryVariableContext) => string | number | boolean | Date)>;
+}
+/**
+ * Module specific Expression Functions
+ */
+export declare type ModuleExpressionFunctionsMap = Partial<Record<AdaptableModule, ModuleExpressionFunctions>>;
+/**
+ * Type specific Expression Functions
+ */
+export interface ModuleExpressionFunctions {
+    /**
+     * System (built-in) Boolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemBooleanFunctions?: BooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => BooleanFunctionName[]);
+    /**
+     * Custom (user defined) Boolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (none)
+     * @gridInfoItem
+     */
+    customBooleanFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<BooleanFunctionName>) => Record<string, ExpressionFunction>);
+    /**
+     * System (built-in) Scalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemScalarFunctions?: ScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => ScalarFunctionName[]);
+    /**
+     * Custom (user defined) Scalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (none)
+     * @gridInfoItem
+     */
+    customScalarFunctions?: Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<ScalarFunctionName>) => Record<string, ExpressionFunction>);
+    /**
+     * System (built-in) Observable Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemObservableFunctions?: ObservableFunctionName[] | ((context: GlobalExpressionFunctionsContext<ObservableFunctionName>) => ObservableFunctionName[]);
+    /**
+     * System (built-in) AggregatedBoolean Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemAggregatedBooleanFunctions?: AggregatedBooleanFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedBooleanFunctionName>) => AggregatedBooleanFunctionName[]);
+    /**
+     * System (built-in) AggregatedScalar Expression Functions available in AdaptableQL
+     *
+     * @defaultValue null (sets all)
+     * @gridInfoItem
+     */
+    systemAggregatedScalarFunctions?: AggregatedScalarFunctionName[] | ((context: GlobalExpressionFunctionsContext<AggregatedScalarFunctionName>) => AggregatedScalarFunctionName[]);
+}
+/**
+ * Context provided to global expression functions properties property callback
+ */
+export interface GlobalExpressionFunctionsContext<T> extends BaseContext {
+    /**
+     * The names of all expression functions available in this context
+     */
+    availableExpressionFunctionNames: T[];
+}
+/**
+ * Context provided to ExpressionOptions.moduleExpressionFunctions property callback
+ */
+export interface ModuleExpressionFunctionsContext extends BaseContext {
+    /**
+     * The Adaptable Module requesting the expression functions
+     */
+    module: AdaptableModule;
+    /**
+     * The global boolean expression functions
+     */
+    availableBooleanFunctionNames: BooleanFunctionName[];
+    /**
+     * The global scalar expression functions
+     */
+    availableScalarFunctionNames: ScalarFunctionName[];
+    /**
+     * The global observable expression functions
+     */
+    availableObservableFunctionNames: ObservableFunctionName[];
+    /**
+     * The global aggregated boolean expression functions
+     */
+    availableAggregatedBooleanFunctionNames: AggregatedBooleanFunctionName[];
+    /**
+     * The global aggregated scalar expression functions
+     */
+    availableAggregatedScalarFunctionNames: AggregatedScalarFunctionName[];
+}
+/**
+ * Context passed when evaluating `ExpressionOptions.customQueryVariables`
+ */
+export interface CustomQueryVariableContext extends BaseContext {
+    /**
+     * Optional variable arguments
+     */
+    args?: any[];
+}
+/**
+ * Context passed when evaluating Queryable Columns
+ */
+export interface QueryableColumnContext extends BaseContext {
+    /**
+     * Basic Column Info - just ColumnId, DataType and FriendlyName
+     */
+    adaptableColumn: AdaptableColumnBase;
+}

package/src/AdaptableOptions/ExpressionOptions.js

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

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -148,7 +148,8 @@ export interface FilterOptions {
      */
     enableFilterOnSpecialColumns?: boolean;
     /**
-     * Which Adaptable System Filter Predicates are available
+     * Set which System Filter Predicates are available
+     * @deprecated use systemFilterPredicates in PredicateOptions
      */
     systemFilters?: SystemFilterPredicateIds;
     /**

package/src/AdaptableOptions/PredicateOptions.d.ts

@@ -0,0 +1,32 @@
+import { AdaptablePredicateDef, BaseContext, SystemAlertPredicateIds, SystemFilterPredicateIds, SystemFormatColumnPredicateIds, SystemFlashingCellPredicateIds, PredicateModuleScope } from '../types';
+/**
+ * Options for managing Adaptable Predicates using AdaptableQL
+ */
+export interface PredicateOptions {
+    /**
+     * Set which System Filter Predicates are available - by List or Function
+     */
+    systemFilterPredicates?: SystemFilterPredicateIds | ((context: SystemPredicatesContext) => SystemFilterPredicateIds);
+    /**
+     * Set which System Alert Predicates are available - by List or Function
+     */
+    systemAlertPredicates?: SystemAlertPredicateIds | ((context: SystemPredicatesContext) => SystemAlertPredicateIds);
+    /**
+     * Set which System Format Column Predicates are available - by List or Function
+     */
+    systemFormatColumnPredicates?: SystemFormatColumnPredicateIds | ((context: SystemPredicatesContext) => SystemFormatColumnPredicateIds);
+    /**
+     * Set which System Flashing Cell Predicates are available - by List or Function
+     */
+    systemFlashingCellPredicates?: SystemFlashingCellPredicateIds | ((context: SystemPredicatesContext) => SystemFlashingCellPredicateIds);
+}
+export interface SystemPredicatesContext extends BaseContext {
+    /**
+     * AdapTable-provided System Predicate Definitions
+     */
+    systemPredicateDefs: AdaptablePredicateDef[];
+    /**
+     * Module for which Predicates are being retrieved
+     */
+    moduleScope: PredicateModuleScope;
+}

package/src/AdaptableOptions/PredicateOptions.js

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

package/src/Api/AlertApi.d.ts

@@ -135,10 +135,6 @@ export interface AlertApi {
      * Opens Settings Panel with Alert section selected and visible
      */
     showAlertPopup(): void;
-    /**
-     * Retrieves all Predicate Defs with Module Scope of Alert
-     */
-    getAlertPredicateDefs(): AdaptablePredicateDef[];
     /**
      * Retrieves all Predicate Defs that match given Scope
      * @param scope the Scope to check
@@ -172,4 +168,24 @@ export interface AlertApi {
      * @param alertDefinition Alert Definition to use
      */
     getAlertRuleDescription(alertDefinition: AlertDefinition): string;
+    /**
+     * Was Adaptable Alert fired due to a Cell Change
+     * @param alert AdaptableAlert to check
+     */
+    isCellChangedAdaptableAlert(alert: AdaptableAlert): boolean;
+    /**
+     * Was Adaptable Alert fired due to a Row Change
+     * @param alert AdaptableAlert to check
+     */
+    isRowChangedAdaptableAlert(alert: AdaptableAlert): boolean;
+    /**
+     * Is Adaptable Alert a Generic one
+     * @param alert AdaptableAlert to check
+     */
+    isGenericAdaptableAlert(alert: AdaptableAlert): boolean;
+    /**
+     * Returns for the Alert Type for an Adaptable Alert
+     * @param alert AdaptableAlert to check
+     */
+    getAlertTypeForAdaptableAlert(alert: AdaptableAlert): 'cellChanged' | 'rowChanged' | 'generic';
 }

package/src/Api/FilterApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn, ColumnFilter, GridCell, SystemFilterPredicateIds } from '../types';
+import { AdaptableColumn, ColumnFilter, GridCell } from '../types';
 import * as Redux from 'redux';
 import { ColumnFilterDef, AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 import { RowNode } from '@ag-grid-community/core';
@@ -23,10 +23,6 @@ export interface FilterApi {
      * @param columnId Id of Column to lookup
      */
     getFilterPredicateDefsForColumnId(columnId: string): AdaptablePredicateDef[] | undefined;
-    /**
-     * Retrieves Ids for all System Filters
-     */
-    getAllSystemFilterIds(): SystemFilterPredicateIds;
     /**
      * Makes Quick Filter Bar appear
      */

package/src/Api/FlashingCellApi.d.ts

@@ -83,10 +83,6 @@ export interface FlashingCellApi {
      * @returns flashing cell definition
      */
     unSuspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
-    /**
-     * Retrieves all Predicate Defs with Module Scope of Flashing Cell
-     */
-    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
     /**
      * Retrieves all Predicate Defs that match given Scope
      * @param scope the Scope to check

package/src/Api/FormatColumnApi.d.ts

@@ -177,10 +177,6 @@ export interface FormatColumnApi {
      * @param formatColumn Format Column
      */
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
-    /**
-     * Returns all Predicates usable in Format Columns
-     */
-    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
     /**
      * Returns all Predicates appropriate for the given Scope
      * @param scope Scope to check

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

@@ -37,11 +37,14 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     showAlertWarning(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): void;
     showAlertError(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): void;
     showAlertPopup(): void;
-    getAlertPredicateDefs(): AdaptablePredicateDef[];
     getAlertPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
     editAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     suspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     unSuspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     getAlertDescription(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
     getAlertRuleDescription(alert: AlertDefinition): string;
+    isCellChangedAdaptableAlert(alert: AdaptableAlert): boolean;
+    isRowChangedAdaptableAlert(alert: AdaptableAlert): boolean;
+    isGenericAdaptableAlert(alert: AdaptableAlert): boolean;
+    getAlertTypeForAdaptableAlert(alert: AdaptableAlert): 'cellChanged' | 'rowChanged' | 'generic';
 }

package/src/Api/Implementation/AlertApiImpl.js

@@ -279,11 +279,10 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     showAlertPopup() {
         this.showModulePopup(ModuleConstants.AlertModuleId);
     }
-    getAlertPredicateDefs() {
-        return this.adaptable.api.predicateApi.getPredicateDefsByModuleScope('alert');
-    }
     getAlertPredicateDefsForScope(scope) {
-        return this.getAlertPredicateDefs().filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
+        return this.getAdaptableApi()
+            .predicateApi.getAlertPredicateDefs()
+            .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
     editAlertDefinition(alertDefinition) {
         this.dispatchAction(AlertRedux.AlertDefinitionEdit(alertDefinition));
@@ -323,5 +322,17 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             : this.adaptable.api.internalApi.getAdaptableQueryExpressionText(alert.Rule);
         return ruleDescription;
     }
+    isCellChangedAdaptableAlert(alert) {
+        return alert.alertType === 'cellChanged';
+    }
+    isRowChangedAdaptableAlert(alert) {
+        return alert.alertType === 'rowChanged';
+    }
+    isGenericAdaptableAlert(alert) {
+        return alert.alertType === 'generic';
+    }
+    getAlertTypeForAdaptableAlert(alert) {
+        return alert.alertType;
+    }
 }
 exports.AlertApiImpl = AlertApiImpl;

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

@@ -11,7 +11,8 @@ import { ActionOptions, ContainerOptions, DashboardOptions, EditOptions, FilterO
 import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
 import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableQLOptions, ExpressionOptions } from '../../AdaptableOptions/AdaptableQLOptions';
+import { AdaptableQLOptions } from '../../AdaptableOptions/AdaptableQLOptions';
+import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
 import { AlertOptions } from '../../AdaptableOptions/AlertOptions';
 import { ColumnOptions } from '../../AdaptableOptions/ColumnOptions';
 export declare abstract class ApiBase {

package/src/Api/Implementation/ColumnApiImpl.js

@@ -275,7 +275,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getColumns().filter((c) => c.queryable);
     }
     LogMissingColumnWarning(columnId) {
-        console.log('MISSING', columnId);
         if (this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning &&
             this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning === true) {
             if (!this.isAutoRowGroupColumn(columnId) &&