@adaptabletools/adaptable 15.2.0-canary.6 → 15.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/bundle.cjs.js +12 -12
  2. package/package.json +1 -1
  3. package/publishTimestamp.d.ts +1 -1
  4. package/publishTimestamp.js +1 -1
  5. package/src/AdaptableInterfaces/IAdaptable.d.ts +1 -0
  6. package/src/AdaptableOptions/AlertOptions.d.ts +3 -3
  7. package/src/AdaptableOptions/Glue42PluginOptions.d.ts +1 -1
  8. package/src/AdaptableOptions/Glue42WebPluginOptions.d.ts +7 -0
  9. package/src/AdaptableOptions/PredicateOptions.d.ts +5 -1
  10. package/src/Api/AlertApi.d.ts +2 -2
  11. package/src/Api/Glue42Api.d.ts +1 -1
  12. package/src/Api/Implementation/AlertApiImpl.d.ts +2 -2
  13. package/src/Api/Implementation/AlertApiImpl.js +6 -6
  14. package/src/Api/Implementation/FilterApiImpl.js +4 -1
  15. package/src/Api/Implementation/FlashingCellApiImpl.js +1 -1
  16. package/src/Api/Implementation/PluginsApiImpl.d.ts +2 -0
  17. package/src/Api/Implementation/PluginsApiImpl.js +6 -0
  18. package/src/Api/Implementation/PredicateApiImpl.d.ts +5 -5
  19. package/src/Api/Implementation/PredicateApiImpl.js +8 -8
  20. package/src/Api/Internal/AlertInternalApi.d.ts +3 -3
  21. package/src/Api/Internal/AlertInternalApi.js +7 -7
  22. package/src/Api/Internal/FormatColumnInternalApi.js +1 -1
  23. package/src/Api/Internal/GridInternalApi.js +0 -1
  24. package/src/Api/Internal/PredicateInternalApi.d.ts +5 -4
  25. package/src/Api/Internal/PredicateInternalApi.js +16 -12
  26. package/src/Api/PluginsApi.d.ts +6 -1
  27. package/src/Api/PredicateApi.d.ts +5 -5
  28. package/src/Strategy/AlertModule.js +1 -1
  29. package/src/View/Alert/Wizard/AlertNotificationWizardSection.js +1 -1
  30. package/src/agGrid/Adaptable.d.ts +1 -0
  31. package/src/agGrid/Adaptable.js +23 -21
  32. package/src/metamodel/adaptable.metamodel.d.ts +12 -0
  33. package/src/metamodel/adaptable.metamodel.js +1 -1
  34. package/src/types.d.ts +1 -0
  35. package/version.d.ts +1 -1
  36. package/version.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable",
3
- "version": "15.2.0-canary.6",
3
+ "version": "15.2.0",
4
4
  "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
5
5
  "keywords": [
6
6
  "web-components",
@@ -1,2 +1,2 @@
1
- declare const _default: 1681229596918;
1
+ declare const _default: 1681725929316;
2
2
  export default _default;
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = 1681229596918;
3
+ exports.default = 1681725929316;
@@ -244,6 +244,7 @@ export interface IAdaptable {
244
244
  getVisibleColumnCount(): number;
245
245
  setLayout(layout: Layout): void;
246
246
  isGridSelectable(): boolean;
247
+ isGridRangeSelectable(): boolean;
247
248
  isGridGroupable(): boolean;
248
249
  isGridPivotable(): boolean;
249
250
  isGridGroupingActive(): boolean;
@@ -30,7 +30,7 @@ export interface AlertOptions<TData = any> {
30
30
  */
31
31
  rowHighlightDuration?: number;
32
32
  /**
33
- * How long (in ms) the status-panel will be highlighted when an Alert Fires
33
+ * How long (in ms) Alert panel in Status Bar highlights when an Alert Fires
34
34
  *
35
35
  * @defaultValue 2000
36
36
  */
@@ -51,9 +51,9 @@ export interface AlertOptions<TData = any> {
51
51
  */
52
52
  dataChangeDetectionPolicy?: 'rawValue' | 'formattedValue';
53
53
  /**
54
- * Function providing Title to display in Alert; if empty, AdapTable provides dynamically
54
+ * Function providing Header to display in Alert; if empty, AdapTable provides dynamically
55
55
  */
56
- alertMessageTitle?: (alertMessageContext: AlertMessageContext<TData>) => string | undefined;
56
+ alertMessageHeader?: (alertMessageContext: AlertMessageContext<TData>) => string | undefined;
57
57
  /**
58
58
  * Function providing Message to display in Alert; if empty, AdapTable provides dynamically
59
59
  */
@@ -1,5 +1,5 @@
1
1
  /**
2
- * Options for using the Glue42 plugin
2
+ * Options for using the Glue42 Desktop plugin
3
3
  */
4
4
  export interface Glue42PluginOptions {
5
5
  /**
@@ -1,3 +1,10 @@
1
+ /**
2
+ * Options for using the Glue42 Web plugin
3
+ */
1
4
  export interface Glue42WebPluginOptions {
5
+ /**
6
+ * Converts AdapTable Alerts configured to display in popup as Glue42 Notifications
7
+ * @defaultValue true
8
+ */
2
9
  showAdaptableAlertsAsNotifications?: boolean;
3
10
  }
@@ -1,4 +1,4 @@
1
- import { AdaptablePredicateDef, BaseContext, PredicateModuleScope, SystemAlertPredicateIds, SystemFilterPredicateIds, SystemFlashingCellPredicateIds, SystemFormatColumnPredicateIds } from '../types';
1
+ import { AdaptablePredicateDef, AdaptableScope, BaseContext, PredicateModuleScope, SystemAlertPredicateIds, SystemFilterPredicateIds, SystemFlashingCellPredicateIds, SystemFormatColumnPredicateIds } from '../types';
2
2
  /**
3
3
  * Options for managing Adaptable Predicates using AdaptableQL
4
4
  */
@@ -32,4 +32,8 @@ export interface SystemPredicatesContext extends BaseContext {
32
32
  * Module for which Predicates are being retrieved
33
33
  */
34
34
  moduleScope: PredicateModuleScope;
35
+ /**
36
+ * Current Scope where Predicates are being used
37
+ */
38
+ columnScope: AdaptableScope;
35
39
  }
@@ -193,7 +193,7 @@ export interface AlertApi {
193
193
  /**
194
194
  * @deprecated internal method, will be removed in next major release
195
195
  */
196
- getAlertMessageTitle(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
196
+ getAlertMessageHeader(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
197
197
  /**
198
198
  * @deprecated internal method, will be removed in next major release
199
199
  */
@@ -204,7 +204,7 @@ export interface AlertApi {
204
204
  /**
205
205
  * @deprecated internal method, will be removed in next major release
206
206
  */
207
- getCustomAlertMessageTitle(alertDefinition: AlertDefinition, dataChangedInfo?: {
207
+ getCustomAlertMessageHeader(alertDefinition: AlertDefinition, dataChangedInfo?: {
208
208
  cellDataChangedInfo?: CellDataChangedInfo;
209
209
  gridDataChangedInfo?: GridDataChangedInfo;
210
210
  }): string;
@@ -10,7 +10,7 @@ export interface Glue42Api {
10
10
  */
11
11
  getGlue42State(): Glue42State | undefined;
12
12
  /**
13
- * Retrieves the Glue42PluginOptions provided in Glue42 Plugin
13
+ * Retrieves the Glue42PluginOptions provided in Glue42 Desktop Plugin
14
14
  */
15
15
  getPluginOptions(): Glue42PluginOptions;
16
16
  /**
@@ -59,7 +59,7 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
59
59
  getAlertDefinitionsWithAllowEdit(): AlertDefinition[];
60
60
  getAlertDefinitionsWithPreventEdit(): AlertDefinition[];
61
61
  getAlertDescription(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
62
- getAlertMessageTitle(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
62
+ getAlertMessageHeader(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
63
63
  getAlertPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
64
64
  getAlertRuleDescription(alertDefinition: AlertDefinition): string;
65
65
  getAlertTypeForAdaptableAlert(alert: AdaptableAlert): 'cellChanged' | 'rowChanged' | 'generic';
@@ -67,7 +67,7 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
67
67
  cellDataChangedInfo?: CellDataChangedInfo;
68
68
  gridDataChangedInfo?: GridDataChangedInfo;
69
69
  }): string;
70
- getCustomAlertMessageTitle(alertDefinition: AlertDefinition, dataChangedInfo?: {
70
+ getCustomAlertMessageHeader(alertDefinition: AlertDefinition, dataChangedInfo?: {
71
71
  cellDataChangedInfo?: CellDataChangedInfo;
72
72
  gridDataChangedInfo?: GridDataChangedInfo;
73
73
  }): string;
@@ -285,9 +285,9 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
285
285
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDescription');
286
286
  return this.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo);
287
287
  }
288
- getAlertMessageTitle(alertDefinition, cellDataChangedInfo) {
289
- (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertMessageTitle');
290
- return this.internalApi.getAlertMessageTitle(alertDefinition, cellDataChangedInfo);
288
+ getAlertMessageHeader(alertDefinition, cellDataChangedInfo) {
289
+ (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertMessageHeader');
290
+ return this.internalApi.getAlertMessageHeader(alertDefinition, cellDataChangedInfo);
291
291
  }
292
292
  getAlertPredicateDefsForScope(scope) {
293
293
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertPredicateDefsForScope');
@@ -305,9 +305,9 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
305
305
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertDescription');
306
306
  return this.internalApi.getCustomAlertDescription(alertDefinition, dataChangedInfo);
307
307
  }
308
- getCustomAlertMessageTitle(alertDefinition, dataChangedInfo) {
309
- (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertMessageTitle');
310
- return this.internalApi.getCustomAlertMessageTitle(alertDefinition, dataChangedInfo);
308
+ getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
309
+ (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertMessageHeader');
310
+ return this.internalApi.getCustomAlertMessageHeader(alertDefinition, dataChangedInfo);
311
311
  }
312
312
  getNonReactiveAlertDefinitions() {
313
313
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getNonReactiveAlertDefinitions');
@@ -18,8 +18,11 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
18
18
  return this.internalApi.findPredicateDefByShortcut(shortcut, column);
19
19
  }
20
20
  getFilterPredicateDefsForColumn(column) {
21
+ const scope = {
22
+ ColumnIds: [column.columnId]
23
+ };
21
24
  return this.getAdaptableApi()
22
- .predicateApi.internalApi.getFilterPredicateDefs()
25
+ .predicateApi.internalApi.getFilterPredicateDefs(scope)
23
26
  .filter((predicate) => this.adaptable.api.scopeApi.isColumnInScope(column, predicate.columnScope));
24
27
  }
25
28
  getFilterPredicateDefsForColumnId(columnId) {
@@ -90,7 +90,7 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
90
90
  }
91
91
  getFlashingCellPredicateDefsForScope(scope) {
92
92
  return this.getAdaptableApi()
93
- .predicateApi.internalApi.getFlashingCellPredicateDefs()
93
+ .predicateApi.internalApi.getFlashingCellPredicateDefs(scope)
94
94
  .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
95
95
  }
96
96
  clearGridFlashing() {
@@ -6,6 +6,7 @@ import { Glue42Api } from '../Glue42Api';
6
6
  import { OpenFinApi } from '../OpenFinApi';
7
7
  import { FinanceApi } from '../FinanceApi';
8
8
  import { FinsembleApi } from '../FinsembleApi';
9
+ import { Glue42WebApi } from '../Glue42WebApi';
9
10
  export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
10
11
  getPluginsState(): PluginsState;
11
12
  getPluginState(pluginId: string): any;
@@ -14,6 +15,7 @@ export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
14
15
  private getPluginApi;
15
16
  getipushpullPluginApi(): IPushPullApi;
16
17
  getGlue42PluginApi(): Glue42Api;
18
+ getGlue42WebPluginApi(): Glue42WebApi;
17
19
  getOpenFinPluginApi(): OpenFinApi;
18
20
  getFinancePluginApi(): FinanceApi;
19
21
  getFinsemblePluginApi(): FinsembleApi;
@@ -29,6 +29,9 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
29
29
  if (pluginId === 'glue42') {
30
30
  return api;
31
31
  }
32
+ if (pluginId === 'glue42web') {
33
+ return api;
34
+ }
32
35
  if (pluginId === 'openfin') {
33
36
  return api;
34
37
  }
@@ -47,6 +50,9 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
47
50
  getGlue42PluginApi() {
48
51
  return this.getPluginApi('glue42');
49
52
  }
53
+ getGlue42WebPluginApi() {
54
+ return this.getPluginApi('glue42web');
55
+ }
50
56
  getOpenFinPluginApi() {
51
57
  return this.getPluginApi('openfin');
52
58
  }
@@ -1,7 +1,7 @@
1
1
  import { ApiBase } from './ApiBase';
2
2
  import { PredicateApi } from '../PredicateApi';
3
3
  import { PredicateDefHandlerParams, PredicateModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
4
- import { AdaptablePredicate, AdaptablePredicateDef, AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId } from '../../types';
4
+ import { AdaptablePredicate, AdaptablePredicateDef, AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId, AdaptableScope } from '../../types';
5
5
  import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
6
6
  import { PredicateInternalApi } from '../Internal/PredicateInternalApi';
7
7
  export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
@@ -24,8 +24,8 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
24
24
  handlePredicates(predicates: AdaptablePredicate[], params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
25
25
  getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
26
26
  hasPredicateValues(predicate: AdaptablePredicate): boolean;
27
- getFilterPredicateDefs(): AdaptablePredicateDef[];
28
- getAlertPredicateDefs(): AdaptablePredicateDef[];
29
- getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
30
- getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
27
+ getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
28
+ getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
29
+ getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
30
+ getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
31
31
  }
@@ -123,21 +123,21 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
123
123
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'hasPredicateValues');
124
124
  return this.internalApi.hasPredicateValues(predicate);
125
125
  }
126
- getFilterPredicateDefs() {
126
+ getFilterPredicateDefs(scope) {
127
127
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFilterPredicateDefs');
128
- return this.internalApi.getFilterPredicateDefs();
128
+ return this.internalApi.getFilterPredicateDefs(scope);
129
129
  }
130
- getAlertPredicateDefs() {
130
+ getAlertPredicateDefs(scope) {
131
131
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getAlertPredicateDefs');
132
- return this.internalApi.getAlertPredicateDefs();
132
+ return this.internalApi.getAlertPredicateDefs(scope);
133
133
  }
134
- getFormatColumnPredicateDefs() {
134
+ getFormatColumnPredicateDefs(scope) {
135
135
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFormatColumnPredicateDefs');
136
- return this.internalApi.getFormatColumnPredicateDefs();
136
+ return this.internalApi.getFormatColumnPredicateDefs(scope);
137
137
  }
138
- getFlashingCellPredicateDefs() {
138
+ getFlashingCellPredicateDefs(scope) {
139
139
  (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'PredicateApi', 'getFlashingCellPredicateDefs');
140
- return this.internalApi.getFlashingCellPredicateDefs();
140
+ return this.internalApi.getFlashingCellPredicateDefs(scope);
141
141
  }
142
142
  }
143
143
  exports.PredicateApiImpl = PredicateApiImpl;
@@ -83,7 +83,7 @@ export declare class AlertInternalApi extends ApiBase {
83
83
  * Returns a description title of an Alert Definition
84
84
  * @param alertDefinition Alert Definition to use
85
85
  */
86
- getAlertMessageTitle(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
86
+ getAlertMessageHeader(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
87
87
  /**
88
88
  * Returns custom description for alert using the 'alertMessageText' property
89
89
  *
@@ -95,11 +95,11 @@ export declare class AlertInternalApi extends ApiBase {
95
95
  gridDataChangedInfo?: GridDataChangedInfo;
96
96
  }): string;
97
97
  /**
98
- * Returns custom title defined by 'alertMessageTitle' property
98
+ * Returns custom title defined by 'alertMessageHeader' property
99
99
  * @param alertDefinition Alert Definition to use
100
100
  * @param dataChangedInfo Data change info, it can be eighter grid or cell data chantged info
101
101
  */
102
- getCustomAlertMessageTitle(alertDefinition: AlertDefinition, dataChangedInfo?: {
102
+ getCustomAlertMessageHeader(alertDefinition: AlertDefinition, dataChangedInfo?: {
103
103
  cellDataChangedInfo?: CellDataChangedInfo;
104
104
  gridDataChangedInfo?: GridDataChangedInfo;
105
105
  }): string;
@@ -202,7 +202,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
202
202
  */
203
203
  getAlertPredicateDefsForScope(scope) {
204
204
  return this.getPredicateApi()
205
- .internalApi.getAlertPredicateDefs()
205
+ .internalApi.getAlertPredicateDefs(scope)
206
206
  .filter((predicateDef) => this.getScopeApi().isScopeInScope(scope, predicateDef.columnScope));
207
207
  }
208
208
  /**
@@ -225,9 +225,9 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
225
225
  * Returns a description title of an Alert Definition
226
226
  * @param alertDefinition Alert Definition to use
227
227
  */
228
- getAlertMessageTitle(alertDefinition, cellDataChangedInfo) {
228
+ getAlertMessageHeader(alertDefinition, cellDataChangedInfo) {
229
229
  var _a, _b;
230
- return ((_a = this.getCustomAlertMessageTitle(alertDefinition, {
230
+ return ((_a = this.getCustomAlertMessageHeader(alertDefinition, {
231
231
  cellDataChangedInfo,
232
232
  })) !== null && _a !== void 0 ? _a : (_b = cellDataChangedInfo === null || cellDataChangedInfo === void 0 ? void 0 : cellDataChangedInfo.column) === null || _b === void 0 ? void 0 : _b.friendlyName);
233
233
  }
@@ -254,13 +254,13 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
254
254
  return null;
255
255
  }
256
256
  /**
257
- * Returns custom title defined by 'alertMessageTitle' property
257
+ * Returns custom title defined by 'alertMessageHeader' property
258
258
  * @param alertDefinition Alert Definition to use
259
259
  * @param dataChangedInfo Data change info, it can be eighter grid or cell data chantged info
260
260
  */
261
- getCustomAlertMessageTitle(alertDefinition, dataChangedInfo) {
261
+ getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
262
262
  var _a;
263
- const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageTitle;
263
+ const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageHeader;
264
264
  if (alertMessageFunction) {
265
265
  const returnText = alertMessageFunction({
266
266
  alertDefinition,
@@ -476,7 +476,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
476
476
  }
477
477
  showAlertForDefinitions(cellDataChangedInfo, alertDefinitions = []) {
478
478
  alertDefinitions.forEach((alertDefinition) => {
479
- const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.getAdaptableApi().alertApi.internalApi.getAlertMessageTitle(alertDefinition, cellDataChangedInfo), this.getAdaptableApi().alertApi.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
479
+ const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.getAdaptableApi().alertApi.internalApi.getAlertMessageHeader(alertDefinition, cellDataChangedInfo), this.getAdaptableApi().alertApi.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
480
480
  this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
481
481
  });
482
482
  }
@@ -146,7 +146,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
146
146
  */
147
147
  getFormatColumnDefsForScope(scope) {
148
148
  return this.getAdaptableApi()
149
- .predicateApi.internalApi.getFormatColumnPredicateDefs()
149
+ .predicateApi.internalApi.getFormatColumnPredicateDefs(scope)
150
150
  .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
151
151
  }
152
152
  /**
@@ -69,7 +69,6 @@ class GridInternalApi extends ApiBase_1.ApiBase {
69
69
  * @param columnFilter Current applied filter
70
70
  */
71
71
  async getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly) {
72
- console.log('getDistinctFilterDisplayValuesForColumn ', columnId, filter);
73
72
  const abColumn = this.getColumnApi().getColumnWithColumnId(columnId);
74
73
  if (abColumn == undefined) {
75
74
  return {
@@ -2,6 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
2
2
  import { AdaptablePredicate, AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
3
3
  import { SystemFilterPredicateId } from '../../PredefinedConfig/Common/ColumnFilter';
4
4
  import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
5
+ import { AdaptableScope } from '../../types';
5
6
  export declare class PredicateInternalApi extends ApiBase {
6
7
  /**
7
8
  * Returns true if the predicate has a dropdown.
@@ -12,22 +13,22 @@ export declare class PredicateInternalApi extends ApiBase {
12
13
  /**
13
14
  * Get all Filter Predicate Definitions - System and Custom
14
15
  */
15
- getFilterPredicateDefs(): AdaptablePredicateDef[];
16
+ getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
16
17
  private getSystemFilterPredicateIds;
17
18
  /**
18
19
  * Get all Alert Predicate Definitions - System and Custom
19
20
  */
20
- getAlertPredicateDefs(): AdaptablePredicateDef[];
21
+ getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
21
22
  private getSystemAlertPredicateIds;
22
23
  /**
23
24
  * Get all Format Column Predicate Definitions - System and Custom
24
25
  */
25
- getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
26
+ getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
26
27
  private getSystemFormatColumnPredicateIds;
27
28
  /**
28
29
  * Get all Flashing Cell Predicate Definitions - System and Custom
29
30
  */
30
- getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
31
+ getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
31
32
  private getSystemFlashingCellPredicateIds;
32
33
  /**
33
34
  * Gets the correct Equality-type System Predicate for a particular DataType
@@ -14,14 +14,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
14
14
  /**
15
15
  * Get all Filter Predicate Definitions - System and Custom
16
16
  */
17
- getFilterPredicateDefs() {
17
+ getFilterPredicateDefs(scope) {
18
18
  var _a;
19
19
  return [
20
- ...(_a = this.getSystemFilterPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
20
+ ...(_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
21
21
  ...this.getPredicateApi().getCustomPredicateDefs(),
22
22
  ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
23
23
  }
24
- getSystemFilterPredicateIds() {
24
+ getSystemFilterPredicateIds(scope) {
25
25
  const systemFilterPredicates = this.getAdaptableQLOptions().predicateOptions.systemFilterPredicates;
26
26
  if (typeof systemFilterPredicates === 'function') {
27
27
  const systemPredicateContext = {
@@ -30,6 +30,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
30
30
  .getSystemPredicateDefs()
31
31
  .filter((p) => p.moduleScope.includes('filter')),
32
32
  moduleScope: 'filter',
33
+ columnScope: scope
33
34
  };
34
35
  return systemFilterPredicates(systemPredicateContext);
35
36
  }
@@ -38,14 +39,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
38
39
  /**
39
40
  * Get all Alert Predicate Definitions - System and Custom
40
41
  */
41
- getAlertPredicateDefs() {
42
+ getAlertPredicateDefs(scope) {
42
43
  var _a;
43
44
  return [
44
- ...(_a = this.getSystemAlertPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
45
+ ...(_a = this.getSystemAlertPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
45
46
  ...this.getPredicateApi().getCustomPredicateDefs(),
46
47
  ].filter((predicateDef) => predicateDef.moduleScope.includes('alert'));
47
48
  }
48
- getSystemAlertPredicateIds() {
49
+ getSystemAlertPredicateIds(scope) {
49
50
  const systemAlertPredicates = this.getAdaptableQLOptions().predicateOptions.systemAlertPredicates;
50
51
  if (typeof systemAlertPredicates === 'function') {
51
52
  const systemPredicateContext = {
@@ -54,6 +55,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
54
55
  .getSystemPredicateDefs()
55
56
  .filter((p) => p.moduleScope.includes('alert')),
56
57
  moduleScope: 'alert',
58
+ columnScope: scope
57
59
  };
58
60
  return systemAlertPredicates(systemPredicateContext);
59
61
  }
@@ -62,14 +64,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
62
64
  /**
63
65
  * Get all Format Column Predicate Definitions - System and Custom
64
66
  */
65
- getFormatColumnPredicateDefs() {
67
+ getFormatColumnPredicateDefs(scope) {
66
68
  var _a;
67
69
  return [
68
- ...(_a = this.getSystemFormatColumnPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
70
+ ...(_a = this.getSystemFormatColumnPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
69
71
  ...this.getPredicateApi().getCustomPredicateDefs(),
70
72
  ].filter((predicateDef) => predicateDef.moduleScope.includes('formatColumn'));
71
73
  }
72
- getSystemFormatColumnPredicateIds() {
74
+ getSystemFormatColumnPredicateIds(scope) {
73
75
  const systemFormatColumnPredicates = this.getAdaptableQLOptions().predicateOptions.systemFormatColumnPredicates;
74
76
  if (typeof systemFormatColumnPredicates === 'function') {
75
77
  const systemPredicateContext = {
@@ -78,6 +80,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
78
80
  .getSystemPredicateDefs()
79
81
  .filter((p) => p.moduleScope.includes('formatColumn')),
80
82
  moduleScope: 'formatColumn',
83
+ columnScope: scope
81
84
  };
82
85
  return systemFormatColumnPredicates(systemPredicateContext);
83
86
  }
@@ -86,14 +89,14 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
86
89
  /**
87
90
  * Get all Flashing Cell Predicate Definitions - System and Custom
88
91
  */
89
- getFlashingCellPredicateDefs() {
92
+ getFlashingCellPredicateDefs(scope) {
90
93
  var _a;
91
94
  return [
92
- ...(_a = this.getSystemFlashingCellPredicateIds()) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
95
+ ...(_a = this.getSystemFlashingCellPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)),
93
96
  ...this.getPredicateApi().getCustomPredicateDefs(),
94
97
  ].filter((predicateDef) => predicateDef.moduleScope.includes('flashingcell'));
95
98
  }
96
- getSystemFlashingCellPredicateIds() {
99
+ getSystemFlashingCellPredicateIds(scope) {
97
100
  const systemFlashingCellPredicates = this.getAdaptableQLOptions().predicateOptions.systemFlashingCellPredicates;
98
101
  if (typeof systemFlashingCellPredicates === 'function') {
99
102
  const systemPredicateContext = {
@@ -102,6 +105,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
102
105
  .getSystemPredicateDefs()
103
106
  .filter((p) => p.moduleScope.includes('flashingcell')),
104
107
  moduleScope: 'flashingcell',
108
+ columnScope: scope
105
109
  };
106
110
  return systemFlashingCellPredicates(systemPredicateContext);
107
111
  }
@@ -4,6 +4,7 @@ import { Glue42Api } from './Glue42Api';
4
4
  import { OpenFinApi } from './OpenFinApi';
5
5
  import { FinanceApi } from './FinanceApi';
6
6
  import { FinsembleApi } from './FinsembleApi';
7
+ import { Glue42WebApi } from './Glue42WebApi';
7
8
  /**
8
9
  * API methods dealing with AdapTable plugins
9
10
  */
@@ -34,9 +35,13 @@ export interface PluginsApi {
34
35
  */
35
36
  getipushpullPluginApi(): IPushPullApi;
36
37
  /**
37
- * Returns Glue42 API class in Adaptable API
38
+ * Returns Glue42 (Desktop) API class in Adaptable API
38
39
  */
39
40
  getGlue42PluginApi(): Glue42Api;
41
+ /**
42
+ * Returns Glue42 (Web) API class in Adaptable API
43
+ */
44
+ getGlue42WebPluginApi(): Glue42WebApi;
40
45
  /**
41
46
  * Returns OpenFin API class in Adaptable API
42
47
  */
@@ -1,4 +1,4 @@
1
- import { AdaptableColumnDataType, AdaptableColumnPredicate, SystemFilterPredicateId } from '../../types';
1
+ import { AdaptableColumnDataType, AdaptableColumnPredicate, AdaptableScope, SystemFilterPredicateId } from '../../types';
2
2
  import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, PredicateModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
3
3
  /**
4
4
  * Functions which manage the Predicate object in AdapTable
@@ -95,19 +95,19 @@ export interface PredicateApi {
95
95
  /**
96
96
  * @deprecated internal method, will be removed in next major release
97
97
  */
98
- getFilterPredicateDefs(): AdaptablePredicateDef[];
98
+ getFilterPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
99
99
  /**
100
100
  * @deprecated internal method, will be removed in next major release
101
101
  */
102
- getAlertPredicateDefs(): AdaptablePredicateDef[];
102
+ getAlertPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
103
103
  /**
104
104
  * @deprecated internal method, will be removed in next major release
105
105
  */
106
- getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
106
+ getFormatColumnPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
107
107
  /**
108
108
  * @deprecated internal method, will be removed in next major release
109
109
  */
110
- getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
110
+ getFlashingCellPredicateDefs(scope: AdaptableScope): AdaptablePredicateDef[];
111
111
  /**
112
112
  * @deprecated internal method, will be removed in next major release
113
113
  */
@@ -166,7 +166,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
166
166
  const customMessage = this.api.alertApi.internalApi.getCustomAlertDescription(alertDefinition, {
167
167
  gridDataChangedInfo,
168
168
  });
169
- const customHeader = this.api.alertApi.internalApi.getCustomAlertMessageTitle(alertDefinition, {
169
+ const customHeader = this.api.alertApi.internalApi.getCustomAlertMessageHeader(alertDefinition, {
170
170
  gridDataChangedInfo,
171
171
  });
172
172
  const alertMessage = alertDefinition.MessageText
@@ -42,7 +42,7 @@ const AlertPreview = (_a) => {
42
42
  const Buttons = (((_a = alertForm === null || alertForm === void 0 ? void 0 : alertForm.Buttons) === null || _a === void 0 ? void 0 : _a.length) ? alertForm.Buttons : DEFAULT_BUTTONS).map(mapButtons);
43
43
  const result = {
44
44
  alertType: 'generic',
45
- header: api.alertApi.internalApi.getAlertMessageTitle(alertDefinition),
45
+ header: api.alertApi.internalApi.getAlertMessageHeader(alertDefinition),
46
46
  message: api.alertApi.internalApi.getAlertDescription(alertDefinition),
47
47
  alertDefinition: Object.assign(Object.assign({}, alertDefinition), { AlertForm: Object.assign(Object.assign({}, alertForm), { Buttons }) }),
48
48
  };
@@ -362,6 +362,7 @@ export declare class Adaptable implements IAdaptable {
362
362
  private updateColumnDataTypeIfRowDataIsEmpty;
363
363
  private runAdaptableComparerFunction;
364
364
  isGridSelectable(): boolean;
365
+ isGridRangeSelectable(): boolean;
365
366
  isGridGroupable(): boolean;
366
367
  isGridGroupingActive(): boolean;
367
368
  isGridPivotable(): boolean;