Refactor core-data actions and resolvers from generators to thunks

WordPress · Sep 2, 2021 · eef42e3 · eef42e3
1 parent b029315
commit eef42e3
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 224 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
@@ -33,7 +33,6 @@
 		"@wordpress/api-fetch": "file:../api-fetch",
 		"@wordpress/blocks": "file:../blocks",
 		"@wordpress/data": "file:../data",
-		"@wordpress/data-controls": "file:../data-controls",
 		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/element": "file:../element",
 		"@wordpress/html-entities": "file:../html-entities",

diff --git a/packages/core-data/src/actions.js b/packages/core-data/src/actions.js
@@ -7,8 +7,7 @@ import { v4 as uuid } from 'uuid';
 /**
  * WordPress dependencies
  */
-import { __unstableAwaitPromise } from '@wordpress/data-controls';
-import triggerFetch from '@wordpress/api-fetch';
+import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 
 /**
@@ -17,7 +16,6 @@ import { addQueryArgs } from '@wordpress/url';
 import { receiveItems, removeItems, receiveQueriedItems } from './queried-data';
 import { getKindEntities, DEFAULT_ENTITY_KEY } from './entities';
 import { createBatch } from './batch';
-import { getDispatch } from './controls';
 import { STORE_NAME } from './name';
 
 /**
@@ -168,7 +166,7 @@ export const deleteEntityRecord = (
 	name,
 	recordId,
 	query,
-	{ __unstableFetch = triggerFetch } = {}
+	{ __unstableFetch = apiFetch } = {}
 ) => async ( { dispatch } ) => {
 	const entities = await dispatch( getKindEntities( kind ) );
 	const entity = find( entities, { kind, name } );
@@ -204,7 +202,7 @@ export const deleteEntityRecord = (
 				method: 'DELETE',
 			} );
 
-			await dispatch( removeItems( kind, name, recordId, true ) );
+			dispatch( removeItems( kind, name, recordId, true ) );
 		} catch ( _error ) {
 			error = _error;
 		}
@@ -242,7 +240,7 @@ export const editEntityRecord = (
 	recordId,
 	edits,
 	options = {}
-) => async ( { select, dispatch } ) => {
+) => ( { select, dispatch } ) => {
 	const entity = select.getEntity( kind, name );
 	if ( ! entity ) {
 		throw new Error(
@@ -270,7 +268,7 @@ export const editEntityRecord = (
 		}, {} ),
 		transientEdits,
 	};
-	return await dispatch( {
+	dispatch( {
 		type: 'EDIT_ENTITY_RECORD',
 		...edit,
 		meta: {
@@ -347,7 +345,7 @@ export const saveEntityRecord = (
 	kind,
 	name,
 	record,
-	{ isAutosave = false, __unstableFetch = triggerFetch } = {}
+	{ isAutosave = false, __unstableFetch = apiFetch } = {}
 ) => async ( { select, dispatch } ) => {
 	const entities = await dispatch( getKindEntities( kind ) );
 	const entity = find( entities, { kind, name } );
@@ -371,7 +369,7 @@ export const saveEntityRecord = (
 				const evaluatedValue = value(
 					select.getEditedEntityRecord( kind, name, recordId )
 				);
-				await dispatch.editEntityRecord(
+				dispatch.editEntityRecord(
 					kind,
 					name,
 					recordId,
@@ -384,7 +382,7 @@ export const saveEntityRecord = (
 			}
 		}
 
-		await dispatch( {
+		dispatch( {
 			type: 'SAVE_ENTITY_RECORD_START',
 			kind,
 			name,
@@ -437,13 +435,11 @@ export const saveEntityRecord = (
 								: data.status,
 					}
 				);
-				const options = {
+				updatedRecord = await __unstableFetch( {
 					path: `${ path }/autosaves`,
 					method: 'POST',
 					data,
-				};
-				updatedRecord = await __unstableFetch( options );
-
+				} );
 				// An autosave may be processed by the server as a regular save
 				// when its update is requested by the author and the post had
 				// draft or auto-draft status.
@@ -487,15 +483,15 @@ export const saveEntityRecord = (
 						},
 						{}
 					);
-					await dispatch.receiveEntityRecords(
+					dispatch.receiveEntityRecords(
 						kind,
 						name,
 						newRecord,
 						undefined,
 						true
 					);
 				} else {
-					await dispatch.receiveAutosaves(
+					dispatch.receiveAutosaves(
 						persistedRecord.id,
 						updatedRecord
 					);
@@ -511,13 +507,12 @@ export const saveEntityRecord = (
 						),
 					};
 				}
-				const options = {
+				updatedRecord = await __unstableFetch( {
 					path,
 					method: recordId ? 'PUT' : 'POST',
 					data: edits,
-				};
-				updatedRecord = await __unstableFetch( options );
-				await dispatch.receiveEntityRecords(
+				} );
+				dispatch.receiveEntityRecords(
 					kind,
 					name,
 					updatedRecord,
@@ -540,7 +535,7 @@ export const saveEntityRecord = (
 
 		return updatedRecord;
 	} finally {
-		await dispatch.__unstableReleaseStoreLock( lock );
+		dispatch.__unstableReleaseStoreLock( lock );
 	}
 };
 
@@ -566,52 +561,41 @@ export const saveEntityRecord = (
  * @return {Promise} A promise that resolves to an array containing the return
  *                   values of each function given in `requests`.
  */
-export function* __experimentalBatch( requests ) {
+export const __experimentalBatch = ( requests ) => async ( { dispatch } ) => {
 	const batch = createBatch();
-	const dispatch = yield getDispatch();
 	const api = {
 		saveEntityRecord( kind, name, record, options ) {
 			return batch.add( ( add ) =>
-				dispatch( STORE_NAME ).saveEntityRecord( kind, name, record, {
+				dispatch.saveEntityRecord( kind, name, record, {
 					...options,
 					__unstableFetch: add,
 				} )
 			);
 		},
 		saveEditedEntityRecord( kind, name, recordId, options ) {
 			return batch.add( ( add ) =>
-				dispatch( STORE_NAME ).saveEditedEntityRecord(
-					kind,
-					name,
-					recordId,
-					{
-						...options,
-						__unstableFetch: add,
-					}
-				)
+				dispatch.saveEditedEntityRecord( kind, name, recordId, {
+					...options,
+					__unstableFetch: add,
+				} )
 			);
 		},
 		deleteEntityRecord( kind, name, recordId, query, options ) {
 			return batch.add( ( add ) =>
-				dispatch( STORE_NAME ).deleteEntityRecord(
-					kind,
-					name,
-					recordId,
-					query,
-					{
-						...options,
-						__unstableFetch: add,
-					}
-				)
+				dispatch.deleteEntityRecord( kind, name, recordId, query, {
+					...options,
+					__unstableFetch: add,
+				} )
 			);
 		},
 	};
 	const resultPromises = requests.map( ( request ) => request( api ) );
-	const [ , ...results ] = yield __unstableAwaitPromise(
-		Promise.all( [ batch.run(), ...resultPromises ] )
-	);
+	const [ , ...results ] = await Promise.all( [
+		batch.run(),
+		...resultPromises,
+	] );
 	return results;
-}
+};
 
 /**
  * Action triggered to save an entity record's edits.

diff --git a/packages/core-data/src/controls.js b/packages/core-data/src/controls.js
diff --git a/packages/core-data/src/entities.js b/packages/core-data/src/entities.js
@@ -6,15 +6,13 @@ import { upperFirst, camelCase, map, find, get, startCase } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { controls } from '@wordpress/data';
-import { apiFetch } from '@wordpress/data-controls';
+import apiFetch from '@wordpress/api-fetch';
 import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { addEntities } from './actions';
-import { STORE_NAME } from './name';
 
 export const DEFAULT_ENTITY_KEY = 'id';
 
@@ -167,8 +165,8 @@ export const prePersistPostType = ( persistedRecord, edits ) => {
  *
  * @return {Promise} Entities promise
  */
-function* loadPostTypeEntities() {
-	const postTypes = yield apiFetch( { path: '/wp/v2/types?context=edit' } );
+async function loadPostTypeEntities() {
+	const postTypes = await apiFetch( { path: '/wp/v2/types?context=edit' } );
 	return map( postTypes, ( postType, name ) => {
 		const isTemplate = [ 'wp_template', 'wp_template_part' ].includes(
 			name
@@ -199,8 +197,8 @@ function* loadPostTypeEntities() {
  *
  * @return {Promise} Entities promise
  */
-function* loadTaxonomyEntities() {
-	const taxonomies = yield apiFetch( {
+async function loadTaxonomyEntities() {
+	const taxonomies = await apiFetch( {
 		path: '/wp/v2/taxonomies?context=edit',
 	} );
 	return map( taxonomies, ( taxonomy, name ) => {
@@ -248,12 +246,8 @@ export const getMethodName = (
  *
  * @return {Array} Entities
  */
-export function* getKindEntities( kind ) {
-	let entities = yield controls.select(
-		STORE_NAME,
-		'getEntitiesByKind',
-		kind
-	);
+export const getKindEntities = ( kind ) => async ( { select, dispatch } ) => {
+	let entities = select.getEntitiesByKind( kind );
 	if ( entities && entities.length !== 0 ) {
 		return entities;
 	}
@@ -263,8 +257,8 @@ export function* getKindEntities( kind ) {
 		return [];
 	}
 
-	entities = yield kindConfig.loadEntities();
-	yield addEntities( entities );
+	entities = await kindConfig.loadEntities();
+	dispatch( addEntities( entities ) );
 
 	return entities;
-}
+};
diff --git a/packages/core-data/src/index.js b/packages/core-data/src/index.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { createReduxStore, register } from '@wordpress/data';
-import { controls } from '@wordpress/data-controls';
 
 /**
  * Internal dependencies
@@ -12,7 +11,6 @@ import * as selectors from './selectors';
 import * as actions from './actions';
 import * as resolvers from './resolvers';
 import createLocksActions from './locks/actions';
-import customControls from './controls';
 import { defaultEntities, getMethodName } from './entities';
 import { STORE_NAME } from './name';
 
@@ -58,7 +56,6 @@ const entityActions = defaultEntities.reduce( ( result, entity ) => {
 
 const storeConfig = () => ( {
 	reducer,
-	controls: { ...customControls, ...controls },
 	actions: { ...actions, ...entityActions, ...createLocksActions() },
 	selectors: { ...selectors, ...entitySelectors },
 	resolvers: { ...resolvers, ...entityResolvers },