@adaptabletools/adaptable-plugin-openfin 16.2.4 → 17.0.0-canary.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-openfin",
-  "version": "16.2.4",
+  "version": "17.0.0-canary.10",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -11,7 +11,6 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "lodash": "^4.17.15",
-    "openfin-fdc3": "^0.2.3",
     "openfin-notifications": "^0.12.6",
     "prop-types": "^15.6.2",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
@@ -20,6 +19,6 @@
     "redux": "4.0.5",
     "styled-components": "^4.4.1",
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "16.2.4"
+    "@adaptabletools/adaptable": "17.0.0-canary.10"
   }
 }

package/src/Module/OpenFinModule.js

@@ -145,7 +145,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (iOpenFinReport.ReportName !== GeneralConstants_1.ALL_DATA_REPORT) {
             this.removeGridSortChangedListener = this.adaptable._on('SortChanged', resendLiveData);
             // if the grid filters have changed then update any live reports except cell or row selected
-            this.removeGridFilteredListener = this.adaptable._on('GridFiltered', resendLiveDataNoSelectionReport);
+            this.removeGridFilteredListener = this.adaptable._on('AdapTableFiltersApplied', resendLiveDataNoSelectionReport);
         }
         // if grid selection has changed and the iOpenFin Live report is 'Selected Cells' or 'Selected Rows' then send updated data
         this.removeSelectionChangedListener = this.api.eventApi.on('SelectionChanged', () => {

package/src/OpenFinApiImpl.js

@@ -83,16 +83,10 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
                 AlertId: alert.Uuid,
             },
         };
-        // const context: AlertFormContext = {
-        //   alert: alert,
-        //   api: this.getAdaptableApi(),
-        //   formData: undefined,
-        // };
-        const alertForm = typeof alert.alertDefinition.AlertForm === 'string' ? null : alert.alertDefinition.AlertForm;
-        // this.getAdaptableApi().internalApi.getAdaptableFormFromAlertForm(
-        //   alert.alertDefinition.AlertForm,
-        //   context
-        // );
+        const alertForm = typeof alert.alertDefinition.AlertForm === 'string'
+            ? null
+            : alert.alertDefinition.AlertForm ||
+                this.getAlertApi().internalApi.getDefaultAlertNotificationForm();
         if (alertForm && (alertForm === null || alertForm === void 0 ? void 0 : alertForm.Buttons)) {
             notification.buttons = alertForm.Buttons.map((button) => {
                 const { ButtonStyle: buttonStyle } = button;

package/src/Utilities/Services/Interface/IOpenFinService.d.ts

@@ -1,5 +1,5 @@
 import { EmitterCallback } from '@adaptabletools/adaptable/src/Utilities/Emitter';
-export declare type ExcelSheetChangedEvent = {
+export type ExcelSheetChangedEvent = {
     data: {
         address: string;
         row: number;

package/src/Utilities/Services/OpenFinService.js

@@ -13,104 +13,6 @@ function isExcelOpenfinLoaded() {
 }
 exports.isExcelOpenfinLoaded = isExcelOpenfinLoaded;
 class OpenFinService {
-    constructor(adaptable, options) {
-        this.adaptable = adaptable;
-        this.excelConnected = false;
-        this.connectedCallbacks = [];
-        this.onWorkbookRemoved = (event) => {
-            event.workbook.removeEventListener('workbookActivated', this.onWorkbookActivated);
-            const { workbook } = event;
-            this.adaptable.logger.info('Workbook closed:' + workbook.name + ', Stopping Openfin Live Excel');
-            this.getOpenFinApi().stopLiveData();
-        };
-        this.onWorkbookSaved = (event) => {
-            const NewName = event.workbook.name;
-            this.adaptable.logger.info('workbook saved', NewName);
-            //saving adds an extension, but the name does not have that
-            // however, not adding the extension will not find the workbook when we do getWorkBookByName
-            // and will crash the app
-            this.workbookName = NewName;
-        };
-        this.onWorkbookActivated = (event) => {
-            this.adaptable.logger.info('Workbook Activated: ' + event.target.name);
-            event.target.getWorksheets((ack) => {
-                this.adaptable.logger.info('getWorksheets:', ack);
-            });
-        };
-        this.onWorkbookAdded = (event) => {
-            this.adaptable.logger.success('Workbook Added: ' + event.workbook.name);
-            let workbook = event.workbook;
-            workbook.addEventListener('workbookActivated', this.onWorkbookActivated);
-        };
-        this.onSheetChanged = (event) => {
-            this.emit('sheetchanged', event);
-        };
-        this.getRowContents = (rowIndex, columnCount) => {
-            return new Promise((resolve, reject) => {
-                try {
-                    this.activeWorksheet.getRow('A' + rowIndex, columnCount, (row) => {
-                        return resolve(row.map((x) => x.value));
-                    });
-                }
-                catch (err) {
-                    reject(err);
-                }
-            });
-        };
-        this.onExcelConnected = () => {
-            this.excelConnected = true;
-            this.connectedCallbacks.forEach((fn) => fn());
-            this.connectedCallbacks.length = 0;
-            this.adaptable.logger.success('Excel Connected');
-            fin.desktop.Excel.addEventListener('workbookClosed', this.onWorkbookRemoved);
-            fin.desktop.Excel.addEventListener('workbookSaved', this.onWorkbookSaved);
-            fin.desktop.Excel.addEventListener('workbookAdded', this.onWorkbookAdded);
-        };
-        this.onExcelDisconnected = () => {
-            this.adaptable.logger.info('Excel Disconnected');
-            this.excelConnected = false;
-            this.initialisingExcel = null;
-            this.workbookName = undefined;
-            this.activeWorksheet = null;
-            fin.desktop.Excel.removeEventListener('workbookClosed', this.onWorkbookRemoved);
-            fin.desktop.Excel.removeEventListener('workbookSaved', this.onWorkbookSaved);
-            fin.desktop.Excel.removeEventListener('workbookAdded', this.onWorkbookAdded);
-            fin.desktop.ExcelService.removeEventListener('excelConnected', this.onExcelConnected);
-            fin.desktop.ExcelService.removeEventListener('excelDisconnected', this.onExcelDisconnected);
-            this.adaptable.logger.info('Excel closed stopping all Live Excel');
-            this.getOpenFinApi().stopLiveData();
-        };
-        this.initialisingExcel = null;
-        this.waitForExcel = () => {
-            let startTime = Date.now();
-            const poolForExcel = (callback) => {
-                if (Date.now() - startTime > 20000) {
-                    console.error(`Could not find any Excel instance.`);
-                    return callback();
-                }
-                if (!fin.desktop.Excel || !fin.desktop.Excel.getWorkbooks) {
-                    requestAnimationFrame(() => {
-                        poolForExcel(callback);
-                    });
-                }
-                else {
-                    callback();
-                }
-            };
-            return new Promise((resolve) => {
-                poolForExcel(() => resolve(''));
-            });
-        };
-        this.on = (eventName, callback) => {
-            return this.emitter.on(eventName, callback);
-        };
-        this.emit = (eventName, data) => {
-            return this.emitter.emit(eventName, data);
-        };
-        this.adaptable = adaptable;
-        this.options = options;
-        this.emitter = new Emitter_1.default();
-    }
     getOpenFinApi() {
         return this.adaptable.api.pluginsApi.getOpenFinPluginApi();
     }
@@ -247,5 +149,103 @@ class OpenFinService {
         });
         return this.initialisingExcel;
     }
+    constructor(adaptable, options) {
+        this.adaptable = adaptable;
+        this.excelConnected = false;
+        this.connectedCallbacks = [];
+        this.onWorkbookRemoved = (event) => {
+            event.workbook.removeEventListener('workbookActivated', this.onWorkbookActivated);
+            const { workbook } = event;
+            this.adaptable.logger.info('Workbook closed:' + workbook.name + ', Stopping Openfin Live Excel');
+            this.getOpenFinApi().stopLiveData();
+        };
+        this.onWorkbookSaved = (event) => {
+            const NewName = event.workbook.name;
+            this.adaptable.logger.info('workbook saved', NewName);
+            //saving adds an extension, but the name does not have that
+            // however, not adding the extension will not find the workbook when we do getWorkBookByName
+            // and will crash the app
+            this.workbookName = NewName;
+        };
+        this.onWorkbookActivated = (event) => {
+            this.adaptable.logger.info('Workbook Activated: ' + event.target.name);
+            event.target.getWorksheets((ack) => {
+                this.adaptable.logger.info('getWorksheets:', ack);
+            });
+        };
+        this.onWorkbookAdded = (event) => {
+            this.adaptable.logger.success('Workbook Added: ' + event.workbook.name);
+            let workbook = event.workbook;
+            workbook.addEventListener('workbookActivated', this.onWorkbookActivated);
+        };
+        this.onSheetChanged = (event) => {
+            this.emit('sheetchanged', event);
+        };
+        this.getRowContents = (rowIndex, columnCount) => {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.activeWorksheet.getRow('A' + rowIndex, columnCount, (row) => {
+                        return resolve(row.map((x) => x.value));
+                    });
+                }
+                catch (err) {
+                    reject(err);
+                }
+            });
+        };
+        this.onExcelConnected = () => {
+            this.excelConnected = true;
+            this.connectedCallbacks.forEach((fn) => fn());
+            this.connectedCallbacks.length = 0;
+            this.adaptable.logger.success('Excel Connected');
+            fin.desktop.Excel.addEventListener('workbookClosed', this.onWorkbookRemoved);
+            fin.desktop.Excel.addEventListener('workbookSaved', this.onWorkbookSaved);
+            fin.desktop.Excel.addEventListener('workbookAdded', this.onWorkbookAdded);
+        };
+        this.onExcelDisconnected = () => {
+            this.adaptable.logger.info('Excel Disconnected');
+            this.excelConnected = false;
+            this.initialisingExcel = null;
+            this.workbookName = undefined;
+            this.activeWorksheet = null;
+            fin.desktop.Excel.removeEventListener('workbookClosed', this.onWorkbookRemoved);
+            fin.desktop.Excel.removeEventListener('workbookSaved', this.onWorkbookSaved);
+            fin.desktop.Excel.removeEventListener('workbookAdded', this.onWorkbookAdded);
+            fin.desktop.ExcelService.removeEventListener('excelConnected', this.onExcelConnected);
+            fin.desktop.ExcelService.removeEventListener('excelDisconnected', this.onExcelDisconnected);
+            this.adaptable.logger.info('Excel closed stopping all Live Excel');
+            this.getOpenFinApi().stopLiveData();
+        };
+        this.initialisingExcel = null;
+        this.waitForExcel = () => {
+            let startTime = Date.now();
+            const poolForExcel = (callback) => {
+                if (Date.now() - startTime > 20000) {
+                    console.error(`Could not find any Excel instance.`);
+                    return callback();
+                }
+                if (!fin.desktop.Excel || !fin.desktop.Excel.getWorkbooks) {
+                    requestAnimationFrame(() => {
+                        poolForExcel(callback);
+                    });
+                }
+                else {
+                    callback();
+                }
+            };
+            return new Promise((resolve) => {
+                poolForExcel(() => resolve(''));
+            });
+        };
+        this.on = (eventName, callback) => {
+            return this.emitter.on(eventName, callback);
+        };
+        this.emit = (eventName, data) => {
+            return this.emitter.emit(eventName, data);
+        };
+        this.adaptable = adaptable;
+        this.options = options;
+        this.emitter = new Emitter_1.default();
+    }
 }
 exports.OpenFinService = OpenFinService;

package/src/index.js

@@ -76,16 +76,13 @@ class OpenFinPlugin extends types_1.AdaptablePlugin {
         this.openFinApi = new OpenFinApiImpl_1.OpenFinApiImpl(adaptable, this.options);
         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 (!alertFiredInfo.alert.alertDefinition.AlertForm ||
+            if (this.options.showAdaptableAlertsAsNotifications) {
+                if (!alertFiredInfo.alert.alertDefinition.AlertProperties.DisplayNotification &&
                     typeof alertFiredInfo.alert.alertDefinition.AlertForm === 'string') {
-                    // bail out early for no forms or for more dynamic forms
-                    return true;
+                    // bail out early for dynamic forms
+                    return;
                 }
                 this.openFinApi.showNotificationForAlert(alertFiredInfo.alert);
-                return false;
             }
         });
         this.registerProperty('api', () => this.openFinApi);