@adaptabletools/adaptable-plugin-ipushpull 22.0.2 → 22.0.3

package/package.json

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

package/src/View/IPushPullAddPagePopup.js

@@ -4,14 +4,14 @@ import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 import { StringExtensions } from '@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions';
 import FormLayout, { FormRow } from '@adaptabletools/adaptable/src/components/FormLayout';
-import Input from '@adaptabletools/adaptable/src/components/Input';
+import AdaptableInput from '@adaptabletools/adaptable/src/View/Components/AdaptableInput';
 import SimpleButton from '@adaptabletools/adaptable/src/components/SimpleButton';
 import { PanelWithImage } from '@adaptabletools/adaptable/src/View/Components/Panels/PanelWithImage';
 import { usePopupContext } from '@adaptabletools/adaptable/src/View/Components/Popups/AdaptablePopup/PopupContext';
 import ErrorBox from '@adaptabletools/adaptable/src/components/ErrorBox';
 import HelpBlock from '@adaptabletools/adaptable/src/components/HelpBlock';
 import { Flex } from '@adaptabletools/adaptable/src/components/Flex';
-import Dropdown from '@adaptabletools/adaptable/src/components/Dropdown';
+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';
 const IPushPullAddPageComponent = (props) => {
@@ -35,11 +35,11 @@ const IPushPullAddPageComponent = (props) => {
         setState({ ...state, Page: e.value });
     };
     const onFolderChanged = (folderName) => {
-        if (StringExtensions.IsNotNullOrEmpty(folderName) && folderName !== 'Select Folder') {
-            let avaialablePages = props.IPushPullDomainsPages.find((f) => f.Name == folderName).Pages;
+        if (StringExtensions.IsNotNullOrEmpty(folderName)) {
+            let availablePages = props.IPushPullDomainsPages.find((f) => f.Name == folderName)?.Pages ?? [];
             setState({
                 Folder: folderName,
-                AvailablePages: avaialablePages,
+                AvailablePages: availablePages,
                 Page: EMPTY_STRING,
                 ErrorMessage: EMPTY_STRING,
             });
@@ -67,10 +67,10 @@ const IPushPullAddPageComponent = (props) => {
             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, 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: "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(Input, { className: "twa:w-1/2", type: "text", placeholder: "Page Name", value: state.Page, onChange: onPageNameChange })),
+                        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" },

package/src/View/IPushPullLoginPopup.js

@@ -5,7 +5,7 @@ import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers
 import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
 import { StringExtensions } from '@adaptabletools/adaptable/src/Utilities/Extensions/StringExtensions';
 import FormLayout, { FormRow } from '@adaptabletools/adaptable/src/components/FormLayout';
-import Input from '@adaptabletools/adaptable/src/components/Input';
+import AdaptableInput from '@adaptabletools/adaptable/src/View/Components/AdaptableInput';
 import SimpleButton from '@adaptabletools/adaptable/src/components/SimpleButton';
 import { PanelWithImage } from '@adaptabletools/adaptable/src/View/Components/Panels/PanelWithImage';
 import { usePopupContext } from '@adaptabletools/adaptable/src/View/Components/Popups/AdaptablePopup/PopupContext';
@@ -39,10 +39,10 @@ const IPushPullLoginComponent = (props) => {
             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, { className: "twa:w-full", type: "email", placeholder: "Email address", value: state.Login, onChange: onLoginChange })),
-                    React.createElement(FormRow, { label: "ipushpull password:" },
-                        React.createElement(Input, { className: "twa:w-full", type: "password", placeholder: "Password", value: state.Password, onChange: onPasswordChange })),
+                    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" },

package/src/View/IPushPullViewPanel.js

@@ -4,7 +4,7 @@ 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 DropdownButton from '@adaptabletools/adaptable/src/components/DropdownButton';
+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';
@@ -62,58 +62,42 @@ const IPushPullViewPanelComponent = (props) => {
     let allReports = systemReports
         .filter((s) => props.api.exportApi.internalApi.isSystemReportActive(s))
         .concat(props.Reports.map((r) => r.Name));
-    let availableReports = allReports.map((report) => {
-        return {
-            label: report,
-            value: report,
-            onClick: () => onSelectedReportChanged(report),
-        };
-    });
-    let availableFolders = props.IPushPullDomainsPages?.map((iPushPullDomain) => {
-        return {
-            label: iPushPullDomain.Name,
-            value: iPushPullDomain.Name,
-            onClick: () => onFolderChanged(iPushPullDomain.Name),
-        };
-    }) ?? [];
-    let availablePages = props.CurrentIPushPullAvailablePages?.map((page) => {
-        return {
-            label: page,
-            value: page,
-            onClick: () => onPageChanged(page),
-        };
-    }) ?? [];
-    // this is clearly ridiculous!
-    // im getting tired...
-    let isCompletedReport = StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName) &&
-        StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder) &&
-        StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage);
+    let availableReports = allReports.map((report) => ({
+        label: report,
+        value: report,
+    }));
+    let availableFolders = props.IPushPullDomainsPages?.map((iPushPullDomain) => ({
+        label: iPushPullDomain.Name,
+        value: iPushPullDomain.Name,
+    })) ?? [];
+    let availablePages = props.CurrentIPushPullAvailablePages?.map((page) => ({
+        label: page,
+        value: page,
+    })) ?? [];
+    let hasReport = StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName);
+    let hasFolder = StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder);
+    let hasPage = StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage);
+    let isCompletedReport = hasReport && hasFolder && hasPage;
     let isLiveIPushPullReport = isCompletedReport &&
         props.CurrentLiveIPushPullReport &&
         props.CurrentIPushPullReportName == props.CurrentLiveIPushPullReport.ReportName &&
         props.CurrentIPushPullFolder == props.CurrentLiveIPushPullReport.Folder &&
         props.CurrentIPushPullPage == props.CurrentLiveIPushPullReport.Page;
     const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    return props.IsIPushPullRunning ? (React.createElement(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, 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, 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, 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, { 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 }),
-            isLiveIPushPullReport ? (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, { 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 },
+    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"));
 };

package/src/index.d.ts

@@ -19,5 +19,5 @@ declare class IPushPullPlugin extends AdaptablePlugin {
     afterInitStore(adaptable: IAdaptable): void;
 }
 export type { IPushPullPluginOptions, IPushPullConfig } from './IPushPullPluginOptions';
-declare const _default: (options?: IPushPullPluginOptions) => IPushPullPlugin;
-export default _default;
+export declare const ipushpullPlugin: (options?: IPushPullPluginOptions) => IPushPullPlugin;
+export default ipushpullPlugin;

package/src/index.js

@@ -132,7 +132,7 @@ class IPushPullPlugin extends AdaptablePlugin {
                         return next(action);
                     }
                     case IPUSHPULL_DOMAIN_PAGES_SET: {
-                        //refresh the available pages
+                        const result = next(action);
                         const currentFolder = middlewareAPI.getState().Internal.IPushPullCurrentFolder;
                         const isFolderValid = StringExtensions.IsNotNullOrEmpty(currentFolder);
                         if (isFolderValid) {
@@ -141,7 +141,7 @@ class IPushPullPlugin extends AdaptablePlugin {
                                 .getPagesForIPushPullDomain(currentFolder);
                             middlewareAPI.dispatch(IPushPullSetCurrentAvailablePages(availablePages));
                         }
-                        return next(action);
+                        return result;
                     }
                     default: {
                         return next(action);
@@ -157,4 +157,5 @@ class IPushPullPlugin extends AdaptablePlugin {
         AdaptableViewPanelFactory.set(IPushPullModuleId, IPushPullViewPanelControl);
     }
 }
-export default (options) => new IPushPullPlugin(options);
+export const ipushpullPlugin = (options) => new IPushPullPlugin(options);
+export default ipushpullPlugin;

package/src/ipushpull-client/IPushPullClient.d.ts

@@ -4,6 +4,7 @@ export declare class IPushPullClient {
     private tokens;
     private refreshPromise;
     constructor(config: IPushPullClientConfig);
+    private getBasicAuthHeader;
     private buildOAuthBody;
     login(username: string, password: string): Promise<IPushPullTokens>;
     refreshToken(): Promise<IPushPullTokens>;

package/src/ipushpull-client/IPushPullClient.js

@@ -5,13 +5,12 @@ export class IPushPullClient {
     constructor(config) {
         this.config = config;
     }
+    getBasicAuthHeader() {
+        const credentials = `${this.config.api_key}:${this.config.api_secret}`;
+        return `Basic ${btoa(credentials)}`;
+    }
     buildOAuthBody(params) {
-        const allParams = {
-            ...params,
-            client_id: this.config.api_key,
-            client_secret: this.config.api_secret,
-        };
-        return Object.entries(allParams)
+        return Object.entries(params)
             .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
             .join('&');
     }
@@ -26,6 +25,7 @@ export class IPushPullClient {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
+                Authorization: this.getBasicAuthHeader(),
             },
             body,
         });
@@ -66,6 +66,7 @@ export class IPushPullClient {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
+                Authorization: this.getBasicAuthHeader(),
             },
             body,
         });

package/src/View/IPushPullPopup.d.ts

@@ -1,2 +0,0 @@
-import * as React from 'react';
-export declare let IPushPullPopup: React.ComponentType<any>;

package/src/View/IPushPullPopup.js

@@ -1,37 +0,0 @@
-import * as React from 'react';
-import { connect } from 'react-redux';
-import { PanelWithButton } from '@adaptabletools/adaptable/src/View/Components/Panels/PanelWithButton';
-import * as IPushPullRedux from '../Redux/ActionReducers/IPushPullRedux';
-import * as TeamSharingRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/TeamSharingRedux';
-import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
-import { UIHelper } from '@adaptabletools/adaptable/src/View/UIHelper';
-class IPushPullPopupComponent extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = UIHelper.getEmptyConfigState();
-    }
-    shouldClosePopupOnFinishWizard = false;
-    componentDidMount() {
-        if (this.props.popupParams) {
-            this.shouldClosePopupOnFinishWizard =
-                this.props.popupParams.source && this.props.popupParams.source == 'Toolbar';
-        }
-    }
-    render() {
-        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);
-    }
-}
-function mapStateToProps(state) {
-    return {};
-}
-function mapDispatchToProps(dispatch) {
-    return {
-        onIPushPullSendSnapshot: (report) => dispatch(IPushPullRedux.IPushPullSendSnapshot(report)),
-        onIPushPullStopLiveData: () => dispatch(IPushPullRedux.IPushPullStopLiveData()),
-        onShare: (entity, config) => dispatch(TeamSharingRedux.TeamSharingShare(entity, ModuleConstants.IPushPullModuleId, config)),
-    };
-}
-export let IPushPullPopup = connect(mapStateToProps, mapDispatchToProps)(IPushPullPopupComponent);