@adaptabletools/adaptable-plugin-openfin 12.0.0-canary.3 → 12.0.0-canary.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-openfin",
-  "version": "12.0.0-canary.3",
+  "version": "12.0.0-canary.6",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -20,6 +20,6 @@
     "redux": "4.0.5",
     "styled-components": "^4.4.1",
     "tslib": "^2.0.0",
-    "@adaptabletools/adaptable": "12.0.0-canary.3"
+    "@adaptabletools/adaptable": "12.0.0-canary.6"
   }
 }

package/src/OpenFinApiImpl.js

@@ -7,6 +7,7 @@ const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/
 const OpenFinRedux = tslib_1.__importStar(require("./Redux/ActionReducers/OpenFinRedux"));
 const openfin_notifications_1 = require("openfin-notifications");
 const isRunningInOpenfin_1 = require("./Utilities/isRunningInOpenfin");
+const AdaptableIconComponent_1 = require("@adaptabletools/adaptable/src/components/AdaptableIconComponent");
 // needed because otherwise openfin-notifications is not initialized properly
 // as it assumes it's running before DOMContentLoaded, but nextjs and other bundlers
 // might inject it after DOMContentLoaded is fired - so we fire it programatically
@@ -114,13 +115,14 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
         }
         const showIcon = this.options.showAppIconInNotifications;
         const appIcon = (_a = this.adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.applicationIcon;
-        if (!notification.icon && appIcon && showIcon) {
+        if (!notification.icon && showIcon && AdaptableIconComponent_1.isAdaptableExternalIcon(appIcon)) {
             notification.icon = appIcon.src;
         }
         const fn = this.options.onShowNotification;
         if (fn && fn(notification, alert) === false) {
             return;
         }
+        // see https://developers.openfin.co/of-docs/docs/customize-notifications
         openfin_notifications_1.create(notification);
     }
     getOpenFinState() {

package/src/OpenFinHelper.d.ts

@@ -16,7 +16,7 @@ export declare function OnWorkbookSaved(): IEvent<any, {
 }>;
 export declare function isRunningInOpenfin(): boolean;
 export declare function isExcelOpenfinLoaded(): boolean;
-export declare function pushData(workBookName: string, data: any[]): Promise<any>;
+export declare function pushData(workBookName: string, data: any[]): Promise<void>;
 /**
  * @deprecated not used anymore
  */

package/src/Redux/ActionReducers/OpenFinRedux.js

@@ -3,30 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenFinReducer = exports.initialOpenFinState = exports.OpenFinSetCurrentReportName = exports.OpenFinLiveReportClear = exports.OpenFinLiveReportSet = exports.OpenFinStopLiveData = exports.OpenFinStartLiveData = void 0;
 const PluginsRedux_1 = require("@adaptabletools/adaptable/src/Redux/ActionsReducers/PluginsRedux");
 const GeneralConstants_1 = require("@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants");
-exports.OpenFinStartLiveData = (openFinReport) => ({
+const OpenFinStartLiveData = (openFinReport) => ({
     type: PluginsRedux_1.OPENFIN_START_LIVE_DATA,
     openFinReport: openFinReport,
 });
-exports.OpenFinStopLiveData = (openFinReport) => ({
+exports.OpenFinStartLiveData = OpenFinStartLiveData;
+const OpenFinStopLiveData = (openFinReport) => ({
     type: PluginsRedux_1.OPENFIN_STOP_LIVE_DATA,
     openFinReport: openFinReport,
 });
-exports.OpenFinLiveReportSet = (openFinReport) => ({
+exports.OpenFinStopLiveData = OpenFinStopLiveData;
+const OpenFinLiveReportSet = (openFinReport) => ({
     type: PluginsRedux_1.OPENFIN_LIVE_REPORT_SET,
     openFinReport: openFinReport,
 });
-exports.OpenFinLiveReportClear = () => ({
+exports.OpenFinLiveReportSet = OpenFinLiveReportSet;
+const OpenFinLiveReportClear = () => ({
     type: PluginsRedux_1.OPENFIN_LIVE_REPORT_CLEAR,
 });
-exports.OpenFinSetCurrentReportName = (reportName) => ({
+exports.OpenFinLiveReportClear = OpenFinLiveReportClear;
+const OpenFinSetCurrentReportName = (reportName) => ({
     type: PluginsRedux_1.OPENFIN_SET_CURRENT_REPORTNAME,
     reportName,
 });
+exports.OpenFinSetCurrentReportName = OpenFinSetCurrentReportName;
 exports.initialOpenFinState = {
     CurrentLiveOpenFinReport: undefined,
     OpenFinCurrentReportName: GeneralConstants_1.EMPTY_STRING,
 };
-exports.OpenFinReducer = (
+const OpenFinReducer = (
 // initial state is handled in the plugin rootReducer
 state, action) => {
     switch (action.type) {
@@ -48,3 +53,4 @@ state, action) => {
             return state;
     }
 };
+exports.OpenFinReducer = OpenFinReducer;

package/src/Utilities/Services/setup.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setup = void 0;
 const logger_1 = require("../../logger");
-exports.setup = async () => {
+const setup = async () => {
     const excelAssetAlias = 'excel-api-addin';
     const excelServiceUuid = '886834D1-4651-4872-996C-7B2578E953B9';
     const installFolder = '%localappdata%\\OpenFin\\shared\\assets\\excel-api-addin';
@@ -106,3 +106,4 @@ exports.setup = async () => {
         });
     }
 };
+exports.setup = setup;

package/src/index.js

@@ -105,7 +105,8 @@ class OpenFinPlugin extends types_1.AdaptablePlugin {
         this.OpenFinService = new OpenFinService_1.OpenFinService(adaptable, this.options);
         adaptable.api.eventApi.on('AlertFired', (alertFiredInfo) => {
             var _a, _b;
-            if (this.options.showAdaptableAlertsAsNotifications && ((_b = (_a = alertFiredInfo.alert) === null || _a === void 0 ? void 0 : _a.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.DisplayNotification)) {
+            if (this.options.showAdaptableAlertsAsNotifications &&
+                ((_b = (_a = alertFiredInfo.alert) === null || _a === void 0 ? void 0 : _a.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.DisplayNotification)) {
                 if (!alertFiredInfo.alert.alertDefinition.AlertForm ||
                     typeof alertFiredInfo.alert.alertDefinition.AlertForm === 'string') {
                     // bail out early for no forms or for more dynamic forms