Propose useEntityRecords

WordPress · Feb 15, 2022 · e7ac34e · e7ac34e
1 parent 8b8886c
commit e7ac34e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/packages/core-data/src/hooks/use-entity-records.ts b/packages/core-data/src/hooks/use-entity-records.ts
@@ -29,6 +29,7 @@ interface EntityRecordsResolution< RecordType > {
  * @param  kind      Kind of the requested entities.
  * @param  name      Name of the requested entities.
  * @param  queryArgs HTTP query for the requested entities.
+ *                   Resolves the specified entity record.
  *
  * @example
  * ```js

diff --git a/packages/core-data/src/hooks/use-query-select.ts b/packages/core-data/src/hooks/use-query-select.ts
@@ -72,10 +72,28 @@ interface QuerySelectResponse {
  * @return {QuerySelectResponse} Queried data.
  */
 export default function __experimentalUseQuerySelect( mapQuerySelect, deps ) {
-	return useSelect( ( select, registry ) => {
-		const resolve = ( store ) => enrichSelectors( select( store ) );
-		return mapQuerySelect( resolve, registry );
-	}, deps );
+	const { data, isResolving, hasResolved, ...rest } = useSelect(
+		( select, registry ) => {
+			const resolve = ( store ) => enrichSelectors( select( store ) );
+			return mapQuerySelect( resolve, registry );
+		},
+		deps
+	);
+
+	let status;
+	if ( isResolving ) {
+		status = Status.Resolving;
+	} else if ( hasResolved ) {
+		if ( data ) {
+			status = Status.Success;
+		} else {
+			status = Status.Error;
+		}
+	} else {
+		status = Status.Idle;
+	}
+
+	return { data, isResolving, hasResolved, status, ...rest };
 }
 
 type QuerySelector = ( ...args ) => QuerySelectResponse;
@@ -122,7 +140,9 @@ const enrichSelectors = memoize( ( selectors ) => {
 					data,
 					status,
 					isResolving,
-					hasResolved,
+					hasResolved:
+						! isResolving &&
+						hasFinishedResolution( selectorName, args ),
 				};
 			},
 		} );