@adaptabletools/adaptable-plugin-ipushpull 21.2.1 → 22.0.0-canary.0

package/package.json

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

package/src/View/IPushPullAddPagePopup.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { ConnectedComponent } from 'react-redux';
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 import { IPushPullDomain } from '@adaptabletools/adaptable/src/AdaptableState/IPushPullState';
 interface IPushPullAddPagePopupProps {
@@ -6,8 +7,6 @@ interface IPushPullAddPagePopupProps {
     onAddPage: (folder: string, page: string) => IPushPullRedux.IPushPullAddPageAction;
     onCancel: () => any;
 }
-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>;
-}>;
+declare const IPushPullAddPageComponent: (props: IPushPullAddPagePopupProps) => React.JSX.Element;
+export declare let IPushPullAddPagePopup: ConnectedComponent<typeof IPushPullAddPageComponent, Omit<IPushPullAddPagePopupProps, "IPushPullDomainsPages" | "onAddPage" | "onCancel">>;
 export {};

package/src/View/IPushPullAddPagePopup.js

@@ -65,7 +65,7 @@ const IPushPullAddPageComponent = (props) => {
                 e.preventDefault();
                 onSubmit();
             }, footerProps: {
-                fontSize: 'var(--ab-font-size-4)',
+                className: 'twa:text-4',
             }, footer: React.createElement(React.Fragment, null,
                 React.createElement(SimpleButton, { tone: "neutral", variant: "text", tooltip: "Close", onClick: (e) => {
                         e.stopPropagation();
@@ -74,13 +74,13 @@ const IPushPullAddPageComponent = (props) => {
                 React.createElement("div", { style: { flex: 1 } }),
                 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(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(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(Dropdown, { 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 ? state.Folder : null, placeholder: "Select Folder" })),
                     React.createElement(FormRow, { label: "Page" },
-                        React.createElement(Input, { width: "50%", type: "text", placeholder: "Page Name", value: state.Page, onChange: onPageNameChange })),
+                        React.createElement(Input, { className: "twa:w-1/2", type: "text", placeholder: "Page Name", value: state.Page, onChange: onPageNameChange })),
                     state.ErrorMessage ? (React.createElement(FormRow, { label: "" },
                         React.createElement(ErrorBox, null, state.ErrorMessage))) : null)))));
 };

package/src/View/IPushPullLoginPopup.d.ts

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

package/src/View/IPushPullLoginPopup.js

@@ -37,7 +37,7 @@ const IPushPullLoginComponent = (props) => {
                 e.preventDefault();
                 onSubmit();
             }, footerProps: {
-                fontSize: 'var(--ab-font-size-4)',
+                className: 'twa:text-4',
             }, footer: React.createElement(React.Fragment, null,
                 React.createElement(SimpleButton, { tone: "neutral", variant: "text", tooltip: "Close", onClick: (e) => {
                         e.stopPropagation();
@@ -45,13 +45,13 @@ const IPushPullLoginComponent = (props) => {
                     } }, "CLOSE"),
                 React.createElement("div", { style: { flex: 1 } }),
                 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(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: "ipushpull login:" },
-                        React.createElement(Input, { width: "100%", type: "email", placeholder: "Email address", value: state.Login, onChange: onLoginChange })),
+                        React.createElement(Input, { className: "twa:w-full", 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 })),
+                        React.createElement(Input, { 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)))));
 };

package/src/View/IPushPullPopup.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as Redux from 'redux';
+import { ConnectedComponent } from 'react-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';
@@ -19,8 +19,5 @@ declare class IPushPullPopupComponent extends React.Component<IPushPullPopupProp
     render(): React.JSX.Element;
     onApplyExport(iPushPullReport: IPushPullReport): void;
 }
-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 declare let IPushPullPopup: ConnectedComponent<typeof IPushPullPopupComponent, IPushPullPopupProps>;
 export {};

package/src/View/IPushPullPopup.js

@@ -18,7 +18,7 @@ class IPushPullPopupComponent extends React.Component {
         }
     }
     render() {
-        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() }));
+        return (React.createElement(PanelWithButton, { headerText: this.props.moduleInfo.FriendlyName, bodyProps: { className: 'twa:p-0' }, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() }));
     }
     onApplyExport(iPushPullReport) {
         this.props.onIPushPullSendSnapshot(iPushPullReport);

package/src/View/IPushPullViewPanel.d.ts

@@ -5,6 +5,7 @@ import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers
 import { AdaptableColumn } from '@adaptabletools/adaptable/src/AdaptableState/Common/AdaptableColumn';
 import { Report } from '@adaptabletools/adaptable/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;
@@ -25,7 +26,6 @@ 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) => React.JSX.Element, {
-    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
-    store?: import("redux").Store<any, import("redux").UnknownAction, unknown>;
-}>;
+declare const IPushPullViewPanelComponent: (props: IPushPullViewPanelComponentProps) => React.JSX.Element;
+export declare const IPushPullViewPanelControl: ConnectedComponent<typeof IPushPullViewPanelComponent, IPushPullViewPanelComponentProps>;
+export {};

package/src/View/IPushPullViewPanel.js

@@ -96,24 +96,24 @@ const IPushPullViewPanelComponent = (props) => {
     const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
     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)
+            React.createElement(DropdownButton, { disabled: allReports.length == 0 || isLiveIPushPullReport, items: availableReports, columns: ['label'], className: `ab-${elementType}__IPushPull__select twa:min-w-[140px] twa:text-0 twa:mr-2`, onClear: () => onSelectedReportChanged(''), showClearButton: StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName), variant: "outlined" }, StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName)
                 ? props.CurrentIPushPullReportName
                 : 'Select Report')),
         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)
+            React.createElement(DropdownButton, { disabled: allReports.length == 0 || isLiveIPushPullReport, items: availableFolders, columns: ['label'], className: `ab-${elementType}__IPushPull__select twa:min-w-[140px] twa:text-0 twa:mr-2`, onClear: () => onFolderChanged(''), showClearButton: StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder), variant: "outlined" }, StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder)
                 ? props.CurrentIPushPullFolder
                 : 'Select Folder')),
         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)
+            React.createElement(DropdownButton, { disabled: allReports.length == 0 || isLiveIPushPullReport, items: availablePages, columns: ['label'], className: `ab-${elementType}__IPushPull__select twa:min-w-[140px] twa:text-0 twa:mr-2`, onClear: () => onPageChanged(''), showClearButton: StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage), variant: "outlined" }, StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage)
                 ? props.CurrentIPushPullPage
                 : 'Select Page')),
-        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.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule, { marginLeft: 1, className: `ab-${elementType}__IPushPull__schedule`, onClick: () => onNewIPushPullSchedule(), tooltip: "Schedule", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })))),
+        React.createElement(Flex, { className: "twa:min-w-[148px]" },
+            React.createElement(ButtonExport, { className: `ab-${elementType}__IPushPull__export twa:ml-1`, onClick: () => onIPushPullSendSnapshot(), tooltip: "Send Snapshot to ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel }),
+            true ? (React.createElement(ButtonPause, { className: `ab-${elementType}__IPushPull__pause twa:ml-1 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 twa:ml-1`, 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.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule, { className: `ab-${elementType}__IPushPull__schedule twa:ml-1`, onClick: () => onNewIPushPullSchedule(), tooltip: "Schedule", disabled: isLiveIPushPullReport || !isCompletedReport, 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 },
+            React.createElement(ButtonNewPage, { className: `ab-${elementType}__IPushPull__newpage twa:ml-1`, onClick: () => props.onShowAddIPushPullPage(), tooltip: "New Page", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel }),
+            React.createElement(ButtonLogout, { className: `ab-${elementType}__IPushPull__logout twa:ml-1`, 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"));
 };

package/src/index.d.ts

@@ -1,5 +1,5 @@
 import { AdaptablePlugin } from '@adaptabletools/adaptable/types';
-import type { Action, Middleware } from 'redux';
+import type { Middleware } from 'redux';
 import * as Redux from 'redux';
 import { IPushPullState } from '@adaptabletools/adaptable/src/AdaptableState/IPushPullState';
 import { IPushPullApi } from '@adaptabletools/adaptable/src/Api/IPushPullApi';