@adaptabletools/adaptable-plugin-ipushpull-cjs 20.0.0-canary.2 → 20.0.0-canary.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-ipushpull-cjs",
-  "version": "20.0.0-canary.2",
+  "version": "20.0.0-canary.20",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -18,8 +18,7 @@
     "redux": "^5.0.1",
     "styled-components": "^4.4.1",
     "tinycolor2": "^1.4.2",
-    "tslib": "^2.8.1",
-    "@adaptabletools/adaptable-cjs": "20.0.0-canary.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {}
 }

package/src/Module/PushPullModule.js

@@ -106,58 +106,55 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.ippService;
     }
     sendNewLiveData() {
-        //we wait for the last sendNewLiveData to finish
-        if (this.isSendingData == true) {
+        // We wait for the last sendNewLiveData to finish
+        if (this.isSendingData === true) {
             this.throttledRecomputeAndSendLiveDataEvent();
             return;
         }
-        let currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
+        const currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
         if (currentLiveIPushPullReport) {
             this.isSendingData = true;
-            let report = this.api.exportApi.getReportByName(currentLiveIPushPullReport.ReportName);
-            let reportAsArray = this.api.exportApi.internalApi.getReportDataAsArray(report);
-            const currentData = JSON.stringify(reportAsArray);
-            if (currentData === this.lastData) {
-                this.adaptable.logger.warn(EQUAL_DATA_ERR);
-                this.isSendingData = false;
-                return;
-            }
-            Promise.resolve()
-                .then(() => {
-                return new Promise((resolve, reject) => {
-                    if (reportAsArray) {
-                        resolve(reportAsArray);
-                    }
-                    else {
-                        reject('no data in the report');
-                    }
-                });
+            this.api.exportApi
+                .getReportData(currentLiveIPushPullReport.ReportName, 'JSON')
+                .then((exportResultData) => {
+                if (exportResultData?.type !== 'json' || !exportResultData.data) {
+                    throw new Error('No data in the report');
+                }
+                const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(exportResultData.data);
+                const currentData = JSON.stringify(reportDataAsArray);
+                if (currentData === this.lastData) {
+                    this.adaptable.logger.warn(EQUAL_DATA_ERR);
+                    this.isSendingData = false;
+                    throw new Error(EQUAL_DATA_ERR); // Using throw to exit the promise chain
+                }
+                return { reportDataAsArray, currentData };
             })
-                .then((reportAsArray) => {
-                return this.getIPPService().pushData(currentLiveIPushPullReport.Page, reportAsArray);
+                .then(({ reportDataAsArray, currentData }) => {
+                return this.getIPPService()
+                    .pushData(currentLiveIPushPullReport.Page, reportDataAsArray)
+                    .then(() => currentData); // Pass currentData to the next then
             })
-                .then(() => {
+                .then((currentData) => {
                 this.lastData = currentData;
+                this.adaptable.logger.success('All live report data sent');
+                this.isSendingData = false;
                 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);
-                this.stopLiveData();
-                let errorMessage = 'Export Failed';
-                if (reason) {
-                    errorMessage += ': ' + reason;
+                // Skip logging for expected cases
+                if (reason?.message !== EQUAL_DATA_ERR) {
+                    this.isSendingData = false;
+                    this.adaptable.logger.warn('Failed to send data to ipushpull for [' +
+                        currentLiveIPushPullReport.ReportName +
+                        ']', reason);
+                    this.stopLiveData();
+                    let errorMessage = 'Export Failed';
+                    if (reason) {
+                        errorMessage += ': ' + reason;
+                    }
+                    errorMessage += '.  This live export has been cancelled.';
+                    this.api.alertApi.showAlertError('ipushpull Export Error', errorMessage);
                 }
-                errorMessage += '.  This live export has been cancelled.';
-                this.api.alertApi.showAlertError('ipushpull Export Error', errorMessage);
-            });
-            Promise.resolve()
-                .then(() => {
-                this.adaptable.logger.success('All live report data sent');
-                this.isSendingData = false;
-            })
-                .catch(() => {
-                this.adaptable.logger.warn('Failed to send data');
-                this.isSendingData = false;
             });
         }
     }
@@ -165,13 +162,16 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.getIPPService()
             .loadPage(iPushPullReport.Folder, iPushPullReport.Page)
             .then(() => {
-            let report = this.api.exportApi.getReportByName(iPushPullReport.ReportName);
-            if (report) {
-                let reportAsArray = this.api.exportApi.internalApi.getReportDataAsArray(report);
-                if (reportAsArray) {
-                    this.getIPPService().pushData(iPushPullReport.Page, reportAsArray);
-                }
+            return this.api.exportApi.getReportData(iPushPullReport.ReportName, 'JSON');
+        })
+            .then((exportResultData) => {
+            if (exportResultData?.type === 'json' && exportResultData?.data) {
+                const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(exportResultData.data);
+                return this.getIPPService().pushData(iPushPullReport.Page, reportDataAsArray);
             }
+        })
+            .catch((error) => {
+            this.adaptable.logger.warn(`Failed to send snapshot for report [${iPushPullReport.ReportName}]`, error);
         });
     }
     startLiveData(iPushPullReport) {