@adaptabletools/adaptable-plugin-ipushpull 16.2.4 → 17.0.0-canary.1

package/README.md

@@ -0,0 +1,113 @@
+# AdapTable ipushpull Plugin Read Me
+
+The ipushpull plugin connects AdapTable with [ipushpull](https://www.ipushpull.com) the market-leading collaborative software.
+
+It allows user to send Reports - either System Reports shipped by AdapTable or those created via the AdapTable Export function - to ipushpull and from their to Symphony and other destinations.
+
+## Version 7 
+Version 7 of AdapTable made significant changes to how ipushpull is set up, primarily by using this dedicated plugin.
+
+As a consequence, the ipushpull section from Predefined Config was removed and no ipushpull information is provided by users that way.
+
+Similarly all ipushpull state is now transient and **not persisted** when the application ends.
+
+Instead we now use the `ipushpullPluginOptions` object in a similar way to other plugins. 
+
+The actual ipushpull functionality is unchanged, and the information required to be supplied by the user is identical but it now done through Options and not Predefined Config - isolating it in this way enables us to add more ipushpull-related functionality in a much quicker and safer way, isolated from the rest of the application.
+
+## ipushpull Options
+
+The ipushpull plugin contains an `ipushpullPluginOptions` object which allows users to set up their instance.
+
+It contains credential details, useful properties (e.g. `throttleTime`, `autoLogin` etc.) and the ipupshpull config object.
+
+## ipushpull Api
+
+The `ipushpullApi` is available for full runtime programmatic access to ipushpull objects and methods.
+
+> Note: because ipushpull is a plugin, you can get hold of this object through the `getPluginApi` method of pluginsApi.
+
+## ipushpull Setup Example
+ 
+  ```ts
+  
+  // set up AdaptableOptions
+  const adaptableOptions: AdaptableOptions = {
+     ******
+      plugins: [
+      ipp({
+          username: process.env.IPUSHPULL_USERNAME,
+          password: process.env.IPUSHPULL_PASSWORD,
+          throttleTime: 5000,
+          includeSystemReports: true,
+          ippConfig: {
+             api_secret: process.env.IPUSHPULL_API_KEY,
+             api_key: process.env.IPUSHPULL_API_KEY,
+             api_url: 'https://www.ipushpull.com/api/1.0',
+             ws_url: 'https://www.ipushpull.com',
+             web_url: 'https://www.ipushpull.com',
+             docs_url: 'https://docs.ipushpull.com',
+             storage_prefix: 'ipp_local',
+             transport: 'polling',
+             hsts: false, // strict cors policy
+         },
+       }),
+     ],
+    ******
+   };
+   
+  // Instantitate AdapTable and get the main Api object 
+  adaptableApi = await Adaptable.init(adaptableOptions);
+  
+  // use the plugins api to get the IPushPullApi object
+  const ipushpullApi: IPushPullApi = adaptableApi.pluginsApi.getPluginApi(
+    'ipushpull'
+  );
+  
+ ```
+
+## ipushpull Toolbar
+
+The ipushpull plugin includes a dedicated ipushpull Toolbar - the main way to interact with ipushpull inside AdapTable.
+
+At start-up this simply displays a login button that, when clicked, opens a login screen asking for username and password.
+
+> There is a `AutoLogin` property option which will automatically log the user in to ipushpull (if the correct credentials have been provided in ipushpull Plugin Options).
+
+Once the user is successfully logged in, the Toolbar will contain a number of elements (primarily dropdowns and buttons). These include:
+
+### Dropdowns
+
+1. **Reports Dropdown** - this shows all the Reports that have been created via the Export function.
+    > This dropdown will also include any System Reports that AdapTable ships by default (e.g. Selected Cells); however these can be removed by setting `IncludeSystemReports` to false
+
+2. **Folders Dropdown** - lists all the folders (aka 'Domains') to which the user has access in ipushpull
+
+3. **Pages Dropdown** - lists all the ipushpull pages in the currently selected Folder (in the Folders Dropdown).
+
+### Buttons
+
+1. **Send Snapshot** - this will run the current report and send the data to the currently selected ipushpull page.  This is a **one-off** action.
+
+2. **Run Live Report** - this will run the current report and send the data to the currently selected ipushpull page.  It will also send live updates so as the data in the grid ticks and the report updaes, ipushpull will be updated in real time.
+   > The button displays a 'Play' icon; however, when a Live Report is running this changes to a 'Pause' icon.
+
+3. **New ipushpull Page** - alllows the user to create a new ipushpull page in the folder of his choice.
+
+4. **Create Schedule** - enables an ipushpull report to be sent at a schedule of the user's choice
+   >This leverages AdapTable Scheduling which enables actions to be performed either at a one off date and time or to be repeated daily at a scheduled time.  
+
+5. **Logout Button** - logs the User out of ipushpull (and displays the login button).
+
+
+## Help
+
+Developers can learn how to access AdapTable programmatically at [AdapTable Documentation](https://docs.adaptabletools.com).
+
+## More Information
+
+General information about Adaptable Tools is available at our [Website](http://www.adaptabletools.com) 
+
+## Support
+
+For all support enquiries please email [`support@adaptabletools.com`](mailto:support@adaptabletools.com) or [raise a Support Ticket](https://adaptabletools.zendesk.com/hc/en-us/requests/new).

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@adaptabletools/adaptable-plugin-ipushpull",
-  "version": "16.2.4",
+  "version": "17.0.0-canary.1",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
     "name": "Jonny Wolfson",
     "email": "jonny.wolfson@adaptabletools.com"
   },
-  "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
     "ipushpull-js": "^2.25.0",
@@ -19,6 +18,10 @@
     "redux": "4.0.5",
     "styled-components": "^4.4.1",
     "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "16.2.4"
+    "@adaptabletools/adaptable": "17.0.0-canary.1"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./src/index.js"
   }
 }

package/src/IPushPullApiImpl.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPushPullApiImpl = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("@adaptabletools/adaptable/src/Api/Implementation/ApiBase");
-const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
-const IPushPullRedux = tslib_1.__importStar(require("./Redux/ActionReducers/IPushPullRedux"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/Extensions/ArrayExtensions"));
-const Helper_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/Helpers/Helper"));
-class IPushPullApiImpl extends ApiBase_1.ApiBase {
+import { ApiBase } from '@adaptabletools/adaptable/src/Api/Implementation/ApiBase';
+import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
+import * as IPushPullRedux from './Redux/ActionReducers/IPushPullRedux';
+import ArrayExtensions from '@adaptabletools/adaptable/src/Utilities/Extensions/ArrayExtensions';
+import Helper from '@adaptabletools/adaptable/src/Utilities/Helpers/Helper';
+export class IPushPullApiImpl extends ApiBase {
     constructor(adaptable, options) {
         super(adaptable);
         this.ippService = null;
@@ -80,7 +76,7 @@ class IPushPullApiImpl extends ApiBase_1.ApiBase {
     getPagesForIPushPullDomain(folderName) {
         let returnArray = [];
         let iPushPullDomains = this.getIPushPullDomains();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(iPushPullDomains)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(iPushPullDomains)) {
             let iPushPullDomain = iPushPullDomains.find((f) => f.Name == folderName);
             if (iPushPullDomain) {
                 returnArray = iPushPullDomain.Pages;
@@ -132,7 +128,7 @@ class IPushPullApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.ReportService.PublishLiveLiveDataChangedEvent('ipushpull', 'Disconnected');
     }
     isIPushPullLiveDataRunning() {
-        return Helper_1.default.objectExists(this.getCurrentLiveIPushPullReport());
+        return Helper.objectExists(this.getCurrentLiveIPushPullReport());
     }
     getIPPService() {
         if (!this.ippService) {
@@ -169,4 +165,3 @@ class IPushPullApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(IPushPullRedux.IPushPullLiveReportClear());
     }
 }
-exports.IPushPullApiImpl = IPushPullApiImpl;

package/src/Module/Interface/IPushPullModule.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/src/Module/PushPullModule.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PushPullModule = void 0;
-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 GeneralConstants_1 = require("@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants");
+import { AdaptableModuleBase } from '@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase';
+import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
+import throttle from 'lodash/throttle';
+import { SELECTED_CELLS_REPORT, DEFAULT_LIVE_REPORT_THROTTLE_TIME, SELECTED_ROWS_REPORT, } from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
 const EQUAL_DATA_ERR = 'equal data, so not sending';
-class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+export class PushPullModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.IPushPullModuleId, 'ipushpull', 'download', null, 'Send data from AdapTable to ipushpull', api);
         this.isSendingData = false;
@@ -15,7 +11,7 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.adaptable = api.internalApi.getAdaptableInstance();
         this.api.eventApi.on('AdaptableReady', () => {
             setTimeout(() => {
-                this.throttledRecomputeAndSendLiveDataEvent = (0, throttle_1.default)(() => this.sendNewLiveData(), this.getThrottleTimeFromState());
+                this.throttledRecomputeAndSendLiveDataEvent = throttle(() => this.sendNewLiveData(), this.getThrottleTimeFromState());
             }, 1000);
         });
         // if a piece of data has updated then update any live reports except cell or row selected where the data change is relevant
@@ -28,8 +24,8 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (api.isIPushPullLiveDataRunning()) {
                 let currentLiveIPushPullReport = api.getCurrentLiveIPushPullReport();
                 if (currentLiveIPushPullReport &&
-                    currentLiveIPushPullReport.ReportName !== GeneralConstants_1.SELECTED_CELLS_REPORT &&
-                    currentLiveIPushPullReport.ReportName !== GeneralConstants_1.SELECTED_ROWS_REPORT &&
+                    currentLiveIPushPullReport.ReportName !== SELECTED_CELLS_REPORT &&
+                    currentLiveIPushPullReport.ReportName !== SELECTED_ROWS_REPORT &&
                     exportApi.internalApi.isDataChangeInReport(cellDataChangedInfo, this.getCurrentReport())) {
                     this.throttledRecomputeAndSendLiveDataEvent();
                 }
@@ -42,13 +38,13 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
         // if the grid filters have changed then update any live reports except cell or row selected
-        this.adaptable._on('GridFiltered', () => {
+        this.adaptable._on('AdapTableFiltersApplied', () => {
             // Rerun all reports except selected cells / rows when filter changes
             if (this.getIPPApi().isIPushPullLiveDataRunning()) {
                 let currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
                 if (currentLiveIPushPullReport &&
-                    currentLiveIPushPullReport.ReportName !== GeneralConstants_1.SELECTED_CELLS_REPORT &&
-                    currentLiveIPushPullReport.ReportName !== GeneralConstants_1.SELECTED_ROWS_REPORT) {
+                    currentLiveIPushPullReport.ReportName !== SELECTED_CELLS_REPORT &&
+                    currentLiveIPushPullReport.ReportName !== SELECTED_ROWS_REPORT) {
                     this.throttledRecomputeAndSendLiveDataEvent();
                 }
             }
@@ -58,8 +54,8 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (this.getIPPApi().isIPushPullLiveDataRunning()) {
                 let currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
                 if (currentLiveIPushPullReport &&
-                    (currentLiveIPushPullReport.ReportName === GeneralConstants_1.SELECTED_CELLS_REPORT ||
-                        currentLiveIPushPullReport.ReportName === GeneralConstants_1.SELECTED_ROWS_REPORT)) {
+                    (currentLiveIPushPullReport.ReportName === SELECTED_CELLS_REPORT ||
+                        currentLiveIPushPullReport.ReportName === SELECTED_ROWS_REPORT)) {
                     this.throttledRecomputeAndSendLiveDataEvent();
                 }
             }
@@ -184,7 +180,6 @@ class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.getIPPApi().isIPushPullRunning()) {
             iPushPullThrottleTime = this.getIPPApi().getIPushPullThrottleTime();
         }
-        return iPushPullThrottleTime ? iPushPullThrottleTime : GeneralConstants_1.DEFAULT_LIVE_REPORT_THROTTLE_TIME;
+        return iPushPullThrottleTime ? iPushPullThrottleTime : DEFAULT_LIVE_REPORT_THROTTLE_TIME;
     }
 }
-exports.PushPullModule = PushPullModule;

package/src/Redux/ActionReducers/IPushPullRedux.js

@@ -1,172 +1,148 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPushPullReducer = exports.iPushPullInitialState = exports.IPushPullSetCurrentAvailablePages = exports.IPushPullSetCurrentPage = exports.IPushPullSetCurrentFolder = exports.IPushPullSetCurrentReportName = exports.IPushPullLiveReportClear = exports.IPushPullLiveReportSet = exports.IPushPullClearDomainsPages = exports.IPushPullSetDomainsPages = exports.SetIPushPullRunningOff = exports.SetIPushPullRunningOn = exports.SetIPushPullAvailableOff = exports.SetIPushPullAvailableOn = exports.IPushPullAddPage = exports.IPushPullSetLoginErrorMessage = exports.IPushPullSetLoginDetails = exports.IPushPullLogout = exports.IPushPullLogin = exports.IPushPullStopLiveData = exports.IPushPullStartLiveData = exports.IPushPullSendSnapshot = exports.IPushPullSetThrottleTime = void 0;
-const GeneralConstants_1 = require("@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants");
-const PluginsRedux_1 = require("@adaptabletools/adaptable/src/Redux/ActionsReducers/PluginsRedux");
-const IPushPullSetThrottleTime = (throttleTime) => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_THROTTLE_TIME,
+import { EMPTY_ARRAY, EMPTY_STRING, } from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
+import { IPUSHPULL_SET_THROTTLE_TIME, IPUSHPULL_SEND_SNAPSHOT, IPUSHPULL_START_LIVE_DATA, IPUSHPULL_STOP_LIVE_DATA, IPUSHPULL_LOGIN, IPUSHPULL_LOGOUT, IPUSHPULL_SET_LOGIN_DETAILS, IPUSHPULL_SET_LOGIN_ERROR_MESSAGE, IPUSHPULL_ADD_PAGE, IPUSHPULL_SET_AVAILABLE_ON, IPUSHPULL_SET_AVAILABLE_OFF, IPUSHPULL_SET_RUNNING_ON, IPUSHPULL_SET_RUNNING_OFF, IPUSHPULL_DOMAIN_PAGES_SET, IPUSHPULL_DOMAIN_PAGES_CLEAR, IPUSHPULL_LIVE_REPORT_SET, IPUSHPULL_LIVE_REPORT_CLEAR, IPUSHPULL_SET_CURRENT_REPORTNAME, IPUSHPULL_SET_CURRENT_FOLDER, IPUSHPULL_SET_CURRENT_PAGE, IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES, } from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PluginsRedux';
+export const IPushPullSetThrottleTime = (throttleTime) => ({
+    type: IPUSHPULL_SET_THROTTLE_TIME,
     throttleTime,
 });
-exports.IPushPullSetThrottleTime = IPushPullSetThrottleTime;
-const IPushPullSendSnapshot = (iPushPullReport) => ({
-    type: PluginsRedux_1.IPUSHPULL_SEND_SNAPSHOT,
+export const IPushPullSendSnapshot = (iPushPullReport) => ({
+    type: IPUSHPULL_SEND_SNAPSHOT,
     iPushPullReport,
 });
-exports.IPushPullSendSnapshot = IPushPullSendSnapshot;
-const IPushPullStartLiveData = (iPushPullReport) => ({
-    type: PluginsRedux_1.IPUSHPULL_START_LIVE_DATA,
+export const IPushPullStartLiveData = (iPushPullReport) => ({
+    type: IPUSHPULL_START_LIVE_DATA,
     iPushPullReport,
 });
-exports.IPushPullStartLiveData = IPushPullStartLiveData;
-const IPushPullStopLiveData = () => ({
-    type: PluginsRedux_1.IPUSHPULL_STOP_LIVE_DATA,
+export const IPushPullStopLiveData = () => ({
+    type: IPUSHPULL_STOP_LIVE_DATA,
 });
-exports.IPushPullStopLiveData = IPushPullStopLiveData;
-const IPushPullLogin = (username, password) => ({
-    type: PluginsRedux_1.IPUSHPULL_LOGIN,
+export const IPushPullLogin = (username, password) => ({
+    type: IPUSHPULL_LOGIN,
     username,
     password,
 });
-exports.IPushPullLogin = IPushPullLogin;
-const IPushPullLogout = () => ({
-    type: PluginsRedux_1.IPUSHPULL_LOGOUT,
+export const IPushPullLogout = () => ({
+    type: IPUSHPULL_LOGOUT,
 });
-exports.IPushPullLogout = IPushPullLogout;
-const IPushPullSetLoginDetails = (username, password) => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_LOGIN_DETAILS,
+export const IPushPullSetLoginDetails = (username, password) => ({
+    type: IPUSHPULL_SET_LOGIN_DETAILS,
     username,
     password,
 });
-exports.IPushPullSetLoginDetails = IPushPullSetLoginDetails;
-const IPushPullSetLoginErrorMessage = (errorMessage) => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_LOGIN_ERROR_MESSAGE,
+export const IPushPullSetLoginErrorMessage = (errorMessage) => ({
+    type: IPUSHPULL_SET_LOGIN_ERROR_MESSAGE,
     errorMessage,
 });
-exports.IPushPullSetLoginErrorMessage = IPushPullSetLoginErrorMessage;
-const IPushPullAddPage = (folder, page) => ({
-    type: PluginsRedux_1.IPUSHPULL_ADD_PAGE,
+export const IPushPullAddPage = (folder, page) => ({
+    type: IPUSHPULL_ADD_PAGE,
     folder,
     page,
 });
-exports.IPushPullAddPage = IPushPullAddPage;
-const SetIPushPullAvailableOn = () => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_AVAILABLE_ON,
+export const SetIPushPullAvailableOn = () => ({
+    type: IPUSHPULL_SET_AVAILABLE_ON,
 });
-exports.SetIPushPullAvailableOn = SetIPushPullAvailableOn;
-const SetIPushPullAvailableOff = () => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_AVAILABLE_OFF,
+export const SetIPushPullAvailableOff = () => ({
+    type: IPUSHPULL_SET_AVAILABLE_OFF,
 });
-exports.SetIPushPullAvailableOff = SetIPushPullAvailableOff;
-const SetIPushPullRunningOn = () => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_RUNNING_ON,
+export const SetIPushPullRunningOn = () => ({
+    type: IPUSHPULL_SET_RUNNING_ON,
 });
-exports.SetIPushPullRunningOn = SetIPushPullRunningOn;
-const SetIPushPullRunningOff = () => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_RUNNING_OFF,
+export const SetIPushPullRunningOff = () => ({
+    type: IPUSHPULL_SET_RUNNING_OFF,
 });
-exports.SetIPushPullRunningOff = SetIPushPullRunningOff;
-const IPushPullSetDomainsPages = (IPushPullDomainsPages) => {
+export const IPushPullSetDomainsPages = (IPushPullDomainsPages) => {
     return {
-        type: PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_SET,
+        type: IPUSHPULL_DOMAIN_PAGES_SET,
         IPushPullDomainsPages,
     };
 };
-exports.IPushPullSetDomainsPages = IPushPullSetDomainsPages;
-const IPushPullClearDomainsPages = () => {
+export const IPushPullClearDomainsPages = () => {
     return {
-        type: PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_CLEAR,
+        type: IPUSHPULL_DOMAIN_PAGES_CLEAR,
     };
 };
-exports.IPushPullClearDomainsPages = IPushPullClearDomainsPages;
-const IPushPullLiveReportSet = (iPushPullReport) => ({
-    type: PluginsRedux_1.IPUSHPULL_LIVE_REPORT_SET,
+export const IPushPullLiveReportSet = (iPushPullReport) => ({
+    type: IPUSHPULL_LIVE_REPORT_SET,
     iPushPullReport,
 });
-exports.IPushPullLiveReportSet = IPushPullLiveReportSet;
-const IPushPullLiveReportClear = () => ({
-    type: PluginsRedux_1.IPUSHPULL_LIVE_REPORT_CLEAR,
+export const IPushPullLiveReportClear = () => ({
+    type: IPUSHPULL_LIVE_REPORT_CLEAR,
 });
-exports.IPushPullLiveReportClear = IPushPullLiveReportClear;
-const IPushPullSetCurrentReportName = (reportName) => ({ type: PluginsRedux_1.IPUSHPULL_SET_CURRENT_REPORTNAME, reportName });
-exports.IPushPullSetCurrentReportName = IPushPullSetCurrentReportName;
-const IPushPullSetCurrentFolder = (folder) => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_CURRENT_FOLDER,
+export const IPushPullSetCurrentReportName = (reportName) => ({ type: IPUSHPULL_SET_CURRENT_REPORTNAME, reportName });
+export const IPushPullSetCurrentFolder = (folder) => ({
+    type: IPUSHPULL_SET_CURRENT_FOLDER,
     folder,
 });
-exports.IPushPullSetCurrentFolder = IPushPullSetCurrentFolder;
-const IPushPullSetCurrentPage = (page) => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_CURRENT_PAGE,
+export const IPushPullSetCurrentPage = (page) => ({
+    type: IPUSHPULL_SET_CURRENT_PAGE,
     page,
 });
-exports.IPushPullSetCurrentPage = IPushPullSetCurrentPage;
-const IPushPullSetCurrentAvailablePages = (availablePages) => ({
-    type: PluginsRedux_1.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES,
+export const IPushPullSetCurrentAvailablePages = (availablePages) => ({
+    type: IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES,
     availablePages,
 });
-exports.IPushPullSetCurrentAvailablePages = IPushPullSetCurrentAvailablePages;
-exports.iPushPullInitialState = {
+export const iPushPullInitialState = {
     IsIPushPullRunning: false,
-    IPushPullDomainsPages: GeneralConstants_1.EMPTY_ARRAY,
+    IPushPullDomainsPages: EMPTY_ARRAY,
     CurrentLiveIPushPullReport: undefined,
     IPushPullLoginErrorMessage: undefined,
-    IPushPullCurrentReportName: GeneralConstants_1.EMPTY_STRING,
-    IPushPullCurrentFolder: GeneralConstants_1.EMPTY_STRING,
-    IPushPullCurrentPage: GeneralConstants_1.EMPTY_STRING,
-    IPushPullCurrentAvailablePages: GeneralConstants_1.EMPTY_ARRAY,
+    IPushPullCurrentReportName: EMPTY_STRING,
+    IPushPullCurrentFolder: EMPTY_STRING,
+    IPushPullCurrentPage: EMPTY_STRING,
+    IPushPullCurrentAvailablePages: EMPTY_ARRAY,
 };
-const IPushPullReducer = (
+export const IPushPullReducer = (
 // initial state is handled in the plugin rootReducer
 state, action) => {
     switch (action.type) {
-        case PluginsRedux_1.IPUSHPULL_SET_AVAILABLE_ON:
+        case IPUSHPULL_SET_AVAILABLE_ON:
             return Object.assign({}, state, { IsIPushPullAvailable: true });
-        case PluginsRedux_1.IPUSHPULL_SET_AVAILABLE_OFF:
+        case IPUSHPULL_SET_AVAILABLE_OFF:
             return Object.assign({}, state, { IsIPushPullAvailable: false });
-        case PluginsRedux_1.IPUSHPULL_SET_RUNNING_ON:
+        case IPUSHPULL_SET_RUNNING_ON:
             return Object.assign({}, state, { IsIPushPullRunning: true });
-        case PluginsRedux_1.IPUSHPULL_SET_RUNNING_OFF:
+        case IPUSHPULL_SET_RUNNING_OFF:
             return Object.assign({}, state, { IsIPushPullRunning: false });
-        case PluginsRedux_1.IPUSHPULL_SET_LOGIN_DETAILS: {
+        case IPUSHPULL_SET_LOGIN_DETAILS: {
             let loginAction = action;
             return Object.assign(Object.assign({}, state), { CurrentIPushpullUsername: loginAction.username, CurrentIPushpullPassword: loginAction.password });
         }
-        case PluginsRedux_1.IPUSHPULL_LOGOUT: {
+        case IPUSHPULL_LOGOUT: {
             return Object.assign(Object.assign({}, state), { CurrentIPushpullUsername: undefined, CurrentIPushpullPassword: undefined });
         }
-        case PluginsRedux_1.IPUSHPULL_SET_LOGIN_ERROR_MESSAGE: {
+        case IPUSHPULL_SET_LOGIN_ERROR_MESSAGE: {
             return Object.assign(Object.assign({}, state), { IPushPullLoginErrorMessage: action.errorMessage });
         }
-        case PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_SET: {
+        case IPUSHPULL_DOMAIN_PAGES_SET: {
             return Object.assign({}, state, {
                 IPushPullDomainsPages: action.IPushPullDomainsPages || [],
             });
         }
-        case PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_CLEAR: {
+        case IPUSHPULL_DOMAIN_PAGES_CLEAR: {
             return Object.assign({}, state, {
                 IPushPullDomainsPages: [],
             });
         }
-        case PluginsRedux_1.IPUSHPULL_LIVE_REPORT_SET: {
+        case IPUSHPULL_LIVE_REPORT_SET: {
             const actionType = action;
             return Object.assign({}, state, { CurrentLiveIPushPullReport: actionType.iPushPullReport });
         }
-        case PluginsRedux_1.IPUSHPULL_LIVE_REPORT_CLEAR: {
+        case IPUSHPULL_LIVE_REPORT_CLEAR: {
             // const atctionType = action as IPushPullLiveReportSetAction;
             return Object.assign({}, state, { CurrentLiveIPushPullReport: undefined });
         }
-        case PluginsRedux_1.IPUSHPULL_SET_CURRENT_REPORTNAME: {
+        case IPUSHPULL_SET_CURRENT_REPORTNAME: {
             const actionTyped = action;
             return Object.assign({}, state, { IPushPullCurrentReportName: actionTyped.reportName });
         }
-        case PluginsRedux_1.IPUSHPULL_SET_CURRENT_FOLDER: {
+        case IPUSHPULL_SET_CURRENT_FOLDER: {
             const actionTyped = action;
             return Object.assign({}, state, { IPushPullCurrentFolder: actionTyped.folder });
         }
-        case PluginsRedux_1.IPUSHPULL_SET_CURRENT_PAGE: {
+        case IPUSHPULL_SET_CURRENT_PAGE: {
             const actionTyped = action;
             return Object.assign({}, state, { IPushPullCurrentPage: actionTyped.page });
         }
-        case PluginsRedux_1.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES: {
+        case IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES: {
             const actionTyped = action;
             return Object.assign({}, state, {
                 IPushPullCurrentAvailablePages: actionTyped.availablePages,
@@ -176,4 +152,3 @@ state, action) => {
             return state;
     }
 };
-exports.IPushPullReducer = IPushPullReducer;

package/src/Utilities/Services/Interface/IPushPullService.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/src/Utilities/Services/PushPullService.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PushPullService = exports.ServiceStatus = void 0;
-const tslib_1 = require("tslib");
-const StringExtensions_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions"));
-var ServiceStatus;
+import StringExtensions from '@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions';
+export var ServiceStatus;
 (function (ServiceStatus) {
     ServiceStatus["Unknown"] = "Unknown";
     ServiceStatus["Disconnected"] = "Disconnected";
     ServiceStatus["Connected"] = "Connected";
     ServiceStatus["Error"] = "Error";
-})(ServiceStatus = exports.ServiceStatus || (exports.ServiceStatus = {}));
-class PushPullService {
+})(ServiceStatus || (ServiceStatus = {}));
+export class PushPullService {
     constructor(adaptable) {
         this.adaptable = adaptable;
         this.ppInstance = null;
@@ -31,8 +27,8 @@ class PushPullService {
                         // get the username and passwrord from the options
                         let userName = this.getIPPApi().getIPushPullUsername();
                         let password = this.getIPPApi().getIPushPullPassword();
-                        if (StringExtensions_1.default.IsNotNullOrEmpty(userName) &&
-                            StringExtensions_1.default.IsNotNullOrEmpty(password)) {
+                        if (StringExtensions.IsNotNullOrEmpty(userName) &&
+                            StringExtensions.IsNotNullOrEmpty(password)) {
                             try {
                                 // slightly circular but it means tht we do the logic in one go..
                                 this.getIPPApi().loginToIPushPull(userName, password);
@@ -211,4 +207,3 @@ class PushPullService {
         });
     }
 }
-exports.PushPullService = PushPullService;

package/src/View/IPushPullAddPagePopup.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 import { IPushPullDomain } from '@adaptabletools/adaptable/src/PredefinedConfig/IPushPullState';
 interface IPushPullAddPagePopupProps {
@@ -5,5 +6,5 @@ interface IPushPullAddPagePopupProps {
     onAddPage: (folder: string, page: string) => IPushPullRedux.IPushPullAddPageAction;
     onCancel: () => any;
 }
-export declare let IPushPullAddPagePopup: import("react-redux").ConnectedComponent<(props: IPushPullAddPagePopupProps) => JSX.Element, import("react-redux").Omit<IPushPullAddPagePopupProps, "IPushPullDomainsPages" | "onCancel" | "onAddPage">>;
+export declare let IPushPullAddPagePopup: import("react-redux").ConnectedComponent<(props: IPushPullAddPagePopupProps) => JSX.Element, import("react-redux").Omit<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, "IPushPullDomainsPages" | "onCancel" | "onAddPage">>;
 export {};

package/src/View/IPushPullAddPagePopup.js

@@ -1,34 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPushPullAddPagePopup = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
-const PopupRedux = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux"));
-const IPushPullRedux = tslib_1.__importStar(require("../Redux/ActionReducers/IPushPullRedux"));
-const StringExtensions_1 = require("@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions");
-const FormLayout_1 = tslib_1.__importStar(require("@adaptabletools/adaptable/src/components/FormLayout"));
-const Input_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/Input"));
-const SimpleButton_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/SimpleButton"));
-const FlexWithFooter_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/FlexWithFooter"));
-const PanelWithImage_1 = require("@adaptabletools/adaptable/src/View/Components/Panels/PanelWithImage");
-const PopupContext_1 = require("@adaptabletools/adaptable/src/View/Components/Popups/AdaptablePopup/PopupContext");
-const ErrorBox_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/ErrorBox"));
-const HelpBlock_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/HelpBlock"));
-const rebass_1 = require("rebass");
-const Dropdown_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/Dropdown"));
-const GeneralConstants_1 = require("@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/Extensions/ArrayExtensions"));
+import * as React from 'react';
+import { connect } from 'react-redux';
+import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
+import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
+import { StringExtensions } from '@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions';
+import FormLayout, { FormRow } from '@adaptabletools/adaptable/src/components/FormLayout';
+import Input from '@adaptabletools/adaptable/src/components/Input';
+import SimpleButton from '@adaptabletools/adaptable/src/components/SimpleButton';
+import FlexWithFooter from '@adaptabletools/adaptable/src/components/FlexWithFooter';
+import { PanelWithImage } from '@adaptabletools/adaptable/src/View/Components/Panels/PanelWithImage';
+import { usePopupContext } from '@adaptabletools/adaptable/src/View/Components/Popups/AdaptablePopup/PopupContext';
+import ErrorBox from '@adaptabletools/adaptable/src/components/ErrorBox';
+import HelpBlock from '@adaptabletools/adaptable/src/components/HelpBlock';
+import { Flex } from 'rebass';
+import Dropdown from '@adaptabletools/adaptable/src/components/Dropdown';
+import { EMPTY_STRING, EMPTY_ARRAY, } from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
+import ArrayExtensions from '@adaptabletools/adaptable/src/Utilities/Extensions/ArrayExtensions';
 const IPushPullAddPageComponent = (props) => {
     const [state, setState] = React.useState({
         Folder: '',
         Page: '',
-        AvailablePages: GeneralConstants_1.EMPTY_ARRAY,
+        AvailablePages: EMPTY_ARRAY,
         ErrorMessage: '',
     });
-    const { hidePopup } = (0, PopupContext_1.usePopupContext)();
+    const { hidePopup } = usePopupContext();
     const onSubmit = () => {
-        if (ArrayExtensions_1.default.ContainsItem(state.AvailablePages, state.Page)) {
+        if (ArrayExtensions.ContainsItem(state.AvailablePages, state.Page)) {
             setState(Object.assign(Object.assign({}, state), { ErrorMessage: 'A page with that name already exists in the folder' }));
         }
         else {
@@ -40,21 +36,21 @@ const IPushPullAddPageComponent = (props) => {
         setState(Object.assign(Object.assign({}, state), { Page: e.value }));
     };
     const onFolderChanged = (folderName) => {
-        if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(folderName) && folderName !== 'Select Folder') {
+        if (StringExtensions.IsNotNullOrEmpty(folderName) && folderName !== 'Select Folder') {
             let avaialablePages = props.IPushPullDomainsPages.find((f) => f.Name == folderName).Pages;
             setState({
                 Folder: folderName,
                 AvailablePages: avaialablePages,
-                Page: GeneralConstants_1.EMPTY_STRING,
-                ErrorMessage: GeneralConstants_1.EMPTY_STRING,
+                Page: EMPTY_STRING,
+                ErrorMessage: EMPTY_STRING,
             });
         }
         else {
             setState({
-                Folder: GeneralConstants_1.EMPTY_STRING,
+                Folder: EMPTY_STRING,
                 AvailablePages: [],
-                Page: GeneralConstants_1.EMPTY_STRING,
-                ErrorMessage: GeneralConstants_1.EMPTY_STRING,
+                Page: EMPTY_STRING,
+                ErrorMessage: EMPTY_STRING,
             });
         }
     };
@@ -64,29 +60,29 @@ const IPushPullAddPageComponent = (props) => {
             value: iPushPullDomain.Name,
         };
     });
-    return (React.createElement(PanelWithImage_1.PanelWithImage, { header: "Add ipushpull Page", glyphicon: "newpage", variant: "primary", style: { height: '100%' } },
-        React.createElement(FlexWithFooter_1.default, { as: "form", onSubmit: (e) => {
+    return (React.createElement(PanelWithImage, { header: "Add ipushpull Page", glyphicon: "newpage", variant: "primary", style: { height: '100%' } },
+        React.createElement(FlexWithFooter, { as: "form", onSubmit: (e) => {
                 e.preventDefault();
                 onSubmit();
             }, footerProps: {
                 fontSize: 'var(--ab-font-size-4)',
             }, footer: React.createElement(React.Fragment, null,
-                React.createElement(SimpleButton_1.default, { tone: "neutral", variant: "text", tooltip: "Close", onClick: (e) => {
+                React.createElement(SimpleButton, { tone: "neutral", variant: "text", tooltip: "Close", onClick: (e) => {
                         e.stopPropagation();
                         hidePopup();
                     } }, "CLOSE"),
                 React.createElement("div", { style: { flex: 1 } }),
-                React.createElement(SimpleButton_1.default, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(state.Folder) ||
-                        StringExtensions_1.StringExtensions.IsNullOrEmpty(state.Page), icon: 'check' }, "Add Page")) },
-            React.createElement(rebass_1.Flex, { flexDirection: "column", padding: 2, margin: 2 },
-                React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "Select a folder and then choose the name of the new ipushpull page it should contain."),
-                React.createElement(FormLayout_1.default, { margin: 3 },
-                    React.createElement(FormLayout_1.FormRow, { label: "Folder:" },
-                        React.createElement(Dropdown_1.default, { disabled: availableFolders.length == 0, style: { minWidth: '50%' }, options: availableFolders, className: "ab-Popup__IPushPull__select", onChange: (folder) => onFolderChanged(folder), value: state.Folder ? state.Folder : null, placeholder: "Select Folder", marginRight: 2 })),
-                    React.createElement(FormLayout_1.FormRow, { label: "Page" },
-                        React.createElement(Input_1.default, { width: "50%", type: "text", placeholder: "Page Name", value: state.Page, onChange: onPageNameChange })),
-                    state.ErrorMessage ? (React.createElement(FormLayout_1.FormRow, { label: "" },
-                        React.createElement(ErrorBox_1.default, null, state.ErrorMessage))) : null)))));
+                React.createElement(SimpleButton, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions.IsNullOrEmpty(state.Folder) ||
+                        StringExtensions.IsNullOrEmpty(state.Page), icon: 'check' }, "Add Page")) },
+            React.createElement(Flex, { flexDirection: "column", padding: 2, margin: 2 },
+                React.createElement(HelpBlock, { marginBottom: 1 }, "Select a folder and then choose the name of the new ipushpull page it should contain."),
+                React.createElement(FormLayout, { margin: 3 },
+                    React.createElement(FormRow, { label: "Folder:" },
+                        React.createElement(Dropdown, { disabled: availableFolders.length == 0, style: { minWidth: '50%' }, options: availableFolders, className: "ab-Popup__IPushPull__select", onChange: (folder) => onFolderChanged(folder), value: state.Folder ? state.Folder : null, placeholder: "Select Folder", marginRight: 2 })),
+                    React.createElement(FormRow, { label: "Page" },
+                        React.createElement(Input, { width: "50%", type: "text", placeholder: "Page Name", value: state.Page, onChange: onPageNameChange })),
+                    state.ErrorMessage ? (React.createElement(FormRow, { label: "" },
+                        React.createElement(ErrorBox, null, state.ErrorMessage))) : null)))));
 };
 function mapStateToProps(state) {
     return {
@@ -101,4 +97,4 @@ function mapDispatchToProps(dispatch) {
         },
     };
 }
-exports.IPushPullAddPagePopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(IPushPullAddPageComponent);
+export let IPushPullAddPagePopup = connect(mapStateToProps, mapDispatchToProps)(IPushPullAddPageComponent);

package/src/View/IPushPullLoginPopup.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 interface IPushPullLoginPopupProps {
     pushpullLogin: string | undefined;
@@ -6,5 +7,5 @@ interface IPushPullLoginPopupProps {
     onLogin: (login: string, password: string) => IPushPullRedux.IPushPullLoginAction;
     onCancel: () => any;
 }
-export declare let IPushPullLoginPopup: import("react-redux").ConnectedComponent<(props: IPushPullLoginPopupProps) => JSX.Element, import("react-redux").Omit<IPushPullLoginPopupProps, "pushpullLogin" | "pushpullPassword" | "pushpullLoginErrorMessage" | "onLogin" | "onCancel">>;
+export declare let IPushPullLoginPopup: import("react-redux").ConnectedComponent<(props: IPushPullLoginPopupProps) => JSX.Element, import("react-redux").Omit<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, keyof IPushPullLoginPopupProps>>;
 export {};

package/src/View/IPushPullLoginPopup.js

@@ -1,30 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPushPullLoginPopup = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
-const AdaptableContext_1 = require("@adaptabletools/adaptable/src/View/AdaptableContext");
-const PopupRedux = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux"));
-const IPushPullRedux = tslib_1.__importStar(require("../Redux/ActionReducers/IPushPullRedux"));
-const StringExtensions_1 = require("@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions");
-const FormLayout_1 = tslib_1.__importStar(require("@adaptabletools/adaptable/src/components/FormLayout"));
-const Input_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/Input"));
-const SimpleButton_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/SimpleButton"));
-const FlexWithFooter_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/FlexWithFooter"));
-const PanelWithImage_1 = require("@adaptabletools/adaptable/src/View/Components/Panels/PanelWithImage");
-const PopupContext_1 = require("@adaptabletools/adaptable/src/View/Components/Popups/AdaptablePopup/PopupContext");
-const ErrorBox_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/ErrorBox"));
-const HelpBlock_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/HelpBlock"));
-const rebass_1 = require("rebass");
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { useAdaptable } from '@adaptabletools/adaptable/src/View/AdaptableContext';
+import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
+import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
+import { StringExtensions } from '@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions';
+import FormLayout, { FormRow } from '@adaptabletools/adaptable/src/components/FormLayout';
+import Input from '@adaptabletools/adaptable/src/components/Input';
+import SimpleButton from '@adaptabletools/adaptable/src/components/SimpleButton';
+import FlexWithFooter from '@adaptabletools/adaptable/src/components/FlexWithFooter';
+import { PanelWithImage } from '@adaptabletools/adaptable/src/View/Components/Panels/PanelWithImage';
+import { usePopupContext } from '@adaptabletools/adaptable/src/View/Components/Popups/AdaptablePopup/PopupContext';
+import ErrorBox from '@adaptabletools/adaptable/src/components/ErrorBox';
+import HelpBlock from '@adaptabletools/adaptable/src/components/HelpBlock';
+import { Flex } from 'rebass';
 const IPushPullLoginComponent = (props) => {
-    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const adaptable = useAdaptable();
     const options = adaptable.getPlugin('ipushpull').options;
     const [state, setState] = React.useState({
         Login: options.username || '',
         Password: options.password || '',
     });
-    const { hidePopup } = (0, PopupContext_1.usePopupContext)();
+    const { hidePopup } = usePopupContext();
     const onSubmit = () => {
         props.onLogin(state.Login || '', state.Password || '');
     };
@@ -36,28 +32,28 @@ const IPushPullLoginComponent = (props) => {
         const e = event.target;
         setState(Object.assign(Object.assign({}, state), { Password: e.value }));
     };
-    return (React.createElement(PanelWithImage_1.PanelWithImage, { header: "ipushpull Login Details", glyphicon: "login", variant: "primary", style: { height: '100%' } },
-        React.createElement(FlexWithFooter_1.default, { as: "form", onSubmit: (e) => {
+    return (React.createElement(PanelWithImage, { header: "ipushpull Login Details", glyphicon: "login", variant: "primary", style: { height: '100%' } },
+        React.createElement(FlexWithFooter, { as: "form", onSubmit: (e) => {
                 e.preventDefault();
                 onSubmit();
             }, footerProps: {
                 fontSize: 'var(--ab-font-size-4)',
             }, footer: React.createElement(React.Fragment, null,
-                React.createElement(SimpleButton_1.default, { tone: "neutral", variant: "text", tooltip: "Close", onClick: (e) => {
+                React.createElement(SimpleButton, { tone: "neutral", variant: "text", tooltip: "Close", onClick: (e) => {
                         e.stopPropagation();
                         hidePopup();
                     } }, "CLOSE"),
                 React.createElement("div", { style: { flex: 1 } }),
-                React.createElement(SimpleButton_1.default, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(state.Password), icon: 'check' }, "Login")) },
-            React.createElement(rebass_1.Flex, { flexDirection: "column", padding: 2, margin: 2 },
-                React.createElement(HelpBlock_1.default, { marginBottom: 1 }, "Login to ipushpull using your login (email address) and password."),
-                React.createElement(FormLayout_1.default, { margin: 3 },
-                    React.createElement(FormLayout_1.FormRow, { label: "ipushpull login:" },
-                        React.createElement(Input_1.default, { width: "100%", type: "email", placeholder: "Email address", value: state.Login, onChange: onLoginChange })),
-                    React.createElement(FormLayout_1.FormRow, { label: "ipushpull password:" },
-                        React.createElement(Input_1.default, { width: "100%", type: "password", placeholder: "Password", value: state.Password, onChange: onPasswordChange })),
-                    props.pushpullLoginErrorMessage ? (React.createElement(FormLayout_1.FormRow, { label: "" },
-                        React.createElement(ErrorBox_1.default, null, props.pushpullLoginErrorMessage))) : null)))));
+                React.createElement(SimpleButton, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions.IsNullOrEmpty(state.Password), icon: 'check' }, "Login")) },
+            React.createElement(Flex, { flexDirection: "column", padding: 2, margin: 2 },
+                React.createElement(HelpBlock, { marginBottom: 1 }, "Login to ipushpull using your login (email address) and password."),
+                React.createElement(FormLayout, { margin: 3 },
+                    React.createElement(FormRow, { label: "ipushpull login:" },
+                        React.createElement(Input, { width: "100%", type: "email", placeholder: "Email address", value: state.Login, onChange: onLoginChange })),
+                    React.createElement(FormRow, { label: "ipushpull password:" },
+                        React.createElement(Input, { width: "100%", type: "password", placeholder: "Password", value: state.Password, onChange: onPasswordChange })),
+                    props.pushpullLoginErrorMessage ? (React.createElement(FormRow, { label: "" },
+                        React.createElement(ErrorBox, null, props.pushpullLoginErrorMessage))) : null)))));
 };
 function mapStateToProps(state) {
     return {
@@ -76,4 +72,4 @@ function mapDispatchToProps(dispatch) {
         },
     };
 }
-exports.IPushPullLoginPopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(IPushPullLoginComponent);
+export let IPushPullLoginPopup = connect(mapStateToProps, mapDispatchToProps)(IPushPullLoginComponent);

package/src/View/IPushPullPopup.d.ts

@@ -18,5 +18,5 @@ declare class IPushPullPopupComponent extends React.Component<IPushPullPopupProp
     render(): JSX.Element;
     onApplyExport(iPushPullReport: IPushPullReport): void;
 }
-export declare let IPushPullPopup: import("react-redux").ConnectedComponent<typeof IPushPullPopupComponent, import("react-redux").Omit<React.ClassAttributes<IPushPullPopupComponent> & IPushPullPopupProps, "key" | "api" | "ref" | "onSuspend" | "accessLevel" | "modalContainer" | "moduleInfo" | "popupParams" | "onClearPopupParams" | "teamSharingActivated" | "onClosePopup" | "onUnSuspend" | "onShare" | "onIPushPullSendSnapshot" | "onIPushPullStopLiveData">>;
+export declare let IPushPullPopup: import("react-redux").ConnectedComponent<typeof IPushPullPopupComponent, import("react-redux").Omit<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, keyof IPushPullPopupProps>>;
 export {};

package/src/View/IPushPullPopup.js

@@ -1,19 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPushPullPopup = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
-const PanelWithButton_1 = require("@adaptabletools/adaptable/src/View/Components/Panels/PanelWithButton");
-const IPushPullRedux = tslib_1.__importStar(require("../Redux/ActionReducers/IPushPullRedux"));
-const TeamSharingRedux = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Redux/ActionsReducers/TeamSharingRedux"));
-const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
-const UIHelper_1 = require("@adaptabletools/adaptable/src/View/UIHelper");
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { PanelWithButton } from '@adaptabletools/adaptable/src/View/Components/Panels/PanelWithButton';
+import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
+import * as TeamSharingRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/TeamSharingRedux';
+import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
+import { UIHelper } from '@adaptabletools/adaptable/src/View/UIHelper';
 class IPushPullPopupComponent extends React.Component {
     constructor(props) {
         super(props);
         this.shouldClosePopupOnFinishWizard = false;
-        this.state = UIHelper_1.UIHelper.getEmptyConfigState();
+        this.state = UIHelper.getEmptyConfigState();
     }
     componentDidMount() {
         if (this.props.popupParams) {
@@ -22,7 +18,7 @@ class IPushPullPopupComponent extends React.Component {
         }
     }
     render() {
-        return (React.createElement(PanelWithButton_1.PanelWithButton, { headerText: this.props.moduleInfo.FriendlyName, bodyProps: { padding: 0 }, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() }));
+        return (React.createElement(PanelWithButton, { headerText: this.props.moduleInfo.FriendlyName, bodyProps: { padding: 0 }, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() }));
     }
     onApplyExport(iPushPullReport) {
         this.props.onIPushPullSendSnapshot(iPushPullReport);
@@ -38,4 +34,4 @@ function mapDispatchToProps(dispatch) {
         onShare: (entity, config) => dispatch(TeamSharingRedux.TeamSharingShare(entity, ModuleConstants.IPushPullModuleId, config)),
     };
 }
-exports.IPushPullPopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(IPushPullPopupComponent);
+export let IPushPullPopup = connect(mapStateToProps, mapDispatchToProps)(IPushPullPopupComponent);

package/src/View/IPushPullViewPanel.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ViewPanelProps } from '@adaptabletools/adaptable/src/View/Components/SharedProps/ViewPanelProps';
 import { IPushPullDomain, IPushPullReport, IPushPullSchedule } from '@adaptabletools/adaptable/src/PredefinedConfig/IPushPullState';
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
@@ -24,4 +25,4 @@ export interface IPushPullViewPanelComponentProps extends ViewPanelProps {
     onCurrentIPushPullFolderChange: (folder: string) => IPushPullRedux.IPushPullSetCurrentFolderAction;
     onCurrentIPushPullPageChange: (page: string) => IPushPullRedux.IPushPullSetCurrentPageAction;
 }
-export declare const IPushPullViewPanelControl: import("react-redux").ConnectedComponent<(props: IPushPullViewPanelComponentProps) => JSX.Element, import("react-redux").Omit<IPushPullViewPanelComponentProps, "api" | "Columns" | "Reports" | "IsIPushPullRunning" | "IPushPullDomainsPages" | "CurrentLiveIPushPullReport" | "accessLevel" | "moduleInfo" | "viewType" | "onIPushPullSendSnapshot" | "onIPushPullStartLiveData" | "onIPushPullStopLiveData" | "onNewIPushPullSchedule" | "onShowIPushPullLogin" | "onShowAddIPushPullPage" | "CurrentIPushPullReportName" | "CurrentIPushPullFolder" | "CurrentIPushPullPage" | "CurrentIPushPullAvailablePages" | "onCurrentIPushPullReportNameChange" | "onCurrentIPushPullFolderChange" | "onCurrentIPushPullPageChange">>;
+export declare const IPushPullViewPanelControl: import("react-redux").ConnectedComponent<(props: IPushPullViewPanelComponentProps) => JSX.Element, import("react-redux").Omit<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, keyof IPushPullViewPanelComponentProps>>;

package/src/View/IPushPullViewPanel.js

@@ -1,25 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPushPullViewPanelControl = void 0;
-const tslib_1 = require("tslib");
-const IPushPullRedux = tslib_1.__importStar(require("../Redux/ActionReducers/IPushPullRedux"));
-const PopupRedux = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux"));
-const React = tslib_1.__importStar(require("react"));
-const ObjectFactory_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/ObjectFactory"));
-const StringExtensions_1 = require("@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions");
-const rebass_1 = require("rebass");
-const DropdownButton_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/DropdownButton"));
-const ButtonExport_1 = require("@adaptabletools/adaptable/src/View/Components/Buttons/ButtonExport");
-const ButtonPause_1 = require("@adaptabletools/adaptable/src/View/Components/Buttons/ButtonPause");
-const ButtonPlay_1 = require("@adaptabletools/adaptable/src/View/Components/Buttons/ButtonPlay");
-const join_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/components/utils/join"));
-const GeneralConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants"));
-const ButtonSchedule_1 = require("@adaptabletools/adaptable/src/View/Components/Buttons/ButtonSchedule");
-const ButtonNewPage_1 = require("@adaptabletools/adaptable/src/View/Components/Buttons/ButtonNewPage");
-const ButtonLogout_1 = require("@adaptabletools/adaptable/src/View/Components/Buttons/ButtonLogout");
-const ButtonLogin_1 = require("@adaptabletools/adaptable/src/View/Components/Buttons/ButtonLogin");
-const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
-const react_redux_1 = require("react-redux");
+import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
+import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
+import * as React from 'react';
+import ObjectFactory from '@adaptabletools/adaptable/src/Utilities/ObjectFactory';
+import { StringExtensions } from '@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions';
+import { Flex } from 'rebass';
+import DropdownButton from '@adaptabletools/adaptable/src/components/DropdownButton';
+import { ButtonExport } from '@adaptabletools/adaptable/src/View/Components/Buttons/ButtonExport';
+import { ButtonPause } from '@adaptabletools/adaptable/src/View/Components/Buttons/ButtonPause';
+import { ButtonPlay } from '@adaptabletools/adaptable/src/View/Components/Buttons/ButtonPlay';
+import join from '@adaptabletools/adaptable/src/components/utils/join';
+import * as GeneralConstants from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
+import { ButtonSchedule } from '@adaptabletools/adaptable/src/View/Components/Buttons/ButtonSchedule';
+import { ButtonNewPage } from '@adaptabletools/adaptable/src/View/Components/Buttons/ButtonNewPage';
+import { ButtonLogout } from '@adaptabletools/adaptable/src/View/Components/Buttons/ButtonLogout';
+import { ButtonLogin } from '@adaptabletools/adaptable/src/View/Components/Buttons/ButtonLogin';
+import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
+import { connect } from 'react-redux';
 const IPushPullViewPanelComponent = (props) => {
     var _a, _b, _c, _d;
     const [_, update] = React.useState(0);
@@ -50,7 +46,7 @@ const IPushPullViewPanelComponent = (props) => {
         props.onIPushPullStartLiveData(createIPushPullReportFromState());
     };
     const onNewIPushPullSchedule = () => {
-        let iPushPullSchedule = ObjectFactory_1.default.CreateIPushPullSchedule(createIPushPullReportFromState());
+        let iPushPullSchedule = ObjectFactory.CreateIPushPullSchedule(createIPushPullReportFromState());
         props.onNewIPushPullSchedule(iPushPullSchedule);
     };
     // perhaps this should be props and in real state?
@@ -90,35 +86,35 @@ const IPushPullViewPanelComponent = (props) => {
     })) !== null && _d !== void 0 ? _d : [];
     // this is clearly ridiculous!
     // im getting tired...
-    let isCompletedReport = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName) &&
-        StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder) &&
-        StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage);
+    let isCompletedReport = StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName) &&
+        StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder) &&
+        StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage);
     let isLiveIPushPullReport = isCompletedReport &&
         props.CurrentLiveIPushPullReport &&
         props.CurrentIPushPullReportName == props.CurrentLiveIPushPullReport.ReportName &&
         props.CurrentIPushPullFolder == props.CurrentLiveIPushPullReport.Folder &&
         props.CurrentIPushPullPage == props.CurrentLiveIPushPullReport.Page;
     const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    return props.IsIPushPullRunning ? (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__IPushPull__wrap`, flexWrap: props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
-        React.createElement(rebass_1.Flex, null,
-            React.createElement(DropdownButton_1.default, { disabled: allReports.length == 0 || isLiveIPushPullReport, style: { minWidth: 140, fontSize: 'small' }, items: availableReports, columns: ['label'], className: `ab-${elementType}__IPushPull__select`, onClear: () => onSelectedReportChanged(''), showClearButton: StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName), variant: "outlined", marginRight: 2 }, StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName)
+    return props.IsIPushPullRunning ? (React.createElement(Flex, { flexDirection: "row", className: `ab-${elementType}__IPushPull__wrap`, flexWrap: props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+        React.createElement(Flex, null,
+            React.createElement(DropdownButton, { disabled: allReports.length == 0 || isLiveIPushPullReport, style: { minWidth: 140, fontSize: 'small' }, items: availableReports, columns: ['label'], className: `ab-${elementType}__IPushPull__select`, onClear: () => onSelectedReportChanged(''), showClearButton: StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName), variant: "outlined", marginRight: 2 }, StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName)
                 ? props.CurrentIPushPullReportName
                 : 'Select Report')),
-        React.createElement(rebass_1.Flex, null,
-            React.createElement(DropdownButton_1.default, { disabled: allReports.length == 0 || isLiveIPushPullReport, style: { minWidth: 140, fontSize: 'small' }, items: availableFolders, columns: ['label'], className: `ab-${elementType}__IPushPull__select`, onClear: () => onFolderChanged(''), showClearButton: StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder), variant: "outlined", marginRight: 2 }, StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder)
+        React.createElement(Flex, null,
+            React.createElement(DropdownButton, { disabled: allReports.length == 0 || isLiveIPushPullReport, style: { minWidth: 140, fontSize: 'small' }, items: availableFolders, columns: ['label'], className: `ab-${elementType}__IPushPull__select`, onClear: () => onFolderChanged(''), showClearButton: StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder), variant: "outlined", marginRight: 2 }, StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder)
                 ? props.CurrentIPushPullFolder
                 : 'Select Folder')),
-        React.createElement(rebass_1.Flex, null,
-            React.createElement(DropdownButton_1.default, { disabled: allReports.length == 0 || isLiveIPushPullReport, style: { minWidth: 140, fontSize: 'small' }, items: availablePages, columns: ['label'], className: `ab-${elementType}__IPushPull__select`, onClear: () => onPageChanged(''), showClearButton: StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage), variant: "outlined", marginRight: 2 }, StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage)
+        React.createElement(Flex, null,
+            React.createElement(DropdownButton, { disabled: allReports.length == 0 || isLiveIPushPullReport, style: { minWidth: 140, fontSize: 'small' }, items: availablePages, columns: ['label'], className: `ab-${elementType}__IPushPull__select`, onClear: () => onPageChanged(''), showClearButton: StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage), variant: "outlined", marginRight: 2 }, StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage)
                 ? props.CurrentIPushPullPage
                 : 'Select Page')),
-        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 })))),
+        React.createElement(Flex, { style: { minWidth: '148px' } },
+            React.createElement(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, { 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, { marginLeft: 1, className: `ab-${elementType}__IPushPull__play`, onClick: () => onIPushPullStartLiveData(), tooltip: "Start sync with ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })),
+            isCompletedReport && (React.createElement(Flex, { className: join(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__IPushPull__controls`), alignItems: "stretch" }, props.api.internalApi.getEntitlementService().isModuleFullEntitlement('Schedule') && (React.createElement(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 },
+            React.createElement(ButtonNewPage, { marginLeft: 1, className: `ab-${elementType}__IPushPull__newpage`, onClick: () => props.onShowAddIPushPullPage(), tooltip: "New Page", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel }),
+            React.createElement(ButtonLogout, { marginLeft: 1, className: `ab-${elementType}__IPushPull__logout`, onClick: () => getIPPApi().logoutFromIPushPull(), tooltip: "Logout", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel })))) : (React.createElement(ButtonLogin, { marginLeft: 1, className: `ab-${elementType}__IPushPull__login`, onClick: () => props.onShowIPushPullLogin(), tooltip: "Login to ipushpull", accessLevel: props.accessLevel },
         ' ',
         "Login"));
 };
@@ -155,4 +151,4 @@ function mapDispatchToProps(dispatch) {
         onCurrentIPushPullPageChange: (page) => dispatch(IPushPullRedux.IPushPullSetCurrentPage(page)),
     };
 }
-exports.IPushPullViewPanelControl = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(IPushPullViewPanelComponent);
+export const IPushPullViewPanelControl = connect(mapStateToProps, mapDispatchToProps)(IPushPullViewPanelComponent);

package/src/env.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
+export default {
     IPUSHPULL_API_KEY: "CbBaMaoqHVifScrYwKssGnGyNkv5xHOhQVGm3cYP",
     IPUSHPULL_API_SECRET: "xYzE51kuHyyt9kQCvMe0tz0H2sDSjyEQcF5SOBlPQmcL9em0NqcCzyqLYj5fhpuZxQ8BiVcYl6zoOHeI6GYZj1TkUiiLVFoW3HUxiCdEUjlPS8Vl2YHUMEPD5qkLYnGj",
 };

package/src/index.js

@@ -1,37 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const types_1 = require("@adaptabletools/adaptable/types");
-const env_1 = tslib_1.__importDefault(require("./env"));
-const package_json_1 = require("../package.json");
-const version_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/version"));
-const ModuleConstants = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants"));
-const ModuleConstants_1 = require("@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants");
-const PopupRedux = tslib_1.__importStar(require("@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux"));
-const AdaptableViewFactory_1 = require("@adaptabletools/adaptable/src/View/AdaptableViewFactory");
-const PushPullModule_1 = require("./Module/PushPullModule");
-const IPushPullApiImpl_1 = require("./IPushPullApiImpl");
-const PushPullService_1 = require("./Utilities/Services/PushPullService");
-const ipushpull_js_1 = tslib_1.__importDefault(require("ipushpull-js"));
-const IPushPullRedux_1 = require("./Redux/ActionReducers/IPushPullRedux");
-const IPushPullLoginPopup_1 = require("./View/IPushPullLoginPopup");
-const IPushPullAddPagePopup_1 = require("./View/IPushPullAddPagePopup");
-const PluginsRedux_1 = require("@adaptabletools/adaptable/src/Redux/ActionsReducers/PluginsRedux");
-const StringExtensions_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions"));
-const IPushPullViewPanel_1 = require("./View/IPushPullViewPanel");
-if (package_json_1.version !== version_1.default) {
+import { AdaptablePlugin } from '@adaptabletools/adaptable/types';
+import env from './env';
+import { version, name } from '../package.json';
+import { version as coreVersion } from '@adaptabletools/adaptable/package.json';
+import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
+import { IPushPullModuleId } from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
+import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
+import { AdaptableViewFactory, AdaptableViewPanelFactory, } from '@adaptabletools/adaptable/src/View/AdaptableViewFactory';
+import { PushPullModule } from './Module/PushPullModule';
+import { IPushPullApiImpl } from './IPushPullApiImpl';
+import { PushPullService } from './Utilities/Services/PushPullService';
+import ipushpull from 'ipushpull-js';
+import { iPushPullInitialState, IPushPullReducer, IPushPullSetCurrentAvailablePages, IPushPullSetCurrentPage, } from './Redux/ActionReducers/IPushPullRedux';
+import { IPushPullLoginPopup } from './View/IPushPullLoginPopup';
+import { IPushPullAddPagePopup } from './View/IPushPullAddPagePopup';
+import { IPUSHPULL_ADD_PAGE, IPUSHPULL_DOMAIN_PAGES_SET, IPUSHPULL_LOGIN, IPUSHPULL_SEND_SNAPSHOT, IPUSHPULL_SET_CURRENT_FOLDER, IPUSHPULL_START_LIVE_DATA, IPUSHPULL_STOP_LIVE_DATA, } from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PluginsRedux';
+import StringExtensions from '@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions';
+import { IPushPullViewPanelControl } from './View/IPushPullViewPanel';
+const suffix = name.endsWith('-cjs') ? '-cjs' : '';
+if (version !== coreVersion) {
     console.warn(`
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!! "@adaptabletools/adaptable-plugin-ipushpull" (v @${package_json_1.version}) and "@adaptabletools/adaptable" (v @${version_1.default}) have different versions - they should have the exact same version.
+!!!!!!! "@adaptabletools/adaptable-plugin-ipushpull${suffix}" (v @${version}) and "@adaptabletools/adaptable${suffix}" (v @${coreVersion}) have different versions - they should have the exact same version.
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 `);
 }
 const getApiKey = () => {
-    let key = env_1.default.IPUSHPULL_API_KEY; // need to make sure that is always there
+    let key = env.IPUSHPULL_API_KEY; // need to make sure that is always there
     return key;
 };
 const getApiSecret = () => {
-    let secret = env_1.default.IPUSHPULL_API_SECRET; // need to make sure that is always there
+    let secret = env.IPUSHPULL_API_SECRET; // need to make sure that is always there
     return secret;
 };
 const defaultOptions = {
@@ -50,7 +48,7 @@ const defaultOptions = {
     throttleTime: 2000,
     includeSystemReports: true,
 };
-class IPushPullPlugin extends types_1.AdaptablePlugin {
+class IPushPullPlugin extends AdaptablePlugin {
     constructor(options) {
         super(options);
         this.pluginId = 'ipushpull';
@@ -61,9 +59,9 @@ class IPushPullPlugin extends types_1.AdaptablePlugin {
                     if (!state) {
                         // required for store initialization
                         // (idiomatic way of default parameter value in reducer is not feasible because the passed argument is already initialized by the System reducer)
-                        augmentedState = Object.assign({}, augmentedState, IPushPullRedux_1.iPushPullInitialState);
+                        augmentedState = Object.assign({}, augmentedState, iPushPullInitialState);
                     }
-                    return (0, IPushPullRedux_1.IPushPullReducer)(augmentedState, action);
+                    return IPushPullReducer(augmentedState, action);
                 },
             };
         };
@@ -71,57 +69,57 @@ class IPushPullPlugin extends types_1.AdaptablePlugin {
             return (next) => {
                 return (action) => {
                     switch (action.type) {
-                        case PluginsRedux_1.IPUSHPULL_LOGIN: {
+                        case IPUSHPULL_LOGIN: {
                             const actionTyped = action;
                             this.iPushPullApi.loginToIPushPull(actionTyped.username, actionTyped.password);
                             return next(action);
                         }
-                        case PluginsRedux_1.IPUSHPULL_SEND_SNAPSHOT: {
+                        case IPUSHPULL_SEND_SNAPSHOT: {
                             let iPushPullModule = (adaptable.adaptableModules.get(ModuleConstants.IPushPullModuleId));
                             const actionTyped = action;
                             iPushPullModule.sendSnapshot(actionTyped.iPushPullReport);
                             middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
                             return next(action);
                         }
-                        case PluginsRedux_1.IPUSHPULL_START_LIVE_DATA: {
+                        case IPUSHPULL_START_LIVE_DATA: {
                             let iPushPullModule = (adaptable.adaptableModules.get(ModuleConstants.IPushPullModuleId));
                             const actionTyped = action;
                             iPushPullModule.startLiveData(actionTyped.iPushPullReport);
                             middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
                             return next(action);
                         }
-                        case PluginsRedux_1.IPUSHPULL_STOP_LIVE_DATA: {
+                        case IPUSHPULL_STOP_LIVE_DATA: {
                             let iPushPullModule = (adaptable.adaptableModules.get(ModuleConstants.IPushPullModuleId));
                             iPushPullModule.stopLiveData();
                             return next(action);
                         }
-                        case PluginsRedux_1.IPUSHPULL_ADD_PAGE: {
+                        case IPUSHPULL_ADD_PAGE: {
                             const actionTyped = action;
                             this.iPushPullApi.addNewIPushPullPage(actionTyped.folder, actionTyped.page);
                             return next(action);
                         }
-                        case PluginsRedux_1.IPUSHPULL_SET_CURRENT_FOLDER: {
+                        case IPUSHPULL_SET_CURRENT_FOLDER: {
                             const actionTyped = action;
                             const currentFolder = actionTyped.folder;
-                            const isFolderValid = StringExtensions_1.default.IsNotNullOrEmpty(currentFolder);
+                            const isFolderValid = StringExtensions.IsNotNullOrEmpty(currentFolder);
                             const availablePages = isFolderValid
                                 ? adaptable.api.pluginsApi
                                     .getipushpullPluginApi()
                                     .getPagesForIPushPullDomain(currentFolder)
                                 : [];
-                            middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentAvailablePages)(availablePages));
-                            middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentPage)(''));
+                            middlewareAPI.dispatch(IPushPullSetCurrentAvailablePages(availablePages));
+                            middlewareAPI.dispatch(IPushPullSetCurrentPage(''));
                             return next(action);
                         }
-                        case PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_SET: {
+                        case IPUSHPULL_DOMAIN_PAGES_SET: {
                             //refresh the available pages
                             const currentFolder = middlewareAPI.getState().System.IPushPullCurrentFolder;
-                            const isFolderValid = StringExtensions_1.default.IsNotNullOrEmpty(currentFolder);
+                            const isFolderValid = StringExtensions.IsNotNullOrEmpty(currentFolder);
                             if (isFolderValid) {
                                 const availablePages = adaptable.api.pluginsApi
                                     .getipushpullPluginApi()
                                     .getPagesForIPushPullDomain(currentFolder);
-                                middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentAvailablePages)(availablePages));
+                                middlewareAPI.dispatch(IPushPullSetCurrentAvailablePages(availablePages));
                             }
                             return next(action);
                         }
@@ -146,20 +144,20 @@ class IPushPullPlugin extends types_1.AdaptablePlugin {
          * Includes ipushpull config and objects and, optionally, any ipushpull Reports (including schedules).
          */
         // IPushPull?: IPushPullState;
-        ipushpull_js_1.default.config.set(this.options.ippConfig);
+        ipushpull.config.set(this.options.ippConfig);
     }
     afterInitApi(adaptable) {
-        this.iPushPullApi = new IPushPullApiImpl_1.IPushPullApiImpl(adaptable, this.options);
-        this.PushPullService = new PushPullService_1.PushPullService(adaptable);
-        this.iPushPullApi.setIPushPullInstance(ipushpull_js_1.default);
+        this.iPushPullApi = new IPushPullApiImpl(adaptable, this.options);
+        this.PushPullService = new PushPullService(adaptable);
+        this.iPushPullApi.setIPushPullInstance(ipushpull);
         this.registerProperty('api', () => this.iPushPullApi);
         this.registerProperty('service', () => this.PushPullService);
     }
     afterInitModules(adaptable, modules) {
-        modules.set(ModuleConstants_1.IPushPullModuleId, new PushPullModule_1.PushPullModule(adaptable.api));
-        AdaptableViewFactory_1.AdaptableViewFactory.IPushPullLoginPopup = IPushPullLoginPopup_1.IPushPullLoginPopup;
-        AdaptableViewFactory_1.AdaptableViewFactory.IPushPullAddPagePopup = IPushPullAddPagePopup_1.IPushPullAddPagePopup;
-        AdaptableViewFactory_1.AdaptableViewPanelFactory.set(ModuleConstants_1.IPushPullModuleId, IPushPullViewPanel_1.IPushPullViewPanelControl);
+        modules.set(IPushPullModuleId, new PushPullModule(adaptable.api));
+        AdaptableViewFactory.IPushPullLoginPopup = IPushPullLoginPopup;
+        AdaptableViewFactory.IPushPullAddPagePopup = IPushPullAddPagePopup;
+        AdaptableViewPanelFactory.set(IPushPullModuleId, IPushPullViewPanelControl);
     }
 }
-exports.default = (options) => new IPushPullPlugin(options);
+export default (options) => new IPushPullPlugin(options);