Add support for Core Data Entities Actions

core-data/actions.js

@@ -1,7 +1,17 @@
 /**
  * External dependencies
  */
-import { castArray } from 'lodash';
+import { castArray, find } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import apiRequest from '@wordpress/api-request';
+
+/**
+ * Internal dependencies
+ */
+import { getKindEntities } from './entities';
 
 /**
  * Returns an action object used in signalling that terms have been received
@@ -81,3 +91,30 @@ export function receiveThemeSupportsFromIndex( index ) {
 		themeSupports: index.theme_supports,
 	};
 }
+
+/**
+ * Action generator to trigger update an entity record.
+ *
+ * @param {string}       kind    Kind of the received entity.
+ * @param {string}       name    Name of the received entity.
+ * @param {Object}       record  Records to update.
+ *
+ * @return {Promise} Promise of the updated post
+ */
+export async function* updateEntityRecord( kind, name, record ) {
+	const entities = yield* getKindEntities( kind );
+	const entity = find( entities, { kind, name } );
+	if ( ! entity ) {
+		return;
+	}
+
+	const key = entity.key || 'id';
+	const updatedRecord = await apiRequest( {
+		path: `${ entity.baseUrl }/${ record[ key ] }?context=edit`,
+		method: 'PUT',
+		data: record,
+	} );
+	yield receiveEntityRecords( kind, name, updatedRecord );
+
+	return updatedRecord;
+}

core-data/entities.js

@@ -7,11 +7,11 @@ import { upperFirst, camelCase, map, find } from 'lodash';
  * WordPress dependencies
  */
 import apiRequest from '@wordpress/api-request';
+import { select } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
-import { getEntitiesByKind } from './selectors';
 import { addEntities } from './actions';
 
 export const defaultEntities = [
@@ -61,13 +61,12 @@ export const getMethodName = ( kind, name, prefix = 'get', usePlural = false ) =
 /**
  * Loads the kind entities into the store.
  *
- * @param {Object} state Global state
  * @param {string} kind  Kind
  *
  * @return {Array} Entities
  */
-export async function* getKindEntities( state, kind ) {
-	let entities = getEntitiesByKind( state, kind );
+export async function* getKindEntities( kind ) {
+	let entities = select( 'core' ).getEntitiesByKind( kind );
 
 	if ( entities && entities.length !== 0 ) {
 		return entities;

core-data/index.js

@@ -22,10 +22,15 @@ const createEntityRecordGetter = ( source ) => defaultEntities.reduce( ( result,
 
 const entityResolvers = createEntityRecordGetter( resolvers );
 const entitySelectors = createEntityRecordGetter( selectors );
+const entityActions = defaultEntities.reduce( ( result, entity ) => {
+	const { kind, name } = entity;
+	result[ getMethodName( kind, name, 'update' ) ] = actions.updateEntityRecord.bind( null, kind, name );
+	return result;
+}, {} );
 
 const store = registerStore( REDUCER_KEY, {
 	reducer,
-	actions,
+	actions: { ...actions, ...entityActions },
 	selectors: { ...selectors, ...entitySelectors },
 	resolvers: { ...resolvers, ...entityResolvers },
 } );

core-data/resolvers.js

@@ -45,7 +45,7 @@ export async function* getAuthors() {
  * @param {number} key    Record's key
  */
 export async function* getEntityRecord( state, kind, name, key ) {
-	const entities = yield* await getKindEntities( state, kind );
+	const entities = yield* await getKindEntities( kind );
 	const entity = find( entities, { kind, name } );
 	if ( ! entity ) {
 		return;
@@ -62,7 +62,7 @@ export async function* getEntityRecord( state, kind, name, key ) {
  * @param {string} name   Entity name.
  */
 export async function* getEntityRecords( state, kind, name ) {
-	const entities = yield* await getKindEntities( state, kind );
+	const entities = yield* await getKindEntities( kind );
 	const entity = find( entities, { kind, name } );
 	if ( ! entity ) {
 		return;

editor/store/effects.js

@@ -20,6 +20,7 @@ import {
 } from '@wordpress/blocks';
 import { __ } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
+import { dispatch as dispatchAction } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -111,7 +112,7 @@ export default {
 			content: getEditedPostContent( state ),
 			id: post.id,
 		};
-		const basePath = wp.api.getPostTypeRoute( getCurrentPostType( state ) );
+		const postType = getCurrentPostType( state );
 
 		dispatch( {
 			type: 'REQUEST_POST_UPDATE_START',
@@ -130,6 +131,7 @@ export default {
 				parent: post.id,
 			};
 
+			const basePath = wp.api.getPostTypeRoute( postType );
 			request = wp.apiRequest( {
 				path: `/wp/v2/${ basePath }/${ post.id }/autosaves`,
 				method: 'POST',
@@ -145,11 +147,7 @@ export default {
 			dispatch( removeNotice( SAVE_POST_NOTICE_ID ) );
 			dispatch( removeNotice( AUTOSAVE_POST_NOTICE_ID ) );
 
-			request = wp.apiRequest( {
-				path: `/wp/v2/${ basePath }/${ post.id }`,
-				method: 'PUT',
-				data: toSend,
-			} );
+			request = dispatchAction( 'core' ).updateEntityRecord( 'postType', postType, toSend );
 		}
 
 		request.then(

packages/data/src/runtime.js

@@ -75,16 +75,20 @@ export default function createStoreRuntime( store ) {
 	return async ( actionCreator ) => {
 		if ( isActionLike( actionCreator ) ) {
 			store.dispatch( actionCreator );
-			return;
+			return actionCreator;
 		}
 
 		// Attempt to normalize the action creator as async iterable.
 		actionCreator = toAsyncIterable( actionCreator );
-		for await ( const maybeAction of actionCreator ) {
+		let ret;
+		do {
+			ret = await actionCreator.next();
 			// Dispatch if it quacks like an action.
-			if ( isActionLike( maybeAction ) ) {
-				store.dispatch( maybeAction );
+			if ( isActionLike( ret.value ) ) {
+				store.dispatch( ret.value );
 			}
-		}
+		} while ( ! ret.done );
+
+		return ret.value;
 	};
 }