@wordpress/core-data 4.11.0 → 4.14.0

package/src/resolvers.js

@@ -1,16 +1,7 @@
 /**
  * External dependencies
  */
-import {
-	camelCase,
-	compact,
-	find,
-	get,
-	includes,
-	map,
-	mapKeys,
-	uniq,
-} from 'lodash';
+import { camelCase } from 'change-case';
 
 /**
  * WordPress dependencies
@@ -59,13 +50,16 @@ export const getCurrentUser =
  * @param {string}           name  Entity name.
  * @param {number|string}    key   Record's key
  * @param {Object|undefined} query Optional object of query parameters to
- *                                 include with request.
+ *                                 include with request. If requesting specific
+ *                                 fields, fields must always include the ID.
  */
 export const getEntityRecord =
 	( kind, name, key = '', query ) =>
 	async ( { select, dispatch } ) => {
 		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
-		const entityConfig = find( configs, { kind, name } );
+		const entityConfig = configs.find(
+			( config ) => config.name === name && config.kind === kind
+		);
 		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
 			return;
 		}
@@ -83,11 +77,13 @@ export const getEntityRecord =
 				// the ID.
 				query = {
 					...query,
-					_fields: uniq( [
-						...( getNormalizedCommaSeparable( query._fields ) ||
-							[] ),
-						entityConfig.key || DEFAULT_ENTITY_KEY,
-					] ).join(),
+					_fields: [
+						...new Set( [
+							...( getNormalizedCommaSeparable( query._fields ) ||
+								[] ),
+							entityConfig.key || DEFAULT_ENTITY_KEY,
+						] ),
+					].join(),
 				};
 			}
 
@@ -140,13 +136,16 @@ export const getEditedEntityRecord = forwardResolver( 'getEntityRecord' );
  *
  * @param {string}  kind  Entity kind.
  * @param {string}  name  Entity name.
- * @param {Object?} query Query Object.
+ * @param {Object?} query Query Object. If requesting specific fields, fields
+ *                        must always include the ID.
  */
 export const getEntityRecords =
 	( kind, name, query = {} ) =>
 	async ( { dispatch } ) => {
 		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
-		const entityConfig = find( configs, { kind, name } );
+		const entityConfig = configs.find(
+			( config ) => config.name === name && config.kind === kind
+		);
 		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
 			return;
 		}
@@ -164,11 +163,13 @@ export const getEntityRecords =
 				// the ID.
 				query = {
 					...query,
-					_fields: uniq( [
-						...( getNormalizedCommaSeparable( query._fields ) ||
-							[] ),
-						entityConfig.key || DEFAULT_ENTITY_KEY,
-					] ).join(),
+					_fields: [
+						...new Set( [
+							...( getNormalizedCommaSeparable( query._fields ) ||
+								[] ),
+							entityConfig.key || DEFAULT_ENTITY_KEY,
+						] ),
+					].join(),
 				};
 			}
 
@@ -313,8 +314,9 @@ export const canUser =
 		// return the expected result in the native version. Instead, API requests
 		// only return the result, without including response properties like the headers.
 		const allowHeader = response.headers?.get( 'allow' );
-		const key = compact( [ action, resource, id ] ).join( '/' );
-		const isAllowed = includes( allowHeader, method );
+		const key = [ action, resource, id ].filter( Boolean ).join( '/' );
+		const isAllowed =
+			allowHeader?.includes?.( method ) || allowHeader?.allow === method;
 		dispatch.receiveUserPermission( key, isAllowed );
 	};
 
@@ -330,7 +332,9 @@ export const canUserEditEntityRecord =
 	( kind, name, recordId ) =>
 	async ( { dispatch } ) => {
 		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
-		const entityConfig = find( configs, { kind, name } );
+		const entityConfig = configs.find(
+			( config ) => config.name === name && config.kind === kind
+		);
 		if ( ! entityConfig ) {
 			return;
 		}
@@ -434,13 +438,9 @@ export const __experimentalGetCurrentGlobalStylesId =
 			'theme',
 			{ status: 'active' }
 		);
-		const globalStylesURL = get( activeThemes, [
-			0,
-			'_links',
-			'wp:user-global-styles',
-			0,
-			'href',
-		] );
+		const globalStylesURL =
+			activeThemes?.[ 0 ]?._links?.[ 'wp:user-global-styles' ]?.[ 0 ]
+				?.href;
 		if ( globalStylesURL ) {
 			const globalStylesObject = await apiFetch( {
 				url: globalStylesURL,
@@ -483,8 +483,13 @@ export const getBlockPatterns =
 		const restPatterns = await apiFetch( {
 			path: '/wp/v2/block-patterns/patterns',
 		} );
-		const patterns = map( restPatterns, ( pattern ) =>
-			mapKeys( pattern, ( value, key ) => camelCase( key ) )
+		const patterns = restPatterns?.map( ( pattern ) =>
+			Object.fromEntries(
+				Object.entries( pattern ).map( ( [ key, value ] ) => [
+					camelCase( key ),
+					value,
+				] )
+			)
 		);
 		dispatch( { type: 'RECEIVE_BLOCK_PATTERNS', patterns } );
 	};

package/src/selectors.ts

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import createSelector from 'rememo';
-import { set, map, find, get, filter, compact } from 'lodash';
+import { set, map, find, get, filter } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -296,7 +296,8 @@ interface GetEntityRecord {
  * @param  kind  Entity kind.
  * @param  name  Entity name.
  * @param  key   Record's key
- * @param  query Optional query.
+ * @param  query Optional query. If requesting specific
+ *               fields, fields must always include the ID.
  *
  * @return Record.
  */
@@ -526,7 +527,8 @@ interface GetEntityRecords {
  * @param  state State tree
  * @param  kind  Entity kind.
  * @param  name  Entity name.
- * @param  query Optional terms query.
+ * @param  query Optional terms query. If requesting specific
+ *               fields, fields must always include the ID.
  *
  * @return Records.
  */
@@ -1115,7 +1117,7 @@ export function canUser(
 	resource: string,
 	id?: GenericRecordKey
 ): boolean | undefined {
-	const key = compact( [ action, resource, id ] ).join( '/' );
+	const key = [ action, resource, id ].filter( Boolean ).join( '/' );
 	return get( state, [ 'userPermissions', key ] );
 }