@adaptabletools/adaptable-plugin-openfin 10.0.4-canary.5 → 11.0.0-canary.5

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@adaptabletools/adaptable-plugin-openfin",
-  "version": "10.0.4-canary.5",
+  "version": "11.0.0-canary.5",
   "description": "",
+  "homepage": "http://www.adaptabletools.com/",
+  "author": {
+    "name": "Jonny Wolfson",
+    "email": "jonny.wolfson@adaptabletools.com"
+  },
   "main": "src/index.js",
+  "typings": "src/index.d.ts",
   "dependencies": {
-    "lodash-es": "^4.17.15",
+    "lodash": "^4.17.15",
     "openfin-fdc3": "^0.2.3",
     "openfin-notifications": "^0.12.6",
     "prop-types": "^15.6.2",
@@ -13,11 +19,7 @@
     "rebass": "^3.2.2",
     "redux": "4.0.5",
     "styled-components": "^4.4.1",
-    "@adaptabletools/adaptable": "10.0.4-canary.5"
-  },
-  "author": {
-    "name": "Jonny Wolfson",
-    "email": "jonny.wolfson@adaptabletools.com"
-  },
-  "homepage": "http://www.adaptabletools.com/"
+    "tslib": "^2.0.0",
+    "@adaptabletools/adaptable": "11.0.0-canary.5"
+  }
 }

package/src/Module/OpenFinModule.js

@@ -4,7 +4,7 @@ exports.OpenFinModule = exports.EXCEL_VALIDATION_FAILED = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
-const throttle_1 = tslib_1.__importDefault(require("lodash-es/throttle"));
+const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
 const logger_1 = require("../logger");
 const GeneralConstants_1 = require("@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants");
 exports.EXCEL_VALIDATION_FAILED = 'excelValidationFailed';
@@ -203,11 +203,11 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                         this.adaptable.api.predicateApi.predicateToString((_a = failedValidationRules[0].Rule) === null || _a === void 0 ? void 0 : _a.Predicate);
                                     const info = Object.assign({}, dataChangedInfo);
                                     delete info.rowNode;
-                                    const notificationsOptions = api.getNotificationsOptions();
-                                    notificationsOptions.actionHandlers = (_b = notificationsOptions.actionHandlers) !== null && _b !== void 0 ? _b : [];
+                                    const alertOptions = api.getAlertOptions();
+                                    alertOptions.actionHandlers = (_b = alertOptions.actionHandlers) !== null && _b !== void 0 ? _b : [];
                                     if (pluginOptions.onValidationFailureInExcel === 'show-undo-notification' &&
-                                        !notificationsOptions.actionHandlers.find((handler) => handler.name === 'openfin-plugin:excel-undo')) {
-                                        notificationsOptions.actionHandlers.push({
+                                        !alertOptions.actionHandlers.find((handler) => handler.name === 'openfin-plugin:excel-undo')) {
+                                        alertOptions.actionHandlers.push({
                                             name: 'openfin-plugin:excel-undo',
                                             handler: (button, context) => {
                                                 try {

package/src/OpenFinApiImpl.d.ts

@@ -1,7 +1,7 @@
 import { ApiBase } from '@adaptabletools/adaptable/src/Api/Implementation/ApiBase';
 import { OpenFinApi } from '@adaptabletools/adaptable/src/Api/OpenFinApi';
 import { OpenFinPluginOptions } from '@adaptabletools/adaptable/src/AdaptableOptions/OpenFinPluginOptions';
-import { AdaptableAlert, NotificationsOptions } from '@adaptabletools/adaptable/types';
+import { AdaptableAlert, NotificationsOptions, AlertOptions } from '@adaptabletools/adaptable/types';
 import { OpenFinState, OpenFinReport, OpenFinSchedule } from '@adaptabletools/adaptable/src/PredefinedConfig/OpenFinState';
 import { IAdaptable } from '@adaptabletools/adaptable/src/AdaptableInterfaces/IAdaptable';
 export declare class OpenFinApiImpl extends ApiBase implements OpenFinApi {
@@ -20,6 +20,7 @@ export declare class OpenFinApiImpl extends ApiBase implements OpenFinApi {
     getCurrentLiveOpenFinReport(): OpenFinReport | undefined;
     getOpenFinSchedules(): OpenFinSchedule[];
     getNotificationsOptions(): NotificationsOptions;
+    getAlertOptions(): AlertOptions;
     startLiveData(OpenFinReport: OpenFinReport): void;
     stopLiveData(): void;
     showOpenFinPopup(): void;

package/src/OpenFinApiImpl.js

@@ -30,7 +30,7 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
                     ((_a = event.notification.customData) === null || _a === void 0 ? void 0 : _a.name) === 'validation-failed') {
                     if (this.getCurrentLiveOpenFinReport()) {
                         try {
-                            let openFinModule = (this.adaptable.modules.get(ModuleConstants.OpenFinModuleId));
+                            let openFinModule = (this.adaptable.adaptableModules.get(ModuleConstants.OpenFinModuleId));
                             openFinModule.sendInitialLiveData(true);
                         }
                         catch (ex) {
@@ -113,8 +113,7 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
             notification.expires = new Date(Date.now() + this.options.notificationTimeout);
         }
         const showIcon = this.options.showAppIconInNotifications;
-        const appIcon = (_a = this.adaptable.api.internalApi.getAdaptableOptions()
-            .userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.applicationIcon;
+        const appIcon = (_a = this.adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.applicationIcon;
         if (!notification.icon && appIcon && showIcon) {
             notification.icon = appIcon.src;
         }
@@ -158,6 +157,9 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
     getNotificationsOptions() {
         return this.getAdaptableApi().internalApi.getAdaptableOptions().notificationsOptions;
     }
+    getAlertOptions() {
+        return this.getAdaptableApi().internalApi.getAdaptableOptions().alertOptions;
+    }
     startLiveData(OpenFinReport) {
         if (this.checkItemExists(OpenFinReport, OpenFinReport.ReportName, 'OpenFin Report')) {
             this.dispatchAction(OpenFinRedux.OpenFinStartLiveData(OpenFinReport));

package/src/index.js

@@ -98,7 +98,7 @@ class OpenFinPlugin extends types_1.AdaptablePlugin {
                 (_b = (_a = this.options).broadcastFDC3Instrument) === null || _b === void 0 ? void 0 : _b.call(_a, instrumentContext);
             });
         });
-        this.openFinModule = adaptable.modules.get(ModuleConstants.OpenFinModuleId);
+        this.openFinModule = (adaptable.adaptableModules.get(ModuleConstants.OpenFinModuleId));
     }
     afterInitApi(adaptable) {
         this.openFinApi = new OpenFinApiImpl_1.OpenFinApiImpl(adaptable, this.options);