Extract the isValidTemplate from the setupEditorState action

WordPress · Feb 23, 2018 · be44df7 · be44df7
1 parent 15e8f10
commit be44df7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 23 deletions.
diff --git a/editor/store/actions.js b/editor/store/actions.js
@@ -42,17 +42,15 @@ export function resetPost( post ) {
  * @param {Object}  post            Post object.
  * @param {Array}   blocks          Array of blocks.
  * @param {Object}  edits           Initial edited attributes object.
- * @param {boolean} isValidTemplate Whether the template is valid or not.
  *
  * @return {Object} Action object.
  */
-export function setupEditorState( post, blocks, edits, isValidTemplate ) {
+export function setupEditorState( post, blocks, edits ) {
 	return {
 		type: 'SETUP_EDITOR_STATE',
 		post,
 		blocks,
 		edits,
-		isValidTemplate,
 	};
 }
 

diff --git a/editor/store/effects.js b/editor/store/effects.js
@@ -307,7 +307,10 @@ export default {
 			edits.status = 'draft';
 		}
 
-		return setupEditorState( post, blocks, edits, isValidTemplate );
+		return [
+			setTemplateValidity( isValidTemplate ),
+			setupEditorState( post, blocks, edits ),
+		];
 	},
 	SYNCHRONIZE_TEMPLATE( action, { getState } ) {
 		const state = getState();

diff --git a/editor/store/reducer.js b/editor/store/reducer.js
@@ -649,11 +649,6 @@ export function template( state = { isValid: true }, action ) {
 				template: action.settings.template,
 				lock: action.settings.templateLock,
 			};
-		case 'SETUP_EDITOR_STATE':
-			return {
-				...state,
-				isValid: action.isValidTemplate,
-			};
 		case 'SET_TEMPLATE_VALIDITY':
 			return {
 				...state,

diff --git a/editor/store/test/effects.js b/editor/store/test/effects.js
@@ -30,6 +30,7 @@ import {
 	convertBlockToStatic,
 	convertBlockToReusable,
 	selectBlock,
+	setTemplateValidity,
 } from '../../store/actions';
 import reducer from '../reducer';
 import effects from '../effects';
@@ -417,7 +418,10 @@ describe( 'effects', () => {
 
 			const result = handler( { post, settings: {} } );
 
-			expect( result ).toEqual( setupEditorState( post, [], {}, true ) );
+			expect( result ).toEqual( [
+				setTemplateValidity( true ),
+				setupEditorState( post, [], {} ),
+			] );
 		} );
 
 		it( 'should return block reset with non-empty content', () => {
@@ -435,8 +439,11 @@ describe( 'effects', () => {
 
 			const result = handler( { post, settings: {} } );
 
-			expect( result.blocks ).toHaveLength( 1 );
-			expect( result ).toEqual( setupEditorState( post, result.blocks, {}, true ) );
+			expect( result[ 1 ].blocks ).toHaveLength( 1 );
+			expect( result ).toEqual( [
+				setTemplateValidity( true ),
+				setupEditorState( post, result[ 1 ].blocks, {} ),
+			] );
 		} );
 
 		it( 'should return post setup action only if auto-draft', () => {
@@ -453,7 +460,10 @@ describe( 'effects', () => {
 
 			const result = handler( { post, settings: {} } );
 
-			expect( result ).toEqual( setupEditorState( post, [], { title: 'A History of Pork', status: 'draft' }, true ) );
+			expect( result ).toEqual( [
+				setTemplateValidity( true ),
+				setupEditorState( post, [], { title: 'A History of Pork', status: 'draft' } ),
+			] );
 		} );
 	} );
 

diff --git a/editor/store/test/reducer.js b/editor/store/test/reducer.js
@@ -1776,16 +1776,6 @@ describe( 'state', () => {
 			expect( state ).toEqual( { isValid: true, template: blockTemplate, lock: 'all' } );
 		} );
 
-		it( 'should set the validity flag', () => {
-			const original = deepFreeze( { isValid: true, template: [] } );
-			const state = template( original, {
-				type: 'SETUP_EDITOR_STATE',
-				isValidTemplate: false,
-			} );
-
-			expect( state ).toEqual( { isValid: false, template: [] } );
-		} );
-
 		it( 'should reset the validity flag', () => {
 			const original = deepFreeze( { isValid: false, template: [] } );
 			const state = template( original, {