@adaptabletools/adaptable-plugin-openfin 18.1.14 → 18.1.15-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-openfin",
-  "version": "18.1.14",
+  "version": "18.1.15-canary.0",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -18,7 +18,7 @@
     "redux": "4.0.5",
     "styled-components": "^4.4.1",
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "18.1.14"
+    "@adaptabletools/adaptable": "18.1.15-canary.0"
   },
   "type": "module",
   "module": "src/index.js"

package/src/Module/OpenFinModule.js

@@ -22,8 +22,7 @@ export class OpenFinModule extends AdaptableModuleBase {
             this.AccessLevel = 'Hidden';
         }
         else {
-            this.AccessLevel = this.api.internalApi
-                .getEntitlementService()
+            this.AccessLevel = this.api.entitlementApi
                 .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
         }
     }
@@ -46,15 +45,15 @@ export class OpenFinModule extends AdaptableModuleBase {
         if (currentLiveIOpenFinReport) {
             this.isSendingData = true;
             let report = this.api.exportApi.getReportByName(currentLiveIOpenFinReport.ReportName);
-            let reportData = this.adaptable.ReportService.getReportData(report, true);
+            let reportData = this.api.exportApi.internalApi.getReportData(report, true);
             this.currentReportData = reportData;
-            let ReportAsArray = this.adaptable.ReportService.convertReportDataToArray(reportData);
+            let ReportAsArray = this.api.exportApi.internalApi.convertReportDataToArray(reportData);
             return this.getOpenFinService()
                 .clearAndPushData(ReportAsArray)
                 .then(() => {
                 this.adaptable.logger.success('All live report data sent');
                 this.isSendingData = false;
-                return this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('OpenFin', 'LiveDataUpdated', currentLiveIOpenFinReport);
+                return this.api.exportApi.internalApi.publishLiveLiveDataChangedEvent('OpenFin', 'LiveDataUpdated', currentLiveIOpenFinReport);
             })
                 .catch((reason) => {
                 this.isSendingData = false;
@@ -70,36 +69,6 @@ export class OpenFinModule extends AdaptableModuleBase {
             });
         }
     }
-    // private sendReportDelta(
-    //   currentLiveOpenFinReport: OpenFinReport,
-    //   dataChangedInfo: DataChangedInfo
-    // ) {
-    //   let report: Report = this.api.exportApi.getReportByName(
-    //     currentLiveOpenFinReport.ReportName
-    //   );
-    //   const columns: AdaptableColumn[] = this.adaptable.ReportService.GetReportColumnsForReport(
-    //     report
-    //   );
-    //   let columnIndex = columns.findIndex((col) => col.ColumnId === dataChangedInfo.ColumnId);
-    //   if (columnIndex == -1) {
-    //     LogAdaptableError(
-    //       `Cannot send delta update for column ${dataChangedInfo.ColumnId}`
-    //     );
-    //     return;
-    //   }
-    //   const rowNode = this.api.gridApi.getRowNodeForPrimaryKey(
-    //     dataChangedInfo.PrimaryKeyValue
-    //   );
-    //   if (!rowNode || rowNode.rowIndex == null) {
-    //     LogAdaptableError(
-    //       `Cannot send delta update for row with primary key ${dataChangedInfo.PrimaryKeyValue}`
-    //     );
-    //   }
-    //   const rowIndex = rowNode.rowIndex as number;
-    //   const excelAddress = getExcelColumnLetter(columnIndex) + `${rowIndex + 2}`; // +1 since first row in excel are column headers and +1 since rows in excel start at 1
-    //   const data = this.adaptable.ReportService.getRowValues(rowNode, columns, report)[columnIndex];
-    //   this.getOpenFinService().pushData([[data]], excelAddress);
-    // }
     startLiveData(iOpenFinReport) {
         this.cleanup(); // just in case the previous report has not been stopped
         this.liveTimeoutId = setTimeout(() => {

package/src/OpenFinApiImpl.js

@@ -151,13 +151,13 @@ export class OpenFinApiImpl extends ApiBase {
     startLiveData(OpenFinReport) {
         if (this.checkItemExists(OpenFinReport, OpenFinReport.ReportName, 'OpenFin Report')) {
             this.dispatchAction(OpenFinRedux.OpenFinStartLiveData(OpenFinReport));
-            this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStarted', OpenFinReport);
+            this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStarted', OpenFinReport);
         }
     }
     stopLiveData() {
         let currentLiveReport = this.getCurrentLiveOpenFinReport();
         this.dispatchAction(OpenFinRedux.OpenFinStopLiveData(currentLiveReport));
         // fire the Live Report event for Export Stopped
-        this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStopped', currentLiveReport);
+        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStopped', currentLiveReport);
     }
 }

package/src/View/OpenFinViewPanel.js

@@ -37,7 +37,7 @@ class OpenFinViewPanelComponent extends React.Component {
     render() {
         let allReports = this.props.api.exportApi
             .getAvailableSystemReports()
-            .filter((s) => this.props.api.internalApi.getReportService().IsSystemReportActive(s))
+            .filter((s) => this.props.api.exportApi.internalApi.isSystemReportActive(s))
             .filter((s) => s !== GeneralConstants.VISUAL_DATA_REPORT)
             .map((s) => {
             return s;