@wordpress/editor 14.4.0 → 14.5.0

package/src/store/actions.js

@@ -196,22 +196,45 @@ export const savePost =
 			content,
 		};
 		dispatch( { type: 'REQUEST_POST_UPDATE_START', options } );
-		await registry
-			.dispatch( coreStore )
-			.saveEntityRecord(
-				'postType',
-				previousRecord.type,
-				edits,
+
+		let error = false;
+		try {
+			error = await applyFilters(
+				'editor.__unstablePreSavePost',
+				Promise.resolve( false ),
 				options
 			);
+		} catch ( err ) {
+			error = err;
+		}
 
-		let error = registry
-			.select( coreStore )
-			.getLastEntitySaveError(
-				'postType',
-				previousRecord.type,
-				previousRecord.id
-			);
+		if ( ! error ) {
+			try {
+				await registry
+					.dispatch( coreStore )
+					.saveEntityRecord(
+						'postType',
+						previousRecord.type,
+						edits,
+						options
+					);
+			} catch ( err ) {
+				error =
+					err.message && err.code !== 'unknown_error'
+						? err.message
+						: __( 'An error occurred while updating.' );
+			}
+		}
+
+		if ( ! error ) {
+			error = registry
+				.select( coreStore )
+				.getLastEntitySaveError(
+					'postType',
+					previousRecord.type,
+					previousRecord.id
+				);
+		}
 
 		if ( ! error ) {
 			await applyFilters(

package/src/store/private-actions.js

@@ -393,10 +393,14 @@ export const removeTemplates =
 			if ( items.length === 1 ) {
 				// Depending on how the entity was retrieved its title might be
 				// an object or simple string.
-				const title =
-					typeof items[ 0 ].title === 'string'
-						? items[ 0 ].title
-						: items[ 0 ].title?.rendered;
+				let title;
+				if ( typeof items[ 0 ].title === 'string' ) {
+					title = items[ 0 ].title;
+				} else if ( typeof items[ 0 ].title?.rendered === 'string' ) {
+					title = items[ 0 ].title?.rendered;
+				} else if ( typeof items[ 0 ].title?.raw === 'string' ) {
+					title = items[ 0 ].title?.raw;
+				}
 				successMessage = isResetting
 					? sprintf(
 							/* translators: The template/part's name. */

package/src/store/private-selectors.js

@@ -25,7 +25,10 @@ import {
 	getCurrentPost,
 	__experimentalGetDefaultTemplatePartAreas,
 } from './selectors';
-import { getEntityActions as _getEntityActions } from '../dataviews/store/private-selectors';
+import {
+	getEntityActions as _getEntityActions,
+	isEntityReady as _isEntityReady,
+} from '../dataviews/store/private-selectors';
 
 const EMPTY_INSERTION_POINT = {
 	rootClientId: undefined,
@@ -110,7 +113,10 @@ export const getPostIcon = createRegistrySelector(
 			// `icon` is the `menu_icon` property of a post type. We
 			// only handle `dashicons` for now, even if the `menu_icon`
 			// also supports urls and svg as values.
-			if ( postTypeEntity?.icon?.startsWith( 'dashicons-' ) ) {
+			if (
+				typeof postTypeEntity?.icon === 'string' &&
+				postTypeEntity.icon.startsWith( 'dashicons-' )
+			) {
 				return postTypeEntity.icon.slice( 10 );
 			}
 			return pageIcon;
@@ -160,3 +166,40 @@ export const hasPostMetaChanges = createRegistrySelector(
 export function getEntityActions( state, ...args ) {
 	return _getEntityActions( state.dataviews, ...args );
 }
+
+export function isEntityReady( state, ...args ) {
+	return _isEntityReady( state.dataviews, ...args );
+}
+
+/**
+ * Similar to getBlocksByName in @wordpress/block-editor, but only returns the top-most
+ * blocks that aren't descendants of the query block.
+ *
+ * @param {Object}       state      Global application state.
+ * @param {Array|string} blockNames Block names of the blocks to retrieve.
+ *
+ * @return {Array} Block client IDs.
+ */
+export const getPostBlocksByName = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, blockNames ) => {
+			blockNames = Array.isArray( blockNames )
+				? blockNames
+				: [ blockNames ];
+			const { getBlocksByName, getBlockParents, getBlockName } =
+				select( blockEditorStore );
+			return getBlocksByName( blockNames ).filter( ( clientId ) =>
+				getBlockParents( clientId ).every( ( parentClientId ) => {
+					const parentBlockName = getBlockName( parentClientId );
+					return (
+						// Ignore descendents of the query block.
+						parentBlockName !== 'core/query' &&
+						// Enable only the top-most block.
+						! blockNames.includes( parentBlockName )
+					);
+				} )
+			);
+		},
+		() => [ select( blockEditorStore ).getBlocks() ]
+	)
+);

package/src/store/test/private-selectors.js

@@ -0,0 +1,78 @@
+/**
+ * Internal dependencies
+ */
+import { getPostBlocksByName } from '../private-selectors';
+
+describe( 'getPostBlocksByName', () => {
+	const state = {
+		blocks: {
+			byClientId: new Map( [
+				[ 'block1', { name: 'core/paragraph' } ],
+				[ 'block2', { name: 'core/heading' } ],
+				[ 'block3', { name: 'core/paragraph' } ],
+				[ 'block4', { name: 'core/query' } ],
+				[ 'block5', { name: 'core/paragraph' } ],
+				[ 'block6', { name: 'core/heading' } ],
+			] ),
+			order: new Map( [
+				[ '', [ 'block1', 'block2', 'block3', 'block4' ] ],
+				[ 'block4', [ 'block5', 'block6' ] ],
+			] ),
+			parents: new Map( [
+				[ 'block1', '' ],
+				[ 'block2', '' ],
+				[ 'block3', '' ],
+				[ 'block4', '' ],
+				[ 'block5', 'block4' ],
+				[ 'block6', 'block4' ],
+			] ),
+		},
+	};
+
+	getPostBlocksByName.registry = {
+		select: () => ( {
+			getBlocksByName: ( blockNames ) =>
+				Array.from( state.blocks.byClientId.keys() ).filter(
+					( clientId ) =>
+						blockNames.includes(
+							state.blocks.byClientId.get( clientId ).name
+						)
+				),
+			getBlockParents: ( clientId ) => {
+				const parents = [];
+				let parent = state.blocks.parents.get( clientId );
+				while ( parent ) {
+					parents.push( parent );
+					parent = state.blocks.parents.get( parent );
+				}
+				return parents;
+			},
+			getBlockName: ( clientId ) =>
+				state.blocks.byClientId.get( clientId ).name,
+			getBlocks: () => [],
+		} ),
+	};
+
+	it( 'should return top-level blocks of the specified name', () => {
+		const result = getPostBlocksByName( state, 'core/paragraph' );
+		expect( result ).toEqual( [ 'block1', 'block3' ] );
+	} );
+
+	it( 'should return an empty array if no blocks match', () => {
+		const result = getPostBlocksByName( state, 'core/non-existent' );
+		expect( result ).toEqual( [] );
+	} );
+
+	it( 'should ignore blocks inside a query block', () => {
+		const result = getPostBlocksByName( state, 'core/paragraph' );
+		expect( result ).toEqual( [ 'block1', 'block3' ] );
+	} );
+
+	it( 'should handle multiple block names', () => {
+		const result = getPostBlocksByName( state, [
+			'core/paragraph',
+			'core/heading',
+		] );
+		expect( result ).toEqual( [ 'block1', 'block2', 'block3' ] );
+	} );
+} );