From 04dcbffe75260f12dfee6b24fc999fd665f3d11e Mon Sep 17 00:00:00 2001
From: Shashank Vishwakarma <shashank000s4@gmail.com>
Date: Mon, 3 Jun 2024 19:28:58 +0530
Subject: [PATCH] Fixed: Inconsistent Field Label Display on Task Side Panel
 (#5687)

Now all the required fields are displayed with the respective labels.

- Added a `FieldContextProvider` for the field `Reminder` in the
`ActivityEditorFields`.
- Fixed the missing label values, by adding a missed optional
`showLabel` within the `fieldDefinition` in the `useFieldContext`.

fixes: #5667

![Screenshot
(342)](https://github.com/twentyhq/twenty/assets/140178357/adf9563a-6cab-4809-8616-1c256abab717)
---
 .../components/ActivityEditorFields.tsx       | 20 ++++++++++++++++---
 .../object-record/hooks/useFieldContext.tsx   |  1 +
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx b/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx
index fe5e37539..9f221d840 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx
@@ -57,11 +57,21 @@ export const ActivityEditorFields = ({
     return [upsertActivityMutation, { loading: false }];
   };
 
+  const { FieldContextProvider: ReminderAtFieldContextProvider } =
+    useFieldContext({
+      objectNameSingular: CoreObjectNameSingular.Activity,
+      objectRecordId: activityId,
+      fieldMetadataName: 'reminderAt',
+      fieldPosition: 0,
+      clearable: true,
+      customUseUpdateOneObjectHook: useUpsertOneActivityMutation,
+    });
+
   const { FieldContextProvider: DueAtFieldContextProvider } = useFieldContext({
     objectNameSingular: CoreObjectNameSingular.Activity,
     objectRecordId: activityId,
     fieldMetadataName: 'dueAt',
-    fieldPosition: 0,
+    fieldPosition: 1,
     clearable: true,
     customUseUpdateOneObjectHook: useUpsertOneActivityMutation,
   });
@@ -71,7 +81,7 @@ export const ActivityEditorFields = ({
       objectNameSingular: CoreObjectNameSingular.Activity,
       objectRecordId: activityId,
       fieldMetadataName: 'assignee',
-      fieldPosition: 1,
+      fieldPosition: 2,
       clearable: true,
       customUseUpdateOneObjectHook: useUpsertOneActivityMutation,
     });
@@ -81,15 +91,19 @@ export const ActivityEditorFields = ({
       objectNameSingular: CoreObjectNameSingular.Activity,
       objectRecordId: activityId,
       fieldMetadataName: 'activityTargets',
-      fieldPosition: 2,
+      fieldPosition: 3,
     });
 
   return (
     <StyledPropertyBox>
       {activity.type === 'Task' &&
+        ReminderAtFieldContextProvider &&
         DueAtFieldContextProvider &&
         AssigneeFieldContextProvider && (
           <>
+            <ReminderAtFieldContextProvider>
+              <RecordInlineCell />
+            </ReminderAtFieldContextProvider>
             <DueAtFieldContextProvider>
               <RecordInlineCell />
             </DueAtFieldContextProvider>
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx b/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx
index a2ea0646b..84095a341 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx
@@ -69,6 +69,7 @@ export const useFieldContext = ({
               isLabelIdentifier,
               fieldDefinition: formatFieldMetadataItemAsColumnDefinition({
                 field: fieldMetadataItem,
+                showLabel: true,
                 position: fieldPosition,
                 objectMetadataItem,
               }),