@contentful/field-editor-reference 6.13.12 → 6.13.14

package/dist/cjs/common/EntityStore.js

@@ -386,31 +386,32 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = (0,
         currentEnvironmentId,
         isReleaseRequestError
     ]);
-    const getEntityScheduledActions = (0, _react.useCallback)(function getEntityScheduledActions(entityType, entityId, options) {
+    const getEntityScheduledActions = (0, _react.useCallback)(function getEntityScheduledActions(_, entityId, options) {
         if (releaseId) {
             return new Promise((resolve)=>resolve([]));
         }
-        const fixedEntityCacheId = 'scheduledActionEntityId';
-        const maxScheduledActions = 500;
+        const maxScheduledActions = 1000;
         const spaceId = options?.spaceId ?? currentSpaceId;
         const environmentId = options?.environmentId ?? currentEnvironmentId;
+        const query = {
+            'environment.sys.id': environmentId,
+            'sys.status': 'scheduled',
+            'entity.sys.linkType[in]': 'Entry,Asset',
+            order: '-scheduledFor.datetime',
+            limit: maxScheduledActions
+        };
         const queryKey = [
-            'scheduled-actions',
-            entityType,
-            fixedEntityCacheId,
+            'spaces',
             spaceId,
-            environmentId,
-            releaseId
+            'scheduled_actions',
+            {
+                query
+            }
         ];
         return fetch(queryKey, async ({ cmaClient })=>{
             const response = await cmaClient.scheduledActions.getMany({
                 spaceId,
-                query: {
-                    'environment.sys.id': environmentId,
-                    'sys.status[in]': 'scheduled',
-                    order: 'scheduledFor.datetime',
-                    limit: maxScheduledActions
-                }
+                query
             });
             return response.items;
         }, options).then((items)=>items.filter((action)=>action.entity.sys.id === entityId));

package/dist/cjs/common/queryClient.js

@@ -63,12 +63,21 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 const clientContext = /*#__PURE__*/ _react.createContext(undefined);
+function useMaybeHostQueryClient() {
+    try {
+        return (0, _reactquery.useQueryClient)();
+    } catch  {
+        return undefined;
+    }
+}
 function useQueryClient() {
     const client = _react.useContext(clientContext);
+    const hostClient = useMaybeHostQueryClient();
     return _react.useMemo(()=>{
         if (client) {
             return client;
         }
+        if (hostClient) return hostClient;
         return new _reactquery.QueryClient({
             defaultOptions: {
                 queries: {
@@ -82,7 +91,8 @@ function useQueryClient() {
             }
         });
     }, [
-        client
+        client,
+        hostClient
     ]);
 }
 const useQuery = (key, fn, opt)=>{

package/dist/esm/common/EntityStore.js

@@ -298,31 +298,32 @@ const [InternalServiceProvider, useFetch, useEntityLoader, useCurrentIds] = cons
         currentEnvironmentId,
         isReleaseRequestError
     ]);
-    const getEntityScheduledActions = useCallback(function getEntityScheduledActions(entityType, entityId, options) {
+    const getEntityScheduledActions = useCallback(function getEntityScheduledActions(_, entityId, options) {
         if (releaseId) {
             return new Promise((resolve)=>resolve([]));
         }
-        const fixedEntityCacheId = 'scheduledActionEntityId';
-        const maxScheduledActions = 500;
+        const maxScheduledActions = 1000;
         const spaceId = options?.spaceId ?? currentSpaceId;
         const environmentId = options?.environmentId ?? currentEnvironmentId;
+        const query = {
+            'environment.sys.id': environmentId,
+            'sys.status': 'scheduled',
+            'entity.sys.linkType[in]': 'Entry,Asset',
+            order: '-scheduledFor.datetime',
+            limit: maxScheduledActions
+        };
         const queryKey = [
-            'scheduled-actions',
-            entityType,
-            fixedEntityCacheId,
+            'spaces',
             spaceId,
-            environmentId,
-            releaseId
+            'scheduled_actions',
+            {
+                query
+            }
         ];
         return fetch(queryKey, async ({ cmaClient })=>{
             const response = await cmaClient.scheduledActions.getMany({
                 spaceId,
-                query: {
-                    'environment.sys.id': environmentId,
-                    'sys.status[in]': 'scheduled',
-                    order: 'scheduledFor.datetime',
-                    limit: maxScheduledActions
-                }
+                query
             });
             return response.items;
         }, options).then((items)=>items.filter((action)=>action.entity.sys.id === entityId));

package/dist/esm/common/queryClient.js

@@ -1,12 +1,21 @@
 import * as React from 'react';
-import { QueryClient, useQuery as useRQ } from '@tanstack/react-query';
+import { QueryClient, useQuery as useRQ, useQueryClient as useHostQueryClient } from '@tanstack/react-query';
 const clientContext = /*#__PURE__*/ React.createContext(undefined);
+function useMaybeHostQueryClient() {
+    try {
+        return useHostQueryClient();
+    } catch  {
+        return undefined;
+    }
+}
 export function useQueryClient() {
     const client = React.useContext(clientContext);
+    const hostClient = useMaybeHostQueryClient();
     return React.useMemo(()=>{
         if (client) {
             return client;
         }
+        if (hostClient) return hostClient;
         return new QueryClient({
             defaultOptions: {
                 queries: {
@@ -20,7 +29,8 @@ export function useQueryClient() {
             }
         });
     }, [
-        client
+        client,
+        hostClient
     ]);
 }
 export const useQuery = (key, fn, opt)=>{

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

@@ -83,7 +83,7 @@ export declare function isFunctionInvocationError(value: unknown): value is Func
 declare const useEntityLoader: () => {
     getResource: <R extends Resource = Resource>(resourceType: string, urn: string, options?: GetResourceOptions) => QueryResourceResult<R>;
     getEntity: <E extends FetchableEntity>(entityType: FetchableEntityType, entityId: string, releaseId?: string, options?: GetEntityOptions) => QueryEntityResult<E>;
-    getEntityScheduledActions: (entityType: FetchableEntityType, entityId: string, options?: GetEntityOptions) => QueryEntityResult<ScheduledAction[]>;
+    getEntityScheduledActions: (_: FetchableEntityType, entityId: string, options?: GetEntityOptions) => QueryEntityResult<ScheduledAction[]>;
     getResourceProvider: (organizationId: string, appDefinitionId: string) => QueryEntityResult<ResourceProvider>;
 };
 export declare function useEntity<E extends FetchableEntity>(entityType: FetchableEntityType, entityId: string, options?: Omit<UseEntityOptions, 'releaseId'>): UseEntityResult<E>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-reference",
-  "version": "6.13.12",
+  "version": "6.13.14",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -39,7 +39,7 @@
     "@contentful/f36-components": "^5.4.1",
     "@contentful/f36-icons": "^5.4.1",
     "@contentful/f36-tokens": "^5.1.0",
-    "@contentful/field-editor-shared": "^2.13.10",
+    "@contentful/field-editor-shared": "^2.14.0",
     "@contentful/mimetype": "^2.2.29",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^7.0.0",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "381053321a01093836775e15c7c36c1fac080fa9"
+  "gitHead": "43023e9b8123777e95bcfc1a28d23aff16d36782"
 }