@adaptabletools/adaptable-plugin-ipushpull-cjs 18.1.13 → 18.1.15-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-ipushpull-cjs",
-  "version": "18.1.13",
+  "version": "18.1.15-canary.0",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -20,7 +20,7 @@
     "styled-components": "^4.4.1",
     "tinycolor2": "^1.4.2",
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable-cjs": "18.1.13"
+    "@adaptabletools/adaptable-cjs": "18.1.15-canary.0"
   },
   "peerDependencies": {}
 }

package/src/IPushPullApiImpl.js

@@ -41,13 +41,13 @@ class IPushPullApiImpl extends ApiBase_1.ApiBase {
     sendSnapshot(iPushPullReport) {
         if (this.checkItemExists(iPushPullReport, iPushPullReport.ReportName, 'IPushPull Report')) {
             this.dispatchAction(IPushPullRedux.IPushPullSendSnapshot(iPushPullReport));
-            this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'SnapshotSent');
+            this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'SnapshotSent');
         }
     }
     startLiveData(iPushPullReport) {
         if (this.checkItemExists(iPushPullReport, iPushPullReport.ReportName, 'IPushPull Report')) {
             this.dispatchAction(IPushPullRedux.IPushPullLiveReportSet(iPushPullReport));
-            this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStarted', iPushPullReport);
+            this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStarted', iPushPullReport);
         }
     }
     stopLiveData() {
@@ -59,7 +59,7 @@ class IPushPullApiImpl extends ApiBase_1.ApiBase {
         // clear the live report
         this.dispatchAction(IPushPullRedux.IPushPullLiveReportClear());
         // fire the Live Report event for Export Stopped
-        this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStopped', currentLiveReport);
+        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStopped', currentLiveReport);
     }
     isIPushPullReportLive(iPushPullReport) {
         if (!iPushPullReport) {
@@ -125,11 +125,11 @@ class IPushPullApiImpl extends ApiBase_1.ApiBase {
     }
     setIPushPullRunningOn() {
         this.dispatchAction(IPushPullRedux.SetIPushPullRunningOn());
-        this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'Connected');
+        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'Connected');
     }
     setIPushPullRunningOff() {
         this.dispatchAction(IPushPullRedux.SetIPushPullRunningOff());
-        this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'Disconnected');
+        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'Disconnected');
     }
     isIPushPullLiveDataRunning() {
         return Helper_1.default.objectExists(this.getCurrentLiveIPushPullReport());

package/src/Module/PushPullModule.js

@@ -82,8 +82,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.AccessLevel = 'Hidden';
         }
         else {
-            this.AccessLevel = this.api.internalApi
-                .getEntitlementService()
+            this.AccessLevel = this.api.entitlementApi
                 .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
         }
     }
@@ -117,7 +116,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (currentLiveIPushPullReport) {
             this.isSendingData = true;
             let report = this.api.exportApi.getReportByName(currentLiveIPushPullReport.ReportName);
-            let reportAsArray = this.adaptable.ReportService.getReportDataAsArray(report);
+            let reportAsArray = this.api.exportApi.internalApi.getReportDataAsArray(report);
             const currentData = JSON.stringify(reportAsArray);
             if (currentData === this.lastData) {
                 this.adaptable.logger.warn(EQUAL_DATA_ERR);
@@ -140,7 +139,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             })
                 .then(() => {
                 this.lastData = currentData;
-                return this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'LiveDataUpdated', currentLiveIPushPullReport);
+                return this.api.exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataUpdated', currentLiveIPushPullReport);
             })
                 .catch((reason) => {
                 this.adaptable.logger.warn('Failed to send data to ipushpull for [' + currentLiveIPushPullReport.ReportName + ']', reason);
@@ -169,7 +168,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .then(() => {
             let report = this.api.exportApi.getReportByName(iPushPullReport.ReportName);
             if (report) {
-                let reportAsArray = this.adaptable.ReportService.getReportDataAsArray(report);
+                let reportAsArray = this.api.exportApi.internalApi.getReportDataAsArray(report);
                 if (reportAsArray) {
                     this.getIPPService().pushData(iPushPullReport.Page, reportAsArray);
                 }

package/src/Redux/ActionReducers/IPushPullRedux.js

@@ -100,7 +100,7 @@ const IPushPullSetCurrentPage = (page) => ({
 });
 exports.IPushPullSetCurrentPage = IPushPullSetCurrentPage;
 const IPushPullSetCurrentAvailablePages = (availablePages) => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES,
+    type: PluginsRedux_1.IPUSHPULL_SET_AVAILABLE_PAGES,
     availablePages,
 });
 exports.IPushPullSetCurrentAvailablePages = IPushPullSetCurrentAvailablePages;
@@ -166,7 +166,7 @@ state, action) => {
             const actionTyped = action;
             return Object.assign({}, state, { IPushPullCurrentPage: actionTyped.page });
         }
-        case PluginsRedux_1.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES: {
+        case PluginsRedux_1.IPUSHPULL_SET_AVAILABLE_PAGES: {
             const actionTyped = action;
             return Object.assign({}, state, {
                 IPushPullCurrentAvailablePages: actionTyped.availablePages,

package/src/View/IPushPullViewPanel.js

@@ -65,7 +65,7 @@ const IPushPullViewPanelComponent = (props) => {
         ? props.api.exportApi.getAvailableSystemReports()
         : [];
     let allReports = systemReports
-        .filter((s) => props.api.internalApi.getReportService().IsSystemReportActive(s))
+        .filter((s) => props.api.exportApi.internalApi.isSystemReportActive(s))
         .concat(props.Reports.map((r) => r.Name));
     let availableReports = allReports.map((report) => {
         return {
@@ -115,7 +115,7 @@ const IPushPullViewPanelComponent = (props) => {
         React.createElement(rebass_1.Flex, { style: { minWidth: '148px' } },
             React.createElement(ButtonExport_1.ButtonExport, { marginLeft: 1, className: `ab-${elementType}__IPushPull__export`, onClick: () => onIPushPullSendSnapshot(), tooltip: "Send Snapshot to ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel }),
             true ? (React.createElement(ButtonPause_1.ButtonPause, { fillColor: 'red', marginLeft: 1, className: `ab-${elementType}__IPushPull__pause`, onClick: () => props.onIPushPullStopLiveData(), tooltip: "Stop sync with ipushpull", disabled: !isLiveIPushPullReport, accessLevel: props.accessLevel })) : (React.createElement(ButtonPlay_1.ButtonPlay, { marginLeft: 1, className: `ab-${elementType}__IPushPull__play`, onClick: () => onIPushPullStartLiveData(), tooltip: "Start sync with ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })),
-            isCompletedReport && (React.createElement(rebass_1.Flex, { className: (0, join_1.default)(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__IPushPull__controls`), alignItems: "stretch" }, props.api.internalApi.getEntitlementService().isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { marginLeft: 1, className: `ab-${elementType}__IPushPull__schedule`, onClick: () => onNewIPushPullSchedule(), tooltip: "Schedule", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })))),
+            isCompletedReport && (React.createElement(rebass_1.Flex, { className: (0, join_1.default)(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__IPushPull__controls`), alignItems: "stretch" }, props.api.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { marginLeft: 1, className: `ab-${elementType}__IPushPull__schedule`, onClick: () => onNewIPushPullSchedule(), tooltip: "Schedule", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })))),
             ' ',
             React.createElement(ButtonNewPage_1.ButtonNewPage, { marginLeft: 1, className: `ab-${elementType}__IPushPull__newpage`, onClick: () => props.onShowAddIPushPullPage(), tooltip: "New Page", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel }),
             React.createElement(ButtonLogout_1.ButtonLogout, { marginLeft: 1, className: `ab-${elementType}__IPushPull__logout`, onClick: () => getIPPApi().logoutFromIPushPull(), tooltip: "Logout", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel })))) : (React.createElement(ButtonLogin_1.ButtonLogin, { marginLeft: 1, className: `ab-${elementType}__IPushPull__login`, onClick: () => props.onShowIPushPullLogin(), tooltip: "Login to ipushpull", accessLevel: props.accessLevel },