@adaptabletools/adaptable-plugin-ipushpull 22.1.1 → 23.0.0-canary.1

package/README.md

@@ -32,7 +32,7 @@ Once the user is successfully logged in, the Toolbar will contain a number of el
 
 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
+4. **Send Snapshot / Live Data** - export grid data to ipushpull on demand (scheduling is not supported via ipushpull)
    >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).

package/package.json

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

package/src/IPushPullApiImpl.d.ts

@@ -1,5 +1,5 @@
 import { ApiBase } from '@adaptabletools/adaptable/src/Api/Implementation/ApiBase';
-import { IPushPullDomain, IPushPullReport, IPushPullSchedule } from '@adaptabletools/adaptable/src/AdaptableState/IPushPullState';
+import { IPushPullDomain, IPushPullReport } from '@adaptabletools/adaptable/src/AdaptableState/IPushPullState';
 import { IPushPullApi } from '@adaptabletools/adaptable/src/Api/IPushPullApi';
 import { IPushPullPluginOptions } from './IPushPullPluginOptions';
 import { IAdaptable } from '@adaptabletools/adaptable/src/AdaptableInterfaces/IAdaptable';
@@ -32,7 +32,6 @@ export declare class IPushPullApiImpl extends ApiBase implements IPushPullApi {
     setIPushPullThrottleTime(throttleTime: number): void;
     setIPushPullDomains(iPushPullDomains: IPushPullDomain[]): void;
     clearIPushPullDomains(): void;
-    getIPushPullSchedules(): IPushPullSchedule[];
     showIPushPullPopup(): void;
     setIPushPullAvailableOn(): void;
     setIPushPullAvailableOff(): void;

package/src/IPushPullApiImpl.js

@@ -108,9 +108,6 @@ export class IPushPullApiImpl extends ApiBase {
     clearIPushPullDomains() {
         this.dispatchAction(IPushPullRedux.IPushPullClearDomainsPages());
     }
-    getIPushPullSchedules() {
-        return this.getAdaptableState().Schedule.IPushPullSchedules || [];
-    }
     showIPushPullPopup() {
         this.showModulePopup(ModuleConstants.IPushPullModuleId);
     }

package/src/View/IPushPullAddPagePopup.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { connect } from 'react-redux';
 import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
@@ -11,9 +12,9 @@ import { usePopupContext } from '@adaptabletools/adaptable/src/View/Components/P
 import ErrorBox from '@adaptabletools/adaptable/src/components/ErrorBox';
 import HelpBlock from '@adaptabletools/adaptable/src/components/HelpBlock';
 import { Flex } from '@adaptabletools/adaptable/src/components/Flex';
-import { Select } from '@adaptabletools/adaptable/src/components/Select';
 import { EMPTY_STRING, EMPTY_ARRAY, } from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
 import ArrayExtensions from '@adaptabletools/adaptable/src/Utilities/Extensions/ArrayExtensions';
+import { SingleSelect } from '@adaptabletools/adaptable/src/components/NewSelect';
 const IPushPullAddPageComponent = (props) => {
     const [state, setState] = React.useState({
         Folder: '',
@@ -59,27 +60,14 @@ const IPushPullAddPageComponent = (props) => {
             value: iPushPullDomain.Name,
         };
     });
-    return (React.createElement(PanelWithImage, { header: "Add ipushpull Page", glyphicon: "newpage", variant: "primary" },
-        React.createElement("form", { onSubmit: (e) => {
+    return (_jsx(PanelWithImage, { header: "Add ipushpull Page", glyphicon: "newpage", variant: "primary", children: _jsxs("form", { onSubmit: (e) => {
                 e.preventDefault();
                 onSubmit();
-            } },
-            React.createElement(Flex, { flexDirection: "column", className: "twa:p-2 twa:m-2" },
-                React.createElement(HelpBlock, { className: "twa:mb-1" }, "Select a folder and then choose the name of the new ipushpull page it should contain."),
-                React.createElement(FormLayout, { className: "twa:m-3" },
-                    React.createElement(FormRow, { label: "Folder" },
-                        React.createElement(Select, { disabled: availableFolders.length == 0, options: availableFolders, className: "ab-Popup__IPushPull__select twa:min-w-[50%] twa:mr-2", onChange: (folder) => onFolderChanged(folder), value: state.Folder || undefined, placeholder: "Select Folder", isClearable: true })),
-                    React.createElement(FormRow, { label: "Page" },
-                        React.createElement(AdaptableInput, { className: "twa:w-1/2", type: "text", placeholder: "Page Name", value: state.Page, disabled: StringExtensions.IsNullOrEmpty(state.Folder), onChange: onPageNameChange })),
-                    state.ErrorMessage ? (React.createElement(FormRow, { label: "" },
-                        React.createElement(ErrorBox, null, state.ErrorMessage))) : null)),
-            React.createElement(Flex, { className: "twa:p-2", justifyContent: "space-between" },
-                React.createElement(SimpleButton, { tone: "neutral", variant: "outlined", tooltip: "Close", onClick: (e) => {
-                        e.stopPropagation();
-                        hidePopup();
-                    } }, "CLOSE"),
-                React.createElement(SimpleButton, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions.IsNullOrEmpty(state.Folder) ||
-                        StringExtensions.IsNullOrEmpty(state.Page), icon: 'check' }, "Add Page")))));
+            }, children: [_jsxs(Flex, { flexDirection: "column", className: "twa:p-2 twa:m-2", children: [_jsx(HelpBlock, { className: "twa:mb-1", children: "Select a folder and then choose the name of the new ipushpull page it should contain." }), _jsxs(FormLayout, { className: "twa:m-3", children: [_jsx(FormRow, { label: "Folder", children: _jsx(SingleSelect, { disabled: availableFolders.length == 0, items: availableFolders, className: "ab-Popup__IPushPull__select twa:min-w-[50%] twa:mr-2", onValueChange: (folder) => onFolderChanged(folder), value: state.Folder || undefined, placeholder: "Select Folder" }) }), _jsx(FormRow, { label: "Page", children: _jsx(AdaptableInput, { className: "twa:w-1/2", type: "text", placeholder: "Page Name", value: state.Page, disabled: StringExtensions.IsNullOrEmpty(state.Folder), onChange: onPageNameChange }) }), state.ErrorMessage ? (_jsx(FormRow, { label: "", children: _jsx(ErrorBox, { children: state.ErrorMessage }) })) : null] })] }), _jsxs(Flex, { className: "twa:p-2", justifyContent: "space-between", children: [_jsx(SimpleButton, { tone: "neutral", variant: "outlined", tooltip: "Close", onClick: (e) => {
+                                e.stopPropagation();
+                                hidePopup();
+                            }, children: "CLOSE" }), _jsx(SimpleButton, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions.IsNullOrEmpty(state.Folder) ||
+                                StringExtensions.IsNullOrEmpty(state.Page), icon: 'check', children: "Add Page" })] })] }) }));
 };
 function mapStateToProps(state) {
     return {

package/src/View/IPushPullLoginPopup.js

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { useAdaptable } from '@adaptabletools/adaptable/src/View/AdaptableContext';
@@ -31,26 +32,13 @@ const IPushPullLoginComponent = (props) => {
         const e = event.target;
         setState({ ...state, Password: e.value });
     };
-    return (React.createElement(PanelWithImage, { header: "ipushpull Login Details", glyphicon: "login", variant: "primary" },
-        React.createElement("form", { onSubmit: (e) => {
+    return (_jsx(PanelWithImage, { header: "ipushpull Login Details", glyphicon: "login", variant: "primary", children: _jsxs("form", { onSubmit: (e) => {
                 e.preventDefault();
                 onSubmit();
-            } },
-            React.createElement(Flex, { flexDirection: "column", className: "twa:p-2 twa:m-2" },
-                React.createElement(HelpBlock, { className: "twa:mb-1" }, "Login to ipushpull using your login (email address) and password."),
-                React.createElement(FormLayout, { className: "twa:m-3" },
-                    React.createElement(FormRow, { label: "User" },
-                        React.createElement(AdaptableInput, { className: "twa:w-full", type: "email", placeholder: "Email address", value: state.Login, onChange: onLoginChange })),
-                    React.createElement(FormRow, { label: "Password" },
-                        React.createElement(AdaptableInput, { className: "twa:w-full", type: "password", placeholder: "Password", value: state.Password, onChange: onPasswordChange })),
-                    props.pushpullLoginErrorMessage ? (React.createElement(FormRow, { label: "" },
-                        React.createElement(ErrorBox, null, props.pushpullLoginErrorMessage))) : null)),
-            React.createElement(Flex, { className: "twa:p-2", justifyContent: "space-between" },
-                React.createElement(SimpleButton, { tone: "neutral", variant: "outlined", tooltip: "Close", onClick: (e) => {
-                        e.stopPropagation();
-                        hidePopup();
-                    } }, "CLOSE"),
-                React.createElement(SimpleButton, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions.IsNullOrEmpty(state.Password), icon: 'check' }, "Login")))));
+            }, children: [_jsxs(Flex, { flexDirection: "column", className: "twa:p-2 twa:m-2", children: [_jsx(HelpBlock, { className: "twa:mb-1", children: "Login to ipushpull using your login (email address) and password." }), _jsxs(FormLayout, { className: "twa:m-3", children: [_jsx(FormRow, { label: "User", children: _jsx(AdaptableInput, { className: "twa:w-full", type: "email", placeholder: "Email address", value: state.Login, onChange: onLoginChange }) }), _jsx(FormRow, { label: "Password", children: _jsx(AdaptableInput, { className: "twa:w-full", type: "password", placeholder: "Password", value: state.Password, onChange: onPasswordChange }) }), props.pushpullLoginErrorMessage ? (_jsx(FormRow, { label: "", children: _jsx(ErrorBox, { children: props.pushpullLoginErrorMessage }) })) : null] })] }), _jsxs(Flex, { className: "twa:p-2", justifyContent: "space-between", children: [_jsx(SimpleButton, { tone: "neutral", variant: "outlined", tooltip: "Close", onClick: (e) => {
+                                e.stopPropagation();
+                                hidePopup();
+                            }, children: "CLOSE" }), _jsx(SimpleButton, { tone: "accent", variant: "raised", type: "submit", disabled: StringExtensions.IsNullOrEmpty(state.Password), icon: 'check', children: "Login" })] })] }) }));
 };
 function mapStateToProps(state) {
     return {

package/src/View/IPushPullViewPanel.d.ts

@@ -1,5 +1,5 @@
 import { ViewPanelProps } from '@adaptabletools/adaptable/src/View/Components/SharedProps/ViewPanelProps';
-import { IPushPullDomain, IPushPullReport, IPushPullSchedule } from '@adaptabletools/adaptable/src/AdaptableState/IPushPullState';
+import { IPushPullDomain, IPushPullReport } from '@adaptabletools/adaptable/src/AdaptableState/IPushPullState';
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
 import { AdaptableColumn } from '@adaptabletools/adaptable/src/AdaptableState/Common/AdaptableColumn';
@@ -9,7 +9,6 @@ export interface IPushPullViewPanelComponentProps extends ViewPanelProps {
     onIPushPullSendSnapshot: (iPushPulleport: IPushPullReport) => IPushPullRedux.IPushPullSendSnapshotAction;
     onIPushPullStartLiveData: (iPushPulleport: IPushPullReport) => IPushPullRedux.IPushPullStartLiveDataAction;
     onIPushPullStopLiveData: () => IPushPullRedux.IPushPullStopLiveDataAction;
-    onNewIPushPullSchedule: (iPushPullSchedule: IPushPullSchedule) => PopupRedux.PopupShowScreenAction;
     onShowIPushPullLogin: () => PopupRedux.PopupShowScreenAction;
     onShowAddIPushPullPage: () => PopupRedux.PopupShowScreenAction;
     Columns: AdaptableColumn[];

package/src/View/IPushPullViewPanel.js

@@ -1,21 +1,20 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 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 '@adaptabletools/adaptable/src/components/Flex';
-import { Select } from '@adaptabletools/adaptable/src/components/Select';
 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';
+import { SingleSelect } from '@adaptabletools/adaptable/src/components/NewSelect';
 const IPushPullViewPanelComponent = (props) => {
     const [_, update] = React.useState(0);
     const forceUpdate = () => update((x) => x + 1);
@@ -44,10 +43,6 @@ const IPushPullViewPanelComponent = (props) => {
     const onIPushPullStartLiveData = () => {
         props.onIPushPullStartLiveData(createIPushPullReportFromState());
     };
-    const onNewIPushPullSchedule = () => {
-        let iPushPullSchedule = ObjectFactory.CreateIPushPullSchedule(createIPushPullReportFromState());
-        props.onNewIPushPullSchedule(iPushPullSchedule);
-    };
     // perhaps this should be props and in real state?
     const createIPushPullReportFromState = () => {
         return {
@@ -84,22 +79,7 @@ const IPushPullViewPanelComponent = (props) => {
         props.CurrentIPushPullFolder == props.CurrentLiveIPushPullReport.Folder &&
         props.CurrentIPushPullPage == props.CurrentLiveIPushPullReport.Page;
     const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    return props.IsIPushPullRunning ? (React.createElement(Flex, { flexDirection: "row", className: `ab-${elementType}__IPushPull__wrap twa:gap-1`, flexWrap: props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
-        React.createElement(Flex, { className: "twa:min-w-[140px]" },
-            React.createElement(Select, { disabled: allReports.length == 0 || isLiveIPushPullReport, options: availableReports, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Report", onChange: (reportName) => onSelectedReportChanged(reportName), value: props.CurrentIPushPullReportName, isClearable: true })),
-        React.createElement(Flex, { className: "twa:min-w-[140px]" },
-            React.createElement(Select, { disabled: !hasReport || isLiveIPushPullReport, options: availableFolders, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Folder", onChange: (folder) => onFolderChanged(folder), value: props.CurrentIPushPullFolder, isClearable: true })),
-        React.createElement(Flex, { className: "twa:min-w-[140px]" },
-            React.createElement(Select, { disabled: !hasFolder || isLiveIPushPullReport, options: availablePages, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Page", onChange: (page) => onPageChanged(page), value: props.CurrentIPushPullPage, isClearable: true })),
-        React.createElement(Flex, { className: join(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__IPushPull__controls twa:w-full`) },
-            React.createElement(Flex, null,
-                React.createElement(ButtonExport, { className: `ab-${elementType}__IPushPull__export`, onClick: () => onIPushPullSendSnapshot(), tooltip: "Send Snapshot to ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel }),
-                isLiveIPushPullReport ? (React.createElement(ButtonPause, { className: `ab-${elementType}__IPushPull__pause twa:fill-red-500`, onClick: () => props.onIPushPullStopLiveData(), tooltip: "Stop sync with ipushpull", disabled: !isLiveIPushPullReport, accessLevel: props.accessLevel })) : (React.createElement(ButtonPlay, { className: `ab-${elementType}__IPushPull__play`, onClick: () => onIPushPullStartLiveData(), tooltip: "Start sync with ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })),
-                props.api.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule, { className: `ab-${elementType}__IPushPull__schedule`, onClick: () => onNewIPushPullSchedule(), tooltip: "Schedule", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })),
-                React.createElement(ButtonNewPage, { className: `ab-${elementType}__IPushPull__newpage`, onClick: () => props.onShowAddIPushPullPage(), tooltip: "New Page", disabled: !hasFolder || isLiveIPushPullReport, accessLevel: props.accessLevel }),
-                React.createElement(ButtonLogout, { className: `ab-${elementType}__IPushPull__logout`, onClick: () => getIPPApi().logoutFromIPushPull(), tooltip: "Logout", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel }))))) : (React.createElement(ButtonLogin, { className: `ab-${elementType}__IPushPull__login twa:ml-1`, onClick: () => props.onShowIPushPullLogin(), tooltip: "Login to ipushpull", accessLevel: props.accessLevel },
-        ' ',
-        "Login"));
+    return props.IsIPushPullRunning ? (_jsxs(Flex, { flexDirection: "row", className: `ab-${elementType}__IPushPull__wrap twa:gap-1`, flexWrap: props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap', children: [_jsx(Flex, { className: "twa:min-w-[140px]", children: _jsx(SingleSelect, { disabled: allReports.length == 0 || isLiveIPushPullReport, items: availableReports, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Report", onValueChange: (reportName) => onSelectedReportChanged(reportName), value: props.CurrentIPushPullReportName }) }), _jsx(Flex, { className: "twa:min-w-[140px]", children: _jsx(SingleSelect, { disabled: !hasReport || isLiveIPushPullReport, items: availableFolders, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Folder", onValueChange: (folder) => onFolderChanged(folder), value: props.CurrentIPushPullFolder }) }), _jsx(Flex, { className: "twa:min-w-[140px]", children: _jsx(SingleSelect, { disabled: !hasFolder || isLiveIPushPullReport, items: availablePages, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Page", onValueChange: (page) => onPageChanged(page), value: props.CurrentIPushPullPage }) }), _jsx(Flex, { className: join(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__IPushPull__controls twa:w-full`), children: _jsxs(Flex, { children: [_jsx(ButtonExport, { className: `ab-${elementType}__IPushPull__export`, onClick: () => onIPushPullSendSnapshot(), tooltip: "Send Snapshot to ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel }), isLiveIPushPullReport ? (_jsx(ButtonPause, { className: `ab-${elementType}__IPushPull__pause twa:fill-red-500`, onClick: () => props.onIPushPullStopLiveData(), tooltip: "Stop sync with ipushpull", disabled: !isLiveIPushPullReport, accessLevel: props.accessLevel })) : (_jsx(ButtonPlay, { className: `ab-${elementType}__IPushPull__play`, onClick: () => onIPushPullStartLiveData(), tooltip: "Start sync with ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })), _jsx(ButtonNewPage, { className: `ab-${elementType}__IPushPull__newpage`, onClick: () => props.onShowAddIPushPullPage(), tooltip: "New Page", disabled: !hasFolder || isLiveIPushPullReport, accessLevel: props.accessLevel }), _jsx(ButtonLogout, { className: `ab-${elementType}__IPushPull__logout`, onClick: () => getIPPApi().logoutFromIPushPull(), tooltip: "Logout", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel })] }) })] })) : (_jsxs(ButtonLogin, { className: `ab-${elementType}__IPushPull__login twa:ml-1`, onClick: () => props.onShowIPushPullLogin(), tooltip: "Login to ipushpull", accessLevel: props.accessLevel, children: [' ', "Login"] }));
 };
 function mapStateToProps(state) {
     return {
@@ -118,11 +98,6 @@ function mapDispatchToProps(dispatch) {
         onIPushPullSendSnapshot: (iPushPullReport) => dispatch(IPushPullRedux.IPushPullSendSnapshot(iPushPullReport)),
         onIPushPullStartLiveData: (iPushPullReport) => dispatch(IPushPullRedux.IPushPullStartLiveData(iPushPullReport)),
         onIPushPullStopLiveData: () => dispatch(IPushPullRedux.IPushPullStopLiveData()),
-        onNewIPushPullSchedule: (iPushPullSchedule) => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ScheduleModuleId, 'SchedulePopup', {
-            action: 'New',
-            source: 'Toolbar',
-            value: iPushPullSchedule,
-        })),
         onShowIPushPullLogin: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.IPushPullModuleId, 'IPushPullLoginPopup', undefined, {
             footer: false,
         })),