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

Support custom composite field deletion (#6320)

Browse Source 
as per title
Fixes #6033 and closes #4841
This commit is contained in:
Marie
2024-07-18 15:28:32 +02:00
committed by GitHub
parent 37720eab13
commit a4e82d643a
4 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx
View File

@ -21,7 +21,6 @@ export const SettingsObjectFieldInactiveActionDropdown = ({
scopeKey,
onDelete,
isCustomField,
fieldType,
}: SettingsObjectFieldInactiveActionDropdownProps) => {
const dropdownId = `${scopeKey}-settings-field-disabled-action-dropdown`;
@ -37,7 +36,7 @@ export const SettingsObjectFieldInactiveActionDropdown = ({
closeDropdown();
};
const isDeletable = isCustomField && fieldType !== FieldMetadataType.Address;
const isDeletable = isCustomField;
return (
<Dropdown

3
packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetail.tsx
View File

@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import { useEffect } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import styled from '@emotion/styled';
import { H2Title, IconPlus, IconSettings } from 'twenty-ui';
import { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from '@/object-metadata/constants/LabelIdentifierFieldMetadataTypes';
@ -198,7 +198,6 @@ export const SettingsObjectDetail = () => {
ActionIcon={
<SettingsObjectFieldInactiveActionDropdown
isCustomField={!!deactivatedMetadataField.isCustom}
fieldType={deactivatedMetadataField.type}
scopeKey={deactivatedMetadataField.id}
onActivate={() =>
activateMetadataField(deactivatedMetadataField)