@adaptabletools/adaptable-plugin-ipushpull 19.2.4 → 20.0.0-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-ipushpull",
-  "version": "19.2.4",
+  "version": "20.0.0-canary.1",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -12,14 +12,13 @@
     "ipushpull-js": "^2.25.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-    "react-redux": "7.2.8",
-    "rebass": "^3.2.2",
-    "redux": "4.0.5",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-redux": "^9.2.0",
+    "redux": "^5.0.1",
     "styled-components": "^4.4.1",
     "tinycolor2": "^1.4.2",
-    "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "19.2.4"
+    "tslib": "^2.8.1",
+    "@adaptabletools/adaptable": "20.0.0-canary.1"
   },
   "type": "module",
   "module": "src/index.js"

package/src/IPushPullApiImpl.js

@@ -10,10 +10,10 @@ export class IPushPullApiImpl extends ApiBase {
         this.options = options;
     }
     getCurrentIPushPullUsername() {
-        return this.getAdaptableState().System.CurrentIPushpullUsername;
+        return this.getAdaptableState().Internal.CurrentIPushpullUsername;
     }
     getCurrentIPushPullPassword() {
-        return this.getAdaptableState().System.CurrentIPushpullPassword;
+        return this.getAdaptableState().Internal.CurrentIPushpullPassword;
     }
     getIPushPullUsername() {
         return this.options.username;
@@ -22,11 +22,10 @@ export class IPushPullApiImpl extends ApiBase {
         return this.options.password;
     }
     getAutoLogin() {
-        var _a;
-        return (_a = this.options.autoLogin) !== null && _a !== void 0 ? _a : false;
+        return this.options.autoLogin ?? false;
     }
     getCurrentLiveIPushPullReport() {
-        return this.getAdaptableState().System.CurrentLiveIPushPullReport;
+        return this.getAdaptableState().Internal.CurrentLiveIPushPullReport;
     }
     setIPushPullInstance(ippInstance) {
         this.ippInstance = ippInstance;
@@ -37,13 +36,13 @@ export class IPushPullApiImpl extends ApiBase {
     sendSnapshot(iPushPullReport) {
         if (this.checkItemExists(iPushPullReport, iPushPullReport.ReportName, 'IPushPull Report')) {
             this.dispatchAction(IPushPullRedux.IPushPullSendSnapshot(iPushPullReport));
-            this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'SnapshotSent');
+            this.getExportApi().internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'SnapshotSent');
         }
     }
     startLiveData(iPushPullReport) {
         if (this.checkItemExists(iPushPullReport, iPushPullReport.ReportName, 'IPushPull Report')) {
             this.dispatchAction(IPushPullRedux.IPushPullLiveReportSet(iPushPullReport));
-            this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStarted', iPushPullReport);
+            this.getExportApi().internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStarted', iPushPullReport);
         }
     }
     stopLiveData() {
@@ -55,7 +54,7 @@ export class IPushPullApiImpl extends ApiBase {
         // clear the live report
         this.dispatchAction(IPushPullRedux.IPushPullLiveReportClear());
         // fire the Live Report event for Export Stopped
-        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStopped', currentLiveReport);
+        this.getExportApi().internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'LiveDataStopped', currentLiveReport);
     }
     isIPushPullReportLive(iPushPullReport) {
         if (!iPushPullReport) {
@@ -68,10 +67,10 @@ export class IPushPullApiImpl extends ApiBase {
         return true;
     }
     isIPushPullRunning() {
-        return this.getAdaptableState().System.IsIPushPullRunning;
+        return this.getAdaptableState().Internal.IsIPushPullRunning;
     }
     getIPushPullDomains() {
-        return this.getAdaptableState().System.IPushPullDomainsPages || [];
+        return this.getAdaptableState().Internal.IPushPullDomainsPages || [];
     }
     getPagesForIPushPullDomain(folderName) {
         let returnArray = [];
@@ -121,11 +120,11 @@ export class IPushPullApiImpl extends ApiBase {
     }
     setIPushPullRunningOn() {
         this.dispatchAction(IPushPullRedux.SetIPushPullRunningOn());
-        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'Connected');
+        this.getExportApi().internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'Connected');
     }
     setIPushPullRunningOff() {
         this.dispatchAction(IPushPullRedux.SetIPushPullRunningOff());
-        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'Disconnected');
+        this.getExportApi().internalApi.publishLiveLiveDataChangedEvent('ipushpull', 'Disconnected');
     }
     isIPushPullLiveDataRunning() {
         return Helper.objectExists(this.getCurrentLiveIPushPullReport());

package/src/Module/PushPullModule.js

@@ -1,7 +1,7 @@
 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';
+import { DEFAULT_LIVE_REPORT_THROTTLE_TIME, SELECTED_DATA_REPORT, } from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
 const EQUAL_DATA_ERR = 'equal data, so not sending';
 export class PushPullModule extends AdaptableModuleBase {
     constructor(api) {
@@ -13,59 +13,59 @@ export class PushPullModule extends AdaptableModuleBase {
             setTimeout(() => {
                 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
-        // currently we DONT send deltas - we simply send everything to ipushpull every time a relevant change happens
-        this.api.internalApi
-            .getDataService()
-            .on('CellDataChanged', (cellDataChangedInfo) => {
-            const api = this.getIPPApi();
-            const exportApi = this.api.exportApi;
-            if (api.isIPushPullLiveDataRunning()) {
-                let currentLiveIPushPullReport = api.getCurrentLiveIPushPullReport();
-                if (currentLiveIPushPullReport &&
-                    currentLiveIPushPullReport.ReportName !== SELECTED_CELLS_REPORT &&
-                    currentLiveIPushPullReport.ReportName !== SELECTED_ROWS_REPORT &&
-                    exportApi.internalApi.isDataChangeInReport(cellDataChangedInfo, this.getCurrentReport())) {
-                    this.throttledRecomputeAndSendLiveDataEvent();
-                }
-            }
-        });
-        // if the grid has refreshed then update all live reports
-        this.adaptable._on('GridRefreshed', () => {
-            if (this.getIPPApi().isIPushPullLiveDataRunning()) {
-                this.throttledRecomputeAndSendLiveDataEvent();
-            }
-        });
-        // if the grid filters have changed then update any live reports except cell or row selected
-        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 !== SELECTED_CELLS_REPORT &&
-                    currentLiveIPushPullReport.ReportName !== SELECTED_ROWS_REPORT) {
-                    this.throttledRecomputeAndSendLiveDataEvent();
-                }
-            }
-        });
-        // if grid selection has changed and the ipushpull Live report is 'Selected Cells' or 'Selected Rows' then send updated data
-        this.api.eventApi.on('CellSelectionChanged', () => {
-            if (this.getIPPApi().isIPushPullLiveDataRunning()) {
-                let currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
-                if (currentLiveIPushPullReport &&
-                    currentLiveIPushPullReport.ReportName === SELECTED_CELLS_REPORT) {
-                    this.throttledRecomputeAndSendLiveDataEvent();
-                }
-            }
-        });
-        this.api.eventApi.on('RowSelectionChanged', () => {
-            if (this.getIPPApi().isIPushPullLiveDataRunning()) {
-                let currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
-                if (currentLiveIPushPullReport &&
-                    currentLiveIPushPullReport.ReportName === SELECTED_ROWS_REPORT) {
-                    this.throttledRecomputeAndSendLiveDataEvent();
-                }
+            if (this.getIPPApi().isIPushPullRunning()) {
+                // if a piece of data has updated then update any live reports except cell or row selected where the data change is relevant
+                // currently we DONT send deltas - we simply send everything to ipushpull every time a relevant change happens
+                this.api.internalApi
+                    .getDataService()
+                    .on('CellDataChanged', (cellDataChangedInfo) => {
+                    const api = this.getIPPApi();
+                    const exportApi = this.api.exportApi;
+                    if (api.isIPushPullLiveDataRunning()) {
+                        let currentLiveIPushPullReport = api.getCurrentLiveIPushPullReport();
+                        if (currentLiveIPushPullReport &&
+                            currentLiveIPushPullReport.ReportName !== SELECTED_DATA_REPORT &&
+                            exportApi.internalApi.isDataChangeInReport(cellDataChangedInfo, this.getCurrentReport())) {
+                            this.throttledRecomputeAndSendLiveDataEvent();
+                        }
+                    }
+                });
+                // if the grid has refreshed then update all live reports
+                this.adaptable._on('GridRefreshed', () => {
+                    if (this.getIPPApi().isIPushPullLiveDataRunning()) {
+                        this.throttledRecomputeAndSendLiveDataEvent();
+                    }
+                });
+                // if the grid filters have changed then update any live reports except cell or row selected
+                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 !== SELECTED_DATA_REPORT) {
+                            this.throttledRecomputeAndSendLiveDataEvent();
+                        }
+                    }
+                });
+                // if grid selection has changed and the ipushpull Live report is 'Selected Cells' or 'Selected Rows' then send updated data
+                this.api.eventApi.on('CellSelectionChanged', () => {
+                    if (this.getIPPApi().isIPushPullLiveDataRunning()) {
+                        let currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
+                        if (currentLiveIPushPullReport &&
+                            currentLiveIPushPullReport.ReportName === SELECTED_DATA_REPORT) {
+                            this.throttledRecomputeAndSendLiveDataEvent();
+                        }
+                    }
+                });
+                this.api.eventApi.on('RowSelectionChanged', () => {
+                    if (this.getIPPApi().isIPushPullLiveDataRunning()) {
+                        let currentLiveIPushPullReport = this.getIPPApi().getCurrentLiveIPushPullReport();
+                        if (currentLiveIPushPullReport &&
+                            currentLiveIPushPullReport.ReportName === SELECTED_DATA_REPORT) {
+                            this.throttledRecomputeAndSendLiveDataEvent();
+                        }
+                    }
+                });
             }
         });
     }
@@ -78,8 +78,7 @@ export class PushPullModule extends AdaptableModuleBase {
             this.AccessLevel = 'Hidden';
         }
         else {
-            this.AccessLevel = this.api.entitlementApi
-                .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
+            this.AccessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
         }
     }
     getIPPApi() {

package/src/Redux/ActionReducers/IPushPullRedux.js

@@ -104,13 +104,24 @@ state, action) => {
             return Object.assign({}, state, { IsIPushPullRunning: false });
         case IPUSHPULL_SET_LOGIN_DETAILS: {
             let loginAction = action;
-            return Object.assign(Object.assign({}, state), { CurrentIPushpullUsername: loginAction.username, CurrentIPushpullPassword: loginAction.password });
+            return {
+                ...state,
+                CurrentIPushpullUsername: loginAction.username,
+                CurrentIPushpullPassword: loginAction.password,
+            };
         }
         case IPUSHPULL_LOGOUT: {
-            return Object.assign(Object.assign({}, state), { CurrentIPushpullUsername: undefined, CurrentIPushpullPassword: undefined });
+            return {
+                ...state,
+                CurrentIPushpullUsername: undefined,
+                CurrentIPushpullPassword: undefined,
+            };
         }
         case IPUSHPULL_SET_LOGIN_ERROR_MESSAGE: {
-            return Object.assign(Object.assign({}, state), { IPushPullLoginErrorMessage: action.errorMessage });
+            return {
+                ...state,
+                IPushPullLoginErrorMessage: action.errorMessage,
+            };
         }
         case IPUSHPULL_DOMAIN_PAGES_SET: {
             return Object.assign({}, state, {

package/src/Utilities/Services/Interface/IPushPullService.d.ts

@@ -1,5 +1,5 @@
 import { ServiceStatus } from '../PushPullService';
-import { IPushPullDomain } from '@adaptabletools/adaptable/src/PredefinedConfig/SystemState';
+import { IPushPullDomain } from '@adaptabletools/adaptable/src/PredefinedConfig/InternalState';
 export interface IPushPullService {
     login(login: string, password: string): Promise<any>;
     getDomainPages(): Promise<IPushPullDomain[]>;

package/src/Utilities/Services/PushPullService.d.ts

@@ -1,7 +1,7 @@
 import { IAdaptable } from '@adaptabletools/adaptable/src/AdaptableInterfaces/IAdaptable';
 import { IPPStyle } from '@adaptabletools/adaptable/src/Utilities/Interface/IPPStyle';
 import { IPushPullService } from './Interface/IPushPullService';
-import { IPushPullDomain } from '@adaptabletools/adaptable/src/PredefinedConfig/SystemState';
+import { IPushPullDomain } from '@adaptabletools/adaptable/src/PredefinedConfig/InternalState';
 export declare enum ServiceStatus {
     Unknown = "Unknown",
     Disconnected = "Disconnected",

package/src/Utilities/Services/PushPullService.js

@@ -228,7 +228,7 @@ export class PushPullService {
                 headerFontStyle: headerColStyle.fontStyle,
                 headerFontWeight: headerColStyle.fontWeight,
                 height: Number(headerColStyle.height.replace('px', '')),
-                Columns: this.adaptable.api.columnApi.getColumns().map((col) => {
+                Columns: this.adaptable.api.columnApi.getUIAvailableColumns().map((col) => {
                     const headerColumn = document.querySelector(`.ag-header-cell[col-id='${col.columnId}']`);
                     const headerColumnStyle = window.getComputedStyle(headerColumn || headerFirstCol, null);
                     return {
@@ -247,7 +247,7 @@ export class PushPullService {
                 fontStyle: firstRowStyle.fontStyle,
                 fontWeight: firstRowStyle.fontWeight,
                 height: Number(firstRowStyle.height.replace('px', '')),
-                Columns: this.adaptable.api.columnApi.getColumns().map((col) => {
+                Columns: this.adaptable.api.columnApi.getUIAvailableColumns().map((col) => {
                     const cellElement = document.querySelector(`.ag-cell[col-id='${col.columnId}']`);
                     const headerColumnStyle = window.getComputedStyle(cellElement || firstRow, null);
                     return {
@@ -269,7 +269,7 @@ export class PushPullService {
                 headerFontStyle: 'normal',
                 headerFontWeight: '400',
                 height: 65,
-                Columns: this.adaptable.api.columnApi.getColumns().map((col) => {
+                Columns: this.adaptable.api.columnApi.getUIAvailableColumns().map((col) => {
                     return {
                         columnFriendlyName: col.friendlyName,
                         width: 200,
@@ -286,7 +286,7 @@ export class PushPullService {
                 fontStyle: 'normal',
                 fontWeight: '400',
                 height: 30,
-                Columns: this.adaptable.api.columnApi.getColumns().map((col) => {
+                Columns: this.adaptable.api.columnApi.getUIAvailableColumns().map((col) => {
                     return {
                         columnFriendlyName: col.friendlyName,
                         width: 200,

package/src/View/IPushPullAddPagePopup.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 import { IPushPullDomain } from '@adaptabletools/adaptable/src/PredefinedConfig/IPushPullState';
 interface IPushPullAddPagePopupProps {
@@ -6,5 +6,8 @@ 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<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, "IPushPullDomainsPages" | "onCancel" | "onAddPage">>;
+export declare let IPushPullAddPagePopup: import("react-redux").ConnectedComponent<(props: IPushPullAddPagePopupProps) => React.JSX.Element, {
+    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
+    store?: import("redux").Store<any, import("redux").UnknownAction, unknown>;
+}>;
 export {};

package/src/View/IPushPullAddPagePopup.js

@@ -11,7 +11,7 @@ import { PanelWithImage } from '@adaptabletools/adaptable/src/View/Components/Pa
 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 { Flex } from '@adaptabletools/adaptable/src/components/Flex';
 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';
@@ -25,7 +25,7 @@ const IPushPullAddPageComponent = (props) => {
     const { hidePopup } = usePopupContext();
     const onSubmit = () => {
         if (ArrayExtensions.ContainsItem(state.AvailablePages, state.Page)) {
-            setState(Object.assign(Object.assign({}, state), { ErrorMessage: 'A page with that name already exists in the folder' }));
+            setState({ ...state, ErrorMessage: 'A page with that name already exists in the folder' });
         }
         else {
             props.onAddPage(state.Folder, state.Page);
@@ -33,7 +33,7 @@ const IPushPullAddPageComponent = (props) => {
     };
     const onPageNameChange = (event) => {
         const e = event.target;
-        setState(Object.assign(Object.assign({}, state), { Page: e.value }));
+        setState({ ...state, Page: e.value });
     };
     const onFolderChanged = (folderName) => {
         if (StringExtensions.IsNotNullOrEmpty(folderName) && folderName !== 'Select Folder') {
@@ -86,7 +86,7 @@ const IPushPullAddPageComponent = (props) => {
 };
 function mapStateToProps(state) {
     return {
-        IPushPullDomainsPages: state.System.IPushPullDomainsPages,
+        IPushPullDomainsPages: state.Internal.IPushPullDomainsPages,
     };
 }
 function mapDispatchToProps(dispatch) {

package/src/View/IPushPullLoginPopup.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 interface IPushPullLoginPopupProps {
     pushpullLogin: string | undefined;
@@ -7,5 +7,8 @@ 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<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, keyof IPushPullLoginPopupProps>>;
+export declare let IPushPullLoginPopup: import("react-redux").ConnectedComponent<(props: IPushPullLoginPopupProps) => React.JSX.Element, {
+    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
+    store?: import("redux").Store<any, import("redux").UnknownAction, unknown>;
+}>;
 export {};

package/src/View/IPushPullLoginPopup.js

@@ -12,7 +12,7 @@ import { PanelWithImage } from '@adaptabletools/adaptable/src/View/Components/Pa
 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 { Flex } from '@adaptabletools/adaptable/src/components/Flex';
 const IPushPullLoginComponent = (props) => {
     const adaptable = useAdaptable();
     const options = adaptable.getPlugin('ipushpull').options;
@@ -26,11 +26,11 @@ const IPushPullLoginComponent = (props) => {
     };
     const onLoginChange = (event) => {
         const e = event.target;
-        setState(Object.assign(Object.assign({}, state), { Login: e.value }));
+        setState({ ...state, Login: e.value });
     };
     const onPasswordChange = (event) => {
         const e = event.target;
-        setState(Object.assign(Object.assign({}, state), { Password: e.value }));
+        setState({ ...state, Password: e.value });
     };
     return (React.createElement(PanelWithImage, { header: "ipushpull Login Details", glyphicon: "login", variant: "primary", style: { height: '100%' } },
         React.createElement(FlexWithFooter, { as: "form", onSubmit: (e) => {
@@ -60,7 +60,7 @@ function mapStateToProps(state) {
         // pushpullLogin: state.IPushPull ? state.IPushPull!.Username : undefined,
         // pushpullPassword: state.IPushPull ? state.IPushPull!.Password : undefined,
         // pushpullLoginErrorMessage: state.IPushPull.IPushPullLoginErrorMessage,
-        pushpullLoginErrorMessage: state.System.IPushPullLoginErrorMessage,
+        pushpullLoginErrorMessage: state.Internal.IPushPullLoginErrorMessage,
     };
 }
 function mapDispatchToProps(dispatch) {

package/src/View/IPushPullPopup.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import * as Redux from 'redux';
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 import { ModuleViewPopupProps } from '@adaptabletools/adaptable/src/View/Components/SharedProps/ModuleViewPopupProps';
 import * as TeamSharingRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/TeamSharingRedux';
@@ -15,8 +16,11 @@ declare class IPushPullPopupComponent extends React.Component<IPushPullPopupProp
     constructor(props: IPushPullPopupProps);
     shouldClosePopupOnFinishWizard: boolean;
     componentDidMount(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     onApplyExport(iPushPullReport: IPushPullReport): void;
 }
-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 declare let IPushPullPopup: import("react-redux").ConnectedComponent<typeof IPushPullPopupComponent, {
+    context?: React.Context<import("react-redux").ReactReduxContextValue<any, Redux.UnknownAction>>;
+    store?: Redux.Store<any, Redux.UnknownAction, unknown>;
+}>;
 export {};

package/src/View/IPushPullViewPanel.d.ts

@@ -1,10 +1,10 @@
-/// <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';
 import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
 import { AdaptableColumn } from '@adaptabletools/adaptable/src/PredefinedConfig/Common/AdaptableColumn';
 import { Report } from '@adaptabletools/adaptable/src/PredefinedConfig/ExportState';
+import * as React from 'react';
 export interface IPushPullViewPanelComponentProps extends ViewPanelProps {
     onIPushPullSendSnapshot: (iPushPulleport: IPushPullReport) => IPushPullRedux.IPushPullSendSnapshotAction;
     onIPushPullStartLiveData: (iPushPulleport: IPushPullReport) => IPushPullRedux.IPushPullStartLiveDataAction;
@@ -25,4 +25,7 @@ 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<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, keyof IPushPullViewPanelComponentProps>>;
+export declare const IPushPullViewPanelControl: import("react-redux").ConnectedComponent<(props: IPushPullViewPanelComponentProps) => React.JSX.Element, {
+    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
+    store?: import("redux").Store<any, import("redux").UnknownAction, unknown>;
+}>;

package/src/View/IPushPullViewPanel.js

@@ -3,7 +3,7 @@ import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers
 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 { Flex } from '@adaptabletools/adaptable/src/components/Flex';
 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';
@@ -17,7 +17,6 @@ import { ButtonLogin } from '@adaptabletools/adaptable/src/View/Components/Butto
 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);
     const forceUpdate = () => update((x) => x + 1);
     const onLiveDataChanged = React.useCallback((liveDataChangedInfo) => {
@@ -70,20 +69,20 @@ const IPushPullViewPanelComponent = (props) => {
             onClick: () => onSelectedReportChanged(report),
         };
     });
-    let availableFolders = (_b = (_a = props.IPushPullDomainsPages) === null || _a === void 0 ? void 0 : _a.map((iPushPullDomain) => {
+    let availableFolders = props.IPushPullDomainsPages?.map((iPushPullDomain) => {
         return {
             label: iPushPullDomain.Name,
             value: iPushPullDomain.Name,
             onClick: () => onFolderChanged(iPushPullDomain.Name),
         };
-    })) !== null && _b !== void 0 ? _b : [];
-    let availablePages = (_d = (_c = props.CurrentIPushPullAvailablePages) === null || _c === void 0 ? void 0 : _c.map((page) => {
+    }) ?? [];
+    let availablePages = props.CurrentIPushPullAvailablePages?.map((page) => {
         return {
             label: page,
             value: page,
             onClick: () => onPageChanged(page),
         };
-    })) !== null && _d !== void 0 ? _d : [];
+    }) ?? [];
     // this is clearly ridiculous!
     // im getting tired...
     let isCompletedReport = StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName) &&
@@ -120,14 +119,14 @@ const IPushPullViewPanelComponent = (props) => {
 };
 function mapStateToProps(state) {
     return {
-        CurrentLiveIPushPullReport: state.System.CurrentLiveIPushPullReport,
+        CurrentLiveIPushPullReport: state.Internal.CurrentLiveIPushPullReport,
         Reports: state.Export.Reports,
-        IPushPullDomainsPages: state.System.IPushPullDomainsPages,
-        IsIPushPullRunning: state.System.IsIPushPullRunning,
-        CurrentIPushPullReportName: state.System.IPushPullCurrentReportName,
-        CurrentIPushPullFolder: state.System.IPushPullCurrentFolder,
-        CurrentIPushPullPage: state.System.IPushPullCurrentPage,
-        CurrentIPushPullAvailablePages: state.System.IPushPullCurrentAvailablePages,
+        IPushPullDomainsPages: state.Internal.IPushPullDomainsPages,
+        IsIPushPullRunning: state.Internal.IsIPushPullRunning,
+        CurrentIPushPullReportName: state.Internal.IPushPullCurrentReportName,
+        CurrentIPushPullFolder: state.Internal.IPushPullCurrentFolder,
+        CurrentIPushPullPage: state.Internal.IPushPullCurrentPage,
+        CurrentIPushPullAvailablePages: state.Internal.IPushPullCurrentAvailablePages,
     };
 }
 function mapDispatchToProps(dispatch) {

package/src/index.d.ts

@@ -4,6 +4,7 @@ import { IPushPullState } from '@adaptabletools/adaptable/src/PredefinedConfig/I
 import { IPushPullApi } from '@adaptabletools/adaptable/src/Api/IPushPullApi';
 import { IPushPullPluginOptions } from '@adaptabletools/adaptable/src/AdaptableOptions/IPushPullPluginOptions';
 import { IAdaptable } from '@adaptabletools/adaptable/src/AdaptableInterfaces/IAdaptable';
+import type { Middleware, Action } from 'redux';
 declare class IPushPullPlugin extends AdaptablePlugin {
     options: IPushPullPluginOptions;
     pluginId: string;
@@ -14,7 +15,7 @@ declare class IPushPullPlugin extends AdaptablePlugin {
     rootReducer: (rootReducer: any) => {
         System: (state: IPushPullState, action: Redux.Action) => IPushPullState;
     };
-    reduxMiddleware: (adaptable: IAdaptable) => Redux.Middleware;
+    reduxMiddleware: (adaptable: IAdaptable) => Middleware;
     afterInitStore(adaptable: IAdaptable): void;
 }
 declare const _default: (options?: IPushPullPluginOptions) => IPushPullPlugin;

package/src/index.js

@@ -1,8 +1,8 @@
 import { AdaptablePlugin } from '@adaptabletools/adaptable/types';
 import env from './env';
 // TODO in the future, try to put back the version check
-// import { version, name } from '../package.json';
-// import { version as coreVersion } from '@adaptabletools/adaptable/package.json';
+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';
@@ -17,14 +17,14 @@ 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${suffix}" (v @${version}) and "@adaptabletools/adaptable${suffix}" (v @${coreVersion}) have different versions - they should have the exact same version.
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// `);
-// }
+const suffix = name.endsWith('-cjs') ? '-cjs' : '';
+if (version !== coreVersion) {
+    console.warn(`
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!! "@adaptabletools/adaptable-plugin-ipushpull${suffix}" (v @${version}) and "@adaptabletools/adaptable${suffix}" (v @${coreVersion}) have different versions - they should have the exact same version.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+`);
+}
 const getApiKey = () => {
     let key = env.IPUSHPULL_API_KEY; // need to make sure that is always there
     return key;
@@ -114,7 +114,7 @@ class IPushPullPlugin extends AdaptablePlugin {
                         }
                         case IPUSHPULL_DOMAIN_PAGES_SET: {
                             //refresh the available pages
-                            const currentFolder = middlewareAPI.getState().System.IPushPullCurrentFolder;
+                            const currentFolder = middlewareAPI.getState().Internal.IPushPullCurrentFolder;
                             const isFolderValid = StringExtensions.IsNotNullOrEmpty(currentFolder);
                             if (isFolderValid) {
                                 const availablePages = adaptable.api.pluginsApi
@@ -131,14 +131,21 @@ class IPushPullPlugin extends AdaptablePlugin {
                 };
             };
         };
-        const ippConfig = Object.assign(Object.assign({}, defaultOptions.ippConfig), (options || {}).ippConfig);
+        const ippConfig = {
+            ...defaultOptions.ippConfig,
+            ...(options || {}).ippConfig,
+        };
         if (!ippConfig.api_key) {
             ippConfig.api_key = defaultOptions.ippConfig.api_key;
         }
         if (!ippConfig.api_secret) {
             ippConfig.api_secret = defaultOptions.ippConfig.api_secret;
         }
-        this.options = Object.assign(Object.assign(Object.assign({}, defaultOptions), options), { ippConfig });
+        this.options = {
+            ...defaultOptions,
+            ...options,
+            ippConfig,
+        };
         /**
          * Contains the objects required to export (snapshot or live) data to ipushpull from AdapTable.
          *