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

Enable deletion of relation fields (#5338)

Browse Source 
In this PR
1. Enable deletion of relation fields in the product and via the api
(migration part was missing in the api)
3. Change wording, only use "deactivate" and "delete" everywhere (and
not a mix of the two + "disable", "erase")
This commit is contained in:
Marie
2024-05-13 17:43:51 +02:00
committed by GitHub
parent 0018ec78b0
commit b9154f315e
30 changed files with 519 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1.tsx
View File

@ -44,14 +44,14 @@ export const SettingsObjectNewFieldStep1 = () => {
const activeObjectMetadataItem =
findActiveObjectMetadataItemBySlug(objectSlug);
const { activateMetadataField, disableMetadataField } =
const { activateMetadataField, deactivateMetadataField } =
useFieldMetadataItem();
const [metadataFields, setMetadataFields] = useState(
activeObjectMetadataItem?.fields ?? [],
);
const activeMetadataFields = metadataFields.filter((field) => field.isActive);
const disabledMetadataFields = metadataFields.filter(
const deactivatedMetadataFields = metadataFields.filter(
(field) => !field.isActive,
);
@ -93,7 +93,7 @@ export const SettingsObjectNewFieldStep1 = () => {
return metadataField.isActive
? activateMetadataField(metadataField)
: disableMetadataField(metadataField);
: deactivateMetadataField(metadataField);
}),
);
@ -124,8 +124,8 @@ export const SettingsObjectNewFieldStep1 = () => {
</SettingsHeaderContainer>
<StyledSection>
<H2Title
title="Check disabled fields"
description="Before creating a custom field, check if it already exists in the disabled section."
title="Check deactivated fields"
description="Before creating a custom field, check if it already exists in the deactivated section."
/>
<Table>
<StyledObjectFieldTableRow>
@ -159,18 +159,18 @@ export const SettingsObjectNewFieldStep1 = () => {
))}
</TableSection>
)}
{!!disabledMetadataFields.length && (
{!!deactivatedMetadataFields.length && (
<TableSection title="Disabled">
{disabledMetadataFields.map((disabledMetadataField) => (
{deactivatedMetadataFields.map((deactivatedMetadataField) => (
<SettingsObjectFieldItemTableRow
key={disabledMetadataField.name}
fieldMetadataItem={disabledMetadataField}
key={deactivatedMetadataField.name}
fieldMetadataItem={deactivatedMetadataField}
ActionIcon={
<LightIconButton
Icon={IconPlus}
accent="tertiary"
onClick={() =>
handleToggleField(disabledMetadataField.id)
handleToggleField(deactivatedMetadataField.id)
}
/>
}