@adaptabletools/adaptable 13.0.6 → 13.0.8

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

@@ -4,14 +4,12 @@ import { ApiBase } from './ApiBase';
 import { FilterApi } from '../FilterApi';
 import { AdaptablePredicateDef, ColumnFilterDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnFilter, GridCell, SystemFilterPredicateIds } from '../../types';
+import { ColumnFilter, GridCell } from '../../types';
 import { RowNode } from '@ag-grid-community/core';
 export declare class FilterApiImpl extends ApiBase implements FilterApi {
-    getAllSystemFilterIds(): SystemFilterPredicateIds;
     findPredicateDefByShortcut(shortcut: string, column: AdaptableColumn): AdaptablePredicateDef;
     getFilterPredicateDefsForColumn(column: AdaptableColumn): AdaptablePredicateDef[];
     getFilterPredicateDefsForColumnId(columnId: string): AdaptablePredicateDef[] | undefined;
-    private getAllFilterPredicates;
     showQuickFilterBar(): void;
     hideQuickFilterBar(): void;
     isQuickFilterAvailable(): boolean;

package/src/Api/Implementation/FilterApiImpl.js

@@ -9,26 +9,18 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exte
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class FilterApiImpl extends ApiBase_1.ApiBase {
-    getAllSystemFilterIds() {
-        return this.getFilterOptions().systemFilters;
-    }
     findPredicateDefByShortcut(shortcut, column) {
         return this.getFilterPredicateDefsForColumn(column).find((i) => { var _a; return (_a = i.shortcuts) === null || _a === void 0 ? void 0 : _a.includes(shortcut); });
     }
     getFilterPredicateDefsForColumn(column) {
-        return this.getAllFilterPredicates().filter((predicate) => this.adaptable.api.scopeApi.isColumnInScope(column, predicate.columnScope));
+        return this.getAdaptableApi()
+            .predicateApi.getFilterPredicateDefs()
+            .filter((predicate) => this.adaptable.api.scopeApi.isColumnInScope(column, predicate.columnScope));
     }
     getFilterPredicateDefsForColumnId(columnId) {
-        const column = this.adaptable.api.columnApi.getColumnFromId(columnId);
+        const column = this.getAdaptableApi().columnApi.getColumnFromId(columnId);
         return column ? this.getFilterPredicateDefsForColumn(column) : undefined;
     }
-    getAllFilterPredicates() {
-        var _a;
-        return [
-            ...(_a = this.getAllSystemFilterIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.adaptable.api.predicateApi.getPredicateDefById(predicateId)),
-            ...this.adaptable.api.predicateApi.getCustomPredicateDefs(),
-        ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
-    }
     showQuickFilterBar() {
         this.dispatchAction(SystemRedux.SystemQuickFilterBarShow());
     }

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

@@ -19,7 +19,6 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     unSuspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     addFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
-    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
     getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
     clearGridFlashing(): void;
 }

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -103,11 +103,10 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
         });
         return flashingCellDefinitions === null || flashingCellDefinitions === void 0 ? void 0 : flashingCellDefinitions.map((flashingCell) => this.getFlashingCellDefinitionById(flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.Uuid));
     }
-    getFlashingCellPredicateDefs() {
-        return this.adaptable.api.predicateApi.getPredicateDefsByModuleScope('flashingcell');
-    }
     getFlashingCellPredicateDefsForScope(scope) {
-        return this.getFlashingCellPredicateDefs().filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
+        return this.getAdaptableApi()
+            .predicateApi.getFlashingCellPredicateDefs()
+            .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
     clearGridFlashing() {
         const currentFlashingCells = this.getAdaptableState().System.AdaptableFlashingCells;

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

@@ -54,7 +54,6 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getStringFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     getDateFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
-    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
     getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
     getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
         node: RowNode;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -202,11 +202,10 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return true;
     }
-    getFormatColumnPredicateDefs() {
-        return this.adaptable.api.predicateApi.getPredicateDefsByModuleScope('formatColumn');
-    }
     getFormatColumnDefsForScope(scope) {
-        return this.getFormatColumnPredicateDefs().filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
+        return this.getAdaptableApi()
+            .predicateApi.getFormatColumnPredicateDefs()
+            .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
     getFormatColumnsRelevantForColumn(formatColumns, column, params) {
         return formatColumns.filter((formatColumn) => this.isFormatColumnRelevantForColumn(formatColumn, column, params));

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

@@ -1,12 +1,12 @@
 import { ApiBase } from './ApiBase';
 import { PredicateApi } from '../PredicateApi';
-import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, ModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumnDataType, SystemFilterPredicateId } from '../../types';
 export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     getPredicateDefs(): AdaptablePredicateDef[];
     getSystemPredicateDefs(): AdaptablePredicateDef[];
     getCustomPredicateDefs(): AdaptablePredicateDef[];
-    getPredicateDefsByModuleScope(moduleScope: ModuleScope): AdaptablePredicateDef[];
+    getPredicateDefsByModuleScope(moduleScope: PredicateModuleScope): AdaptablePredicateDef[];
     getPredicateDefById(predicateId: string): AdaptablePredicateDef;
     getSystemPredicateDefById(predicateId: string): AdaptablePredicateDef;
     getCustomPredicateDefById(predicateId: string): AdaptablePredicateDef;
@@ -15,4 +15,12 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
     hasPredicateValues(predicate: AdaptablePredicate): boolean;
+    private getSystemFilterPredicateIds;
+    getFilterPredicateDefs(): AdaptablePredicateDef[];
+    private getSystemAlertPredicateIds;
+    getAlertPredicateDefs(): AdaptablePredicateDef[];
+    private getSystemFormatColumnPredicateIds;
+    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    private getSystemFlashingCellPredicateIds;
+    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -103,5 +103,88 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
     hasPredicateValues(predicate) {
         return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
     }
+    getSystemFilterPredicateIds() {
+        // for now we still need to get the old ones in case they have been provided
+        // however they have been deprectated and they are not populated by AdapTable
+        const oldSystemFilterPredicates = this.getFilterOptions().systemFilters;
+        if (oldSystemFilterPredicates) {
+            return oldSystemFilterPredicates;
+        }
+        // if old list not provided use the new property in Predicate Options
+        const systemFilterPredicates = this.getAdaptableQLOptions().predicateOptions.systemFilterPredicates;
+        if (typeof systemFilterPredicates === 'function') {
+            const systemPredicateContext = {
+                adaptableApi: this.adaptable.api,
+                systemPredicateDefs: this.getSystemPredicateDefs().filter((p) => p.moduleScope.includes('filter')),
+                moduleScope: 'filter',
+            };
+            return systemFilterPredicates(systemPredicateContext);
+        }
+        return systemFilterPredicates;
+    }
+    getFilterPredicateDefs() {
+        var _a;
+        return [
+            ...(_a = this.getSystemFilterPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateDefById(predicateId)),
+            ...this.getCustomPredicateDefs(),
+        ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
+    }
+    getSystemAlertPredicateIds() {
+        const systemAlertPredicates = this.getAdaptableQLOptions().predicateOptions.systemAlertPredicates;
+        if (typeof systemAlertPredicates === 'function') {
+            const systemPredicateContext = {
+                adaptableApi: this.adaptable.api,
+                systemPredicateDefs: this.getSystemPredicateDefs().filter((p) => p.moduleScope.includes('alert')),
+                moduleScope: 'alert',
+            };
+            return systemAlertPredicates(systemPredicateContext);
+        }
+        return systemAlertPredicates;
+    }
+    getAlertPredicateDefs() {
+        var _a;
+        return [
+            ...(_a = this.getSystemAlertPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateDefById(predicateId)),
+            ...this.getCustomPredicateDefs(),
+        ].filter((predicateDef) => predicateDef.moduleScope.includes('alert'));
+    }
+    getSystemFormatColumnPredicateIds() {
+        const systemFormatColumnPredicates = this.getAdaptableQLOptions().predicateOptions.systemFormatColumnPredicates;
+        if (typeof systemFormatColumnPredicates === 'function') {
+            const systemPredicateContext = {
+                adaptableApi: this.adaptable.api,
+                systemPredicateDefs: this.getSystemPredicateDefs().filter((p) => p.moduleScope.includes('formatColumn')),
+                moduleScope: 'formatColumn',
+            };
+            return systemFormatColumnPredicates(systemPredicateContext);
+        }
+        return systemFormatColumnPredicates;
+    }
+    getFormatColumnPredicateDefs() {
+        var _a;
+        return [
+            ...(_a = this.getSystemFormatColumnPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateDefById(predicateId)),
+            ...this.getCustomPredicateDefs(),
+        ].filter((predicateDef) => predicateDef.moduleScope.includes('formatColumn'));
+    }
+    getSystemFlashingCellPredicateIds() {
+        const systemFlashingCellPredicates = this.getAdaptableQLOptions().predicateOptions.systemFlashingCellPredicates;
+        if (typeof systemFlashingCellPredicates === 'function') {
+            const systemPredicateContext = {
+                adaptableApi: this.adaptable.api,
+                systemPredicateDefs: this.getSystemPredicateDefs().filter((p) => p.moduleScope.includes('flashingcell')),
+                moduleScope: 'flashingcell',
+            };
+            return systemFlashingCellPredicates(systemPredicateContext);
+        }
+        return systemFlashingCellPredicates;
+    }
+    getFlashingCellPredicateDefs() {
+        var _a;
+        return [
+            ...(_a = this.getSystemFlashingCellPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateDefById(predicateId)),
+            ...this.getCustomPredicateDefs(),
+        ].filter((predicateDef) => predicateDef.moduleScope.includes('flashingcell'));
+    }
 }
 exports.PredicateApiImpl = PredicateApiImpl;

package/src/Api/PredicateApi.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableColumnDataType, SystemFilterPredicateId } from '../../types';
-import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, ModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, PredicateModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
 /**
  * Functions which manage the Predicate object in AdapTable
  */
@@ -20,7 +20,7 @@ export interface PredicateApi {
      * Retrieves all Predicate Definitions for given Module Scope
      * @param moduleScope Module Scope to use
      */
-    getPredicateDefsByModuleScope(moduleScope: ModuleScope): AdaptablePredicateDef[];
+    getPredicateDefsByModuleScope(moduleScope: PredicateModuleScope): AdaptablePredicateDef[];
     /**
      * Gets the Predicate Definition for a given Id
      * @param predicateId Id of Predicate Definition
@@ -64,4 +64,20 @@ export interface PredicateApi {
      * @param predicate
      */
     hasPredicateValues(predicate: AdaptablePredicate): boolean;
+    /**
+     * Get all Filter Predicate Definitions - System and Custom
+     */
+    getFilterPredicateDefs(): AdaptablePredicateDef[];
+    /**
+     * Get all Alert Predicate Definitions - System and Custom
+     */
+    getAlertPredicateDefs(): AdaptablePredicateDef[];
+    /**
+     * Get all Format Column Predicate Definitions - System and Custom
+     */
+    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    /**
+     * Get all Flashing Cell Predicate Definitions - System and Custom
+     */
+    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -126,4 +126,11 @@ export interface AlertProperties {
      */
     PreventEdit?: boolean;
 }
-export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'IsNotNumeric' | 'AddedRow' | 'RemovedRow' | 'Any';
+/**
+ * Array containing all System Alert Predicates
+ */
+export declare type SystemAlertPredicateIds = SystemAlertPredicateId[];
+/**
+ * List of System Predicates available for Alerts
+ */
+export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'IsNotNumeric' | 'AddedRow' | 'RemovedRow' | 'Any';

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

@@ -34,7 +34,7 @@ export interface AdaptablePredicateDef {
     /**
      * Modules where the Predicate can run
      */
-    moduleScope: ModuleScope[];
+    moduleScope: PredicateModuleScope[];
     /**
      * Inputs the Predicate can take
      */
@@ -103,12 +103,15 @@ export interface PredicateDefHandlerParams {
 export interface PredicateDefToStringParams {
     inputs: any[];
 }
-export declare type ModuleScope = 'filter' | 'alert' | 'flashingcell' | 'formatColumn';
+export declare type PredicateModuleScope = 'filter' | 'alert' | 'flashingcell' | 'formatColumn';
 /**
  * Array of Predicate Defs which are shipped by AdapTable
  */
 export declare const SystemPredicateDefs: AdaptablePredicateDef[];
 export declare const SystemFilterPredicateIds: string[];
+export declare const SystemAlertPredicateIds: string[];
+export declare const SystemFormatColumnPredicateIds: string[];
+export declare const SystemFlashingCellPredicateIds: string[];
 export interface ColumnFilterDef {
     dataType: AdaptableColumnDataType;
     predicate: AdaptablePredicateDef;

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemFilterPredicateIds = exports.SystemPredicateDefs = void 0;
+exports.SystemFlashingCellPredicateIds = exports.SystemFormatColumnPredicateIds = exports.SystemAlertPredicateIds = exports.SystemFilterPredicateIds = exports.SystemPredicateDefs = void 0;
 const tslib_1 = require("tslib");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const isToday_1 = tslib_1.__importDefault(require("date-fns/isToday"));
@@ -603,3 +603,6 @@ exports.SystemPredicateDefs = [
     },
 ];
 exports.SystemFilterPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('filter')).map((p) => p.id);
+exports.SystemAlertPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('alert')).map((p) => p.id);
+exports.SystemFormatColumnPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('formatColumn')).map((p) => p.id);
+exports.SystemFlashingCellPredicateIds = exports.SystemPredicateDefs.filter((p) => p.moduleScope.includes('flashingcell')).map((p) => p.id);

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

@@ -24,6 +24,6 @@ export interface ColumnFilterPredicate extends AdaptablePredicate {
  */
 export declare type SystemFilterPredicateIds = SystemFilterPredicateId[];
 /**
- * List of all the Filter Predicates shipped by AdapTable
+ * List of System Predicates available for Filters
  */
-export declare type SystemFilterPredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'BooleanToggle';
+export declare type SystemFilterPredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'BooleanToggle';

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -65,4 +65,11 @@ export interface FlashingCellDefinition extends SuspendableObject {
      */
     FlashDuration?: number | 'always';
 }
-export declare type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'Any';
+/**
+ * Array containing all System Flashing Cell Predicates
+ */
+export declare type SystemFlashingCellPredicateIds = SystemFlashingCellPredicateId[];
+/**
+ * List of System Predicates available for Flashing Cells
+ */
+export declare type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'Any';

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -59,7 +59,14 @@ export declare type FormatColumnRule = XOR<{
 export interface FormatColumnPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemFormatColumnPredicateId>;
 }
-export declare type SystemFormatColumnPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False';
+/**
+ * Array containing all System Format Column Predicates
+ */
+export declare type SystemFormatColumnPredicateIds = SystemFormatColumnPredicateId[];
+/**
+ * List of System Predicates available for Format Columns
+ */
+export declare type SystemFormatColumnPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False';
 /**
  * Special Style used when Formatting Columns: Gradient, PercentBar or CheckBox
  *

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -68,6 +68,12 @@ exports.DefaultAdaptableOptions = {
             performExpressionValidation: true,
             maxTimeframeSize: 28800000, // 8 hours
         },
+        predicateOptions: {
+            systemFilterPredicates: AdaptablePredicate_1.SystemFilterPredicateIds,
+            systemAlertPredicates: AdaptablePredicate_1.SystemAlertPredicateIds,
+            systemFormatColumnPredicates: AdaptablePredicate_1.SystemFormatColumnPredicateIds,
+            systemFlashingCellPredicates: AdaptablePredicate_1.SystemFlashingCellPredicateIds,
+        },
     },
     containerOptions: {
         adaptableContainer: 'adaptable',
@@ -199,7 +205,7 @@ exports.DefaultAdaptableOptions = {
         defaultFilterFormTab: 'Values',
         enableFilterOnSpecialColumns: true,
         maxFilterValuesToDisplay: 2000,
-        systemFilters: AdaptablePredicate_1.SystemFilterPredicateIds,
+        systemFilters: undefined,
         showQuickFilter: true,
         showDistinctFilteredValuesOnly: false,
         showClearFilterButton: false,

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -15,6 +15,7 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.adaptableQLOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions, adaptableOptions.adaptableQLOptions);
     returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
     returnedAdaptableOptions.adaptableQLOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.expressionOptions, returnedAdaptableOptions.adaptableQLOptions.expressionOptions);
+    returnedAdaptableOptions.adaptableQLOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.predicateOptions, returnedAdaptableOptions.adaptableQLOptions.predicateOptions);
     returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
     returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
     returnedAdaptableOptions.alertOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);

package/src/metamodel/adaptable.metamodel.d.ts

@@ -4947,6 +4947,16 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
         }[];
     };
+    SystemAlertPredicateId: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    SystemAlertPredicateIds: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     SystemExportDestination: {
         name: string;
         kind: string;
@@ -4967,6 +4977,26 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    SystemFlashingCellPredicateId: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    SystemFlashingCellPredicateIds: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    SystemFormatColumnPredicateId: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    SystemFormatColumnPredicateIds: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     SystemReportName: {
         name: string;
         kind: string;