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

youknowriad · 2018-06-08T14:11:57Z

Related #7096

This PR consolidates all browser navigation (url changes and actual navigation) in the BrowserUrl component of the edit-post module making.

Testing instructions

Click "Trash Post"
Once the removal succeeds, you should be redirected to the post list.

mkaz · 2018-06-08T14:42:44Z

👍 Fixes #7136 - at least give us the ability we need to fix.

aduth · 2018-06-08T15:19:59Z

editor/store/effects.js

@@ -254,6 +253,8 @@ export default {
 		dispatch( removeNotice( TRASH_POST_NOTICE_ID ) );
 		apiRequest( { path: `/wp/v2/${ basePath }/${ postId }`, method: 'DELETE' } ).then(
 			() => {
+				const post = getCurrentPost( getState() );
+				dispatch( resetPost( { ...post, status: 'trashed' } ) );


The correct status is 'trash'.

https://codex.wordpress.org/Function_Reference/get_post_status#Return_Values

aduth · 2018-06-08T15:21:57Z

editor/store/effects.js

@@ -254,6 +253,8 @@ export default {
 		dispatch( removeNotice( TRASH_POST_NOTICE_ID ) );
 		apiRequest( { path: `/wp/v2/${ basePath }/${ postId }`, method: 'DELETE' } ).then(
 			() => {
+				const post = getCurrentPost( getState() );
+				dispatch( resetPost( { ...post, status: 'trashed' } ) );


This seems like what updatePost is meant to handle (updating subsets of post properties). Unfortunately we have it tangled with change detection so that it considers dirtiness as reset. This might not be a problem if we expect a redirect to occur anyways (in fact maybe a good thing to avoid any possibility of a prompt).

Related: #7130 (comment)

This seems like what updatePost is meant to handle [...]

What do you think about this? Should we try to use updatePost? If it's at least the desirable end-solution, should we add a "TODO" comment or task to follow-up on this?

I think it should be a todo for now because at some point I want to move the currentPost out of the editor's state into core-data, in which case we'd have a updateEntityRecord action

aduth · 2018-06-08T15:23:27Z

edit-post/components/browser-url/index.js

+ *
+ * @return {string} Post trashed URL.
+ */
+export function getPostTrashedURL( postId, postType ) {


Why do we export? For tests? 😉

aduth · 2018-06-08T15:24:25Z

edit-post/components/browser-url/index.js

 		const { historyId } = this.state;
+
+		if ( postStatus === 'trashed' ) {


The logic flow for this lifecycle function is a bit confusing, since it handles 2 cases (with 3 conditions including a return) for which one but not the other is delegated to a separate function (setBrowserURL).

Should we consolidate to two conditions (one per case), and use separate functions consistently?

componentDidUpdate( prevProps ) { const { postId, postStatus, postType } = this.props; if ( postStatus === 'trashed' ) { this.setTrashURL( postId, postType ); } const { historyId } = this.state; if ( ( postId !== prevProps.postId || postId !== historyId ) && postStatus !== 'auto-draft' ) { this.setBrowserURL( postId ); } }

Or maybe some other pattern for handling multiple types of lifecycle changes, e.g. componentDidUpdate assigned by _.over or _.cond.

Similar to:

gutenberg/editor/components/navigable-toolbar/index.js

Lines 33 to 35 in 5d7bc40

this.switchOnKeyDown = cond( [

[ matchesProperty( [ 'keyCode' ], ESCAPE ), this.focusSelection ],

] );

I'm using the less smart option :P. I think it's a little bit easier to understand.

youknowriad · 2018-06-19T07:26:00Z

Can I get another review on this one? It should be ready

aduth

👍

aduth · 2018-06-19T18:50:42Z

editor/store/effects.js

@@ -254,6 +253,8 @@ export default {
 		dispatch( removeNotice( TRASH_POST_NOTICE_ID ) );
 		apiRequest( { path: `/wp/v2/${ basePath }/${ postId }`, method: 'DELETE' } ).then(
 			() => {
+				const post = getCurrentPost( getState() );
+				dispatch( resetPost( { ...post, status: 'trash' } ) );
 				dispatch( {
 					...action,
 					type: 'TRASH_POST_SUCCESS',


This action type is never referenced elsewhere. Should we remove it? My only hesitation might be is that it's complementing the failing type, which is in-fact referenced. The counter-point may be that the existence of this action type may be misinterpreted as a hint that it has resulting handling. I'd lean toward removal.

Aside: I'd also like to refactor the notices behavior, which would include consolidating the TRASH_POST_FAILURE action type.

aduth · 2018-06-19T18:52:46Z

editor/store/effects.js

@@ -254,6 +253,8 @@ export default {
 		dispatch( removeNotice( TRASH_POST_NOTICE_ID ) );
 		apiRequest( { path: `/wp/v2/${ basePath }/${ postId }`, method: 'DELETE' } ).then(
 			() => {
+				const post = getCurrentPost( getState() );
+				dispatch( resetPost( { ...post, status: 'trash' } ) );


We should make a note about updating this to updatePost so it's not overlooked (issue or inline comment).

youknowriad requested a review from aduth June 8, 2018 14:11

aduth added Framework Issues related to broader framework topics, especially as it relates to javascript [Type] Code Quality Issues or PRs that relate to code quality labels Jun 8, 2018

youknowriad force-pushed the update/consolidate-post-trash-url-change branch 2 times, most recently from 80907ae to f0f1995 Compare June 8, 2018 14:36

Effects: Move trash post URL change to the BrowserUrl component

3337f28

youknowriad force-pushed the update/consolidate-post-trash-url-change branch from f0f1995 to 3337f28 Compare June 8, 2018 14:47

aduth reviewed Jun 8, 2018

View reviewed changes

youknowriad added 3 commits June 11, 2018 11:37

Use the correct "trash" status

4bde03b

unit test the trashed post URL

bcdb811

Refactor componentDidUpdate to accomodate separate flows

c9829bc

youknowriad force-pushed the update/consolidate-post-trash-url-change branch from 63a88bd to c9829bc Compare June 11, 2018 10:44

aduth approved these changes Jun 19, 2018

View reviewed changes

aduth mentioned this pull request Jun 19, 2018

Fix getWPAdminUrl function to actually return the /wp-admin/ URL #7096

Closed

Remove TRASH_POST_SUCCESS action and add a note about updatePost

549e7a0

youknowriad merged commit 773e37f into master Jun 20, 2018

youknowriad deleted the update/consolidate-post-trash-url-change branch June 20, 2018 10:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

youknowriad commented Jun 8, 2018

mkaz commented Jun 8, 2018

aduth Jun 8, 2018

aduth Jun 8, 2018

aduth Jun 11, 2018

youknowriad Jun 11, 2018

aduth Jun 8, 2018

aduth Jun 8, 2018

youknowriad Jun 11, 2018

youknowriad commented Jun 19, 2018

aduth left a comment

aduth Jun 19, 2018

aduth Jun 19, 2018

		const { historyId } = this.state;

		if ( postStatus === 'trashed' ) {

	this.switchOnKeyDown = cond( [
	[ matchesProperty( [ 'keyCode' ], ESCAPE ), this.focusSelection ],
	] );

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

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

Conversation

youknowriad commented Jun 8, 2018

mkaz commented Jun 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

youknowriad commented Jun 19, 2018

aduth left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment