@secretstache/wordpress-gutenberg 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@secretstache/wordpress-gutenberg",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "",
   "author": "Secret Stache",
   "license": "GPL-2.0-or-later",

package/src/components/ResourcesWrapper.js

@@ -1,16 +1,17 @@
 import { Notice, Placeholder, Spinner } from '@wordpress/components';
 
-const EmptyNotice = ({
-    message = 'No resources were found matching your criteria. Please try to adjust the query.'
-}) => (
+const DEFAULT_EMPTY_RESOURCES_MESSAGE = 'No resources were found matching your criteria. Please try to adjust the query.';
+const DEFAULT_EMPTY_SELECTION_MESSAGE = 'No items are selected. Please use the corresponding relationship field to populate this block.';
+
+export const EmptyNotice = ({ message }) => (
     <Notice status="info" isDismissible={false}>
         <p>{message}</p>
     </Notice>
 );
 
-const LoadingSpinner = () => <Spinner className="bc-spinner" />;
+export const LoadingSpinner = () => <Spinner className="bc-spinner" />;
 
-const PlaceholderContent = ({
+export const PlaceholderContent = ({
     icon = 'info-outline',
     instructions = 'Please configure the block in the sidebar.',
     ...restProps
@@ -24,9 +25,11 @@ const PlaceholderContent = ({
 
 export const ResourcesWrapper = ({
     isLoading,
-    isEmpty,
+    isEmptyResources,
+    isEmptySelection,
     isPlaceholder,
-    emptyMessage,
+    emptyResourcesMessage,
+    emptySelectionMessage,
     placeholderProps = {},
     children,
 }) => {
@@ -34,8 +37,12 @@ export const ResourcesWrapper = ({
         return <LoadingSpinner />;
     }
 
-    if (isEmpty) {
-        return <EmptyNotice message={emptyMessage} />;
+    if (isEmptySelection) {
+        return <EmptyNotice message={emptySelectionMessage || DEFAULT_EMPTY_SELECTION_MESSAGE} />;
+    }
+
+    if (isEmptyResources) {
+        return <EmptyNotice message={emptyResourcesMessage || DEFAULT_EMPTY_RESOURCES_MESSAGE} />;
     }
 
     if (isPlaceholder) {

package/src/hooks/useDataQuery.js

@@ -5,8 +5,8 @@ export const useDataQuery = (config, dependencies = []) => {
         postType,
         curatedPostsIds,
 
-        categoriesTaxonomy,
-        curatedCategoriesIds,
+        taxonomySlug,
+        curatedTermsIds,
 
         numberOfPosts = -1,
         extraQueryArgs,
@@ -21,8 +21,8 @@ export const useDataQuery = (config, dependencies = []) => {
             ...extraQueryArgs,
         };
 
-        if (categoriesTaxonomy && curatedCategoriesIds?.length > 0) {
-            queryArgs[categoriesTaxonomy] = curatedCategoriesIds.join(',');
+        if (taxonomySlug && curatedTermsIds?.length > 0) {
+            queryArgs[taxonomySlug] = curatedTermsIds.join(',');
         }
 
         if (curatedPostsIds?.length > 0) {
@@ -37,7 +37,7 @@ export const useDataQuery = (config, dependencies = []) => {
         const postsToShow = select('core').getEntityRecords('postType', preparedPostType, queryArgs);
         const isResolving = select('core/data').isResolving('core', 'getEntityRecords', ['postType', preparedPostType, queryArgs]);
 
-        const isEmpty = postsToShow !== null && postsToShow?.length === 0;
+        const isEmpty = (postsToShow !== null && postsToShow?.length === 0) || numberOfPosts === 0;
 
         return {
             postsToShow,