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

Chrome: Show notices on post save, schedule, update #1564

Merged
merged 1 commit into from
Jun 29, 2017
Merged

Chrome: Show notices on post save, schedule, update #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion components/notice/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
position: fixed;
top: 40px;
right: 0;
width: 300px;
min-width: 300px;
max-width: 400px;
z-index: z-index( ".components-notice-list" );
}
60 changes: 53 additions & 7 deletions editor/effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import { __ } from 'i18n';
* Internal dependencies
*/
import { getGutenbergURL, getWPAdminURL } from './utils/url';
import { focusBlock, replaceBlocks } from './actions';
import { focusBlock, replaceBlocks, successNotice, errorNotice } from './actions';
import {
getCurrentPostId,
getCurrentPost,
getCurrentPostType,
getBlocks,
getPostEdits,
Expand All @@ -26,8 +26,8 @@ export default {
REQUEST_POST_UPDATE( action, store ) {
const { dispatch, getState } = store;
const state = getState();
const postId = getCurrentPostId( state );
const isNew = ! postId;
const post = getCurrentPost( state );
const isNew = ! post.id;
const edits = getPostEdits( state );
const toSend = {
...edits,
Expand All @@ -36,7 +36,7 @@ export default {
const transactionId = uniqueId();

if ( ! isNew ) {
toSend.id = postId;
toSend.id = post.id;
}

dispatch( {
Expand All @@ -56,6 +56,7 @@ export default {
} );
dispatch( {
type: 'REQUEST_POST_UPDATE_SUCCESS',
previousPost: post,
post: newPost,
isNew,
optimist: { type: COMMIT, id: transactionId },
Expand All @@ -67,13 +68,40 @@ export default {
code: 'unknown_error',
message: __( 'An unknown error occurred.' ),
} ),
post,
edits,
optimist: { type: REVERT, id: transactionId },
} );
} );
},
REQUEST_POST_UPDATE_SUCCESS( action ) {
const { post, isNew } = action;
REQUEST_POST_UPDATE_SUCCESS( action, store ) {
const { previousPost, post, isNew } = action;
const { dispatch } = store;

const publishStatus = [ 'publish', 'private', 'future' ];
const isPublished = publishStatus.indexOf( previousPost.status ) !== -1;
const messages = {
publish: __( 'Post published!' ),
'private': __( 'Post published privately!' ),
future: __( 'Post schduled!' ),
};

// If we save a non published post, we don't show any notice
// If we publish/schedule a post, we show the corresponding publish message
// Unless we show an update notice
if ( isPublished || publishStatus.indexOf( post.status ) !== -1 ) {
const noticeMessage = ! isPublished && publishStatus.indexOf( post.status ) !== -1
? messages[ post.status ]
: __( 'Post updated!' );
dispatch( successNotice(
<p>
<span>{ noticeMessage }</span>
{ ' ' }
<a href={ post.link } target="_blank">{ __( 'View post' ) }</a>
</p>
) );
}

if ( ! isNew ) {
return;
}
Expand All @@ -82,6 +110,24 @@ export default {
} );
window.history.replaceState( {}, 'Post ' + post.id, newURL );
},
REQUEST_POST_UPDATE_FAILURE( action, store ) {
const { post, edits } = action;
const { dispatch } = store;

const publishStatus = [ 'publish', 'private', 'future' ];
const isPublished = publishStatus.indexOf( post.status ) !== -1;
// If the post was being published, we show the corresponding publish error message
// Unless we publish an "updating failed" message
const messages = {
publish: __( 'Publishing failed' ),
'private': __( 'Publishing failed' ),
future: __( 'Scheduling failed' ),
};
const noticeMessage = ! isPublished && publishStatus.indexOf( edits.status ) !== -1
? messages[ edits.status ]
: __( 'Updating failed' );
dispatch( errorNotice( noticeMessage ) );
},
TRASH_POST( action, store ) {
const { dispatch, getState } = store;
const { postId } = action;
Expand Down