@adaptabletools/adaptable-plugin-openfin 18.0.0-canary.9 → 18.0.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 +2 -2
- package/src/Module/OpenFinModule.js +1 -1
- package/src/excel-service/ExcelApi.js +2 -3
- package/src/index.d.ts +2 -3
- package/src/index.js +2 -31
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptabletools/adaptable-plugin-openfin",
|
|
3
|
-
"version": "18.0.
|
|
3
|
+
"version": "18.0.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "http://www.adaptabletools.com/",
|
|
6
6
|
"author": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"redux": "4.0.5",
|
|
19
19
|
"styled-components": "^4.4.1",
|
|
20
20
|
"tslib": "^2.3.0",
|
|
21
|
-
"@adaptabletools/adaptable": "18.0.
|
|
21
|
+
"@adaptabletools/adaptable": "18.0.1"
|
|
22
22
|
},
|
|
23
23
|
"type": "module",
|
|
24
24
|
"module": "src/index.js"
|
|
@@ -293,7 +293,7 @@ export class OpenFinModule extends AdaptableModuleBase {
|
|
|
293
293
|
}
|
|
294
294
|
if (pluginOptions.onValidationFailureInExcel === 'show-notification' ||
|
|
295
295
|
pluginOptions.onValidationFailureInExcel === 'show-undo-notification') {
|
|
296
|
-
const textPredicate = this.adaptable.api.
|
|
296
|
+
const textPredicate = this.adaptable.api.columnScopeApi.getScopeDescription(failedValidationRules[0].Scope) +
|
|
297
297
|
' ' +
|
|
298
298
|
((_a = failedValidationRules[0].Rule) === null || _a === void 0 ? void 0 : _a.Predicates.map((predicate) => this.adaptable.api.predicateApi.predicateToString(predicate)).join(' AND '));
|
|
299
299
|
const info = Object.assign({}, dataChangedInfos[0]);
|
|
@@ -165,9 +165,8 @@ class ExcelService extends RpcDispatcher_1.RpcDispatcher {
|
|
|
165
165
|
yield this.monitorDisconnect();
|
|
166
166
|
try {
|
|
167
167
|
this.logger.debug(this.loggerName + ': Connecting to channel: ' + excelServiceUuid);
|
|
168
|
-
let providerChannel =
|
|
169
|
-
excelServiceUuid
|
|
170
|
-
);
|
|
168
|
+
let providerChannel =
|
|
169
|
+
yield fin.desktop.InterApplicationBus.Channel.connect(excelServiceUuid);
|
|
171
170
|
this.logger.debug(
|
|
172
171
|
this.loggerName + ': Setting service provider version by requesting it from channel.'
|
|
173
172
|
);
|
package/src/index.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AdaptablePlugin } from '@adaptabletools/adaptable/types';
|
|
2
2
|
import * as Redux from 'redux';
|
|
3
3
|
import { SystemState } from '@adaptabletools/adaptable/src/PredefinedConfig/SystemState';
|
|
4
|
-
import { IModule } from '@adaptabletools/adaptable/src/Strategy/Interface/IModule';
|
|
5
4
|
import { OpenFinApi } from '@adaptabletools/adaptable/src/Api/OpenFinApi';
|
|
6
5
|
import { OpenFinPluginOptions } from '@adaptabletools/adaptable/src/AdaptableOptions/OpenFinPluginOptions';
|
|
7
6
|
import { IAdaptable } from '@adaptabletools/adaptable/src/AdaptableInterfaces/IAdaptable';
|
|
@@ -18,7 +17,7 @@ declare class OpenFinPlugin extends AdaptablePlugin {
|
|
|
18
17
|
System: (state: SystemState, action: Redux.Action) => SystemState;
|
|
19
18
|
};
|
|
20
19
|
reduxMiddleware: (adaptable: IAdaptable) => Redux.Middleware;
|
|
21
|
-
|
|
20
|
+
afterInitStore(adaptable: IAdaptable): void;
|
|
22
21
|
}
|
|
23
22
|
declare const _default: (options?: OpenFinPluginOptions) => OpenFinPlugin;
|
|
24
23
|
export default _default;
|
package/src/index.js
CHANGED
|
@@ -87,37 +87,8 @@ class OpenFinPlugin extends AdaptablePlugin {
|
|
|
87
87
|
this.registerProperty('api', () => this.openFinApi);
|
|
88
88
|
this.registerProperty('service', () => this.OpenFinService);
|
|
89
89
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
let ret = next(action);
|
|
93
|
-
const actionTyped = action as SystemRedux.ReportStartLiveAction;
|
|
94
|
-
// fire the Live Report event for Export Started
|
|
95
|
-
adaptable.ReportService.PublishLiveLiveDataChangedEvent(
|
|
96
|
-
actionTyped.ReportDestination,
|
|
97
|
-
'LiveDataStarted'
|
|
98
|
-
);
|
|
99
|
-
// set livereport on
|
|
100
|
-
// adaptable.api.internalApi.setLiveReportRunningOn();
|
|
101
|
-
return ret;
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
// Not doing this for ipushpull any more either
|
|
105
|
-
case SystemRedux.REPORT_STOP_LIVE: {
|
|
106
|
-
const actionTyped = action as SystemRedux.ReportStopLiveAction;
|
|
107
|
-
|
|
108
|
-
let ret = next(action);
|
|
109
|
-
// fire the Live Report event for Export Stopped
|
|
110
|
-
adaptable.ReportService.PublishLiveLiveDataChangedEvent(
|
|
111
|
-
actionTyped.ReportDestination,
|
|
112
|
-
'LiveDataStopped'
|
|
113
|
-
);
|
|
114
|
-
// set livereport off
|
|
115
|
-
// adaptable.api.internalApi.setLiveReportRunningOff();
|
|
116
|
-
return ret;
|
|
117
|
-
}
|
|
118
|
-
*/
|
|
119
|
-
afterInitModules(adaptable, modules) {
|
|
120
|
-
modules.set(OpenFinModuleId, new OpenFinModule(adaptable.api));
|
|
90
|
+
afterInitStore(adaptable) {
|
|
91
|
+
adaptable.adaptableModules.set(OpenFinModuleId, new OpenFinModule(adaptable.api));
|
|
121
92
|
AdaptableViewPanelFactory.set(OpenFinModuleId, OpenFinViewPanelControl);
|
|
122
93
|
}
|
|
123
94
|
}
|