Add hasError flag to throw even falsy errors

WordPress · Mar 15, 2022 · 761c82b · 761c82b
1 parent 5082a34
commit 761c82b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/docs/reference-guides/data/data-core.md b/docs/reference-guides/data/data-core.md
@@ -561,9 +561,9 @@ Action triggered to delete an entity record.
 
 _Parameters_
 
--   _kind_ `string`: Kind of the deleted entity record.
--   _name_ `string`: Name of the deleted entity record.
--   _recordId_ `string`: Record ID of the deleted entity record.
+-   _kind_ `string`: Kind of the deleted entity.
+-   _name_ `string`: Name of the deleted entity.
+-   _recordId_ `string`: Record ID of the deleted entity.
 -   _query_ `?Object`: Special query parameters for the DELETE API call.
 -   _options_ `[Object]`: Delete options.
 -   _options.\_\_unstableFetch_ `[Function]`: Internal use only. Function to call instead of `apiFetch()`. Must return a promise.

diff --git a/packages/core-data/README.md b/packages/core-data/README.md
@@ -64,9 +64,9 @@ Action triggered to delete an entity record.
 
 _Parameters_
 
--   _kind_ `string`: Kind of the deleted entity record.
--   _name_ `string`: Name of the deleted entity record.
--   _recordId_ `string`: Record ID of the deleted entity record.
+-   _kind_ `string`: Kind of the deleted entity.
+-   _name_ `string`: Name of the deleted entity.
+-   _recordId_ `string`: Record ID of the deleted entity.
 -   _query_ `?Object`: Special query parameters for the DELETE API call.
 -   _options_ `[Object]`: Delete options.
 -   _options.\_\_unstableFetch_ `[Function]`: Internal use only. Function to call instead of `apiFetch()`. Must return a promise.

diff --git a/packages/core-data/src/actions.js b/packages/core-data/src/actions.js
@@ -250,6 +250,7 @@ export const deleteEntityRecord = (
 			recordId,
 		} );
 
+		let hasError = false;
 		try {
 			let path = `${ entityConfig.baseURL }/${ recordId }`;
 
@@ -264,6 +265,7 @@ export const deleteEntityRecord = (
 
 			await dispatch( removeItems( kind, name, recordId, true ) );
 		} catch ( _error ) {
+			hasError = true;
 			error = _error;
 		}
 
@@ -275,7 +277,7 @@ export const deleteEntityRecord = (
 			error,
 		} );
 
-		if ( error && throwOnError ) {
+		if ( hasError && throwOnError ) {
 			throw error;
 		}
 
@@ -457,6 +459,7 @@ export const saveEntityRecord = (
 		} );
 		let updatedRecord;
 		let error;
+		let hasError = false;
 		try {
 			const path = `${ entityConfig.baseURL }${
 				recordId ? '/' + recordId : ''
@@ -579,6 +582,7 @@ export const saveEntityRecord = (
 				);
 			}
 		} catch ( _error ) {
+			hasError = true;
 			error = _error;
 		}
 		dispatch( {
@@ -590,7 +594,7 @@ export const saveEntityRecord = (
 			isAutosave,
 		} );
 
-		if ( error && throwOnError ) {
+		if ( hasError && throwOnError ) {
 			throw error;
 		}