@contentful/field-editor-reference 6.4.1 → 6.4.2

package/dist/cjs/common/useContentTypePermissions.js

@@ -9,39 +9,45 @@ Object.defineProperty(exports, "useContentTypePermissions", {
     }
 });
 const _react = require("react");
+const _lodash = require("lodash");
 const _useAccessApi = require("./useAccessApi");
 async function filter(arr, predicate) {
     const fail = Symbol();
     const results = await Promise.all(arr.map(async (item)=>await predicate(item) ? item : fail));
     return results.filter((x)=>x !== fail);
 }
-function useContentTypePermissions(props) {
+function useContentTypePermissions({ entityType, validations, sdk, allContentTypes }) {
     const availableContentTypes = (0, _react.useMemo)(()=>{
-        if (props.entityType === 'Asset') {
+        if (entityType === 'Asset') {
             return [];
         }
-        if (props.validations.contentTypes) {
-            return props.allContentTypes.filter((ct)=>props.validations.contentTypes?.includes(ct.sys.id));
+        if (validations.contentTypes) {
+            return allContentTypes.filter((ct)=>validations.contentTypes?.includes(ct.sys.id));
         }
-        return props.allContentTypes;
+        return allContentTypes;
     }, [
-        props.allContentTypes,
-        props.validations.contentTypes,
-        props.entityType
+        allContentTypes,
+        validations.contentTypes,
+        entityType
     ]);
     const [creatableContentTypes, setCreatableContentTypes] = (0, _react.useState)(availableContentTypes);
-    const { canPerformActionOnEntryOfType } = (0, _useAccessApi.useAccessApi)(props.sdk.access);
+    const { canPerformActionOnEntryOfType } = (0, _useAccessApi.useAccessApi)(sdk.access);
     (0, _react.useEffect)(()=>{
         function getContentTypes(action) {
             return filter(availableContentTypes, (ct)=>canPerformActionOnEntryOfType(action, ct.sys.id));
         }
         async function checkContentTypeAccess() {
             const creatable = await getContentTypes('create');
-            setCreatableContentTypes(creatable);
+            if (!(0, _lodash.isEqual)(creatable, creatableContentTypes)) {
+                setCreatableContentTypes(creatable);
+            }
+        }
+        if (availableContentTypes.length > 0) {
+            void checkContentTypeAccess();
         }
-        void checkContentTypeAccess();
     }, [
-        availableContentTypes
+        availableContentTypes,
+        creatableContentTypes
     ]);
     return {
         creatableContentTypes,

package/dist/cjs/common/useEditorPermissions.js

@@ -12,16 +12,18 @@ const _react = require("react");
 const _fromFieldValidations = require("../utils/fromFieldValidations");
 const _useAccessApi = require("./useAccessApi");
 const _useContentTypePermissions = require("./useContentTypePermissions");
-function useEditorPermissions(props) {
-    const { sdk, entityType, parameters } = props;
-    const validations = (0, _react.useMemo)(()=>(0, _fromFieldValidations.fromFieldValidations)(props.sdk.field), [
-        props.sdk.field
+function useEditorPermissions({ sdk, entityType, parameters, allContentTypes }) {
+    const validations = (0, _react.useMemo)(()=>(0, _fromFieldValidations.fromFieldValidations)(sdk.field), [
+        sdk.field
     ]);
     const [canCreateEntity, setCanCreateEntity] = (0, _react.useState)(true);
     const [canLinkEntity, setCanLinkEntity] = (0, _react.useState)(true);
     const { creatableContentTypes, availableContentTypes } = (0, _useContentTypePermissions.useContentTypePermissions)({
-        ...props,
-        validations
+        entityType,
+        validations,
+        sdk,
+        allContentTypes,
+        parameters
     });
     const { canPerformAction } = (0, _useAccessApi.useAccessApi)(sdk.access);
     (0, _react.useEffect)(()=>{

package/dist/cjs/common/useEditorPermissions.spec.js

@@ -18,7 +18,7 @@ describe('useEditorPermissions', ()=>{
                 id
             }
         });
-    const renderEditorPermissions = async ({ entityType, params = {}, allContentTypes = [], customizeMock, customizeSdk })=>{
+    const renderEditorPermissions = async ({ entityType, params = {}, allContentTypes = [], customizeMock, customizeSdk, waitForUpdate = false })=>{
         const sdk = makeFieldAppSDK(customizeMock);
         customizeSdk?.(sdk);
         const renderResult = (0, _reacthooks.renderHook)(()=>(0, _useEditorPermissions.useEditorPermissions)({
@@ -29,7 +29,9 @@ describe('useEditorPermissions', ()=>{
                     instance: params
                 }
             }));
-        await renderResult.waitForNextUpdate();
+        if (waitForUpdate) {
+            await renderResult.waitForNextUpdate();
+        }
         return {
             ...renderResult,
             sdk
@@ -102,7 +104,8 @@ describe('useEditorPermissions', ()=>{
                 allContentTypes,
                 customizeSdk: (sdk)=>{
                     allowContentTypes(sdk, 'create', 'one');
-                }
+                },
+                waitForUpdate: true
             });
             expect(result.current.canCreateEntity).toBe(true);
         });
@@ -130,7 +133,8 @@ describe('useEditorPermissions', ()=>{
                 allContentTypes,
                 customizeSdk: (sdk)=>{
                     allowContentTypes(sdk, 'read', 'one');
-                }
+                },
+                waitForUpdate: true
             });
             expect(result.current.canLinkEntity).toBe(true);
         });

package/dist/esm/common/useContentTypePermissions.js

@@ -1,37 +1,43 @@
 import { useEffect, useMemo, useState } from 'react';
+import { isEqual } from 'lodash';
 import { useAccessApi } from './useAccessApi';
 async function filter(arr, predicate) {
     const fail = Symbol();
     const results = await Promise.all(arr.map(async (item)=>await predicate(item) ? item : fail));
     return results.filter((x)=>x !== fail);
 }
-export function useContentTypePermissions(props) {
+export function useContentTypePermissions({ entityType, validations, sdk, allContentTypes }) {
     const availableContentTypes = useMemo(()=>{
-        if (props.entityType === 'Asset') {
+        if (entityType === 'Asset') {
             return [];
         }
-        if (props.validations.contentTypes) {
-            return props.allContentTypes.filter((ct)=>props.validations.contentTypes?.includes(ct.sys.id));
+        if (validations.contentTypes) {
+            return allContentTypes.filter((ct)=>validations.contentTypes?.includes(ct.sys.id));
         }
-        return props.allContentTypes;
+        return allContentTypes;
     }, [
-        props.allContentTypes,
-        props.validations.contentTypes,
-        props.entityType
+        allContentTypes,
+        validations.contentTypes,
+        entityType
     ]);
     const [creatableContentTypes, setCreatableContentTypes] = useState(availableContentTypes);
-    const { canPerformActionOnEntryOfType } = useAccessApi(props.sdk.access);
+    const { canPerformActionOnEntryOfType } = useAccessApi(sdk.access);
     useEffect(()=>{
         function getContentTypes(action) {
             return filter(availableContentTypes, (ct)=>canPerformActionOnEntryOfType(action, ct.sys.id));
         }
         async function checkContentTypeAccess() {
             const creatable = await getContentTypes('create');
-            setCreatableContentTypes(creatable);
+            if (!isEqual(creatable, creatableContentTypes)) {
+                setCreatableContentTypes(creatable);
+            }
+        }
+        if (availableContentTypes.length > 0) {
+            void checkContentTypeAccess();
         }
-        void checkContentTypeAccess();
     }, [
-        availableContentTypes
+        availableContentTypes,
+        creatableContentTypes
     ]);
     return {
         creatableContentTypes,

package/dist/esm/common/useEditorPermissions.js

@@ -2,16 +2,18 @@ import { useEffect, useMemo, useState } from 'react';
 import { fromFieldValidations } from '../utils/fromFieldValidations';
 import { useAccessApi } from './useAccessApi';
 import { useContentTypePermissions } from './useContentTypePermissions';
-export function useEditorPermissions(props) {
-    const { sdk, entityType, parameters } = props;
-    const validations = useMemo(()=>fromFieldValidations(props.sdk.field), [
-        props.sdk.field
+export function useEditorPermissions({ sdk, entityType, parameters, allContentTypes }) {
+    const validations = useMemo(()=>fromFieldValidations(sdk.field), [
+        sdk.field
     ]);
     const [canCreateEntity, setCanCreateEntity] = useState(true);
     const [canLinkEntity, setCanLinkEntity] = useState(true);
     const { creatableContentTypes, availableContentTypes } = useContentTypePermissions({
-        ...props,
-        validations
+        entityType,
+        validations,
+        sdk,
+        allContentTypes,
+        parameters
     });
     const { canPerformAction } = useAccessApi(sdk.access);
     useEffect(()=>{

package/dist/esm/common/useEditorPermissions.spec.js

@@ -14,7 +14,7 @@ describe('useEditorPermissions', ()=>{
                 id
             }
         });
-    const renderEditorPermissions = async ({ entityType, params = {}, allContentTypes = [], customizeMock, customizeSdk })=>{
+    const renderEditorPermissions = async ({ entityType, params = {}, allContentTypes = [], customizeMock, customizeSdk, waitForUpdate = false })=>{
         const sdk = makeFieldAppSDK(customizeMock);
         customizeSdk?.(sdk);
         const renderResult = renderHook(()=>useEditorPermissions({
@@ -25,7 +25,9 @@ describe('useEditorPermissions', ()=>{
                     instance: params
                 }
             }));
-        await renderResult.waitForNextUpdate();
+        if (waitForUpdate) {
+            await renderResult.waitForNextUpdate();
+        }
         return {
             ...renderResult,
             sdk
@@ -98,7 +100,8 @@ describe('useEditorPermissions', ()=>{
                 allContentTypes,
                 customizeSdk: (sdk)=>{
                     allowContentTypes(sdk, 'create', 'one');
-                }
+                },
+                waitForUpdate: true
             });
             expect(result.current.canCreateEntity).toBe(true);
         });
@@ -126,7 +129,8 @@ describe('useEditorPermissions', ()=>{
                 allContentTypes,
                 customizeSdk: (sdk)=>{
                     allowContentTypes(sdk, 'read', 'one');
-                }
+                },
+                waitForUpdate: true
             });
             expect(result.current.canLinkEntity).toBe(true);
         });

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

@@ -12,5 +12,5 @@ type ContentTypePermissions = {
     creatableContentTypes: ContentType[];
     availableContentTypes: ContentType[];
 };
-export declare function useContentTypePermissions(props: ContentTypePermissionsProps): ContentTypePermissions;
+export declare function useContentTypePermissions({ entityType, validations, sdk, allContentTypes, }: ContentTypePermissionsProps): ContentTypePermissions;
 export {};

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

@@ -6,7 +6,7 @@ export type EditorPermissionsProps = {
     parameters: ReferenceEditorProps['parameters'];
     allContentTypes: ContentType[];
 };
-export declare function useEditorPermissions(props: EditorPermissionsProps): {
+export declare function useEditorPermissions({ sdk, entityType, parameters, allContentTypes, }: EditorPermissionsProps): {
     canCreateEntity: boolean;
     canLinkEntity: boolean;
     creatableContentTypes: ContentType[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-reference",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "4ab2348c09189a9b3bdc8c0fb7effaa5bfc8c6f7"
+  "gitHead": "6eb05bdb86788fa95e73f9ac8ee846fae69876a1"
 }