Move getEntityConfig inside of other useSelect

WordPress · Dec 13, 2024 · 9e4ceb6 · 9e4ceb6
1 parent e4cd460
commit 9e4ceb6
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/packages/editor/src/components/post-actions/index.js b/packages/editor/src/components/post-actions/index.js
@@ -21,27 +21,28 @@ import { usePostActions } from './actions';
 const { Menu, kebabCase } = unlock( componentsPrivateApis );
 
 function useEditedEntityRecordsWithPermissions( postType, postIds ) {
-	const entityConfig = useSelect(
-		( select ) =>
-			select( coreStore ).getEntityConfig( 'postType', postType ),
-		[ postType ]
-	);
-	const { items } = useSelect(
+	const { items, entityConfig } = useSelect(
 		( select ) => {
+			const { getEntityConfig } = select( coreStore );
 			const { getEditedEntityRecords } = unlock( select( coreStore ) );
+			const entityRecords = getEditedEntityRecords(
+				'postType',
+				postType,
+				postIds
+			);
+
 			return {
-				items: getEditedEntityRecords( 'postType', postType, postIds ),
+				items: entityRecords,
+				entityConfig: getEntityConfig( 'postType', postType ),
 			};
 		},
 		[ postIds, postType ]
 	);
 
 	const ids = useMemo(
 		() =>
-			items?.map(
-				// @ts-ignore
-				( record ) => record[ entityConfig?.key ?? 'id' ]
-			) ?? [],
+			items?.map( ( record ) => record[ entityConfig?.key ?? 'id' ] ) ??
+			[],
 		[ items, entityConfig?.key ]
 	);
 
@@ -59,7 +60,7 @@ function useEditedEntityRecordsWithPermissions( postType, postIds ) {
 		return (
 			items?.map( ( item, index ) => ( {
 				...item,
-				permissions: permissions[ index ],
+				permissions: permissions ? permissions[ index ] : undefined,
 			} ) ) ?? []
 		);
 	}, [ items, permissions ] );