Reuse the check

WordPress · Jul 3, 2024 · ab9e7b1 · ab9e7b1
1 parent 9a30180
commit ab9e7b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 40 deletions.
diff --git a/packages/editor/src/components/post-actions/actions.js b/packages/editor/src/components/post-actions/actions.js
@@ -32,7 +32,6 @@ import {
 import { store as editorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 import isTemplateRevertable from '../../store/utils/is-template-revertable';
-import isTemplatePartRevertable from '../../store/utils/is-template-part-revertable';
 import { exportPatternAsJSONAction } from './export-pattern-action';
 import { CreateTemplatePartModalContents } from '../create-template-part-modal';
 
@@ -792,9 +791,7 @@ const resetTemplateAction = {
 	id: 'reset-template',
 	label: __( 'Reset' ),
 	isEligible: ( item ) => {
-		return item.type === TEMPLATE_PART_POST_TYPE
-			? isTemplatePartRevertable( item )
-			: isTemplateRevertable( item );
+		return isTemplateRevertable( item );
 	},
 	icon: backup,
 	supportsBulk: true,

diff --git a/packages/editor/src/store/private-actions.js b/packages/editor/src/store/private-actions.js
@@ -15,8 +15,6 @@ import { decodeEntities } from '@wordpress/html-entities';
  * Internal dependencies
  */
 import isTemplateRevertable from './utils/is-template-revertable';
-import isTemplatePartRevertable from './utils/is-template-part-revertable';
-import { TEMPLATE_PART_POST_TYPE } from './constants';
 export * from '../dataviews/store/private-actions';
 
 /**
@@ -244,11 +242,7 @@ export const revertTemplate =
 		const noticeId = 'edit-site-template-reverted';
 		registry.dispatch( noticesStore ).removeNotice( noticeId );
 
-		const isRevertable =
-			template.type === TEMPLATE_PART_POST_TYPE
-				? isTemplatePartRevertable
-				: isTemplateRevertable;
-		if ( ! isRevertable( template ) ) {
+		if ( ! isTemplateRevertable( template ) ) {
 			registry
 				.dispatch( noticesStore )
 				.createErrorNotice( __( 'This template is not revertable.' ), {

diff --git a/packages/editor/src/store/utils/is-template-part-revertable.js b/packages/editor/src/store/utils/is-template-part-revertable.js
diff --git a/packages/editor/src/store/utils/is-template-revertable.js b/packages/editor/src/store/utils/is-template-revertable.js
@@ -6,18 +6,18 @@ import { TEMPLATE_ORIGINS } from '../constants';
 // Copy of the function from packages/edit-site/src/utils/is-template-revertable.js
 
 /**
- * Check if a template is revertable to its original theme-provided template file.
+ * Check if a template or template part is revertable to its original theme-provided file.
  *
- * @param {Object} template The template entity to check.
- * @return {boolean} Whether the template is revertable.
+ * @param {Object} templateOrTemplatePart The entity to check.
+ * @return {boolean} Whether the entity is revertable.
  */
-export default function isTemplateRevertable( template ) {
-	if ( ! template ) {
+export default function isTemplateRevertable( templateOrTemplatePart ) {
+	if ( ! templateOrTemplatePart ) {
 		return false;
 	}
-	/* eslint-disable camelcase */
+
 	return (
-		template?.source === TEMPLATE_ORIGINS.custom && template?.has_theme_file
+		templateOrTemplatePart.source === TEMPLATE_ORIGINS.custom &&
+		templateOrTemplatePart.has_theme_file
 	);
-	/* eslint-enable camelcase */
 }