@adaptabletools/adaptable-plugin-ipushpull-cjs 22.0.0-canary.1 → 22.0.0-canary.3

package/package.json

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

package/src/IPushPullApiImpl.js

@@ -8,9 +8,11 @@ const IPushPullRedux = tslib_1.__importStar(require("./Redux/ActionReducers/IPus
 const ArrayExtensions_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable-cjs/src/Utilities/Extensions/ArrayExtensions"));
 const Helper_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable-cjs/src/Utilities/Helpers/Helper"));
 class IPushPullApiImpl extends ApiBase_1.ApiBase {
+    ippInstance;
+    ippService = null;
+    options;
     constructor(_adaptable, options) {
         super(_adaptable);
-        this.ippService = null;
         this.options = options;
     }
     getCurrentIPushPullUsername() {

package/src/Module/PushPullModule.js

@@ -8,10 +8,13 @@ const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
 const GeneralConstants_1 = require("@adaptabletools/adaptable-cjs/src/Utilities/Constants/GeneralConstants");
 const EQUAL_DATA_ERR = 'equal data, so not sending';
 class PushPullModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    isSendingData = false;
+    ippService = null;
+    adaptable;
+    throttledRecomputeAndSendLiveDataEvent;
+    lastData;
     constructor(api) {
         super(ModuleConstants.IPushPullModuleId, 'ipushpull', 'download', null, 'Send data from AdapTable to ipushpull', api);
-        this.isSendingData = false;
-        this.ippService = null;
         this.adaptable = api.internalApi.getAdaptableInstance();
         this.api.eventApi.on('AdaptableReady', () => {
             setTimeout(() => {

package/src/Utilities/Services/PushPullService.js

@@ -12,10 +12,11 @@ var ServiceStatus;
     ServiceStatus["Error"] = "Error";
 })(ServiceStatus || (exports.ServiceStatus = ServiceStatus = {}));
 class PushPullService {
+    adaptable;
+    ppInstance = null;
+    pages = new Map();
     constructor(adaptable) {
         this.adaptable = adaptable;
-        this.ppInstance = null;
-        this.pages = new Map();
         this.adaptable = adaptable;
         this.adaptable.api.eventApi.on('AdaptableReady', async () => {
             // turn off and clear everything

package/src/View/IPushPullAddPagePopup.d.ts

@@ -1,12 +1,2 @@
 import * as React from 'react';
-import { ConnectedComponent } from 'react-redux';
-import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
-import { IPushPullDomain } from "@adaptabletools/adaptable-cjs/src/AdaptableState/IPushPullState";
-interface IPushPullAddPagePopupProps {
-    IPushPullDomainsPages: IPushPullDomain[] | undefined;
-    onAddPage: (folder: string, page: string) => IPushPullRedux.IPushPullAddPageAction;
-    onCancel: () => any;
-}
-declare const IPushPullAddPageComponent: (props: IPushPullAddPagePopupProps) => React.JSX.Element;
-export declare let IPushPullAddPagePopup: ConnectedComponent<typeof IPushPullAddPageComponent, Omit<IPushPullAddPagePopupProps, "IPushPullDomainsPages" | "onAddPage" | "onCancel">>;
-export {};
+export declare let IPushPullAddPagePopup: React.ComponentType;

package/src/View/IPushPullLoginPopup.d.ts

@@ -1,13 +1,2 @@
 import * as React from 'react';
-import { ConnectedComponent } from 'react-redux';
-import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
-interface IPushPullLoginPopupProps {
-    pushpullLogin: string | undefined;
-    pushpullPassword: string | undefined;
-    pushpullLoginErrorMessage: string | undefined;
-    onLogin: (login: string, password: string) => IPushPullRedux.IPushPullLoginAction;
-    onCancel: () => any;
-}
-declare const IPushPullLoginComponent: (props: IPushPullLoginPopupProps) => React.JSX.Element;
-export declare let IPushPullLoginPopup: ConnectedComponent<typeof IPushPullLoginComponent, Omit<IPushPullLoginPopupProps, "pushpullLoginErrorMessage" | "onLogin" | "onCancel">>;
-export {};
+export declare let IPushPullLoginPopup: React.ComponentType;

package/src/View/IPushPullPopup.d.ts

@@ -1,23 +1,2 @@
 import * as React from 'react';
-import { ConnectedComponent } from 'react-redux';
-import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
-import { ModuleViewPopupProps } from "@adaptabletools/adaptable-cjs/src/View/Components/SharedProps/ModuleViewPopupProps";
-import * as TeamSharingRedux from "@adaptabletools/adaptable-cjs/src/Redux/ActionsReducers/TeamSharingRedux";
-import { EditableConfigEntityState } from "@adaptabletools/adaptable-cjs/src/View/Components/SharedProps/EditableConfigEntityState";
-import { AdaptableObject } from "@adaptabletools/adaptable-cjs/src/AdaptableState/Common/AdaptableObject";
-import { IPushPullReport } from "@adaptabletools/adaptable-cjs/src/AdaptableState/IPushPullState";
-import { AdaptableSharedEntityConfig } from "@adaptabletools/adaptable-cjs/src/AdaptableState/TeamSharingState";
-interface IPushPullPopupProps extends ModuleViewPopupProps<IPushPullPopupComponent> {
-    onIPushPullSendSnapshot: (iPushPulleport: IPushPullReport) => IPushPullRedux.IPushPullSendSnapshotAction;
-    onIPushPullStopLiveData: () => IPushPullRedux.IPushPullStopLiveDataAction;
-    onShare: (entity: AdaptableObject, config: AdaptableSharedEntityConfig) => TeamSharingRedux.TeamSharingShareAction;
-}
-declare class IPushPullPopupComponent extends React.Component<IPushPullPopupProps, EditableConfigEntityState> {
-    constructor(props: IPushPullPopupProps);
-    shouldClosePopupOnFinishWizard: boolean;
-    componentDidMount(): void;
-    render(): React.JSX.Element;
-    onApplyExport(iPushPullReport: IPushPullReport): void;
-}
-export declare let IPushPullPopup: ConnectedComponent<typeof IPushPullPopupComponent, IPushPullPopupProps>;
-export {};
+export declare let IPushPullPopup: React.ComponentType<any>;

package/src/View/IPushPullPopup.js

@@ -12,9 +12,9 @@ const UIHelper_1 = require("@adaptabletools/adaptable-cjs/src/View/UIHelper");
 class IPushPullPopupComponent extends React.Component {
     constructor(props) {
         super(props);
-        this.shouldClosePopupOnFinishWizard = false;
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
+    shouldClosePopupOnFinishWizard = false;
     componentDidMount() {
         if (this.props.popupParams) {
             this.shouldClosePopupOnFinishWizard =

package/src/View/IPushPullViewPanel.d.ts

@@ -5,7 +5,6 @@ import * as PopupRedux from "@adaptabletools/adaptable-cjs/src/Redux/ActionsRedu
 import { AdaptableColumn } from "@adaptabletools/adaptable-cjs/src/AdaptableState/Common/AdaptableColumn";
 import { Report } from "@adaptabletools/adaptable-cjs/src/AdaptableState/ExportState";
 import * as React from 'react';
-import { ConnectedComponent } from 'react-redux';
 export interface IPushPullViewPanelComponentProps extends ViewPanelProps {
     onIPushPullSendSnapshot: (iPushPulleport: IPushPullReport) => IPushPullRedux.IPushPullSendSnapshotAction;
     onIPushPullStartLiveData: (iPushPulleport: IPushPullReport) => IPushPullRedux.IPushPullStartLiveDataAction;
@@ -26,6 +25,4 @@ export interface IPushPullViewPanelComponentProps extends ViewPanelProps {
     onCurrentIPushPullFolderChange: (folder: string) => IPushPullRedux.IPushPullSetCurrentFolderAction;
     onCurrentIPushPullPageChange: (page: string) => IPushPullRedux.IPushPullSetCurrentPageAction;
 }
-declare const IPushPullViewPanelComponent: (props: IPushPullViewPanelComponentProps) => React.JSX.Element;
-export declare const IPushPullViewPanelControl: ConnectedComponent<typeof IPushPullViewPanelComponent, IPushPullViewPanelComponentProps>;
-export {};
+export declare const IPushPullViewPanelControl: React.ComponentType<any>;

package/src/index.js

@@ -54,87 +54,11 @@ const defaultOptions = {
     includeSystemReports: true,
 };
 class IPushPullPlugin extends types_1.AdaptablePlugin {
+    pluginId = 'ipushpull';
+    iPushPullApi;
+    PushPullService;
     constructor(options) {
         super(options);
-        this.pluginId = 'ipushpull';
-        this.rootReducer = (rootReducer) => {
-            return {
-                System: (state, action) => {
-                    let augmentedState = rootReducer.System(state, action);
-                    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);
-                    }
-                    return (0, IPushPullRedux_1.IPushPullReducer)(augmentedState, action);
-                },
-            };
-        };
-        this.reduxMiddleware = (adaptable) => (middlewareAPI) => {
-            return (next) => {
-                return (action) => {
-                    switch (action.type) {
-                        case PluginsRedux_1.IPUSHPULL_LOGIN: {
-                            const actionTyped = action;
-                            this.iPushPullApi.loginToIPushPull(actionTyped.username, actionTyped.password);
-                            return next(action);
-                        }
-                        case PluginsRedux_1.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: {
-                            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: {
-                            let iPushPullModule = (adaptable.adaptableModules.get(ModuleConstants.IPushPullModuleId));
-                            iPushPullModule.stopLiveData();
-                            return next(action);
-                        }
-                        case PluginsRedux_1.IPUSHPULL_ADD_PAGE: {
-                            const actionTyped = action;
-                            this.iPushPullApi.addNewIPushPullPage(actionTyped.folder, actionTyped.page);
-                            return next(action);
-                        }
-                        case PluginsRedux_1.IPUSHPULL_SET_CURRENT_FOLDER: {
-                            const actionTyped = action;
-                            const currentFolder = actionTyped.folder;
-                            const isFolderValid = StringExtensions_1.default.IsNotNullOrEmpty(currentFolder);
-                            const availablePages = isFolderValid
-                                ? adaptable.api.pluginsApi
-                                    .getipushpullPluginApi()
-                                    .getPagesForIPushPullDomain(currentFolder)
-                                : [];
-                            middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentAvailablePages)(availablePages));
-                            middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentPage)(''));
-                            return next(action);
-                        }
-                        case PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_SET: {
-                            //refresh the available pages
-                            const currentFolder = middlewareAPI.getState().Internal.IPushPullCurrentFolder;
-                            const isFolderValid = StringExtensions_1.default.IsNotNullOrEmpty(currentFolder);
-                            if (isFolderValid) {
-                                const availablePages = adaptable.api.pluginsApi
-                                    .getipushpullPluginApi()
-                                    .getPagesForIPushPullDomain(currentFolder);
-                                middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentAvailablePages)(availablePages));
-                            }
-                            return next(action);
-                        }
-                        default: {
-                            return next(action);
-                        }
-                    }
-                };
-            };
-        };
         const ippConfig = {
             ...defaultOptions.ippConfig,
             ...(options || {}).ippConfig,
@@ -165,6 +89,84 @@ class IPushPullPlugin extends types_1.AdaptablePlugin {
         this.registerProperty('api', () => this.iPushPullApi);
         this.registerProperty('service', () => this.PushPullService);
     }
+    rootReducer = (rootReducer) => {
+        return {
+            System: (state, action) => {
+                let augmentedState = rootReducer.System(state, action);
+                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);
+                }
+                return (0, IPushPullRedux_1.IPushPullReducer)(augmentedState, action);
+            },
+        };
+    };
+    reduxMiddleware = (adaptable) => (middlewareAPI) => {
+        return (next) => {
+            return (action) => {
+                switch (action.type) {
+                    case PluginsRedux_1.IPUSHPULL_LOGIN: {
+                        const actionTyped = action;
+                        this.iPushPullApi.loginToIPushPull(actionTyped.username, actionTyped.password);
+                        return next(action);
+                    }
+                    case PluginsRedux_1.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: {
+                        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: {
+                        let iPushPullModule = (adaptable.adaptableModules.get(ModuleConstants.IPushPullModuleId));
+                        iPushPullModule.stopLiveData();
+                        return next(action);
+                    }
+                    case PluginsRedux_1.IPUSHPULL_ADD_PAGE: {
+                        const actionTyped = action;
+                        this.iPushPullApi.addNewIPushPullPage(actionTyped.folder, actionTyped.page);
+                        return next(action);
+                    }
+                    case PluginsRedux_1.IPUSHPULL_SET_CURRENT_FOLDER: {
+                        const actionTyped = action;
+                        const currentFolder = actionTyped.folder;
+                        const isFolderValid = StringExtensions_1.default.IsNotNullOrEmpty(currentFolder);
+                        const availablePages = isFolderValid
+                            ? adaptable.api.pluginsApi
+                                .getipushpullPluginApi()
+                                .getPagesForIPushPullDomain(currentFolder)
+                            : [];
+                        middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentAvailablePages)(availablePages));
+                        middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentPage)(''));
+                        return next(action);
+                    }
+                    case PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_SET: {
+                        //refresh the available pages
+                        const currentFolder = middlewareAPI.getState().Internal.IPushPullCurrentFolder;
+                        const isFolderValid = StringExtensions_1.default.IsNotNullOrEmpty(currentFolder);
+                        if (isFolderValid) {
+                            const availablePages = adaptable.api.pluginsApi
+                                .getipushpullPluginApi()
+                                .getPagesForIPushPullDomain(currentFolder);
+                            middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentAvailablePages)(availablePages));
+                        }
+                        return next(action);
+                    }
+                    default: {
+                        return next(action);
+                    }
+                }
+            };
+        };
+    };
     afterInitStore(adaptable) {
         adaptable.adaptableModules.set(ModuleConstants_1.IPushPullModuleId, new PushPullModule_1.PushPullModule(adaptable.api));
         AdaptableViewFactory_1.AdaptableViewFactory.IPushPullLoginPopup = IPushPullLoginPopup_1.IPushPullLoginPopup;