Move publish sidebar logic to core/editor store

This logic is used by the PostPublishPanel, which lives in editor. We don't want editor to depend on anything from edit-post. An alternative approach could be to keep the logic in edit-post and use the the PrePublish and PostPublish extensions. In my view, those are meant for allowing plugins to inject their own panels into the PublishPanel. Dismissing the panel is a core action and using the extensions to circumvent the editor/edit-post separation would be a convoluted way to add support for dismissing the panel.
WordPress · Sep 11, 2018 · 28262d2 · 28262d2
1 parent 9351e3f
commit 28262d2
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 67 deletions.
diff --git a/edit-post/components/header/index.js b/edit-post/components/header/index.js
@@ -81,7 +81,7 @@ export default compose(
 	withSelect( ( select ) => ( {
 		isEditorSidebarOpened: select( 'core/edit-post' ).isEditorSidebarOpened(),
 		isPublishSidebarOpened: select( 'core/edit-post' ).isPublishSidebarOpened(),
-		isPublishSidebarEnabled: select( 'core/edit-post' ).isPublishSidebarEnabled(),
+		isPublishSidebarEnabled: select( 'core/editor' ).isPublishSidebarEnabled(),
 		hasActiveMetaboxes: select( 'core/edit-post' ).hasMetaBoxes(),
 		isSaving: select( 'core/edit-post' ).isSavingMetaBoxes(),
 		hasBlockSelection: !! select( 'core/editor' ).getBlockSelectionStart(),

diff --git a/edit-post/components/header/publish-sidebar-toggle/index.js b/edit-post/components/header/publish-sidebar-toggle/index.js
@@ -21,11 +21,11 @@ const PublishSidebarToggle = function( { onToggle, isEnabled } ) {
 
 export default compose( [
 	withSelect( ( select ) => ( {
-		isEnabled: select( 'core/edit-post' ).isPublishSidebarEnabled(),
+		isEnabled: select( 'core/editor' ).isPublishSidebarEnabled(),
 	} ) ),
 	withDispatch( ( dispatch, ownProps ) => ( {
 		onToggle() {
-			const { disablePublishSidebar, enablePublishSidebar } = dispatch( 'core/edit-post' );
+			const { disablePublishSidebar, enablePublishSidebar } = dispatch( 'core/editor' );
 			if ( ownProps.isEnabled ) {
 				disablePublishSidebar();
 			} else {

diff --git a/edit-post/store/actions.js b/edit-post/store/actions.js
@@ -83,28 +83,6 @@ export function togglePublishSidebar() {
 	};
 }
 
-/**
- * Returns an action object used in signalling that the user has enabled the publish sidebar.
- *
- * @return {Object} Action object
- */
-export function enablePublishSidebar() {
-	return {
-		type: 'ENABLE_PUBLISH_SIDEBAR',
-	};
-}
-
-/**
- * Returns an action object used in signalling that the user has disabled the publish sidebar.
- *
- * @return {Object} Action object
- */
-export function disablePublishSidebar() {
-	return {
-		type: 'DISABLE_PUBLISH_SIDEBAR',
-	};
-}
-
 /**
  * Returns an action object used in signalling that use toggled a panel in the editor.
  *

diff --git a/edit-post/store/reducer.js b/edit-post/store/reducer.js
@@ -49,15 +49,6 @@ export const preferences = combineReducers( {
 
 		return state;
 	},
-	isPublishSidebarEnabled( state = true, action ) {
-		switch ( action.type ) {
-			case 'ENABLE_PUBLISH_SIDEBAR':
-			case 'DISABLE_PUBLISH_SIDEBAR':
-				return action.type === 'ENABLE_PUBLISH_SIDEBAR';
-		}
-
-		return state;
-	},
 	panels( state = PREFERENCES_DEFAULTS.panels, action ) {
 		if ( action.type === 'TOGGLE_GENERAL_SIDEBAR_EDITOR_PANEL' ) {
 			return {

diff --git a/edit-post/store/selectors.js b/edit-post/store/selectors.js
@@ -15,18 +15,6 @@ export function getEditorMode( state ) {
 	return getPreference( state, 'editorMode', 'visual' );
 }
 
-/**
- * Returns whether the pre-publish panel show be shown
- * or hidden on publish.
- *
- * @param {Object} state Global application state.
- *
- * @return {boolean} Whether the pre-publish panel should be shown or not.
- */
-export function isPublishSidebarEnabled( state ) {
-	return getPreference( state, 'isPublishSidebarEnabled', true );
-}
-
 /**
  * Returns true if the editor sidebar is opened.
  *

diff --git a/edit-post/store/test/reducer.js b/edit-post/store/test/reducer.js
@@ -23,7 +23,6 @@ describe( 'state', () => {
 			expect( state ).toEqual( {
 				editorMode: 'visual',
 				isGeneralSidebarDismissed: false,
-				isPublishSidebarEnabled: true,
 				panels: { 'post-status': true },
 				features: { fixedToolbar: false },
 				pinnedPluginItems: {},
@@ -52,24 +51,6 @@ describe( 'state', () => {
 			expect( state.isGeneralSidebarDismissed ).toBe( true );
 		} );
 
-		it( 'should disable the publish sidebar', () => {
-			const original = deepFreeze( preferences( undefined, { } ) );
-			const state = preferences( original, {
-				type: 'DISABLE_PUBLISH_SIDEBAR',
-			} );
-
-			expect( state.isPublishSidebarEnabled ).toBe( false );
-		} );
-
-		it( 'should enable the publish sidebar', () => {
-			const original = deepFreeze( preferences( { isPublishSidebarEnabled: false }, { } ) );
-			const state = preferences( original, {
-				type: 'ENABLE_PUBLISH_SIDEBAR',
-			} );
-
-			expect( state.isPublishSidebarEnabled ).toBe( true );
-		} );
-
 		it( 'should set the sidebar panel open flag to true if unset', () => {
 			const state = preferences( deepFreeze( { panels: {} } ), {
 				type: 'TOGGLE_GENERAL_SIDEBAR_EDITOR_PANEL',

diff --git a/packages/editor/src/components/post-publish-panel/index.js b/packages/editor/src/components/post-publish-panel/index.js
@@ -117,7 +117,7 @@ export default compose( [
 			isSavingPost,
 			isEditedPostDirty,
 		} = select( 'core/editor' );
-		const { isPublishSidebarEnabled } = select( 'core/edit-post' );
+		const { isPublishSidebarEnabled } = select( 'core/editor' );
 		return {
 			postType: getCurrentPostType(),
 			hasPublishAction: get( getCurrentPost(), [ '_links', 'wp:action-publish' ], false ),
@@ -129,7 +129,7 @@ export default compose( [
 		};
 	} ),
 	withDispatch( ( dispatch, { isPublishSidebarEnabled } ) => {
-		const { disablePublishSidebar, enablePublishSidebar } = dispatch( 'core/edit-post' );
+		const { disablePublishSidebar, enablePublishSidebar } = dispatch( 'core/editor' );
 		return {
 			onTogglePublishSidebar: ( ) => {
 				if ( isPublishSidebarEnabled ) {

diff --git a/packages/editor/src/store/actions.js b/packages/editor/src/store/actions.js
@@ -763,3 +763,25 @@ export function unregisterToken( name ) {
 		name,
 	};
 }
+
+/**
+ * Returns an action object used in signalling that the user has enabled the publish sidebar.
+ *
+ * @return {Object} Action object
+ */
+export function enablePublishSidebar() {
+	return {
+		type: 'ENABLE_PUBLISH_SIDEBAR',
+	};
+}
+
+/**
+ * Returns an action object used in signalling that the user has disabled the publish sidebar.
+ *
+ * @return {Object} Action object
+ */
+export function disablePublishSidebar() {
+	return {
+		type: 'DISABLE_PUBLISH_SIDEBAR',
+	};
+}
diff --git a/packages/editor/src/store/defaults.js b/packages/editor/src/store/defaults.js
@@ -5,6 +5,7 @@ import { __ } from '@wordpress/i18n';
 
 export const PREFERENCES_DEFAULTS = {
 	insertUsage: {},
+	isPublishSidebarEnabled: true,
 };
 
 /**

diff --git a/packages/editor/src/store/reducer.js b/packages/editor/src/store/reducer.js
@@ -810,6 +810,13 @@ export function preferences( state = PREFERENCES_DEFAULTS, action ) {
 				...state,
 				insertUsage: omitBy( state.insertUsage, ( { insert } ) => insert.ref === action.id ),
 			};
+
+		case 'ENABLE_PUBLISH_SIDEBAR':
+		case 'DISABLE_PUBLISH_SIDEBAR':
+			return {
+				...state,
+				isPublishSidebarEnabled: action.type === 'ENABLE_PUBLISH_SIDEBAR',
+			};
 	}
 
 	return state;

diff --git a/packages/editor/src/store/selectors.js b/packages/editor/src/store/selectors.js
@@ -1879,3 +1879,15 @@ export function getTokenSettings( state, name ) {
 export function canUserUseUnfilteredHTML( state ) {
 	return has( getCurrentPost( state ), [ '_links', 'wp:action-unfiltered_html' ] );
 }
+
+/**
+ * Returns whether the pre-publish panel should be shown
+ * or hidden on publish.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether the pre-publish panel should be shown or not.
+ */
+export function isPublishSidebarEnabled( state ) {
+	return state.preferences.isPublishSidebarEnabled;
+}
diff --git a/packages/editor/src/store/test/reducer.js b/packages/editor/src/store/test/reducer.js
@@ -1580,9 +1580,28 @@ describe( 'state', () => {
 
 			expect( state ).toEqual( {
 				insertUsage: {},
+				isPublishSidebarEnabled: true,
 			} );
 		} );
 
+		it( 'should disable the publish sidebar', () => {
+			const original = deepFreeze( preferences( undefined, { } ) );
+			const state = preferences( original, {
+				type: 'DISABLE_PUBLISH_SIDEBAR',
+			} );
+
+			expect( state.isPublishSidebarEnabled ).toBe( false );
+		} );
+
+		it( 'should enable the publish sidebar', () => {
+			const original = deepFreeze( preferences( { isPublishSidebarEnabled: false }, { } ) );
+			const state = preferences( original, {
+				type: 'ENABLE_PUBLISH_SIDEBAR',
+			} );
+
+			expect( state.isPublishSidebarEnabled ).toBe( true );
+		} );
+
 		it( 'should record recently used blocks', () => {
 			const state = preferences( deepFreeze( { insertUsage: {} } ), {
 				type: 'INSERT_BLOCKS',