Block Template: Implement "all/insert" locking levels

WordPress · Dec 3, 2017 · b413329 · b413329
1 parent 1398753
commit b413329
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/editor/components/block-list/block.js b/editor/components/block-list/block.js
@@ -3,17 +3,16 @@
  */
 import { connect } from 'react-redux';
 import classnames from 'classnames';
-import { get, partial, reduce, size, flow } from 'lodash';
+import { get, partial, reduce, size } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 import { Component, compose, createElement } from '@wordpress/element';
 import { keycodes } from '@wordpress/utils';
 import { getBlockType, BlockEdit, getBlockDefaultClassname, createBlock, hasBlockSupport } from '@wordpress/blocks';
-import { withFilters } from '@wordpress/components';
+import { withFilters, withContext } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
-import { withContext } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -517,14 +516,14 @@ const mapDispatchToProps = ( dispatch, ownProps ) => ( {
 	},
 } );
 
-export default flow(
+export default compose(
 	withFilters( 'Editor.BlockItem' ),
 	connect( mapStateToProps, mapDispatchToProps ),
 	withContext( 'editor' )( ( settings ) => {
 		const { templateLock } = settings;
 
 		return {
-			isLocked: true === templateLock,
+			isLocked: !! templateLock,
 		};
 	} ),
 )( BlockListBlock );
diff --git a/editor/components/block-mover/index.js b/editor/components/block-mover/index.js
@@ -103,7 +103,7 @@ export default flow(
 		const { templateLock } = settings;
 
 		return {
-			isLocked: true === templateLock,
+			isLocked: templateLock === 'all',
 		};
 	} ),
 )( BlockMover );
diff --git a/editor/components/block-settings-menu/block-delete-button.js b/editor/components/block-settings-menu/block-delete-button.js
@@ -47,7 +47,7 @@ export default flow(
 		const { templateLock } = settings;
 
 		return {
-			isLocked: true === templateLock,
+			isLocked: !! templateLock,
 		};
 	} ),
 )( BlockDeleteButton );
diff --git a/editor/components/block-switcher/index.js b/editor/components/block-switcher/index.js
@@ -146,7 +146,7 @@ export default flow(
 		const { templateLock } = settings;
 
 		return {
-			isLocked: true === templateLock,
+			isLocked: !! templateLock,
 		};
 	} ),
 )( BlockSwitcher );
diff --git a/editor/components/editor-global-keyboard-shortcuts/index.js b/editor/components/editor-global-keyboard-shortcuts/index.js
@@ -85,7 +85,7 @@ export default flow(
 		const { templateLock } = settings;
 
 		return {
-			isLocked: true === templateLock,
+			isLocked: !! templateLock,
 		};
 	} ),
 )( EditorGlobalKeyboardShortcuts );
diff --git a/editor/components/inserter/index.js b/editor/components/inserter/index.js
@@ -132,7 +132,7 @@ export default flowRight( [
 
 		return {
 			hasSupportedBlocks: true === blockTypes || ! isEmpty( blockTypes ),
-			isLocked: true === templateLock,
+			isLocked: !! templateLock,
 		};
 	} ),
 ] )( Inserter );
diff --git a/editor/edit-post/modes/visual-editor/inserter.js b/editor/edit-post/modes/visual-editor/inserter.js
@@ -96,7 +96,7 @@ export default flow(
 		const { templateLock } = settings;
 
 		return {
-			isLocked: true === templateLock,
+			isLocked: !! templateLock,
 		};
 	} ),
 )( VisualEditorInserter );
diff --git a/lib/client-assets.php b/lib/client-assets.php
@@ -791,7 +791,7 @@ function gutenberg_editor_scripts_and_styles( $hook ) {
 	$post_type_object = get_post_type_object( $post_to_edit['type'] );
 	if ( ! empty( $post_type_object->template ) ) {
 		$editor_settings['template']     = $post_type_object->template;
-		$editor_settings['templateLock'] = ! empty( $post_type_object->template_lock ) && $post_type_object->template_lock;
+		$editor_settings['templateLock'] = ! empty( $post_type_object->template_lock ) ? $post_type_object->template_lock : false;
 	}
 
 	$script  = '( function() {';