Framework: Adopt Ducks pattern for state shape

WordPress · Nov 20, 2017 · 4fa0f08 · 4fa0f08
1 parent 21b307f
commit 4fa0f08
Show file tree

Hide file tree

Showing 44 changed files with 6,792 additions and 6,160 deletions.
diff --git a/editor/components/post-permalink/index.js b/editor/components/post-permalink/index.js
@@ -14,7 +14,7 @@ import { Dashicon, ClipboardButton, Button } from '@wordpress/components';
  * Internal Dependencies
  */
 import './style.scss';
-import { isEditedPostNew, getEditedPostAttribute } from '../../state/selectors';
+import { isCurrentPostNew, getEditedPostAttribute } from '../../state/selectors';
 
 class PostPermalink extends Component {
 	constructor() {
@@ -66,7 +66,7 @@ class PostPermalink extends Component {
 export default connect(
 	( state ) => {
 		return {
-			isNew: isEditedPostNew( state ),
+			isNew: isCurrentPostNew( state ),
 			link: getEditedPostAttribute( state, 'link' ),
 		};
 	}

diff --git a/editor/components/post-preview-button/index.js b/editor/components/post-preview-button/index.js
@@ -14,10 +14,10 @@ import { _x } from '@wordpress/i18n';
  * Internal dependencies
  */
 import {
-	getEditedPostPreviewLink,
+	getCurrentPostPreviewLink,
 	getEditedPostAttribute,
 	isEditedPostDirty,
-	isEditedPostNew,
+	isCurrentPostNew,
 	isEditedPostSaveable,
 } from '../../state/selectors';
 import { autosave } from '../../state/actions';
@@ -117,9 +117,9 @@ export class PostPreviewButton extends Component {
 export default connect(
 	( state ) => ( {
 		postId: state.currentPost.id,
-		link: getEditedPostPreviewLink( state ),
+		link: getCurrentPostPreviewLink( state ),
 		isDirty: isEditedPostDirty( state ),
-		isNew: isEditedPostNew( state ),
+		isNew: isCurrentPostNew( state ),
 		isSaveable: isEditedPostSaveable( state ),
 		modified: getEditedPostAttribute( state, 'modified' ),
 	} ),

diff --git a/editor/components/post-saved-state/index.js b/editor/components/post-saved-state/index.js
@@ -16,7 +16,7 @@ import { Dashicon, Button } from '@wordpress/components';
 import './style.scss';
 import { editPost, savePost } from '../../state/actions';
 import {
-	isEditedPostNew,
+	isCurrentPostNew,
 	isCurrentPostPublished,
 	isEditedPostDirty,
 	isSavingPost,
@@ -68,7 +68,7 @@ export function PostSavedState( { isNew, isPublished, isDirty, isSaving, isSavea
 export default connect(
 	( state ) => ( {
 		post: getCurrentPost( state ),
-		isNew: isEditedPostNew( state ),
+		isNew: isCurrentPostNew( state ),
 		isPublished: isCurrentPostPublished( state ),
 		isDirty: isEditedPostDirty( state ),
 		isSaving: isSavingPost( state ),

diff --git a/editor/components/post-trash/index.js b/editor/components/post-trash/index.js
@@ -14,7 +14,7 @@ import { Button, Dashicon } from '@wordpress/components';
  */
 import './style.scss';
 import {
-	isEditedPostNew,
+	isCurrentPostNew,
 	getCurrentPostId,
 	getCurrentPostType,
 } from '../../state/selectors';
@@ -38,7 +38,7 @@ function PostTrash( { isNew, postId, postType, ...props } ) {
 export default connect(
 	( state ) => {
 		return {
-			isNew: isEditedPostNew( state ),
+			isNew: isCurrentPostNew( state ),
 			postId: getCurrentPostId( state ),
 			postType: getCurrentPostType( state ),
 		};

diff --git a/editor/sidebar/discussion-panel/index.js b/editor/sidebar/discussion-panel/index.js
@@ -13,7 +13,7 @@ import { PanelBody, PanelRow } from '@wordpress/components';
  * Internal Dependencies
  */
 import { PostComments, PostPingbacks } from '../../components';
-import { isEditorSidebarPanelOpened } from '../../state/selectors';
+import { isEditorSidebarPanelOpened } from '../../state/preferences';
 import { toggleSidebarPanel } from '../../state/actions';
 
 /**

diff --git a/editor/sidebar/post-trash/index.js b/editor/sidebar/post-trash/index.js
@@ -13,7 +13,7 @@ import { PanelRow } from '@wordpress/components';
  */
 import './style.scss';
 import { PostTrash as PostTrashLink } from '../../components';
-import { isEditedPostNew, getCurrentPostId } from '../../state/selectors';
+import { isCurrentPostNew, getCurrentPostId } from '../../state/selectors';
 
 function PostTrash( { isNew, postId } ) {
 	if ( isNew || ! postId ) {
@@ -30,7 +30,7 @@ function PostTrash( { isNew, postId } ) {
 export default connect(
 	( state ) => {
 		return {
-			isNew: isEditedPostNew( state ),
+			isNew: isCurrentPostNew( state ),
 			postId: getCurrentPostId( state ),
 		};
 	},