Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Onboarding: Redirect to task list after shipping step connection (https://github.com/woocommerce/woocommerce-admin/pull/3331) 

* Add redirectUrl prop to connect step

* Add propTypes to connect component
This commit is contained in:
Joshua T Flowers 2019-12-04 07:16:17 +08:00 committed by GitHub
parent 7e2aa85235
commit 7c9ba29fa2
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/woocommerce-admin/client/dashboard/task-list/tasks/shipping/index.js
View File

@ -14,8 +14,8 @@ import { withDispatch } from '@wordpress/data';
* WooCommerce dependencies
*/
import { Card, Link, Stepper } from '@woocommerce/components';
import { getAdminLink, getSetting } from '@woocommerce/wc-admin-settings';
import { getHistory, getNewPath } from '@woocommerce/navigation';
import { getSetting } from '@woocommerce/wc-admin-settings';
/**
* Internal dependencies
@ -231,6 +231,7 @@ class Shipping extends Component {
),
content: (
<Connect
redirectUrl={ getAdminLink( 'admin.php?page=wc-admin' ) }
completeStep={ this.completeStep }
{ ...this.props }
onConnect={ () => {

32
plugins/woocommerce-admin/client/dashboard/task-list/tasks/steps/connect.js
View File

@ -6,6 +6,7 @@ import { __ } from '@wordpress/i18n';
import { Button } from '@wordpress/components';
import { Component, Fragment } from '@wordpress/element';
import { compose } from '@wordpress/compose';
import PropTypes from 'prop-types';
import { withDispatch } from '@wordpress/data';
/**
@ -53,8 +54,35 @@ class Connect extends Component {
}
}
Connect.propTypes = {
/**
* Method to create a displayed notice.
*/
createNotice: PropTypes.func.isRequired,
/**
* Human readable error message.
*/
error: PropTypes.string,
/**
* Bool to determine if the "Retry" button should be displayed.
*/
hasErrors: PropTypes.bool,
/**
* Bool to check if the connection URL is still being requested.
*/
isRequesting: PropTypes.bool,
/**
* Generated Jetpack connection URL.
*/
jetpackConnectUrl: PropTypes.string,
/**
* Redirect URL to encode as a URL param for the connection path.
*/
redirectUrl: PropTypes.string,
};
export default compose(
withSelect( select => {
withSelect( ( select, props ) => {
const {
getJetpackConnectUrl,
isGetJetpackConnectUrlRequesting,
@ -62,7 +90,7 @@ export default compose(
} = select( 'wc-api' );
const queryArgs = {
redirect_url: window.location.href,
redirect_url: props.redirectUrl || window.location.href,
};
const isRequesting = isGetJetpackConnectUrlRequesting( queryArgs );
const error = getJetpackConnectUrlError( queryArgs );