@adaptabletools/adaptable-plugin-openfin 13.1.1 → 14.0.0-canary.2

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 (3) hide show
  1. package/package.json +2 -2
  2. package/src/Module/OpenFinModule.js +7 -7
  3. package/src/OpenFinApiImpl.js +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable-plugin-openfin",
3
- "version": "13.1.1",
3
+ "version": "14.0.0-canary.2",
4
4
  "description": "",
5
5
  "homepage": "http://www.adaptabletools.com/",
6
6
  "author": {
@@ -20,6 +20,6 @@
20
20
  "redux": "4.0.5",
21
21
  "styled-components": "^4.4.1",
22
22
  "tslib": "^2.3.0",
23
- "@adaptabletools/adaptable": "13.1.1"
23
+ "@adaptabletools/adaptable": "14.0.0-canary.2"
24
24
  }
25
25
  }
package/src/Module/OpenFinModule.js CHANGED
@@ -137,7 +137,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
137
137
  : null;
138
138
  if (currentLiveIOpenFinReport &&
139
139
  !isSelectionReport(currentLiveIOpenFinReport) &&
140
- this.api.exportApi.isDataChangeInReport(cellDataChangedInfo, report)) {
140
+ this.api.exportApi.internalApi.isDataChangeInReport(cellDataChangedInfo, report)) {
141
141
  this.throttledRecomputeAndSendLiveDataEvent();
142
142
  }
143
143
  });
@@ -206,13 +206,13 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
206
206
  return reject(`Cant edit a primary key column`);
207
207
  // return resolve({ ignore: true });
208
208
  }
209
- if (this.api.columnApi.getColumnFromId(columnId).readOnly) {
209
+ if (this.api.columnApi.getColumnWithColumnId(columnId).readOnly) {
210
210
  const msg = `Can't update column ${columnId} as it is read-only`;
211
211
  (0, logger_1.LogAdaptableWarning)(msg);
212
212
  return reject(msg);
213
213
  // return resolve({ ignore: true });
214
214
  }
215
- else if (!this.adaptable.isCellEditable(rowNode, this.adaptable.api.columnApi.getAgGridColumnForAdaptableColumn(columnId))) {
215
+ else if (!this.adaptable.isCellEditable(rowNode, this.adaptable.api.columnApi.internalApi.getAgGridColumnForAdaptableColumn(columnId))) {
216
216
  const msg = `Can't update column cell in ${columnId} as it is read-only`;
217
217
  (0, logger_1.LogAdaptableWarning)(msg);
218
218
  return reject(msg);
@@ -221,7 +221,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
221
221
  const cellDataChangedInfo = this.api.internalApi.buildDataChangedInfo({
222
222
  oldValue,
223
223
  newValue,
224
- column: this.api.columnApi.getColumnFromId(columnId),
224
+ column: this.api.columnApi.getColumnWithColumnId(columnId),
225
225
  primaryKeyValue: primaryKey,
226
226
  rowNode,
227
227
  trigger: 'tick',
@@ -294,7 +294,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
294
294
  pluginOptions.onValidationFailureInExcel === 'show-undo-notification') {
295
295
  const textPredicate = this.adaptable.api.scopeApi.getScopeDescription(failedValidationRules[0].Scope) +
296
296
  ' ' +
297
- this.adaptable.api.predicateApi.predicateToString((_a = failedValidationRules[0].Rule) === null || _a === void 0 ? void 0 : _a.Predicate);
297
+ ((_a = failedValidationRules[0].Rule) === null || _a === void 0 ? void 0 : _a.Predicates.map((predicate) => this.adaptable.api.predicateApi.predicateToString(predicate)).join(' AND '));
298
298
  const info = Object.assign({}, dataChangedInfos[0]);
299
299
  delete info.rowNode;
300
300
  const alertOptions = api.getAlertOptions();
@@ -314,7 +314,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
314
314
  },
315
315
  });
316
316
  }
317
- this.adaptable.api.alertApi.displayAlert({
317
+ this.adaptable.api.alertApi.showAdaptableAlert({
318
318
  alertType: 'cellChanged',
319
319
  cellDataChangedInfo: info,
320
320
  alertDefinition: {
@@ -325,7 +325,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
325
325
  Scope: {
326
326
  All: true,
327
327
  },
328
- Rule: { Predicate: (_c = failedValidationRules[0].Rule) === null || _c === void 0 ? void 0 : _c.Predicate },
328
+ Rule: { Predicates: (_c = failedValidationRules[0].Rule) === null || _c === void 0 ? void 0 : _c.Predicates },
329
329
  AlertForm: {
330
330
  Buttons: pluginOptions.onValidationFailureInExcel === 'show-undo-notification'
331
331
  ? [
package/src/OpenFinApiImpl.js CHANGED
@@ -41,7 +41,7 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
41
41
  }
42
42
  }
43
43
  const alertId = (_c = (_b = event.notification.customData) === null || _b === void 0 ? void 0 : _b.AlertId) !== null && _c !== void 0 ? _c : '';
44
- const alert = adaptable.api.internalApi
44
+ const alert = adaptable.api.alertApi.internalApi
45
45
  .getAdaptableAlerts()
46
46
  .find((alert) => alert.Uuid === alertId);
47
47
  if (event.result.task === CLICK_ALERT_BUTTON) {
@@ -52,7 +52,7 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
52
52
  adaptableApi: adaptable.api,
53
53
  formData: undefined,
54
54
  };
55
- adaptable.api.alertApi.executeAlertButton(clickedButton, context);
55
+ adaptable.api.alertApi.internalApi.executeAlertButton(clickedButton, context);
56
56
  }
57
57
  }
58
58
  event.notification.alert = alert;