@adaptabletools/adaptable-plugin-ipushpull 15.0.1 → 15.0.3-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-ipushpull",
-  "version": "15.0.1",
+  "version": "15.0.3-canary.0",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -19,6 +19,6 @@
     "redux": "4.0.5",
     "styled-components": "^4.4.1",
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "15.0.1"
+    "@adaptabletools/adaptable": "15.0.3-canary.0"
   }
 }

package/src/Module/PushPullModule.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
 const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
-const logger_1 = require("../logger");
 const GeneralConstants_1 = require("@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants");
 const EQUAL_DATA_ERR = 'equal data, so not sending';
 class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
@@ -113,7 +112,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             let reportAsArray = this.adaptable.ReportService.getReportDataAsArray(report);
             const currentData = JSON.stringify(reportAsArray);
             if (currentData === this.lastData) {
-                (0, logger_1.LogAdaptableWarning)(EQUAL_DATA_ERR);
+                this.adaptable.logger.warn(EQUAL_DATA_ERR);
                 this.isSendingData = false;
                 return;
             }
@@ -136,7 +135,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'LiveDataUpdated', currentLiveIPushPullReport);
             })
                 .catch((reason) => {
-                (0, logger_1.LogAdaptableWarning)('Failed to send data to ipushpull for [' + currentLiveIPushPullReport.ReportName + ']', reason);
+                this.adaptable.logger.warn('Failed to send data to ipushpull for [' + currentLiveIPushPullReport.ReportName + ']', reason);
                 this.stopLiveData();
                 let errorMessage = 'Export Failed';
                 if (reason) {
@@ -147,11 +146,11 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             });
             Promise.resolve()
                 .then(() => {
-                (0, logger_1.LogAdaptableSuccess)('All live report data sent');
+                this.adaptable.logger.success('All live report data sent');
                 this.isSendingData = false;
             })
                 .catch(() => {
-                (0, logger_1.LogAdaptableWarning)('Failed to send data');
+                this.adaptable.logger.warn('Failed to send data');
                 this.isSendingData = false;
             });
         }

package/src/Utilities/Services/PushPullService.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PushPullService = exports.ServiceStatus = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = require("../../logger");
 const StringExtensions_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions"));
 var ServiceStatus;
 (function (ServiceStatus) {
@@ -66,7 +65,7 @@ class PushPullService {
             .login(login, password)
             .then((result) => {
             this.ppInstance.__status = ServiceStatus.Connected;
-            (0, logger_1.LogAdaptableSuccess)('Logged in to ipushpull');
+            this.adaptable.logger.success('Logged in to ipushpull');
             return result;
         })
             .catch((err) => {
@@ -84,7 +83,7 @@ class PushPullService {
         return this.ppInstance.api
             .getDomainsAndPages(this.ppInstance.config.api_key)
             .then((response) => {
-            (0, logger_1.LogAdaptableSuccess)('Retrieved ipushpull Folder/Page info');
+            this.adaptable.logger.success('Retrieved ipushpull Folder/Page info');
             return response.data.domains.map((domain) => ({
                 Name: domain.name,
                 FolderId: domain.id,
@@ -94,7 +93,7 @@ class PushPullService {
             }));
         })
             .catch((error) => {
-            (0, logger_1.LogAdaptableError)("Couldn't get Domain/Pages from ipushpull : ", error);
+            this.adaptable.logger.error("Couldn't get Domain/Pages from ipushpull : ", error);
             throw error.message;
         });
     }
@@ -105,7 +104,7 @@ class PushPullService {
         return new Promise((resolve, reject) => {
             const page = new this.ppInstance.Page(pageIPP, folderIPP);
             page.on(page.EVENT_NEW_CONTENT, () => {
-                (0, logger_1.LogAdaptableInfo)(`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.
@@ -119,7 +118,7 @@ class PushPullService {
         if (pageIPP) {
             pageIPP.destroy();
             this.pages.delete(page);
-            (0, logger_1.LogAdaptableInfo)(`Page Unloaded : ${page}`);
+            this.adaptable.logger.info(`Page Unloaded : ${page}`);
         }
     }
     addNewPage(folderId, page) {
@@ -134,7 +133,7 @@ class PushPullService {
             return this.getIPPApi().retrieveIPushPullDomainsFromIPushPull();
         })
             .catch((err) => {
-            (0, logger_1.LogAdaptableError)("Couldn't create Page: '" + page + "'. Reason: " + err);
+            this.adaptable.logger.error("Couldn't create Page: '" + page + "'. Reason: " + err);
         });
     }
     pushData(page, data) {
@@ -203,10 +202,10 @@ class PushPullService {
             pageIPP.Content.canDoDelta = false;
             pageIPP.Content.update(newData, true);
             pageIPP.push().then(() => {
-                (0, logger_1.LogAdaptableSuccess)(`Data pushed for ipushpull page : ${page}`);
+                this.adaptable.logger.success(`Data pushed for ipushpull page : ${page}`);
                 resolve();
             }, (err) => {
-                (0, logger_1.LogAdaptableInfo)(`Error pushing data for ipushpull page : ${page}`);
+                this.adaptable.logger.info(`Error pushing data for ipushpull page : ${page}`);
                 reject();
             });
         });

package/src/logger.d.ts

@@ -1 +0,0 @@
-export declare const LogAdaptableError: (message: string, ...optionalParams: any[]) => void, LogAdaptableInfo: (message: string, ...optionalParams: any[]) => void, LogAdaptableSuccess: (message: string, ...optionalParams: any[]) => void, LogAdaptableWarning: (message: string, ...optionalParams: any[]) => void;

package/src/logger.js

@@ -1,6 +0,0 @@
-"use strict";
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogAdaptableWarning = exports.LogAdaptableSuccess = exports.LogAdaptableInfo = exports.LogAdaptableError = void 0;
-const LoggingHelper_1 = require("@adaptabletools/adaptable/src/Utilities/Helpers/LoggingHelper");
-_a = (0, LoggingHelper_1.getLoggingFunctions)('ipushpull'), exports.LogAdaptableError = _a.LogAdaptableError, exports.LogAdaptableInfo = _a.LogAdaptableInfo, exports.LogAdaptableSuccess = _a.LogAdaptableSuccess, exports.LogAdaptableWarning = _a.LogAdaptableWarning;