DataViews: Update usePostFields to accept postType (WordPress#67380)

Co-authored-by: ntsekouras <[email protected]> Co-authored-by: youknowriad <[email protected]> Co-authored-by: oandregal <[email protected]>
im3dabasia · Dec 4, 2024 · 61b73d7 · 61b73d7
1 parent b101e07
commit 61b73d7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/packages/edit-site/src/components/post-edit/index.js b/packages/edit-site/src/components/post-edit/index.js
@@ -49,7 +49,7 @@ function PostEditForm( { postType, postId } ) {
 	);
 	const [ multiEdits, setMultiEdits ] = useState( {} );
 	const { editEntityRecord } = useDispatch( coreDataStore );
-	const { fields: _fields } = usePostFields();
+	const { fields: _fields } = usePostFields( { postType } );
 	const fields = useMemo(
 		() =>
 			_fields?.map( ( field ) => {

diff --git a/packages/edit-site/src/components/post-list/index.js b/packages/edit-site/src/components/post-list/index.js
@@ -215,7 +215,9 @@ export default function PostList( { postType } ) {
 		return found?.filters ?? [];
 	};
 
-	const { isLoading: isLoadingFields, fields: _fields } = usePostFields();
+	const { isLoading: isLoadingFields, fields: _fields } = usePostFields( {
+		postType,
+	} );
 	const fields = useMemo( () => {
 		const activeViewFilters = getActiveViewFilters(
 			defaultViews,

diff --git a/packages/editor/src/components/post-fields/index.ts b/packages/editor/src/components/post-fields/index.ts
@@ -23,9 +23,11 @@ interface Author {
 	name: string;
 }
 
-function usePostFields(): UsePostFieldsReturn {
-	const postType = 'page'; // TODO: this could be page or post (experimental).
-
+function usePostFields( {
+	postType,
+}: {
+	postType: string;
+} ): UsePostFieldsReturn {
 	const { registerPostTypeSchema } = unlock( useDispatch( editorStore ) );
 	useEffect( () => {
 		registerPostTypeSchema( postType );

diff --git a/packages/editor/src/dataviews/store/private-actions.ts b/packages/editor/src/dataviews/store/private-actions.ts
@@ -128,7 +128,7 @@ export const registerPostTypeSchema =
 
 		const actions = [
 			postTypeConfig.viewable ? viewPost : undefined,
-			!! postTypeConfig?.supports?.revisions
+			!! postTypeConfig.supports?.revisions
 				? viewPostRevisions
 				: undefined,
 			// @ts-ignore
@@ -148,7 +148,7 @@ export const registerPostTypeSchema =
 				? duplicatePattern
 				: undefined,
 			postTypeConfig.supports?.title ? renamePost : undefined,
-			postTypeConfig?.supports?.[ 'page-attributes' ]
+			postTypeConfig.supports?.[ 'page-attributes' ]
 				? reorderPage
 				: undefined,
 			postTypeConfig.slug === 'wp_block' ? exportPattern : undefined,
@@ -157,25 +157,24 @@ export const registerPostTypeSchema =
 			deletePost,
 			trashPost,
 			permanentlyDeletePost,
-		];
+		].filter( Boolean );
 
 		const fields = [
-			featuredImageField,
+			postTypeConfig.supports?.thumbnail &&
+				currentTheme?.[ 'theme-supports' ]?.[ 'post-thumbnails' ] &&
+				featuredImageField,
 			titleField,
-			authorField,
+			postTypeConfig.supports?.author && authorField,
 			statusField,
 			dateField,
 			slugField,
-			parentField,
-			commentStatusField,
+			postTypeConfig.supports?.[ 'page-attributes' ] && parentField,
+			postTypeConfig.supports?.comments && commentStatusField,
 			passwordField,
-		];
+		].filter( Boolean );
 
 		registry.batch( () => {
 			actions.forEach( ( action ) => {
-				if ( ! action ) {
-					return;
-				}
 				unlock( registry.dispatch( editorStore ) ).registerEntityAction(
 					'postType',
 					postType,

diff --git a/packages/editor/src/dataviews/types.ts b/packages/editor/src/dataviews/types.ts
@@ -78,6 +78,9 @@ export interface PostType {
 		'page-attributes'?: boolean;
 		title?: boolean;
 		revisions?: boolean;
+		thumbnail?: boolean;
+		comments?: boolean;
+		author?: boolean;
 	};
 }