@adaptabletools/adaptable 15.2.0-canary.5 → 15.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "15.2.0-canary.5",
+  "version": "15.2.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1680879586791;
+declare const _default: 1681725929316;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -244,6 +244,7 @@ export interface IAdaptable {
     getVisibleColumnCount(): number;
     setLayout(layout: Layout): void;
     isGridSelectable(): boolean;
+    isGridRangeSelectable(): boolean;
     isGridGroupable(): boolean;
     isGridPivotable(): boolean;
     isGridGroupingActive(): boolean;

package/src/AdaptableOptions/AlertOptions.d.ts

@@ -30,7 +30,7 @@ export interface AlertOptions<TData = any> {
      */
     rowHighlightDuration?: number;
     /**
-     * How long (in ms) the status-panel will be highlighted when an Alert Fires
+     * How long (in ms) Alert panel in Status Bar highlights when an Alert Fires
      *
      * @defaultValue 2000
      */
@@ -51,9 +51,9 @@ export interface AlertOptions<TData = any> {
      */
     dataChangeDetectionPolicy?: 'rawValue' | 'formattedValue';
     /**
-     * Function providing Title to display in Alert; if empty, AdapTable provides dynamically
+     * Function providing Header to display in Alert; if empty, AdapTable provides dynamically
      */
-    alertMessageTitle?: (alertMessageContext: AlertMessageContext<TData>) => string | undefined;
+    alertMessageHeader?: (alertMessageContext: AlertMessageContext<TData>) => string | undefined;
     /**
      * Function providing Message to display in Alert; if empty, AdapTable provides dynamically
      */

package/src/AdaptableOptions/ColumnOptions.d.ts

@@ -31,11 +31,7 @@ export interface ColumnOptions {
      */
     autoOrderGroupedColumns?: boolean;
     /**
-     * Automatically removes a column from the grid when it becomes Row Grouped
-     *
-     * @defaultValue false
-     * @gridInfoItem
-     * @noCodeItem
+     * @deprecated - this is now AG Grid behaviour
      */
     hideColumnWhenGrouped?: boolean;
 }

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -193,4 +193,11 @@ export interface FilterOptions<TData = any> {
      * @noCodeItem
      */
     showValuesCount?: (column: AdaptableColumn<TData>) => boolean;
+    /**
+     * Quick filter width can be set in pixels or made to have the same size as the column.
+     * - 'auto' will use the column width
+     * - number will use the number of pixels
+     * @defaultValue '180'
+     */
+    quickFilterValuesWidth?: 'auto' | number;
 }

package/src/AdaptableOptions/Glue42PluginOptions.d.ts

@@ -1,5 +1,5 @@
 /**
- * Options for using the Glue42 plugin
+ * Options for using the Glue42 Desktop plugin
  */
 export interface Glue42PluginOptions {
     /**

package/src/AdaptableOptions/Glue42WebPluginOptions.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Options for using the Glue42 Web plugin
+ */
 export interface Glue42WebPluginOptions {
+    /**
+   * Converts AdapTable Alerts configured to display in popup as Glue42 Notifications
+   * @defaultValue true
+   */
     showAdaptableAlertsAsNotifications?: boolean;
 }

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -38,7 +38,7 @@ export interface LayoutOptions {
      */
     autoSizeColumnsInLayout?: boolean;
     /**
-     * Columns auto-size when Pivot-based Layout loads first time
+     * Columns auto-size when Pivot Layout loads first time (overriding Layout width properties)
      *
      * @defaultValue false
      * @gridInfoItem

package/src/AdaptableOptions/PredicateOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptablePredicateDef, BaseContext, PredicateModuleScope, SystemAlertPredicateIds, SystemFilterPredicateIds, SystemFlashingCellPredicateIds, SystemFormatColumnPredicateIds } from '../types';
+import { AdaptablePredicateDef, AdaptableScope, BaseContext, PredicateModuleScope, SystemAlertPredicateIds, SystemFilterPredicateIds, SystemFlashingCellPredicateIds, SystemFormatColumnPredicateIds } from '../types';
 /**
  * Options for managing Adaptable Predicates using AdaptableQL
  */
@@ -32,4 +32,8 @@ export interface SystemPredicatesContext extends BaseContext {
      * Module for which Predicates are being retrieved
      */
     moduleScope: PredicateModuleScope;
+    /**
+     * Current Scope where Predicates are being used
+     */
+    columnScope: AdaptableScope;
 }

package/src/Api/AlertApi.d.ts

@@ -193,7 +193,7 @@ export interface AlertApi {
     /**
      * @deprecated internal method, will be removed in next major release
      */
-    getAlertMessageTitle(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
+    getAlertMessageHeader(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
     /**
      * @deprecated internal method, will be removed in next major release
      */
@@ -204,7 +204,7 @@ export interface AlertApi {
     /**
      * @deprecated internal method, will be removed in next major release
      */
-    getCustomAlertMessageTitle(alertDefinition: AlertDefinition, dataChangedInfo?: {
+    getCustomAlertMessageHeader(alertDefinition: AlertDefinition, dataChangedInfo?: {
         cellDataChangedInfo?: CellDataChangedInfo;
         gridDataChangedInfo?: GridDataChangedInfo;
     }): string;

package/src/Api/Glue42Api.d.ts

@@ -10,7 +10,7 @@ export interface Glue42Api {
      */
     getGlue42State(): Glue42State | undefined;
     /**
-     * Retrieves the Glue42PluginOptions provided in Glue42 Plugin
+     * Retrieves the Glue42PluginOptions provided in Glue42 Desktop Plugin
      */
     getPluginOptions(): Glue42PluginOptions;
     /**

package/src/Api/GridApi.d.ts

@@ -29,12 +29,12 @@ export interface GridApi {
      */
     getFilteredData(): any[];
     /**
-     * Repopulates grid with given data and fires a 'GridDataChanged' event.
+     * Repopulates grid with given data and fires a 'GridDataChanged' event
      * @param data any data from any datasource that is suitable for AG Grid
      */
     setGridData(data: any[]): void;
     /**
-     * Sets the grid with the given data. It does NOT fire a 'GridDataChanged' event.
+     * Sets grid with given data; does NOT fire a 'GridDataChanged' event
      * @param data any data from any datasource that is suitable for AG Grid
      */
     setInitialGridData(data: any): void;

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

@@ -59,7 +59,7 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     getAlertDefinitionsWithAllowEdit(): AlertDefinition[];
     getAlertDefinitionsWithPreventEdit(): AlertDefinition[];
     getAlertDescription(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
-    getAlertMessageTitle(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
+    getAlertMessageHeader(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
     getAlertPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
     getAlertRuleDescription(alertDefinition: AlertDefinition): string;
     getAlertTypeForAdaptableAlert(alert: AdaptableAlert): 'cellChanged' | 'rowChanged' | 'generic';
@@ -67,7 +67,7 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
         cellDataChangedInfo?: CellDataChangedInfo;
         gridDataChangedInfo?: GridDataChangedInfo;
     }): string;
-    getCustomAlertMessageTitle(alertDefinition: AlertDefinition, dataChangedInfo?: {
+    getCustomAlertMessageHeader(alertDefinition: AlertDefinition, dataChangedInfo?: {
         cellDataChangedInfo?: CellDataChangedInfo;
         gridDataChangedInfo?: GridDataChangedInfo;
     }): string;

package/src/Api/Implementation/AlertApiImpl.js

@@ -285,9 +285,9 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDescription');
         return this.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo);
     }
-    getAlertMessageTitle(alertDefinition, cellDataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertMessageTitle');
-        return this.internalApi.getAlertMessageTitle(alertDefinition, cellDataChangedInfo);
+    getAlertMessageHeader(alertDefinition, cellDataChangedInfo) {
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertMessageHeader');
+        return this.internalApi.getAlertMessageHeader(alertDefinition, cellDataChangedInfo);
     }
     getAlertPredicateDefsForScope(scope) {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertPredicateDefsForScope');
@@ -305,9 +305,9 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertDescription');
         return this.internalApi.getCustomAlertDescription(alertDefinition, dataChangedInfo);
     }
-    getCustomAlertMessageTitle(alertDefinition, dataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertMessageTitle');
-        return this.internalApi.getCustomAlertMessageTitle(alertDefinition, dataChangedInfo);
+    getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
+        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertMessageHeader');
+        return this.internalApi.getCustomAlertMessageHeader(alertDefinition, dataChangedInfo);
     }
     getNonReactiveAlertDefinitions() {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getNonReactiveAlertDefinitions');

package/src/Api/Implementation/FilterApiImpl.js

@@ -18,8 +18,11 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         return this.internalApi.findPredicateDefByShortcut(shortcut, column);
     }
     getFilterPredicateDefsForColumn(column) {
+        const scope = {
+            ColumnIds: [column.columnId]
+        };
         return this.getAdaptableApi()
-            .predicateApi.internalApi.getFilterPredicateDefs()
+            .predicateApi.internalApi.getFilterPredicateDefs(scope)
             .filter((predicate) => this.adaptable.api.scopeApi.isColumnInScope(column, predicate.columnScope));
     }
     getFilterPredicateDefsForColumnId(columnId) {

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -90,7 +90,7 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     }
     getFlashingCellPredicateDefsForScope(scope) {
         return this.getAdaptableApi()
-            .predicateApi.internalApi.getFlashingCellPredicateDefs()
+            .predicateApi.internalApi.getFlashingCellPredicateDefs(scope)
             .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
     clearGridFlashing() {

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

@@ -6,6 +6,7 @@ import { Glue42Api } from '../Glue42Api';
 import { OpenFinApi } from '../OpenFinApi';
 import { FinanceApi } from '../FinanceApi';
 import { FinsembleApi } from '../FinsembleApi';
+import { Glue42WebApi } from '../Glue42WebApi';
 export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     getPluginsState(): PluginsState;
     getPluginState(pluginId: string): any;
@@ -14,6 +15,7 @@ export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     private getPluginApi;
     getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
+    getGlue42WebPluginApi(): Glue42WebApi;
     getOpenFinPluginApi(): OpenFinApi;
     getFinancePluginApi(): FinanceApi;
     getFinsemblePluginApi(): FinsembleApi;

package/src/Api/Implementation/PluginsApiImpl.js

@@ -29,6 +29,9 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
             if (pluginId === 'glue42') {
                 return api;
             }
+            if (pluginId === 'glue42web') {
+                return api;
+            }
             if (pluginId === 'openfin') {
                 return api;
             }
@@ -47,6 +50,9 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
     getGlue42PluginApi() {
         return this.getPluginApi('glue42');
     }
+    getGlue42WebPluginApi() {
+        return this.getPluginApi('glue42web');
+    }
     getOpenFinPluginApi() {
         return this.getPluginApi('openfin');
     }

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

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { PredicateApi } from '../PredicateApi';
 import { PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptablePredicate, AdaptablePredicateDef, AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId } from '../../types';
+import { AdaptablePredicate, AdaptablePredicateDef, AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId, AdaptableScope } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { PredicateInternalApi } from '../Internal/PredicateInternalApi';
 export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
@@ -24,8 +24,8 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     handlePredicates(predicates: AdaptablePredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
     getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
     hasPredicateValues(predicate: AdaptablePredicate): boolean;
-    getFilterPredicateDefs(): AdaptablePredicateDef[];
-    getAlertPredicateDefs(): AdaptablePredicateDef[];
-    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
-    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
+    getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -123,21 +123,21 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'hasPredicateValues');
         return this.internalApi.hasPredicateValues(predicate);
     }
-    getFilterPredicateDefs() {
+    getFilterPredicateDefs(scope) {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFilterPredicateDefs');
-        return this.internalApi.getFilterPredicateDefs();
+        return this.internalApi.getFilterPredicateDefs(scope);
     }
-    getAlertPredicateDefs() {
+    getAlertPredicateDefs(scope) {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getAlertPredicateDefs');
-        return this.internalApi.getAlertPredicateDefs();
+        return this.internalApi.getAlertPredicateDefs(scope);
     }
-    getFormatColumnPredicateDefs() {
+    getFormatColumnPredicateDefs(scope) {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFormatColumnPredicateDefs');
-        return this.internalApi.getFormatColumnPredicateDefs();
+        return this.internalApi.getFormatColumnPredicateDefs(scope);
     }
-    getFlashingCellPredicateDefs() {
+    getFlashingCellPredicateDefs(scope) {
         (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFlashingCellPredicateDefs');
-        return this.internalApi.getFlashingCellPredicateDefs();
+        return this.internalApi.getFlashingCellPredicateDefs(scope);
     }
 }
 exports.PredicateApiImpl = PredicateApiImpl;

package/src/Api/Implementation/ThemeApiImpl.js

@@ -8,6 +8,7 @@ const ApiBase_1 = require("./ApiBase");
 const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const themes_1 = require("../../themes");
 const ThemeInternalApi_1 = require("../Internal/ThemeInternalApi");
+const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 class ThemeApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -105,6 +106,7 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         }
     }
     addUserTheme(theme) {
+        AdaptableHelper_1.default.addUuidAndSource(theme);
         this.dispatchAction(ThemeRedux.ThemeAdd(theme));
     }
     deleteUserTheme(theme) {

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

@@ -83,7 +83,7 @@ export declare class AlertInternalApi extends ApiBase {
      * Returns a description title of an Alert Definition
      * @param alertDefinition Alert Definition to use
      */
-    getAlertMessageTitle(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
+    getAlertMessageHeader(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
     /**
      * Returns custom description for alert using the 'alertMessageText' property
      *
@@ -95,11 +95,11 @@ export declare class AlertInternalApi extends ApiBase {
         gridDataChangedInfo?: GridDataChangedInfo;
     }): string;
     /**
-     * Returns custom title defined by 'alertMessageTitle' property
+     * Returns custom title defined by 'alertMessageHeader' property
      * @param alertDefinition Alert Definition to use
      * @param dataChangedInfo Data change info, it can be eighter grid or cell data chantged info
      */
-    getCustomAlertMessageTitle(alertDefinition: AlertDefinition, dataChangedInfo?: {
+    getCustomAlertMessageHeader(alertDefinition: AlertDefinition, dataChangedInfo?: {
         cellDataChangedInfo?: CellDataChangedInfo;
         gridDataChangedInfo?: GridDataChangedInfo;
     }): string;

package/src/Api/Internal/AlertInternalApi.js

@@ -202,7 +202,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      */
     getAlertPredicateDefsForScope(scope) {
         return this.getPredicateApi()
-            .internalApi.getAlertPredicateDefs()
+            .internalApi.getAlertPredicateDefs(scope)
             .filter((predicateDef) => this.getScopeApi().isScopeInScope(scope, predicateDef.columnScope));
     }
     /**
@@ -225,9 +225,9 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      * Returns a description title of an Alert Definition
      * @param alertDefinition Alert Definition to use
      */
-    getAlertMessageTitle(alertDefinition, cellDataChangedInfo) {
+    getAlertMessageHeader(alertDefinition, cellDataChangedInfo) {
         var _a, _b;
-        return ((_a = this.getCustomAlertMessageTitle(alertDefinition, {
+        return ((_a = this.getCustomAlertMessageHeader(alertDefinition, {
             cellDataChangedInfo,
         })) !== null && _a !== void 0 ? _a : (_b = cellDataChangedInfo === null || cellDataChangedInfo === void 0 ? void 0 : cellDataChangedInfo.column) === null || _b === void 0 ? void 0 : _b.friendlyName);
     }
@@ -254,13 +254,13 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         return null;
     }
     /**
-     * Returns custom title defined by 'alertMessageTitle' property
+     * Returns custom title defined by 'alertMessageHeader' property
      * @param alertDefinition Alert Definition to use
      * @param dataChangedInfo Data change info, it can be eighter grid or cell data chantged info
      */
-    getCustomAlertMessageTitle(alertDefinition, dataChangedInfo) {
+    getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
         var _a;
-        const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageTitle;
+        const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageHeader;
         if (alertMessageFunction) {
             const returnText = alertMessageFunction({
                 alertDefinition,
@@ -476,7 +476,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     }
     showAlertForDefinitions(cellDataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
-            const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.getAdaptableApi().alertApi.internalApi.getAlertMessageTitle(alertDefinition, cellDataChangedInfo), this.getAdaptableApi().alertApi.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
+            const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.getAdaptableApi().alertApi.internalApi.getAlertMessageHeader(alertDefinition, cellDataChangedInfo), this.getAdaptableApi().alertApi.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
             this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
         });
     }

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -146,7 +146,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getFormatColumnDefsForScope(scope) {
         return this.getAdaptableApi()
-            .predicateApi.internalApi.getFormatColumnPredicateDefs()
+            .predicateApi.internalApi.getFormatColumnPredicateDefs(scope)
             .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
     /**

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

@@ -2,6 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptablePredicate, AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { SystemFilterPredicateId } from '../../PredefinedConfig/Common/ColumnFilter';
 import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableScope } from '../../types';
 export declare class PredicateInternalApi extends ApiBase {
     /**
      * Returns true if the predicate has a dropdown.
@@ -12,22 +13,22 @@ export declare class PredicateInternalApi extends ApiBase {
     /**
      * Get all Filter Predicate Definitions - System and Custom
      */
-    getFilterPredicateDefs(): AdaptablePredicateDef[];
+    getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     private getSystemFilterPredicateIds;
     /**
      * Get all Alert Predicate Definitions - System and Custom
      */
-    getAlertPredicateDefs(): AdaptablePredicateDef[];
+    getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     private getSystemAlertPredicateIds;
     /**
      * Get all Format Column Predicate Definitions - System and Custom
      */
-    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     private getSystemFormatColumnPredicateIds;
     /**
      * Get all Flashing Cell Predicate Definitions - System and Custom
      */
-    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     private getSystemFlashingCellPredicateIds;
     /**
      * Gets the correct Equality-type System Predicate for a particular DataType

package/src/Api/Internal/PredicateInternalApi.js

@@ -14,14 +14,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     /**
      * Get all Filter Predicate Definitions - System and Custom
      */
-    getFilterPredicateDefs() {
+    getFilterPredicateDefs(scope) {
         var _a;
         return [
-            ...(_a = this.getSystemFilterPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
+            ...(_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
             ...this.getPredicateApi().getCustomPredicateDefs(),
         ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
     }
-    getSystemFilterPredicateIds() {
+    getSystemFilterPredicateIds(scope) {
         const systemFilterPredicates = this.getAdaptableQLOptions().predicateOptions.systemFilterPredicates;
         if (typeof systemFilterPredicates === 'function') {
             const systemPredicateContext = {
@@ -30,6 +30,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('filter')),
                 moduleScope: 'filter',
+                columnScope: scope
             };
             return systemFilterPredicates(systemPredicateContext);
         }
@@ -38,14 +39,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     /**
      * Get all Alert Predicate Definitions - System and Custom
      */
-    getAlertPredicateDefs() {
+    getAlertPredicateDefs(scope) {
         var _a;
         return [
-            ...(_a = this.getSystemAlertPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
+            ...(_a = this.getSystemAlertPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
             ...this.getPredicateApi().getCustomPredicateDefs(),
         ].filter((predicateDef) => predicateDef.moduleScope.includes('alert'));
     }
-    getSystemAlertPredicateIds() {
+    getSystemAlertPredicateIds(scope) {
         const systemAlertPredicates = this.getAdaptableQLOptions().predicateOptions.systemAlertPredicates;
         if (typeof systemAlertPredicates === 'function') {
             const systemPredicateContext = {
@@ -54,6 +55,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('alert')),
                 moduleScope: 'alert',
+                columnScope: scope
             };
             return systemAlertPredicates(systemPredicateContext);
         }
@@ -62,14 +64,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     /**
      * Get all Format Column Predicate Definitions - System and Custom
      */
-    getFormatColumnPredicateDefs() {
+    getFormatColumnPredicateDefs(scope) {
         var _a;
         return [
-            ...(_a = this.getSystemFormatColumnPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
+            ...(_a = this.getSystemFormatColumnPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
             ...this.getPredicateApi().getCustomPredicateDefs(),
         ].filter((predicateDef) => predicateDef.moduleScope.includes('formatColumn'));
     }
-    getSystemFormatColumnPredicateIds() {
+    getSystemFormatColumnPredicateIds(scope) {
         const systemFormatColumnPredicates = this.getAdaptableQLOptions().predicateOptions.systemFormatColumnPredicates;
         if (typeof systemFormatColumnPredicates === 'function') {
             const systemPredicateContext = {
@@ -78,6 +80,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('formatColumn')),
                 moduleScope: 'formatColumn',
+                columnScope: scope
             };
             return systemFormatColumnPredicates(systemPredicateContext);
         }
@@ -86,14 +89,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     /**
      * Get all Flashing Cell Predicate Definitions - System and Custom
      */
-    getFlashingCellPredicateDefs() {
+    getFlashingCellPredicateDefs(scope) {
         var _a;
         return [
-            ...(_a = this.getSystemFlashingCellPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
+            ...(_a = this.getSystemFlashingCellPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
             ...this.getPredicateApi().getCustomPredicateDefs(),
         ].filter((predicateDef) => predicateDef.moduleScope.includes('flashingcell'));
     }
-    getSystemFlashingCellPredicateIds() {
+    getSystemFlashingCellPredicateIds(scope) {
         const systemFlashingCellPredicates = this.getAdaptableQLOptions().predicateOptions.systemFlashingCellPredicates;
         if (typeof systemFlashingCellPredicates === 'function') {
             const systemPredicateContext = {
@@ -102,6 +105,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('flashingcell')),
                 moduleScope: 'flashingcell',
+                columnScope: scope
             };
             return systemFlashingCellPredicates(systemPredicateContext);
         }

package/src/Api/PluginsApi.d.ts

@@ -4,6 +4,7 @@ import { Glue42Api } from './Glue42Api';
 import { OpenFinApi } from './OpenFinApi';
 import { FinanceApi } from './FinanceApi';
 import { FinsembleApi } from './FinsembleApi';
+import { Glue42WebApi } from './Glue42WebApi';
 /**
  * API methods dealing with AdapTable plugins
  */
@@ -34,9 +35,13 @@ export interface PluginsApi {
      */
     getipushpullPluginApi(): IPushPullApi;
     /**
-     * Returns Glue42 API class in Adaptable API
+     * Returns Glue42 (Desktop) API class in Adaptable API
      */
     getGlue42PluginApi(): Glue42Api;
+    /**
+     * Returns Glue42 (Web) API class in Adaptable API
+     */
+    getGlue42WebPluginApi(): Glue42WebApi;
     /**
      * Returns OpenFin API class in Adaptable API
      */

package/src/Api/PredicateApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId } from '../../types';
+import { AdaptableColumnDataType, AdaptableColumnPredicate, AdaptableScope, SystemFilterPredicateId } from '../../types';
 import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, PredicateModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
 /**
  * Functions which manage the Predicate object in AdapTable
@@ -95,19 +95,19 @@ export interface PredicateApi {
     /**
      * @deprecated internal method, will be removed in next major release
      */
-    getFilterPredicateDefs(): AdaptablePredicateDef[];
+    getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     /**
      * @deprecated internal method, will be removed in next major release
      */
-    getAlertPredicateDefs(): AdaptablePredicateDef[];
+    getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     /**
      * @deprecated internal method, will be removed in next major release
      */
-    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     /**
      * @deprecated internal method, will be removed in next major release
      */
-    getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
     /**
      * @deprecated internal method, will be removed in next major release
      */

package/src/Strategy/AlertModule.js

@@ -166,7 +166,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             const customMessage = this.api.alertApi.internalApi.getCustomAlertDescription(alertDefinition, {
                 gridDataChangedInfo,
             });
-            const customHeader = this.api.alertApi.internalApi.getCustomAlertMessageTitle(alertDefinition, {
+            const customHeader = this.api.alertApi.internalApi.getCustomAlertMessageHeader(alertDefinition, {
                 gridDataChangedInfo,
             });
             const alertMessage = alertDefinition.MessageText