Fix move block to position bug; Add test cases; (#14924)

WordPress · Aug 29, 2019 · 9539381 · 9539381
1 parent 5b2ece4
commit 9539381
Show file tree

Hide file tree

Showing 2 changed files with 185 additions and 0 deletions.
diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
@@ -331,6 +331,12 @@ export function* moveBlockToPosition( clientId, fromRootClientId = '', toRootCli
 		return;
 	}
 
+	// If templateLock is insert we can not remove the block from the parent.
+	// Given that here we know that we are moving the block to a different parent, the move should not be possible if the condition is true.
+	if ( templateLock === 'insert' ) {
+		return;
+	}
+
 	const blockName = yield select(
 		'core/block-editor',
 		'getBlockName',

diff --git a/packages/block-editor/src/store/test/actions.js b/packages/block-editor/src/store/test/actions.js
@@ -9,6 +9,7 @@ import {
 	insertBlock,
 	insertBlocks,
 	mergeBlocks,
+	moveBlockToPosition,
 	multiSelect,
 	removeBlock,
 	removeBlocks,
@@ -468,6 +469,184 @@ describe( 'actions', () => {
 		} );
 	} );
 
+	describe( 'moveBlockToPosition', () => {
+		it( 'should yield MOVE_BLOCK_TO_POSITION action if locking is insert and move is not changing the root block', () => {
+			const moveBlockToPositionGenerator = moveBlockToPosition(
+				'chicken',
+				'ribs',
+				'ribs',
+				5
+			);
+
+			expect(
+				moveBlockToPositionGenerator.next().value
+			).toEqual( {
+				args: [ 'ribs' ],
+				selectorName: 'getTemplateLock',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next( 'insert' ).value
+			).toEqual( {
+				type: 'MOVE_BLOCK_TO_POSITION',
+				fromRootClientId: 'ribs',
+				toRootClientId: 'ribs',
+				clientId: 'chicken',
+				index: 5,
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next().done
+			).toBe( true );
+		} );
+
+		it( 'should not yield MOVE_BLOCK_TO_POSITION action if locking is all', () => {
+			const moveBlockToPositionGenerator = moveBlockToPosition(
+				'chicken',
+				'ribs',
+				'ribs',
+				5
+			);
+
+			expect(
+				moveBlockToPositionGenerator.next().value
+			).toEqual( {
+				args: [ 'ribs' ],
+				selectorName: 'getTemplateLock',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next( 'all' )
+			).toEqual( {
+				done: true,
+				value: undefined,
+			} );
+		} );
+
+		it( 'should not yield MOVE_BLOCK_TO_POSITION action if locking is insert and move is changing the root block', () => {
+			const moveBlockToPositionGenerator = moveBlockToPosition(
+				'chicken',
+				'ribs',
+				'chicken-ribs',
+				5
+			);
+
+			expect(
+				moveBlockToPositionGenerator.next().value
+			).toEqual( {
+				args: [ 'ribs' ],
+				selectorName: 'getTemplateLock',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next( 'insert' )
+			).toEqual( {
+				done: true,
+				value: undefined,
+			} );
+		} );
+
+		it( 'should yield MOVE_BLOCK_TO_POSITION action if there is not locking in the original root block and block can be inserted in the destination', () => {
+			const moveBlockToPositionGenerator = moveBlockToPosition( 'chicken',
+				'ribs',
+				'chicken-ribs',
+				5
+			);
+
+			expect(
+				moveBlockToPositionGenerator.next().value
+			).toEqual( {
+				args: [ 'ribs' ],
+				selectorName: 'getTemplateLock',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next().value
+			).toEqual( {
+				args: [ 'chicken' ],
+				selectorName: 'getBlockName',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next( 'myblock/chicken-block' ).value
+			).toEqual( {
+				args: [ 'myblock/chicken-block', 'chicken-ribs' ],
+				selectorName: 'canInsertBlockType',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next( true ).value
+			).toEqual( {
+				type: 'MOVE_BLOCK_TO_POSITION',
+				fromRootClientId: 'ribs',
+				toRootClientId: 'chicken-ribs',
+				clientId: 'chicken',
+				index: 5,
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next()
+			).toEqual( {
+				done: true,
+				value: undefined,
+			} );
+		} );
+
+		it( 'should not yield MOVE_BLOCK_TO_POSITION action if there is not locking in the original root block and block can be inserted in the destination', () => {
+			const moveBlockToPositionGenerator = moveBlockToPosition( 'chicken',
+				'ribs',
+				'chicken-ribs',
+				5
+			);
+
+			expect(
+				moveBlockToPositionGenerator.next().value
+			).toEqual( {
+				args: [ 'ribs' ],
+				selectorName: 'getTemplateLock',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next().value
+			).toEqual( {
+				args: [ 'chicken' ],
+				selectorName: 'getBlockName',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next( 'myblock/chicken-block' ).value
+			).toEqual( {
+				args: [ 'myblock/chicken-block', 'chicken-ribs' ],
+				selectorName: 'canInsertBlockType',
+				storeName: 'core/block-editor',
+				type: 'SELECT',
+			} );
+
+			expect(
+				moveBlockToPositionGenerator.next( false )
+			).toEqual( {
+				done: true,
+				value: undefined,
+			} );
+		} );
+	} );
+
 	describe( 'removeBlock', () => {
 		it( 'should return REMOVE_BLOCKS action', () => {
 			const clientId = 'myclientid';