@contentful/field-editor-reference 6.18.0 → 6.19.1

package/dist/cjs/common/EntityStore.js

@@ -149,7 +149,7 @@ function handleResourceFetchError(resourceFetchError, resourceTypeEntity) {
     throw resourceFetchError;
 }
 const isEntityQueryKey = (queryKey)=>{
-    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && queryKey.length === 4;
+    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && (queryKey.length === 4 || queryKey.length === 5);
 };
 async function fetchContentfulEntry({ urn, fetch, options }) {
     const resourceId = urn.split(':', 6)[5];
@@ -214,7 +214,7 @@ async function fetchContentfulEntry({ urn, fetch, options }) {
         contentType: contentType
     };
 }
-async function fetchExternalResource({ urn, fetch, options, spaceId, environmentId, resourceType, locale }) {
+async function fetchExternalResource({ urn, fetch, options, spaceId, environmentId, resourceType, locale, referencingEntryId }) {
     let resourceFetchError;
     const [resource, resourceTypes] = await Promise.all([
         fetch([
@@ -223,14 +223,16 @@ async function fetchExternalResource({ urn, fetch, options, spaceId, environment
             environmentId,
             resourceType,
             urn,
-            locale
+            locale,
+            referencingEntryId
         ], ({ cmaClient })=>cmaClient.resource.getMany({
                 spaceId,
                 environmentId,
                 resourceTypeId: resourceType,
                 query: {
                     'sys.urn[in]': urn,
-                    locale
+                    locale,
+                    referencingEntryId
                 }
             }).then(({ items })=>{
                 return items[0] ?? null;
@@ -426,7 +428,8 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
             'Resource',
             resourceType,
             urn,
-            options?.locale
+            options?.locale,
+            options?.referencingEntryId
         ];
         return fetch(queryKey, ()=>{
             if (resourceType === 'Contentful:Entry') {
@@ -443,6 +446,7 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
                 fetch,
                 urn,
                 locale: options?.locale,
+                referencingEntryId: options?.referencingEntryId,
                 options,
                 resourceType,
                 spaceId: currentSpaceId,
@@ -466,10 +470,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
     const onSlideInNavigation = props.sdk.navigator.onSlideInNavigation;
     (0, _react.useEffect)(()=>{
         function findSameSpaceQueries() {
-            return queryCache.findAll({
+            const queries = queryCache.findAll({
                 type: 'active',
                 predicate: (query)=>isSameSpaceEntityQueryKey(query.queryKey)
             });
+            return queries;
         }
         if (typeof onEntityChanged !== 'function') {
             return onSlideInNavigation(({ oldSlideLevel, newSlideLevel })=>{
@@ -483,8 +488,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
         const subscribeQuery = ({ queryKey, queryHash })=>{
             const [entityType, entityId, , , releaseId] = queryKey;
             entityChangeUnsubscribers.current[queryHash] = onEntityChanged(entityType, entityId, (data)=>{
-                if ((0, _lodash.get)(data, 'sys.release.id') === releaseId) {
+                const dataReleaseId = (0, _lodash.get)(data, 'sys.release.id');
+                if (dataReleaseId === releaseId) {
                     queryClient.setQueryData(queryKey, data);
+                } else if (releaseId && !dataReleaseId) {
+                    void queryClient.invalidateQueries(queryKey);
                 }
             });
         };
@@ -581,20 +589,23 @@ function useEntity(entityType, entityId, options) {
         currentEntity
     };
 }
-function useResource(resourceType, urn, { locale, ...options } = {}) {
+function useResource(resourceType, urn, { locale, referencingEntryId, ...options } = {}) {
     if (resourceType.startsWith('Contentful:')) {
         locale = undefined;
+        referencingEntryId = undefined;
     }
     const queryKey = [
         'Resource',
         resourceType,
         urn,
-        locale
+        locale,
+        referencingEntryId
     ];
     const { getResource } = useEntityLoader();
     const { status, data, error } = (0, _queryClient.useQuery)(queryKey, ()=>getResource(resourceType, urn, {
             ...options,
-            locale
+            locale,
+            referencingEntryId
         }), {
         enabled: options?.enabled
     });

package/dist/cjs/resources/Cards/ResourceCard.js

@@ -63,9 +63,10 @@ function ResourceCardSkeleton() {
     });
 }
 function ExistingResourceCard(props) {
-    const { resourceLink, inView, index = 0, locale } = props;
+    const { resourceLink, inView, index = 0, locale, referencingEntryId } = props;
     const resourceOptions = {
         locale,
+        referencingEntryId,
         priority: index * -1,
         enabled: inView,
         allowExternal: true

package/dist/cjs/resources/MultipleResourceReferenceEditor.js

@@ -149,6 +149,7 @@ function MultipleResourceReferenceEditor(props) {
                         index: index,
                         resourceLink: item,
                         locale: props.sdk.field.locale,
+                        referencingEntryId: props.sdk.ids.entry,
                         isDisabled: isDisabled,
                         renderDragHandle: DragHandle,
                         onMoveTop: onMoveTop,

package/dist/cjs/resources/MultipleResourceReferenceEditor.spec.js

@@ -118,7 +118,8 @@ describe('Multiple resource editor', ()=>{
         const options = dialogFn.mock.calls[0][0];
         expect(options).toEqual({
             allowedResources: fieldDefinition.allowedResources,
-            locale: 'en'
+            locale: 'en',
+            referencingEntryId: 'testEntry'
         });
     });
     it('hides the action button when insufficient permissions', async ()=>{

package/dist/cjs/resources/SingleResourceReferenceEditor.js

@@ -71,6 +71,7 @@ function SingleResourceReferenceEditor(props) {
             onRemove: ()=>props.sdk.field.removeValue(),
             resourceLink: value,
             locale: props.sdk.field.locale,
+            referencingEntryId: props.sdk.ids.entry,
             isDisabled: disabled,
             getEntryRouteHref: props.getEntryRouteHref
         }) : /*#__PURE__*/ _react.createElement(_LinkEntityActions.CombinedLinkEntityActions, {

package/dist/cjs/resources/SingleResourceReferenceEditor.spec.js

@@ -114,7 +114,8 @@ describe('Single resource editor', ()=>{
         const options = dialogFn.mock.calls[0][0];
         expect(options).toEqual({
             allowedResources: fieldDefinition.allowedResources,
-            locale: 'en'
+            locale: 'en',
+            referencingEntryId: 'testEntry'
         });
     });
     it('renders no the action button when permissions insufficient', async ()=>{

package/dist/cjs/resources/useResourceLinkActions.js

@@ -35,14 +35,18 @@ function useResourceLinkActions({ parameters, sdk }) {
         field
     ]);
     const multiple = field.type === 'Array';
+    const referencingEntryId = sdk.ids.entry;
+    const allowedResources = field.allowedResources;
     const onLinkExisting = (0, _react.useMemo)(()=>{
         const promptSelection = multiple ? async ()=>await dialogs.selectMultipleResourceEntities({
-                allowedResources: field.allowedResources,
-                locale: field.locale
+                allowedResources,
+                locale: field.locale,
+                referencingEntryId
             }) : async ()=>[
                 await dialogs.selectSingleResourceEntity({
-                    allowedResources: field.allowedResources,
-                    locale: field.locale
+                    allowedResources,
+                    locale: field.locale,
+                    referencingEntryId
                 })
             ];
         return async ()=>{
@@ -50,8 +54,9 @@ function useResourceLinkActions({ parameters, sdk }) {
         };
     }, [
         dialogs,
-        field.allowedResources,
+        allowedResources,
         field.locale,
+        referencingEntryId,
         multiple,
         onLinkedExisting
     ]);

package/dist/esm/common/EntityStore.js

@@ -61,7 +61,7 @@ function handleResourceFetchError(resourceFetchError, resourceTypeEntity) {
     throw resourceFetchError;
 }
 const isEntityQueryKey = (queryKey)=>{
-    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && queryKey.length === 4;
+    return Array.isArray(queryKey) && (queryKey[0] === 'Entry' || queryKey[0] === 'Asset') && (queryKey.length === 4 || queryKey.length === 5);
 };
 async function fetchContentfulEntry({ urn, fetch, options }) {
     const resourceId = urn.split(':', 6)[5];
@@ -126,7 +126,7 @@ async function fetchContentfulEntry({ urn, fetch, options }) {
         contentType: contentType
     };
 }
-async function fetchExternalResource({ urn, fetch, options, spaceId, environmentId, resourceType, locale }) {
+async function fetchExternalResource({ urn, fetch, options, spaceId, environmentId, resourceType, locale, referencingEntryId }) {
     let resourceFetchError;
     const [resource, resourceTypes] = await Promise.all([
         fetch([
@@ -135,14 +135,16 @@ async function fetchExternalResource({ urn, fetch, options, spaceId, environment
             environmentId,
             resourceType,
             urn,
-            locale
+            locale,
+            referencingEntryId
         ], ({ cmaClient })=>cmaClient.resource.getMany({
                 spaceId,
                 environmentId,
                 resourceTypeId: resourceType,
                 query: {
                     'sys.urn[in]': urn,
-                    locale
+                    locale,
+                    referencingEntryId
                 }
             }).then(({ items })=>{
                 return items[0] ?? null;
@@ -338,7 +340,8 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = cons
             'Resource',
             resourceType,
             urn,
-            options?.locale
+            options?.locale,
+            options?.referencingEntryId
         ];
         return fetch(queryKey, ()=>{
             if (resourceType === 'Contentful:Entry') {
@@ -355,6 +358,7 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = cons
                 fetch,
                 urn,
                 locale: options?.locale,
+                referencingEntryId: options?.referencingEntryId,
                 options,
                 resourceType,
                 spaceId: currentSpaceId,
@@ -378,10 +382,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = cons
     const onSlideInNavigation = props.sdk.navigator.onSlideInNavigation;
     useEffect(()=>{
         function findSameSpaceQueries() {
-            return queryCache.findAll({
+            const queries = queryCache.findAll({
                 type: 'active',
                 predicate: (query)=>isSameSpaceEntityQueryKey(query.queryKey)
             });
+            return queries;
         }
         if (typeof onEntityChanged !== 'function') {
             return onSlideInNavigation(({ oldSlideLevel, newSlideLevel })=>{
@@ -395,8 +400,11 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = cons
         const subscribeQuery = ({ queryKey, queryHash })=>{
             const [entityType, entityId, , , releaseId] = queryKey;
             entityChangeUnsubscribers.current[queryHash] = onEntityChanged(entityType, entityId, (data)=>{
-                if (get(data, 'sys.release.id') === releaseId) {
+                const dataReleaseId = get(data, 'sys.release.id');
+                if (dataReleaseId === releaseId) {
                     queryClient.setQueryData(queryKey, data);
+                } else if (releaseId && !dataReleaseId) {
+                    void queryClient.invalidateQueries(queryKey);
                 }
             });
         };
@@ -493,20 +501,23 @@ export function useEntity(entityType, entityId, options) {
         currentEntity
     };
 }
-export function useResource(resourceType, urn, { locale, ...options } = {}) {
+export function useResource(resourceType, urn, { locale, referencingEntryId, ...options } = {}) {
     if (resourceType.startsWith('Contentful:')) {
         locale = undefined;
+        referencingEntryId = undefined;
     }
     const queryKey = [
         'Resource',
         resourceType,
         urn,
-        locale
+        locale,
+        referencingEntryId
     ];
     const { getResource } = useEntityLoader();
     const { status, data, error } = useQuery(queryKey, ()=>getResource(resourceType, urn, {
             ...options,
-            locale
+            locale,
+            referencingEntryId
         }), {
         enabled: options?.enabled
     });

package/dist/esm/resources/Cards/ResourceCard.js

@@ -12,9 +12,10 @@ function ResourceCardSkeleton() {
     });
 }
 function ExistingResourceCard(props) {
-    const { resourceLink, inView, index = 0, locale } = props;
+    const { resourceLink, inView, index = 0, locale, referencingEntryId } = props;
     const resourceOptions = {
         locale,
+        referencingEntryId,
         priority: index * -1,
         enabled: inView,
         allowExternal: true

package/dist/esm/resources/MultipleResourceReferenceEditor.js

@@ -94,6 +94,7 @@ export function MultipleResourceReferenceEditor(props) {
                         index: index,
                         resourceLink: item,
                         locale: props.sdk.field.locale,
+                        referencingEntryId: props.sdk.ids.entry,
                         isDisabled: isDisabled,
                         renderDragHandle: DragHandle,
                         onMoveTop: onMoveTop,

package/dist/esm/resources/MultipleResourceReferenceEditor.spec.js

@@ -73,7 +73,8 @@ describe('Multiple resource editor', ()=>{
         const options = dialogFn.mock.calls[0][0];
         expect(options).toEqual({
             allowedResources: fieldDefinition.allowedResources,
-            locale: 'en'
+            locale: 'en',
+            referencingEntryId: 'testEntry'
         });
     });
     it('hides the action button when insufficient permissions', async ()=>{

package/dist/esm/resources/SingleResourceReferenceEditor.js

@@ -20,6 +20,7 @@ export function SingleResourceReferenceEditor(props) {
             onRemove: ()=>props.sdk.field.removeValue(),
             resourceLink: value,
             locale: props.sdk.field.locale,
+            referencingEntryId: props.sdk.ids.entry,
             isDisabled: disabled,
             getEntryRouteHref: props.getEntryRouteHref
         }) : /*#__PURE__*/ React.createElement(CombinedLinkEntityActions, {

package/dist/esm/resources/SingleResourceReferenceEditor.spec.js

@@ -69,7 +69,8 @@ describe('Single resource editor', ()=>{
         const options = dialogFn.mock.calls[0][0];
         expect(options).toEqual({
             allowedResources: fieldDefinition.allowedResources,
-            locale: 'en'
+            locale: 'en',
+            referencingEntryId: 'testEntry'
         });
     });
     it('renders no the action button when permissions insufficient', async ()=>{

package/dist/esm/resources/useResourceLinkActions.js

@@ -25,14 +25,18 @@ export function useResourceLinkActions({ parameters, sdk }) {
         field
     ]);
     const multiple = field.type === 'Array';
+    const referencingEntryId = sdk.ids.entry;
+    const allowedResources = field.allowedResources;
     const onLinkExisting = useMemo(()=>{
         const promptSelection = multiple ? async ()=>await dialogs.selectMultipleResourceEntities({
-                allowedResources: field.allowedResources,
-                locale: field.locale
+                allowedResources,
+                locale: field.locale,
+                referencingEntryId
             }) : async ()=>[
                 await dialogs.selectSingleResourceEntity({
-                    allowedResources: field.allowedResources,
-                    locale: field.locale
+                    allowedResources,
+                    locale: field.locale,
+                    referencingEntryId
                 })
             ];
         return async ()=>{
@@ -40,8 +44,9 @@ export function useResourceLinkActions({ parameters, sdk }) {
         };
     }, [
         dialogs,
-        field.allowedResources,
+        allowedResources,
         field.locale,
+        referencingEntryId,
         multiple,
         onLinkedExisting
     ]);

package/dist/types/common/EntityStore.d.ts

@@ -33,11 +33,11 @@ type QueryEntityResult<E> = Promise<E>;
 type GetResourceOptions = GetOptions & {
     allowExternal?: boolean;
     locale?: string;
+    referencingEntryId?: string;
 };
 type QueryResourceResult<R extends Resource = Resource> = QueryEntityResult<ResourceInfo<R>>;
 type UseResourceOptions = GetResourceOptions & {
     enabled?: boolean;
-    locale?: string;
 };
 type UseEntityResult<E> = {
     status: 'idle';
@@ -87,7 +87,7 @@ declare const useEntityLoader: () => {
     getResourceProvider: (organizationId: string, appDefinitionId: string) => QueryEntityResult<ResourceProvider>;
 };
 export declare function useEntity<E extends FetchableEntity>(entityType: FetchableEntityType, entityId: string, options?: Omit<UseEntityOptions, 'releaseId'>): UseEntityResult<E>;
-export declare function useResource<R extends Resource = Resource>(resourceType: string, urn: string, { locale, ...options }?: UseResourceOptions): {
+export declare function useResource<R extends Resource = Resource>(resourceType: string, urn: string, { locale, referencingEntryId, ...options }?: UseResourceOptions): {
     status: "error" | "success" | "loading";
     data: ResourceInfo<R> | undefined;
     error: unknown;

package/dist/types/resources/Cards/ResourceCard.d.ts

@@ -5,6 +5,7 @@ type ResourceCardProps = {
     index?: number;
     resourceLink?: ResourceLink<string>;
     locale?: string;
+    referencingEntryId?: string;
     isDisabled: boolean;
     renderDragHandle?: RenderDragFn;
     getEntryRouteHref: (entryRoute: EntryRoute) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-reference",
-  "version": "6.18.0",
+  "version": "6.19.1",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -46,7 +46,7 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@tanstack/react-query": "^4.3.9",
     "constate": "^3.3.2",
-    "contentful-management": "^11.45.1",
+    "contentful-management": "^11.66.0",
     "emotion": "^10.0.17",
     "lodash": "^4.17.15",
     "moment": "^2.20.0",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "b25d0af70c82c9e29505335ce636f2e32e6cb927"
+  "gitHead": "df62d5fb562de590a6de09e86d2e72913c64ac93"
 }