From 8d823827da5dabf782734932a666c73dac2357d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=99=E4=BB=80=E7=93=A6=E7=89=B9?=
 <114943221+ShashwatPS@users.noreply.github.com>
Date: Tue, 28 Oct 2025 23:33:20 +0530
Subject: [PATCH] fix: made standard object labels editable (#15388)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 ...SettingsUpdateDataModelObjectAboutForm.tsx |  2 +-
 .../SettingsDataModelObjectAboutForm.tsx      | 24 +++++++------------
 ...e-metadata-name-is-not-reserved-keyword.ts |  2 ++
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
index 3db53d917a..246e235b38 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
@@ -125,7 +125,7 @@ export const SettingsUpdateDataModelObjectAboutForm = ({
     <FormProvider {...formConfig}>
       <SettingsDataModelObjectAboutForm
         onNewDirtyField={() => formConfig.handleSubmit(handleSave)()}
-        disableEdition={!objectMetadataItem.isCustom || readonly}
+        disableEdition={readonly}
         objectMetadataItem={objectMetadataItem}
       />
     </FormProvider>
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
index 1a6dddbefb..a075554cea 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
@@ -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"
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/validate-metadata-name-is-not-reserved-keyword.ts b/packages/twenty-server/src/engine/metadata-modules/utils/validate-metadata-name-is-not-reserved-keyword.ts
index d35ec9ac1b..68c09779ba 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/validate-metadata-name-is-not-reserved-keyword.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/utils/validate-metadata-name-is-not-reserved-keyword.ts
@@ -24,6 +24,8 @@ const coreObjectNames = [
   'billingSubscriptionItems',
   'featureFlag',
   'featureFlags',
+  'job',
+  'jobs',
   'keyValuePair',
   'keyValuePairs',
   'postgresCredential',