diff --git a/packages/web/src/components/PermissionCatalogField/PermissionSettings.ee.tsx b/packages/web/src/components/PermissionCatalogField/PermissionSettings.ee.tsx index 36e73694..6b9f9e04 100644 --- a/packages/web/src/components/PermissionCatalogField/PermissionSettings.ee.tsx +++ b/packages/web/src/components/PermissionCatalogField/PermissionSettings.ee.tsx @@ -22,14 +22,22 @@ type PermissionSettingsProps = { onClose: () => void; fieldPrefix: string; subject: string; + open?: boolean; defaultChecked?: boolean; actions: IPermissionCatalog['actions']; conditions: IPermissionCatalog['conditions']; }; export default function PermissionSettings(props: PermissionSettingsProps) { - const { onClose, fieldPrefix, subject, actions, conditions, defaultChecked } = - props; + const { + onClose, + open = false, + fieldPrefix, + subject, + actions, + conditions, + defaultChecked, + } = props; const formatMessage = useFormatMessage(); const { getValues, resetField } = useFormContext(); @@ -58,7 +66,7 @@ export default function PermissionSettings(props: PermissionSettingsProps) { }; return ( - + {formatMessage('permissionSettings.title')} diff --git a/packages/web/src/components/PermissionCatalogField/index.ee.tsx b/packages/web/src/components/PermissionCatalogField/index.ee.tsx index 653819c0..19bbfad6 100644 --- a/packages/web/src/components/PermissionCatalogField/index.ee.tsx +++ b/packages/web/src/components/PermissionCatalogField/index.ee.tsx @@ -93,16 +93,15 @@ const PermissionCatalogField = ({ - {dialogName === subject.key && ( - setDialogName('')} - fieldPrefix={`${name}.${subject.key}`} - subject={subject.key} - actions={permissionCatalog.actions} - conditions={permissionCatalog.conditions} - defaultChecked={defaultChecked} - /> - )} + setDialogName('')} + fieldPrefix={`${name}.${subject.key}`} + subject={subject.key} + actions={permissionCatalog.actions} + conditions={permissionCatalog.conditions} + defaultChecked={defaultChecked} + />