@adaptabletools/adaptable-plugin-ipushpull-cjs 22.0.0-canary.6 → 22.0.0-canary.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-ipushpull-cjs",
-  "version": "22.0.0-canary.6",
+  "version": "22.0.0-canary.7",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {

package/src/Module/PushPullModule.js

@@ -139,7 +139,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             })
                 .then((currentData) => {
                 this.lastData = currentData;
-                this.adaptable.logger.success('All live report data sent');
+                this.adaptable.logger.success('Live report data sent successfully.');
                 this.isSendingData = false;
                 return this.api.exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataUpdated', currentLiveIPushPullReport);
             })
@@ -147,16 +147,14 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 // 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.adaptable.logger.warn(`Failed to send data to ipushpull for report "${currentLiveIPushPullReport.ReportName}".`, reason);
                     this.stopLiveData();
-                    let errorMessage = 'Export Failed';
+                    let errorMessage = 'Export failed';
                     if (reason) {
                         errorMessage += ': ' + reason;
                     }
-                    errorMessage += '.  This live export has been cancelled.';
-                    this.api.alertApi.showAlertError('ipushpull Export Error', errorMessage);
+                    errorMessage += '. The live export has been cancelled.';
+                    this.api.alertApi.showAlertError('ipushpull Export', errorMessage);
                 }
             });
         }
@@ -174,7 +172,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         })
             .catch((error) => {
-            this.adaptable.logger.warn(`Failed to send snapshot for report [${iPushPullReport.ReportName}]`, error);
+            this.adaptable.logger.warn(`Failed to send snapshot for report "${iPushPullReport.ReportName}".`, error);
         });
     }
     startLiveData(iPushPullReport) {

package/src/Utilities/Services/PushPullService.js

@@ -67,7 +67,7 @@ class PushPullService {
             .login(login, password)
             .then((result) => {
             this.ppInstance.__status = ServiceStatus.Connected;
-            this.adaptable.logger.success('Logged in to ipushpull');
+            this.adaptable.logger.success('Logged in to ipushpull.');
             return result;
         })
             .catch((err) => {
@@ -80,12 +80,12 @@ class PushPullService {
     // Retrieves domain pages from ipushpull
     getDomainPages() {
         if (!this.ppInstance) {
-            return Promise.reject('No ipushpull instance found!');
+            return Promise.reject('No ipushpull instance found.');
         }
         return this.ppInstance.api
             .getDomainsAndPages(this.ppInstance.config.api_key)
             .then((response) => {
-            this.adaptable.logger.success('Retrieved ipushpull Folder/Page info');
+            this.adaptable.logger.success('Retrieved ipushpull folder and page info.');
             return response.data.domains.map((domain) => ({
                 Name: domain.name,
                 FolderId: domain.id,
@@ -95,18 +95,18 @@ class PushPullService {
             }));
         })
             .catch((error) => {
-            this.adaptable.logger.error("Couldn't get Domain/Pages from ipushpull : ", error);
+            this.adaptable.logger.error('Failed to retrieve folders and pages from ipushpull.', error);
             throw error.message;
         });
     }
     loadPage(folderIPP, pageIPP) {
         if (!this.ppInstance) {
-            return Promise.reject('No ipushpull instance found!');
+            return Promise.reject('No ipushpull instance found.');
         }
         return new Promise((resolve, reject) => {
             const page = new this.ppInstance.Page(pageIPP, folderIPP);
             page.on(page.EVENT_NEW_CONTENT, () => {
-                this.adaptable.logger.info(`Page Ready : ${pageIPP}`);
+                this.adaptable.logger.info(`Page ready: "${pageIPP}".`);
                 this.pages.set(pageIPP, page);
                 resolve(page);
                 // we return true so it removes the listener for new content.
@@ -120,22 +120,22 @@ class PushPullService {
         if (pageIPP) {
             pageIPP.destroy();
             this.pages.delete(page);
-            this.adaptable.logger.info(`Page Unloaded : ${page}`);
+            this.adaptable.logger.info(`Page unloaded: "${page}".`);
         }
     }
     addNewPage(folderId, page) {
         if (!this.ppInstance) {
-            return Promise.reject('No ipushpull instance found!');
+            return Promise.reject('No ipushpull instance found.');
         }
         return this.ppInstance.Page.create(folderId, page)
             .then((createdPage) => {
-            let message = page + "' successfully created.";
-            this.adaptable.api.alertApi.showAlertSuccess('ipushpull Page', message);
+            let message = `Page "${page}" created successfully.`;
+            this.adaptable.api.alertApi.showAlertSuccess('ipushpull', message);
             this.adaptable.api.internalApi.hidePopupScreen();
             return this.getIPPApi().retrieveIPushPullDomainsFromIPushPull();
         })
             .catch((err) => {
-            this.adaptable.logger.error("Couldn't create Page: '" + page + "'. Reason: " + err);
+            this.adaptable.logger.error(`Failed to create page "${page}": ${err}`);
         });
     }
     pushData(page, data) {
@@ -202,10 +202,10 @@ class PushPullService {
             pageIPP.Content.canDoDelta = false;
             pageIPP.Content.update(newData, true);
             pageIPP.push().then(() => {
-                this.adaptable.logger.success(`Data pushed for ipushpull page : ${page}`);
+                this.adaptable.logger.success(`Data pushed for ipushpull page "${page}".`);
                 resolve();
             }, (err) => {
-                this.adaptable.logger.info(`Error pushing data for ipushpull page : ${page}`);
+                this.adaptable.logger.error(`Failed to push data for ipushpull page "${page}".`);
                 reject();
             });
         });

package/src/View/IPushPullAddPagePopup.js

@@ -29,7 +29,7 @@ const IPushPullAddPageComponent = (props) => {
     const { hidePopup } = (0, PopupContext_1.usePopupContext)();
     const onSubmit = () => {
         if (ArrayExtensions_1.default.ContainsItem(state.AvailablePages, state.Page)) {
-            setState({ ...state, ErrorMessage: 'A page with that name already exists in the folder' });
+            setState({ ...state, ErrorMessage: 'A page with that name already exists in this folder.' });
         }
         else {
             props.onAddPage(state.Folder, state.Page);

package/src/index.js

@@ -23,11 +23,7 @@ const { version, name } = package_json_1.default;
 const { version: coreVersion } = package_json_2.default;
 const suffix = name.endsWith('-cjs') ? '-cjs' : '';
 if (version !== coreVersion) {
-    console.warn(`
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!! "@adaptabletools/adaptable-plugin-ipushpull${suffix}" (v @${version}) and "@adaptabletools/adaptable${suffix}" (v @${coreVersion}) have different versions - they should have the exact same version.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-`);
+    console.warn(`Version mismatch: "@adaptabletools/adaptable-plugin-ipushpull${suffix}" (v${version}) and "@adaptabletools/adaptable${suffix}" (v${coreVersion}) have different versions. They should be the exact same version.`);
 }
 const getApiKey = () => {
     let key = env_1.default.IPUSHPULL_API_KEY; // need to make sure that is always there