diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx index 0e96ad9fe..432567b13 100644 --- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx @@ -1,4 +1,4 @@ -import { IconArchiveOff, IconDotsVertical } from 'twenty-ui'; +import { IconArchiveOff, IconDotsVertical, IconTrash } from 'twenty-ui'; import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; @@ -9,6 +9,7 @@ import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem'; type SettingsObjectFieldInactiveActionDropdownProps = { isCustomField?: boolean; + isRelationType?: boolean; onActivate: () => void; onErase: () => void; scopeKey: string; @@ -17,6 +18,9 @@ type SettingsObjectFieldInactiveActionDropdownProps = { export const SettingsObjectFieldInactiveActionDropdown = ({ onActivate, scopeKey, + onErase, + isCustomField, + isRelationType, }: SettingsObjectFieldInactiveActionDropdownProps) => { const dropdownId = `${scopeKey}-settings-field-disabled-action-dropdown`; @@ -27,10 +31,12 @@ export const SettingsObjectFieldInactiveActionDropdown = ({ closeDropdown(); }; - // const handleErase = () => { - // onErase(); - // closeDropdown(); - // }; + const handleErase = () => { + onErase(); + closeDropdown(); + }; + + const isErasable = isCustomField && !isRelationType; return ( - {/* {isCustomField && ( - - )} */} + {isErasable && ( + + )} } diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx index 26048b9a0..6c8f23d1b 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx @@ -32,6 +32,7 @@ import { Table } from '@/ui/layout/table/components/Table'; import { TableHeader } from '@/ui/layout/table/components/TableHeader'; import { TableSection } from '@/ui/layout/table/components/TableSection'; import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb'; +import { FieldMetadataType } from '~/generated-metadata/graphql'; const StyledDiv = styled.div` display: flex; @@ -188,6 +189,10 @@ export const SettingsObjectDetail = () => { ActionIcon={ activateMetadataField(disabledMetadataField)