Consolidate registerPostType{Actions|Fields} into registerPostTypeSchema

WordPress · Nov 22, 2024 · 3e6782e · 3e6782e
1 parent df078fd
commit 3e6782e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 63 deletions.
diff --git a/packages/editor/src/components/post-actions/actions.js b/packages/editor/src/components/post-actions/actions.js
@@ -21,10 +21,10 @@ export function usePostActions( { postType, onActionPerformed, context } ) {
 		[ postType ]
 	);
 
-	const { registerPostTypeActions } = unlock( useDispatch( editorStore ) );
+	const { registerPostTypeSchema } = unlock( useDispatch( editorStore ) );
 	useEffect( () => {
-		registerPostTypeActions( postType );
-	}, [ registerPostTypeActions, postType ] );
+		registerPostTypeSchema( postType );
+	}, [ registerPostTypeSchema, postType ] );
 
 	return useMemo( () => {
 		// Filter actions based on provided context. If not provided

diff --git a/packages/editor/src/components/post-fields/index.ts b/packages/editor/src/components/post-fields/index.ts
@@ -26,10 +26,10 @@ interface Author {
 function usePostFields(): UsePostFieldsReturn {
 	const postType = 'page'; // TODO: this could be page or post (experimental).
 
-	const { registerPostTypeFields } = unlock( useDispatch( editorStore ) );
+	const { registerPostTypeSchema } = unlock( useDispatch( editorStore ) );
 	useEffect( () => {
-		registerPostTypeFields( postType );
-	}, [ registerPostTypeFields, postType ] );
+		registerPostTypeSchema( postType );
+	}, [ registerPostTypeSchema, postType ] );
 
 	const { defaultFields } = useSelect(
 		( select ) => {

diff --git a/packages/editor/src/dataviews/store/private-actions.ts b/packages/editor/src/dataviews/store/private-actions.ts
@@ -88,31 +88,28 @@ export function unregisterEntityField(
 	};
 }
 
-export function setIsReady( kind: string, name: string, part: string ) {
+export function setIsReady( kind: string, name: string ) {
 	return {
 		type: 'SET_IS_READY' as const,
 		kind,
 		name,
-		part,
 	};
 }
 
-export const registerPostTypeActions =
+export const registerPostTypeSchema =
 	( postType: string ) =>
 	async ( { registry }: { registry: any } ) => {
 		const isReady = unlock( registry.select( editorStore ) ).isEntityReady(
 			'postType',
-			postType,
-			'actions'
+			postType
 		);
 		if ( isReady ) {
 			return;
 		}
 
 		unlock( registry.dispatch( editorStore ) ).setIsReady(
 			'postType',
-			postType,
-			'actions'
+			postType
 		);
 
 		const postTypeConfig = ( await registry
@@ -162,40 +159,6 @@ export const registerPostTypeActions =
 			permanentlyDeletePost,
 		];
 
-		registry.batch( () => {
-			actions.forEach( ( action ) => {
-				if ( ! action ) {
-					return;
-				}
-				unlock( registry.dispatch( editorStore ) ).registerEntityAction(
-					'postType',
-					postType,
-					action
-				);
-			} );
-		} );
-
-		doAction( 'core.registerPostTypeActions', postType );
-	};
-
-export const registerPostTypeFields =
-	( postType: string ) =>
-	async ( { registry }: { registry: any } ) => {
-		const isReady = unlock( registry.select( editorStore ) ).isEntityReady(
-			'postType',
-			postType,
-			'fields'
-		);
-		if ( isReady ) {
-			return;
-		}
-
-		unlock( registry.dispatch( editorStore ) ).setIsReady(
-			'postType',
-			postType,
-			'fields'
-		);
-
 		const fields = [
 			featuredImageField,
 			titleField,
@@ -209,6 +172,16 @@ export const registerPostTypeFields =
 		];
 
 		registry.batch( () => {
+			actions.forEach( ( action ) => {
+				if ( ! action ) {
+					return;
+				}
+				unlock( registry.dispatch( editorStore ) ).registerEntityAction(
+					'postType',
+					postType,
+					action
+				);
+			} );
 			fields.forEach( ( field ) => {
 				unlock( registry.dispatch( editorStore ) ).registerEntityField(
 					'postType',
@@ -218,5 +191,5 @@ export const registerPostTypeFields =
 			} );
 		} );
 
-		doAction( 'core.registerPostTypeFields', postType );
+		doAction( 'core.registerPostTypeSchema', postType );
 	};
diff --git a/packages/editor/src/dataviews/store/private-selectors.ts b/packages/editor/src/dataviews/store/private-selectors.ts
@@ -13,11 +13,6 @@ export function getEntityFields( state: State, kind: string, name: string ) {
 	return state.fields[ kind ]?.[ name ] ?? EMPTY_ARRAY;
 }
 
-export function isEntityReady(
-	state: State,
-	kind: string,
-	name: string,
-	part: string
-) {
-	return state.isReady[ kind ]?.[ name ]?.[ part ];
+export function isEntityReady( state: State, kind: string, name: string ) {
+	return state.isReady[ kind ]?.[ name ];
 }
diff --git a/packages/editor/src/dataviews/store/reducer.ts b/packages/editor/src/dataviews/store/reducer.ts
@@ -13,10 +13,7 @@ type ReduxAction =
 
 export type ActionState = Record< string, Record< string, Action< any >[] > >;
 export type FieldsState = Record< string, Record< string, Field< any >[] > >;
-export type ReadyState = Record<
-	string,
-	Record< string, Record< string, boolean > >
->;
+export type ReadyState = Record< string, Record< string, boolean > >;
 export type State = {
 	actions: ActionState;
 	fields: FieldsState;
@@ -30,10 +27,7 @@ function isReady( state: ReadyState = {}, action: ReduxAction ) {
 				...state,
 				[ action.kind ]: {
 					...state[ action.kind ],
-					[ action.name ]: {
-						...( state[ action.kind ]?.[ action.name ] ?? {} ),
-						[ action.part ]: true,
-					},
+					[ action.name ]: true,
 				},
 			};
 	}