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

fix: made standard object labels editable (#15388)

Browse Source 
Fixes #15302 

## Video ( Fixed ) :

[Uploading
IssueFixed.mov…](https://drive.google.com/file/d/1XNk3i3ae9Wafelqgbj5GujaPAJRQRcQh/view?usp=sharing)

---------

Co-authored-by: prastoin <paul@twenty.com>
Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
沙什瓦特
2025-10-28 23:33:20 +05:30
committed by GitHub
parent 7df43d8fe8
commit 8d823827da
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
+1 -1
View File
@@ -125,7 +125,7 @@ export const SettingsUpdateDataModelObjectAboutForm = ({
<FormProvider {...formConfig}>
<SettingsDataModelObjectAboutForm
onNewDirtyField={() => formConfig.handleSubmit(handleSave)()}
disableEdition={!objectMetadataItem.isCustom || readonly}
disableEdition={readonly}
objectMetadataItem={objectMetadataItem}
/>
</FormProvider>
packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+9 -15
View File
@@ -81,6 +81,8 @@ export const SettingsDataModelObjectAboutForm = ({
const isLabelSyncedWithName = watch('isLabelSyncedWithName');
const labelSingular = watch('labelSingular');
const labelPlural = watch('labelPlural');
const isStandardObject =
isDefined(objectMetadataItem?.isCustom) && !objectMetadataItem.isCustom;
watch('nameSingular');
watch('namePlural');
watch('description');
@@ -173,12 +175,7 @@ export const SettingsDataModelObjectAboutForm = ({
}
}}
onBlur={() => onNewDirtyField?.()}
disabled={
disableEdition ||
(objectMetadataItem &&
!objectMetadataItem?.isCustom &&
isLabelSyncedWithName)
}
disabled={disableEdition}
fullWidth
maxLength={OBJECT_NAME_MAXIMUM_LENGTH}
/>
@@ -205,12 +202,7 @@ export const SettingsDataModelObjectAboutForm = ({
}
}}
onBlur={() => onNewDirtyField?.()}
disabled={
disableEdition ||
(objectMetadataItem &&
!objectMetadataItem?.isCustom &&
isLabelSyncedWithName)
}
disabled={disableEdition}
fullWidth
maxLength={OBJECT_NAME_MAXIMUM_LENGTH}
/>
@@ -242,7 +234,8 @@ export const SettingsDataModelObjectAboutForm = ({
'nameSingular' as const satisfies StringKeyOf<ObjectMetadataItem>,
placeholder: `listing`,
defaultValue: objectMetadataItem?.nameSingular ?? '',
disableEdition: disableEdition || isLabelSyncedWithName,
disableEdition:
isStandardObject || disableEdition || isLabelSyncedWithName,
tooltip: apiNameTooltipText,
},
{
@@ -251,7 +244,8 @@ export const SettingsDataModelObjectAboutForm = ({
'namePlural' as const satisfies StringKeyOf<ObjectMetadataItem>,
placeholder: `listings`,
defaultValue: objectMetadataItem?.namePlural ?? '',
disableEdition: disableEdition || isLabelSyncedWithName,
disableEdition:
isStandardObject || disableEdition || isLabelSyncedWithName,
tooltip: apiNameTooltipText,
},
].map(
@@ -319,7 +313,7 @@ export const SettingsDataModelObjectAboutForm = ({
</AdvancedSettingsWrapper>
),
)}
{(!objectMetadataItem || objectMetadataItem?.isCustom) && (
{!isStandardObject && (
<AdvancedSettingsWrapper>
<Controller
name="isLabelSyncedWithName"
packages/twenty-server/src/engine/metadata-modules/utils/validate-metadata-name-is-not-reserved-keyword.ts
+2
View File
@@ -24,6 +24,8 @@ const coreObjectNames = [
'billingSubscriptionItems',
'featureFlag',
'featureFlags',
'job',
'jobs',
'keyValuePair',
'keyValuePairs',
'postgresCredential',