invalidate default template

WordPress · Nov 14, 2024 · f36477c · f36477c
1 parent db59bdb
commit f36477c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/packages/core-data/src/resolvers.js b/packages/core-data/src/resolvers.js
@@ -66,6 +66,15 @@ export const getCurrentUser =
 export const getEntityRecord =
 	( kind, name, key = '', query ) =>
 	async ( { select, dispatch, registry, resolveSelect } ) => {
+		// For back-compat, we allow querying for static templates through
+		// wp_template.
+		if (
+			kind === 'postType' &&
+			name === 'wp_template' &&
+			typeof key === 'string'
+		) {
+			name = '_wp_static_template';
+		}
 		const configs = await resolveSelect.getEntitiesConfig( kind );
 		const entityConfig = configs.find(
 			( config ) => config.name === name && config.kind === kind
@@ -820,6 +829,15 @@ export const getDefaultTemplateId =
 		}
 	};
 
+// Whenever the active template is changed, we must lookup again.
+getDefaultTemplateId.shouldInvalidate = ( action ) => {
+	return (
+		action.type === 'RECEIVE_ITEMS' &&
+		action.kind === 'postType' &&
+		action.name === 'wp_template'
+	);
+};
+
 /**
  * Requests an entity's revisions from the REST API.
  *

diff --git a/packages/core-data/src/selectors.ts b/packages/core-data/src/selectors.ts
@@ -353,6 +353,15 @@ export const getEntityRecord = createSelector(
 		key: EntityRecordKey,
 		query?: GetRecordsHttpQuery
 	): EntityRecord | undefined => {
+		// For back-compat, we allow querying for static templates through
+		// wp_template.
+		if (
+			kind === 'postType' &&
+			name === 'wp_template' &&
+			typeof key === 'string'
+		) {
+			name = '_wp_static_template';
+		}
 		const queriedState =
 			state.entities.records?.[ kind ]?.[ name ]?.queriedData;
 		if ( ! queriedState ) {