Feat 17408 : Add remove option for object permissions rule #17601
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import { useResetObjectPermission } from '@/settings/roles/role-permissions/object-level-permissions/hooks/useResetObjectPermission'; | ||
| import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; | ||
| import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; | ||
| import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; | ||
| import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown'; | ||
| import { t } from '@lingui/core/macro'; | ||
| import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/display'; | ||
| import { IconButton } from 'twenty-ui/input'; | ||
| import { MenuItem, UndecoratedLink } from 'twenty-ui/navigation'; | ||
|
|
||
| type SettingsRolePermissionsObjectLevelTableRowOptionsDropdownProps = { | ||
| roleId: string; | ||
| objectMetadataId: string; | ||
| objectPermissionDetailUrl: string; | ||
| }; | ||
|
|
||
| export const SettingsRolePermissionsObjectLevelTableRowOptionsDropdown = ({ | ||
| roleId, | ||
| objectMetadataId, | ||
| objectPermissionDetailUrl, | ||
| }: SettingsRolePermissionsObjectLevelTableRowOptionsDropdownProps) => { | ||
| const dropdownId = `settings-role-object-level-options-${objectMetadataId}`; | ||
|
|
||
| const { closeDropdown } = useCloseDropdown(); | ||
|
|
||
| const { resetObjectPermission } = useResetObjectPermission(roleId); | ||
|
|
||
| const handleRemove = () => { | ||
| closeDropdown(dropdownId); | ||
| resetObjectPermission(objectMetadataId); | ||
| }; | ||
|
|
||
| return ( | ||
| <Dropdown | ||
| dropdownId={dropdownId} | ||
| clickableComponent={ | ||
| <IconButton | ||
| aria-label={t`Object permission options`} | ||
| variant="tertiary" | ||
| Icon={IconDotsVertical} | ||
| /> | ||
| } | ||
| dropdownComponents={ | ||
| <DropdownContent> | ||
| <DropdownMenuItemsContainer> | ||
| <MenuItem | ||
| text={t`Remove rule`} | ||
| onClick={handleRemove} | ||
| LeftIcon={IconTrash} | ||
| accent="danger" | ||
| /> | ||
| </DropdownMenuItemsContainer> | ||
| <DropdownMenuItemsContainer> | ||
|
Contributor
There was a problem hiding this comment. Nitpick : Could you invert "Remove rule" and "Edit" to fit with design ? #17408 (comment) |
||
| <UndecoratedLink | ||
| fullWidth | ||
| to={objectPermissionDetailUrl} | ||
| onClick={() => closeDropdown(dropdownId)} | ||
| > | ||
| <MenuItem text={t`Edit`} LeftIcon={IconPencil} /> | ||
| </UndecoratedLink> | ||
| </DropdownMenuItemsContainer> | ||
| </DropdownContent> | ||
| } | ||
| dropdownPlacement="bottom-end" | ||
| /> | ||
| ); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import { useUpsertFieldPermissionInDraftRole } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/hooks/useUpsertFieldPermissionInDraftRole'; | ||
| import { useUpsertObjectPermissionInDraftRole } from '@/settings/roles/role-permissions/object-level-permissions/hooks/useUpsertObjectPermissionInDraftRole'; | ||
| import { type SettingsRoleObjectPermissionKey } from '@/settings/roles/role-permissions/objects-permissions/constants/SettingsRoleObjectPermissionIconConfig'; | ||
| import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState'; | ||
| import { useRecoilValue } from 'recoil'; | ||
| import { isDefined } from 'twenty-shared/utils'; | ||
| import { | ||
| type FieldPermission, | ||
| type ObjectPermission, | ||
| } from '~/generated/graphql'; | ||
|
|
||
| const OBJECT_PERMISSION_KEYS: SettingsRoleObjectPermissionKey[] = [ | ||
| 'canReadObjectRecords', | ||
| 'canUpdateObjectRecords', | ||
| 'canSoftDeleteObjectRecords', | ||
| 'canDestroyObjectRecords', | ||
| ]; | ||
|
|
||
| export const useResetObjectPermission = (roleId: string) => { | ||
|
There was a problem hiding this comment. The hook parameter structure is inconsistent with the similar hook |
||
| const settingsDraftRole = useRecoilValue( | ||
| settingsDraftRoleFamilyState(roleId), | ||
| ); | ||
|
|
||
| const { upsertObjectPermissionInDraftRole } = | ||
| useUpsertObjectPermissionInDraftRole(roleId); | ||
|
|
||
| const { upsertFieldPermissionInDraftRole } = | ||
| useUpsertFieldPermissionInDraftRole(roleId); | ||
|
|
||
| const resetObjectPermission = (objectMetadataItemId: string) => { | ||
| const fieldPermissionsForCurrentObject = | ||
| settingsDraftRole.fieldPermissions?.filter( | ||
| (permission) => permission.objectMetadataId === objectMetadataItemId, | ||
| ) ?? []; | ||
| const existingObjectPermission = settingsDraftRole.objectPermissions?.find( | ||
| (objectPermissionToFind) => | ||
| objectPermissionToFind.objectMetadataId === objectMetadataItemId, | ||
| ); | ||
|
|
||
| const resetPermissions = OBJECT_PERMISSION_KEYS.reduce( | ||
| (acc, permissionKey) => { | ||
| acc[permissionKey] = null; | ||
| return acc; | ||
| }, | ||
| {} as Record<SettingsRoleObjectPermissionKey, null>, | ||
| ); | ||
|
|
||
| if (!isDefined(existingObjectPermission)) { | ||
| const newObjectPermission = { | ||
| objectMetadataId: objectMetadataItemId, | ||
| ...resetPermissions, | ||
| } satisfies ObjectPermission; | ||
|
|
||
| upsertObjectPermissionInDraftRole(newObjectPermission); | ||
| } else { | ||
| const updatedObjectPermission = { | ||
| ...existingObjectPermission, | ||
| ...resetPermissions, | ||
| }; | ||
|
|
||
| upsertObjectPermissionInDraftRole(updatedObjectPermission); | ||
| } | ||
sentry[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| fieldPermissionsForCurrentObject.forEach( | ||
| (fieldPermission: FieldPermission) => { | ||
| upsertFieldPermissionInDraftRole({ | ||
| ...fieldPermission, | ||
| canUpdateFieldValue: null, | ||
| canReadFieldValue: null, | ||
| }); | ||
| }, | ||
| ); | ||
| }; | ||
|
|
||
| return { | ||
| resetObjectPermission, | ||
| }; | ||
| }; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To remove cf design