@adaptabletools/adaptable-plugin-openfin 12.2.3 → 13.0.0-canary.1
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.
- package/package.json +3 -3
- package/src/Module/OpenFinModule.js +6 -6
- package/src/OpenFinApiImpl.js +5 -5
- package/src/OpenFinHelper.js +20 -20
- package/src/Utilities/Services/OpenFinService.js +17 -17
- package/src/Utilities/Services/setup.js +7 -7
- package/src/View/OpenFinPopup.js +1 -1
- package/src/View/OpenFinViewPanel.js +4 -4
- package/src/index.js +1 -1
- package/src/logger.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptabletools/adaptable-plugin-openfin",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "13.0.0-canary.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "http://www.adaptabletools.com/",
|
|
6
6
|
"author": {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"rebass": "^3.2.2",
|
|
20
20
|
"redux": "4.0.5",
|
|
21
21
|
"styled-components": "^4.4.1",
|
|
22
|
-
"tslib": "^2.
|
|
23
|
-
"@adaptabletools/adaptable": "
|
|
22
|
+
"tslib": "^2.3.0",
|
|
23
|
+
"@adaptabletools/adaptable": "13.0.0-canary.1"
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -17,7 +17,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
|
|
|
17
17
|
return this.currentReportData ? this.currentReportData.columns : [];
|
|
18
18
|
};
|
|
19
19
|
this.adaptable = api.internalApi.getAdaptableInstance();
|
|
20
|
-
this.throttledRecomputeAndSendLiveDataEvent = throttle_1.default(() => this.sendInitialLiveData(), this.getThrottleTimeFromState());
|
|
20
|
+
this.throttledRecomputeAndSendLiveDataEvent = (0, throttle_1.default)(() => this.sendInitialLiveData(), this.getThrottleTimeFromState());
|
|
21
21
|
}
|
|
22
22
|
getViewAccessLevel() {
|
|
23
23
|
return 'Full';
|
|
@@ -57,13 +57,13 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
|
|
|
57
57
|
return this.getOpenFinService()
|
|
58
58
|
.clearAndPushData(ReportAsArray)
|
|
59
59
|
.then(() => {
|
|
60
|
-
logger_1.LogAdaptableSuccess('All live report data sent');
|
|
60
|
+
(0, logger_1.LogAdaptableSuccess)('All live report data sent');
|
|
61
61
|
this.isSendingData = false;
|
|
62
62
|
return this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('OpenFin', 'LiveDataUpdated', currentLiveIOpenFinReport);
|
|
63
63
|
})
|
|
64
64
|
.catch((reason) => {
|
|
65
65
|
this.isSendingData = false;
|
|
66
|
-
logger_1.LogAdaptableWarning('Failed to send data to OpenFin for [' + currentLiveIOpenFinReport.ReportName + ']', reason);
|
|
66
|
+
(0, logger_1.LogAdaptableWarning)('Failed to send data to OpenFin for [' + currentLiveIOpenFinReport.ReportName + ']', reason);
|
|
67
67
|
this.getOpenFinApi().stopLiveData();
|
|
68
68
|
let errorMessage = 'Export Failed';
|
|
69
69
|
if (reason) {
|
|
@@ -71,7 +71,7 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
|
|
|
71
71
|
}
|
|
72
72
|
errorMessage += '. This live export has been cancelled.';
|
|
73
73
|
this.api.alertApi.showAlertError('iOpenFin Export Error', errorMessage);
|
|
74
|
-
logger_1.LogAdaptableWarning('Failed to send data');
|
|
74
|
+
(0, logger_1.LogAdaptableWarning)('Failed to send data');
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
}
|
|
@@ -208,13 +208,13 @@ class OpenFinModule extends AdaptableModuleBase_1.AdaptableModuleBase {
|
|
|
208
208
|
}
|
|
209
209
|
if (this.api.columnApi.getColumnFromId(columnId).readOnly) {
|
|
210
210
|
const msg = `Can't update column ${columnId} as it is read-only`;
|
|
211
|
-
logger_1.LogAdaptableWarning(msg);
|
|
211
|
+
(0, logger_1.LogAdaptableWarning)(msg);
|
|
212
212
|
return reject(msg);
|
|
213
213
|
// return resolve({ ignore: true });
|
|
214
214
|
}
|
|
215
215
|
else if (!this.adaptable.isCellEditable(rowNode, this.adaptable.api.columnApi.getAgGridColumnForAdaptableColumn(columnId))) {
|
|
216
216
|
const msg = `Can't update column cell in ${columnId} as it is read-only`;
|
|
217
|
-
logger_1.LogAdaptableWarning(msg);
|
|
217
|
+
(0, logger_1.LogAdaptableWarning)(msg);
|
|
218
218
|
return reject(msg);
|
|
219
219
|
// return resolve({ ignore: true });
|
|
220
220
|
}
|
package/src/OpenFinApiImpl.js
CHANGED
|
@@ -24,8 +24,8 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
|
|
|
24
24
|
super(adaptable);
|
|
25
25
|
this.OpenFinService = null;
|
|
26
26
|
this.options = options;
|
|
27
|
-
if (isRunningInOpenfin_1.isRunningInOpenfin()) {
|
|
28
|
-
openfin_notifications_1.addEventListener('notification-action', (event) => {
|
|
27
|
+
if ((0, isRunningInOpenfin_1.isRunningInOpenfin)()) {
|
|
28
|
+
(0, openfin_notifications_1.addEventListener)('notification-action', (event) => {
|
|
29
29
|
var _a, _b, _c, _d, _e;
|
|
30
30
|
if (this.options.onValidationFailureInExcel === 'show-undo-notification' &&
|
|
31
31
|
((_a = event.notification.customData) === null || _a === void 0 ? void 0 : _a.name) === 'validation-failed') {
|
|
@@ -115,7 +115,7 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
|
|
|
115
115
|
}
|
|
116
116
|
const showIcon = this.options.showAppIconInNotifications;
|
|
117
117
|
const appIcon = (_a = this.adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.applicationIcon;
|
|
118
|
-
if (!notification.icon && showIcon && AdaptableIconComponent_1.isAdaptableExternalIcon(appIcon)) {
|
|
118
|
+
if (!notification.icon && showIcon && (0, AdaptableIconComponent_1.isAdaptableExternalIcon)(appIcon)) {
|
|
119
119
|
notification.icon = appIcon.src;
|
|
120
120
|
}
|
|
121
121
|
const fn = this.options.onShowNotification;
|
|
@@ -123,7 +123,7 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
|
|
|
123
123
|
return;
|
|
124
124
|
}
|
|
125
125
|
// see https://developers.openfin.co/of-docs/docs/customize-notifications
|
|
126
|
-
openfin_notifications_1.create(notification);
|
|
126
|
+
(0, openfin_notifications_1.create)(notification);
|
|
127
127
|
}
|
|
128
128
|
getOpenFinState() {
|
|
129
129
|
return this.getAdaptableState().System;
|
|
@@ -131,7 +131,7 @@ class OpenFinApiImpl extends ApiBase_1.ApiBase {
|
|
|
131
131
|
isOpenFinRunning() {
|
|
132
132
|
let OpenFinState = this.getOpenFinState();
|
|
133
133
|
if (OpenFinState) {
|
|
134
|
-
return isRunningInOpenfin_1.isRunningInOpenfin();
|
|
134
|
+
return (0, isRunningInOpenfin_1.isRunningInOpenfin)();
|
|
135
135
|
}
|
|
136
136
|
return false;
|
|
137
137
|
}
|
package/src/OpenFinHelper.js
CHANGED
|
@@ -58,9 +58,9 @@ function isExcelOpenfinLoaded() {
|
|
|
58
58
|
exports.isExcelOpenfinLoaded = isExcelOpenfinLoaded;
|
|
59
59
|
function addWorkbook() {
|
|
60
60
|
return new Promise((resolve, reject) => {
|
|
61
|
-
logger_1.LogAdaptableInfo('Creating new workbook');
|
|
61
|
+
(0, logger_1.LogAdaptableInfo)('Creating new workbook');
|
|
62
62
|
fin.desktop.Excel.addWorkbook(function (workbook /*ExcelWorkbook*/) {
|
|
63
|
-
logger_1.LogAdaptableSuccess('workbook created:' + workbook.name);
|
|
63
|
+
(0, logger_1.LogAdaptableSuccess)('workbook created:' + workbook.name);
|
|
64
64
|
resolve(workbook.name);
|
|
65
65
|
// workbook.addEventListener("workbookActivated", (event) => onWorkbookActivated(event, resolve));
|
|
66
66
|
// workbook.activate();
|
|
@@ -93,7 +93,7 @@ function pushData(workBookName, data) {
|
|
|
93
93
|
return new Promise((resolve, reject) => {
|
|
94
94
|
let workBook = fin.desktop.Excel.getWorkbookByName(workBookName);
|
|
95
95
|
if (!workBook) {
|
|
96
|
-
logger_1.LogAdaptableError('Cannot find workbook:' + workBookName);
|
|
96
|
+
(0, logger_1.LogAdaptableError)('Cannot find workbook:' + workBookName);
|
|
97
97
|
reject('Cannot find workbook:' + workBookName);
|
|
98
98
|
}
|
|
99
99
|
let worksheet = workBook.getWorksheetByName('Sheet1');
|
|
@@ -115,7 +115,7 @@ function initOpenFinExcel() {
|
|
|
115
115
|
.then(onExcelConnected)
|
|
116
116
|
.then(addWorkbook)
|
|
117
117
|
.catch((err) => {
|
|
118
|
-
logger_1.LogAdaptableError(err);
|
|
118
|
+
(0, logger_1.LogAdaptableError)(err);
|
|
119
119
|
return '';
|
|
120
120
|
});
|
|
121
121
|
}
|
|
@@ -125,7 +125,7 @@ function initOpenFinExcel() {
|
|
|
125
125
|
.then(onExcelConnected)
|
|
126
126
|
.then(addWorkbook)
|
|
127
127
|
.catch((err) => {
|
|
128
|
-
logger_1.LogAdaptableError(err);
|
|
128
|
+
(0, logger_1.LogAdaptableError)(err);
|
|
129
129
|
return '';
|
|
130
130
|
});
|
|
131
131
|
}
|
|
@@ -137,7 +137,7 @@ function initExcelPluginService() {
|
|
|
137
137
|
var servicePath = 'OpenFin.ExcelService.exe';
|
|
138
138
|
var addInPath = 'OpenFin.ExcelApi-AddIn.xll';
|
|
139
139
|
if (excelStatus != ExcelServiceStatus.Unknown) {
|
|
140
|
-
logger_1.LogAdaptableInfo('Skipping Add-in deployment as already deployed');
|
|
140
|
+
(0, logger_1.LogAdaptableInfo)('Skipping Add-in deployment as already deployed');
|
|
141
141
|
return Promise.resolve();
|
|
142
142
|
}
|
|
143
143
|
excelStatus = ExcelServiceStatus.Connecting;
|
|
@@ -148,13 +148,13 @@ function initExcelPluginService() {
|
|
|
148
148
|
}
|
|
149
149
|
function deployAddIn(servicePath, installFolder) {
|
|
150
150
|
return new Promise((resolve, reject) => {
|
|
151
|
-
logger_1.LogAdaptableInfo('Deploying Add-In');
|
|
151
|
+
(0, logger_1.LogAdaptableInfo)('Deploying Add-In');
|
|
152
152
|
fin.desktop.System.launchExternalProcess({
|
|
153
153
|
alias: 'excel-api-addin',
|
|
154
154
|
target: servicePath,
|
|
155
155
|
arguments: '-d "' + installFolder + '"',
|
|
156
156
|
listener: function (args) {
|
|
157
|
-
logger_1.LogAdaptableSuccess('Installer script completed! ' + args.exitCode);
|
|
157
|
+
(0, logger_1.LogAdaptableSuccess)('Installer script completed! ' + args.exitCode);
|
|
158
158
|
resolve();
|
|
159
159
|
},
|
|
160
160
|
});
|
|
@@ -166,12 +166,12 @@ function startExcelService(servicePath, installFolder) {
|
|
|
166
166
|
fin.desktop.System.getAllExternalApplications((extApps) => {
|
|
167
167
|
var excelServiceIndex = extApps.findIndex((extApp) => extApp.uuid === serviceUuid);
|
|
168
168
|
if (excelServiceIndex >= 0) {
|
|
169
|
-
logger_1.LogAdaptableInfo('Service Already Running');
|
|
169
|
+
(0, logger_1.LogAdaptableInfo)('Service Already Running');
|
|
170
170
|
resolve();
|
|
171
171
|
return;
|
|
172
172
|
}
|
|
173
173
|
var onServiceStarted = () => {
|
|
174
|
-
logger_1.LogAdaptableSuccess('Service Started');
|
|
174
|
+
(0, logger_1.LogAdaptableSuccess)('Service Started');
|
|
175
175
|
fin.desktop.Excel.instance.removeEventListener('started', onServiceStarted);
|
|
176
176
|
resolve();
|
|
177
177
|
};
|
|
@@ -182,7 +182,7 @@ function startExcelService(servicePath, installFolder) {
|
|
|
182
182
|
arguments: '-p ' + details.port,
|
|
183
183
|
uuid: serviceUuid,
|
|
184
184
|
}, (process) => {
|
|
185
|
-
logger_1.LogAdaptableSuccess('Service Launched: ' + process.uuid);
|
|
185
|
+
(0, logger_1.LogAdaptableSuccess)('Service Launched: ' + process.uuid);
|
|
186
186
|
}, (error) => {
|
|
187
187
|
reject('Error starting Excel service');
|
|
188
188
|
});
|
|
@@ -192,9 +192,9 @@ function startExcelService(servicePath, installFolder) {
|
|
|
192
192
|
}
|
|
193
193
|
function registerAddIn(servicePath, installFolder) {
|
|
194
194
|
return new Promise((resolve, reject) => {
|
|
195
|
-
logger_1.LogAdaptableInfo('Registering Add-In');
|
|
195
|
+
(0, logger_1.LogAdaptableInfo)('Registering Add-In');
|
|
196
196
|
fin.desktop.Excel.install((ack) => {
|
|
197
|
-
logger_1.LogAdaptableInfo('Add-In Registration callback', ack);
|
|
197
|
+
(0, logger_1.LogAdaptableInfo)('Add-In Registration callback', ack);
|
|
198
198
|
//if (ack.success) {
|
|
199
199
|
resolve();
|
|
200
200
|
//}
|
|
@@ -205,11 +205,11 @@ function connectToExcel() {
|
|
|
205
205
|
return new Promise((resolve, reject) => {
|
|
206
206
|
fin.desktop.Excel.instance.getExcelInstances((instances) => {
|
|
207
207
|
if (instances.length > 0) {
|
|
208
|
-
logger_1.LogAdaptableInfo('Excel Already Running');
|
|
208
|
+
(0, logger_1.LogAdaptableInfo)('Excel Already Running');
|
|
209
209
|
resolve();
|
|
210
210
|
}
|
|
211
211
|
else {
|
|
212
|
-
logger_1.LogAdaptableInfo('Launching Excel');
|
|
212
|
+
(0, logger_1.LogAdaptableInfo)('Launching Excel');
|
|
213
213
|
fin.desktop.Excel.run(resolve);
|
|
214
214
|
}
|
|
215
215
|
});
|
|
@@ -223,19 +223,19 @@ function onWorkbookSaved(event) {
|
|
|
223
223
|
_onWorkbookSaved.Dispatch(this, { OldName: event.oldWorkbookName, NewName: event.workbook.name });
|
|
224
224
|
}
|
|
225
225
|
function onWorkbookActivated(event) {
|
|
226
|
-
logger_1.LogAdaptableInfo('Workbook Activated: ' + event.target.name);
|
|
226
|
+
(0, logger_1.LogAdaptableInfo)('Workbook Activated: ' + event.target.name);
|
|
227
227
|
event.target.getWorksheets((ack) => {
|
|
228
|
-
logger_1.LogAdaptableInfo('getWorksheets:', ack);
|
|
228
|
+
(0, logger_1.LogAdaptableInfo)('getWorksheets:', ack);
|
|
229
229
|
});
|
|
230
230
|
}
|
|
231
231
|
function onWorkbookAdded(event) {
|
|
232
|
-
logger_1.LogAdaptableSuccess('Workbook Added: ' + event.workbook.name);
|
|
232
|
+
(0, logger_1.LogAdaptableSuccess)('Workbook Added: ' + event.workbook.name);
|
|
233
233
|
let workbook = event.workbook;
|
|
234
234
|
workbook.addEventListener('workbookActivated', onWorkbookActivated);
|
|
235
235
|
}
|
|
236
236
|
function onExcelConnected() {
|
|
237
237
|
if (excelStatus != ExcelServiceStatus.Connected) {
|
|
238
|
-
logger_1.LogAdaptableSuccess('Excel Connected: ' + fin.desktop.Excel.legacyApi.connectionUuid);
|
|
238
|
+
(0, logger_1.LogAdaptableSuccess)('Excel Connected: ' + fin.desktop.Excel.legacyApi.connectionUuid);
|
|
239
239
|
excelStatus = ExcelServiceStatus.Connected;
|
|
240
240
|
// fin.desktop.Excel.instance.removeEventListener("excelConnected", onExcelConnected);
|
|
241
241
|
fin.desktop.Excel.addEventListener('workbookClosed', onWorkbookRemoved);
|
|
@@ -244,7 +244,7 @@ function onExcelConnected() {
|
|
|
244
244
|
// Grab a snapshot of the current instance, it can change!
|
|
245
245
|
var legacyApi = fin.desktop.Excel.legacyApi;
|
|
246
246
|
var onExcelDisconnected = function () {
|
|
247
|
-
logger_1.LogAdaptableInfo('Excel Disconnected: ' + legacyApi.connectionUuid);
|
|
247
|
+
(0, logger_1.LogAdaptableInfo)('Excel Disconnected: ' + legacyApi.connectionUuid);
|
|
248
248
|
fin.desktop.Excel.instance.removeEventListener('excelDisconnected', onExcelDisconnected);
|
|
249
249
|
legacyApi.removeEventListener('workbookClosed', onWorkbookRemoved);
|
|
250
250
|
legacyApi.removeEventListener('workbookSaved', onWorkbookSaved);
|
|
@@ -6,11 +6,11 @@ const logger_1 = require("../../logger");
|
|
|
6
6
|
const Emitter_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/Emitter"));
|
|
7
7
|
const setup_1 = require("./setup");
|
|
8
8
|
const isRunningInOpenfin_1 = require("../isRunningInOpenfin");
|
|
9
|
-
if (isRunningInOpenfin_1.isRunningInOpenfin()) {
|
|
9
|
+
if ((0, isRunningInOpenfin_1.isRunningInOpenfin)()) {
|
|
10
10
|
require('../../excel-service/index.js');
|
|
11
11
|
}
|
|
12
12
|
function isExcelOpenfinLoaded() {
|
|
13
|
-
return isRunningInOpenfin_1.isRunningInOpenfin() && 'Excel' in fin.desktop;
|
|
13
|
+
return (0, isRunningInOpenfin_1.isRunningInOpenfin)() && 'Excel' in fin.desktop;
|
|
14
14
|
}
|
|
15
15
|
exports.isExcelOpenfinLoaded = isExcelOpenfinLoaded;
|
|
16
16
|
class OpenFinService {
|
|
@@ -21,25 +21,25 @@ class OpenFinService {
|
|
|
21
21
|
this.onWorkbookRemoved = (event) => {
|
|
22
22
|
event.workbook.removeEventListener('workbookActivated', this.onWorkbookActivated);
|
|
23
23
|
const { workbook } = event;
|
|
24
|
-
logger_1.LogAdaptableInfo('Workbook closed:' + workbook.name + ', Stopping Openfin Live Excel');
|
|
24
|
+
(0, logger_1.LogAdaptableInfo)('Workbook closed:' + workbook.name + ', Stopping Openfin Live Excel');
|
|
25
25
|
this.getOpenFinApi().stopLiveData();
|
|
26
26
|
};
|
|
27
27
|
this.onWorkbookSaved = (event) => {
|
|
28
28
|
const NewName = event.workbook.name;
|
|
29
|
-
logger_1.LogAdaptableInfo('workbook saved', NewName);
|
|
29
|
+
(0, logger_1.LogAdaptableInfo)('workbook saved', NewName);
|
|
30
30
|
//saving adds an extension, but the name does not have that
|
|
31
31
|
// however, not adding the extension will not find the workbook when we do getWorkBookByName
|
|
32
32
|
// and will crash the app
|
|
33
33
|
this.workbookName = NewName;
|
|
34
34
|
};
|
|
35
35
|
this.onWorkbookActivated = (event) => {
|
|
36
|
-
logger_1.LogAdaptableInfo('Workbook Activated: ' + event.target.name);
|
|
36
|
+
(0, logger_1.LogAdaptableInfo)('Workbook Activated: ' + event.target.name);
|
|
37
37
|
event.target.getWorksheets((ack) => {
|
|
38
|
-
logger_1.LogAdaptableInfo('getWorksheets:', ack);
|
|
38
|
+
(0, logger_1.LogAdaptableInfo)('getWorksheets:', ack);
|
|
39
39
|
});
|
|
40
40
|
};
|
|
41
41
|
this.onWorkbookAdded = (event) => {
|
|
42
|
-
logger_1.LogAdaptableSuccess('Workbook Added: ' + event.workbook.name);
|
|
42
|
+
(0, logger_1.LogAdaptableSuccess)('Workbook Added: ' + event.workbook.name);
|
|
43
43
|
let workbook = event.workbook;
|
|
44
44
|
workbook.addEventListener('workbookActivated', this.onWorkbookActivated);
|
|
45
45
|
};
|
|
@@ -62,13 +62,13 @@ class OpenFinService {
|
|
|
62
62
|
this.excelConnected = true;
|
|
63
63
|
this.connectedCallbacks.forEach((fn) => fn());
|
|
64
64
|
this.connectedCallbacks.length = 0;
|
|
65
|
-
logger_1.LogAdaptableSuccess('Excel Connected');
|
|
65
|
+
(0, logger_1.LogAdaptableSuccess)('Excel Connected');
|
|
66
66
|
fin.desktop.Excel.addEventListener('workbookClosed', this.onWorkbookRemoved);
|
|
67
67
|
fin.desktop.Excel.addEventListener('workbookSaved', this.onWorkbookSaved);
|
|
68
68
|
fin.desktop.Excel.addEventListener('workbookAdded', this.onWorkbookAdded);
|
|
69
69
|
};
|
|
70
70
|
this.onExcelDisconnected = () => {
|
|
71
|
-
logger_1.LogAdaptableInfo('Excel Disconnected');
|
|
71
|
+
(0, logger_1.LogAdaptableInfo)('Excel Disconnected');
|
|
72
72
|
this.excelConnected = false;
|
|
73
73
|
this.initialisingExcel = null;
|
|
74
74
|
this.workbookName = undefined;
|
|
@@ -78,7 +78,7 @@ class OpenFinService {
|
|
|
78
78
|
fin.desktop.Excel.removeEventListener('workbookAdded', this.onWorkbookAdded);
|
|
79
79
|
fin.desktop.ExcelService.removeEventListener('excelConnected', this.onExcelConnected);
|
|
80
80
|
fin.desktop.ExcelService.removeEventListener('excelDisconnected', this.onExcelDisconnected);
|
|
81
|
-
logger_1.LogAdaptableInfo('Excel closed stopping all Live Excel');
|
|
81
|
+
(0, logger_1.LogAdaptableInfo)('Excel closed stopping all Live Excel');
|
|
82
82
|
this.getOpenFinApi().stopLiveData();
|
|
83
83
|
};
|
|
84
84
|
this.initialisingExcel = null;
|
|
@@ -122,7 +122,7 @@ class OpenFinService {
|
|
|
122
122
|
// since getWorkbookByName only works after getWorkbooks was called
|
|
123
123
|
return fin.desktop.Excel.getWorkbooks().then(() => {
|
|
124
124
|
this.workbookName = workbook.name;
|
|
125
|
-
logger_1.LogAdaptableInfo('added workbook', this.workbookName);
|
|
125
|
+
(0, logger_1.LogAdaptableInfo)('added workbook', this.workbookName);
|
|
126
126
|
return workbook;
|
|
127
127
|
});
|
|
128
128
|
});
|
|
@@ -163,7 +163,7 @@ class OpenFinService {
|
|
|
163
163
|
}
|
|
164
164
|
doPushData(data, { address, clear }) {
|
|
165
165
|
const OpenFinApi = this.getOpenFinApi();
|
|
166
|
-
if (!OpenFinApi || !this.options || !isRunningInOpenfin_1.isRunningInOpenfin()) {
|
|
166
|
+
if (!OpenFinApi || !this.options || !(0, isRunningInOpenfin_1.isRunningInOpenfin)()) {
|
|
167
167
|
return Promise.reject('OpenFinService error');
|
|
168
168
|
}
|
|
169
169
|
let resolve = () => { };
|
|
@@ -177,13 +177,13 @@ class OpenFinService {
|
|
|
177
177
|
const workBookName = workbook.name;
|
|
178
178
|
let workBook = fin.desktop.Excel.getWorkbookByName(workBookName);
|
|
179
179
|
if (!workBook) {
|
|
180
|
-
logger_1.LogAdaptableError('Cannot find workbook:' + workBookName);
|
|
180
|
+
(0, logger_1.LogAdaptableError)('Cannot find workbook:' + workBookName);
|
|
181
181
|
reject('Cannot find workbook:' + workBookName);
|
|
182
182
|
return;
|
|
183
183
|
}
|
|
184
184
|
this.getActiveWorksheet()
|
|
185
185
|
.then((worksheet) => {
|
|
186
|
-
logger_1.LogAdaptableInfo('Got active workheet', worksheet);
|
|
186
|
+
(0, logger_1.LogAdaptableInfo)('Got active workheet', worksheet);
|
|
187
187
|
this.onWorksheetSetData(worksheet, result);
|
|
188
188
|
if (clear) {
|
|
189
189
|
worksheet.clearAllCells(() => {
|
|
@@ -221,20 +221,20 @@ class OpenFinService {
|
|
|
221
221
|
return this.initialisingExcel;
|
|
222
222
|
}
|
|
223
223
|
this.connectedCallbacks.push(callback);
|
|
224
|
-
this.initialisingExcel = setup_1.setup()
|
|
224
|
+
this.initialisingExcel = (0, setup_1.setup)()
|
|
225
225
|
.then(() => {
|
|
226
226
|
fin.desktop.ExcelService.addEventListener('excelConnected', this.onExcelConnected);
|
|
227
227
|
fin.desktop.ExcelService.addEventListener('excelDisconnected', this.onExcelDisconnected);
|
|
228
228
|
return fin.desktop.ExcelService.init();
|
|
229
229
|
})
|
|
230
230
|
.then(() => {
|
|
231
|
-
logger_1.LogAdaptableSuccess('Excel initialized, now connecting');
|
|
231
|
+
(0, logger_1.LogAdaptableSuccess)('Excel initialized, now connecting');
|
|
232
232
|
fin.desktop.Excel.run();
|
|
233
233
|
return true;
|
|
234
234
|
})
|
|
235
235
|
.then(() => {
|
|
236
236
|
return fin.desktop.Excel.getConnectionStatus().then((connected) => {
|
|
237
|
-
logger_1.LogAdaptableSuccess('Excel status', {
|
|
237
|
+
(0, logger_1.LogAdaptableSuccess)('Excel status', {
|
|
238
238
|
initialized: fin.desktop.ExcelService.initialized,
|
|
239
239
|
connected,
|
|
240
240
|
});
|
|
@@ -12,11 +12,11 @@ const setup = async () => {
|
|
|
12
12
|
let serviceIsRunning = await isServiceRunning();
|
|
13
13
|
let assetInfo = await getAppAssetInfo();
|
|
14
14
|
if (serviceIsRunning) {
|
|
15
|
-
logger_1.LogAdaptableInfo('Service Already Running: Skipping Deployment and Registration');
|
|
15
|
+
(0, logger_1.LogAdaptableInfo)('Service Already Running: Skipping Deployment and Registration');
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
if (assetInfo.version === localStorage.installedAssetVersion && !assetInfo.forceDownload) {
|
|
19
|
-
logger_1.LogAdaptableInfo('Current Add-In version previously installed: Skipping Deployment and Registration');
|
|
19
|
+
(0, logger_1.LogAdaptableInfo)('Current Add-In version previously installed: Skipping Deployment and Registration');
|
|
20
20
|
}
|
|
21
21
|
else {
|
|
22
22
|
await deploySharedAssets();
|
|
@@ -58,7 +58,7 @@ const setup = async () => {
|
|
|
58
58
|
target: servicePath,
|
|
59
59
|
arguments: `-d "${installFolder}" -c ${manifest.runtime.version}`,
|
|
60
60
|
listener: (result) => {
|
|
61
|
-
logger_1.LogAdaptableInfo(`Asset Deployment completed! Exit Code: ${result.exitCode}`);
|
|
61
|
+
(0, logger_1.LogAdaptableInfo)(`Asset Deployment completed! Exit Code: ${result.exitCode}`);
|
|
62
62
|
resolve();
|
|
63
63
|
},
|
|
64
64
|
}, () => console.log('Deploying Shared Assets'), (err) => reject(err));
|
|
@@ -72,14 +72,14 @@ const setup = async () => {
|
|
|
72
72
|
arguments: `-i "${installFolder}"`,
|
|
73
73
|
listener: (result) => {
|
|
74
74
|
if (result.exitCode === 0) {
|
|
75
|
-
logger_1.LogAdaptableInfo('Add-In Installed');
|
|
75
|
+
(0, logger_1.LogAdaptableInfo)('Add-In Installed');
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
78
|
-
logger_1.LogAdaptableWarning(`Installation failed. Exit code: ${result.exitCode}`);
|
|
78
|
+
(0, logger_1.LogAdaptableWarning)(`Installation failed. Exit code: ${result.exitCode}`);
|
|
79
79
|
}
|
|
80
80
|
resolve();
|
|
81
81
|
},
|
|
82
|
-
}, () => logger_1.LogAdaptableInfo('Installing Add-In'), (err) => reject(err));
|
|
82
|
+
}, () => (0, logger_1.LogAdaptableInfo)('Installing Add-In'), (err) => reject(err));
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
85
|
function startExcelService() {
|
|
@@ -98,7 +98,7 @@ const setup = async () => {
|
|
|
98
98
|
arguments: '-p ' + details.port,
|
|
99
99
|
uuid: excelServiceUuid,
|
|
100
100
|
}, (process) => {
|
|
101
|
-
logger_1.LogAdaptableInfo('Service Launched: ' + process.uuid);
|
|
101
|
+
(0, logger_1.LogAdaptableInfo)('Service Launched: ' + process.uuid);
|
|
102
102
|
}, (error) => {
|
|
103
103
|
reject('Error starting Excel service');
|
|
104
104
|
});
|
package/src/View/OpenFinPopup.js
CHANGED
|
@@ -35,4 +35,4 @@ function mapDispatchToProps(dispatch) {
|
|
|
35
35
|
onShare: (entity, config) => dispatch(TeamSharingRedux.TeamSharingShare(entity, ModuleConstants.OpenFinModuleId, config)),
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
|
-
exports.OpenFinPopup = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(OpenFinPopupComponent);
|
|
38
|
+
exports.OpenFinPopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(OpenFinPopupComponent);
|
|
@@ -17,7 +17,7 @@ const ButtonSchedule_1 = require("@adaptabletools/adaptable/src/View/Components/
|
|
|
17
17
|
const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
|
|
18
18
|
const ObjectFactory_1 = require("@adaptabletools/adaptable/src/Utilities/ObjectFactory");
|
|
19
19
|
const react_redux_1 = require("react-redux");
|
|
20
|
-
const IS_OPENFIN = isRunningInOpenfin_1.isRunningInOpenfin();
|
|
20
|
+
const IS_OPENFIN = (0, isRunningInOpenfin_1.isRunningInOpenfin)();
|
|
21
21
|
class OpenFinViewPanelComponent extends React.Component {
|
|
22
22
|
constructor(props) {
|
|
23
23
|
super(props);
|
|
@@ -65,7 +65,7 @@ class OpenFinViewPanelComponent extends React.Component {
|
|
|
65
65
|
React.createElement(Dropdown_1.default, { disabled: !IS_OPENFIN || allReports.length == 0 || isLiveOpenFinReport, style: { minWidth: 160 }, options: availableReports, className: `ab-${elementType}__OpenFin__select`, placeholder: !IS_OPENFIN ? 'Not available' : 'Select Report', onChange: (reportName) => this.onSelectedReportChanged(reportName), value: this.props.currentReportName, showClearButton: true, marginRight: 2 })),
|
|
66
66
|
React.createElement(rebass_1.Flex, null,
|
|
67
67
|
isLiveOpenFinReport ? (React.createElement(ButtonPause_1.ButtonPause, { fillColor: 'red', marginLeft: 1, className: `ab-${elementType}__OpenFin__pause`, onClick: () => this.getOpenFinApi().stopLiveData(), tooltip: "Stop sync with OpenFin", disabled: !isLiveOpenFinReport, accessLevel: this.props.accessLevel })) : (React.createElement(ButtonPlay_1.ButtonPlay, { marginLeft: 1, className: `ab-${elementType}__OpenFin__play`, onClick: () => this.onOpenFinStartLiveData(), tooltip: "Start sync with OpenFin", disabled: isLiveOpenFinReport || !isCompletedReport, accessLevel: this.props.accessLevel })),
|
|
68
|
-
React.createElement(rebass_1.Flex, { className: join_1.default(this.props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__OpenFin__controls`), alignItems: "stretch" },
|
|
68
|
+
React.createElement(rebass_1.Flex, { className: (0, join_1.default)(this.props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__OpenFin__controls`), alignItems: "stretch" },
|
|
69
69
|
React.createElement(ButtonSchedule_1.ButtonSchedule, { marginLeft: 1, className: `ab-${elementType}__OpenFin__schedule`, onClick: () => this.onNewOpenFinSchedule(), tooltip: "Schedule", disabled: !IS_OPENFIN, accessLevel: this.props.accessLevel })))));
|
|
70
70
|
}
|
|
71
71
|
onSelectedReportChanged(reportName) {
|
|
@@ -105,9 +105,9 @@ function mapDispatchToProps(dispatch) {
|
|
|
105
105
|
onNewOpenFinSchedule: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ScheduleModuleId, 'SchedulePopup', {
|
|
106
106
|
action: 'New',
|
|
107
107
|
source: 'Other',
|
|
108
|
-
value: ObjectFactory_1.CreateEmptyOpenFinSchedule(),
|
|
108
|
+
value: (0, ObjectFactory_1.CreateEmptyOpenFinSchedule)(),
|
|
109
109
|
})),
|
|
110
110
|
onCurrentReportNameChange: (reportName) => dispatch(OpenFinRedux.OpenFinSetCurrentReportName(reportName)),
|
|
111
111
|
};
|
|
112
112
|
}
|
|
113
|
-
exports.OpenFinViewPanelControl = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(OpenFinViewPanelComponent);
|
|
113
|
+
exports.OpenFinViewPanelControl = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(OpenFinViewPanelComponent);
|
package/src/index.js
CHANGED
|
@@ -41,7 +41,7 @@ class OpenFinPlugin extends types_1.AdaptablePlugin {
|
|
|
41
41
|
// (idiomatic way of default parameter value in reducer is not feasible because the passed argument is already initialized by the System reducer)
|
|
42
42
|
augmentedState = Object.assign({}, augmentedState, OpenFinRedux_1.initialOpenFinState);
|
|
43
43
|
}
|
|
44
|
-
return OpenFinRedux_1.OpenFinReducer(augmentedState, action);
|
|
44
|
+
return (0, OpenFinRedux_1.OpenFinReducer)(augmentedState, action);
|
|
45
45
|
},
|
|
46
46
|
};
|
|
47
47
|
};
|
package/src/logger.js
CHANGED
|
@@ -3,4 +3,4 @@ var _a;
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.LogAdaptableWarning = exports.LogAdaptableSuccess = exports.LogAdaptableInfo = exports.LogAdaptableError = void 0;
|
|
5
5
|
const LoggingHelper_1 = require("@adaptabletools/adaptable/src/Utilities/Helpers/LoggingHelper");
|
|
6
|
-
_a = LoggingHelper_1.getLoggingFunctions('openfin'), exports.LogAdaptableError = _a.LogAdaptableError, exports.LogAdaptableInfo = _a.LogAdaptableInfo, exports.LogAdaptableSuccess = _a.LogAdaptableSuccess, exports.LogAdaptableWarning = _a.LogAdaptableWarning;
|
|
6
|
+
_a = (0, LoggingHelper_1.getLoggingFunctions)('openfin'), exports.LogAdaptableError = _a.LogAdaptableError, exports.LogAdaptableInfo = _a.LogAdaptableInfo, exports.LogAdaptableSuccess = _a.LogAdaptableSuccess, exports.LogAdaptableWarning = _a.LogAdaptableWarning;
|