diff --git a/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx b/packages/twenty-front/src/modules/activities/components/ActivityEditorFields.tsx index fe5e375394..9f221d8405 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 ( {activity.type === 'Task' && + ReminderAtFieldContextProvider && DueAtFieldContextProvider && AssigneeFieldContextProvider && ( <> + + + 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 a2ea0646b1..84095a3417 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, }),