Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Effects: Move trash post URL change to the BrowserUrl component #7228

Merged
merged 5 commits into from
Jun 20, 2018
Merged

Effects: Move trash post URL change to the BrowserUrl component #7228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3337f28
Effects: Move trash post URL change to the BrowserUrl component
youknowriad Jun 8, 2018
4bde03b
Use the correct "trash" status
youknowriad Jun 11, 2018
bcdb811
unit test the trashed post URL
youknowriad Jun 11, 2018
c9829bc
Refactor componentDidUpdate to accomodate separate flows
youknowriad Jun 11, 2018
549e7a0
Remove TRASH_POST_SUCCESS action and add a note about updatePost
youknowriad Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions edit-post/components/browser-url/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ export function getPostEditURL( postId ) {
return addQueryArgs( 'post.php', { post: postId, action: 'edit' } );
}

/**
* Returns the Post's Trashedd URL.
*
* @param {number} postId Post ID.
* @param {string} postType Post Type.
*
* @return {string} Post trashed URL.
*/
export function getPostTrashedURL( postId, postType ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we export? For tests? 😉

return addQueryArgs( 'edit.php', {
trashed: 1,
post_type: postType,
ids: postId,
} );
}

export class BrowserURL extends Component {
constructor() {
super( ...arguments );
Expand All @@ -26,17 +42,29 @@ export class BrowserURL extends Component {
}

componentDidUpdate( prevProps ) {
const { postId, postStatus } = this.props;
const { postId, postStatus, postType } = this.props;
const { historyId } = this.state;
if ( postId === prevProps.postId && postId === historyId ) {

if ( postStatus === 'trash' ) {
this.setTrashURL( postId, postType );
return;
}

if ( postStatus !== 'auto-draft' ) {
if ( ( postId !== prevProps.postId || postId !== historyId ) && postStatus !== 'auto-draft' ) {
this.setBrowserURL( postId );
}
}

/**
* Navigates the browser to the post trashed URL to show a notice about the trashed post.
*
* @param {number} postId Post ID.
* @param {string} postType Post Type.
*/
setTrashURL( postId, postType ) {
window.location.href = getPostTrashedURL( postId, postType );
}

/**
* Replaces the browser URL with a post editor link for the given post ID.
*
Expand Down Expand Up @@ -65,10 +93,11 @@ export class BrowserURL extends Component {

export default withSelect( ( select ) => {
const { getCurrentPost } = select( 'core/editor' );
const { id, status } = getCurrentPost();
const { id, status, type } = getCurrentPost();

return {
postId: id,
postStatus: status,
postType: type,
};
} )( BrowserURL );
10 changes: 9 additions & 1 deletion edit-post/components/browser-url/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { shallow } from 'enzyme';
/**
* Internal dependencies
*/
import { getPostEditURL, BrowserURL } from '../';
import { getPostEditURL, getPostTrashedURL, BrowserURL } from '../';

describe( 'getPostEditURL', () => {
it( 'should generate relative path with post and action arguments', () => {
Expand All @@ -16,6 +16,14 @@ describe( 'getPostEditURL', () => {
} );
} );

describe( 'getPostTrashedURL', () => {
it( 'should generate relative path with post and action arguments', () => {
const url = getPostTrashedURL( 1, 'page' );

expect( url ).toBe( 'edit.php?trashed=1&post_type=page&ids=1' );
} );
} );

describe( 'BrowserURL', () => {
let replaceStateSpy;

Expand Down
19 changes: 5 additions & 14 deletions editor/store/effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import apiRequest from '@wordpress/api-request';
/**
* Internal dependencies
*/
import { getWPAdminURL } from '../utils/url';
import {
setupEditorState,
resetAutosave,
Expand Down Expand Up @@ -254,10 +253,11 @@ export default {
dispatch( removeNotice( TRASH_POST_NOTICE_ID ) );
apiRequest( { path: `/wp/v2/${ basePath }/${ postId }`, method: 'DELETE' } ).then(
() => {
dispatch( {
...action,
type: 'TRASH_POST_SUCCESS',
} );
const post = getCurrentPost( getState() );

// TODO: This should be an updatePost action (updating subsets of post properties),
// But right now editPost is tied with change detection.
dispatch( resetPost( { ...post, status: 'trash' } ) );
},
( err ) => {
dispatch( {
Expand All @@ -271,15 +271,6 @@ export default {
}
);
},
TRASH_POST_SUCCESS( action ) {
const { postId, postType } = action;

window.location.href = getWPAdminURL( 'edit.php', {
trashed: 1,
post_type: postType,
ids: postId,
} );
},
TRASH_POST_FAILURE( action, store ) {
const message = action.error.message && action.error.code !== 'unknown_error' ? action.error.message : __( 'Trashing failed' );
store.dispatch( createErrorNotice( message, { id: TRASH_POST_NOTICE_ID } ) );
Expand Down