admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

3129 show page relation field add delete menu item (#3975)

Browse Source 
* Fix typing error

* Add delete relation button

* Disable delete for workspace members

* Fix lint
This commit is contained in:
martmull
2024-02-15 11:31:21 +01:00
committed by GitHub
parent 88990144cf
commit 8636be5e4b
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindManyRecords.test.tsx
View File

@ -62,6 +62,7 @@ describe('useFindManyRecords', () => {
setCurrentWorkspaceMember({
id: '32219445-f587-4c40-b2b1-6d3205ed96da',
name: { firstName: 'John', lastName: 'Connor' },
locale: 'en',
});
const mockObjectMetadataItems = getObjectMetadataItemsMock();

24
packages/twenty-front/src/modules/object-record/record-relation-card/components/RecordRelationFieldCardContent.tsx
View File

@ -6,12 +6,13 @@ import { LightIconButton, MenuItem } from 'tsup.ui.index';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { RecordChip } from '@/object-record/components/RecordChip';
import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord.ts';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
import { usePersistField } from '@/object-record/record-field/hooks/usePersistField';
import { FieldRelationMetadata } from '@/object-record/record-field/types/FieldMetadata';
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
import { IconDotsVertical, IconUnlink } from '@/ui/display/icon';
import { IconDotsVertical, IconTrash, IconUnlink } from '@/ui/display/icon';
import { CardContent } from '@/ui/layout/card/components/CardContent';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@ -75,6 +76,10 @@ export const RecordRelationFieldCardContent = ({
objectNameSingular: relationObjectMetadataNameSingular,
});
const { deleteOneRecord: deleteOneRelationRecord } = useDeleteOneRecord({
objectNameSingular: relationObjectMetadataNameSingular,
});
const dropdownScopeId = `record-field-card-menu-${relationRecord.id}`;
const { closeDropdown, isDropdownOpen } = useDropdown(dropdownScopeId);
@ -101,6 +106,11 @@ export const RecordRelationFieldCardContent = ({
});
};
const handleDelete = async () => {
closeDropdown();
await deleteOneRelationRecord(relationRecord.id);
};
const isOpportunityCompanyRelation =
(objectMetadataNameSingular === CoreObjectNameSingular.Opportunity &&
relationObjectMetadataNameSingular === CoreObjectNameSingular.Company) ||
@ -108,6 +118,10 @@ export const RecordRelationFieldCardContent = ({
relationObjectMetadataNameSingular ===
CoreObjectNameSingular.Opportunity);
const isAccountOwnerRelation =
relationObjectMetadataNameSingular ===
CoreObjectNameSingular.WorkspaceMember;
return (
<StyledCardContent isDropdownOpen={isDropdownOpen} divider={divider}>
<RecordChip
@ -134,6 +148,14 @@ export const RecordRelationFieldCardContent = ({
text="Detach"
onClick={handleDetach}
/>
{!isAccountOwnerRelation && (
<MenuItem
LeftIcon={IconTrash}
text="Delete"
accent="danger"
onClick={handleDelete}
/>
)}
</DropdownMenuItemsContainer>
}
dropdownHotkeyScope={{