Elgato_dark/twenty
1
0
Fork 0
mirror of https://github.com/twentyhq/twenty synced 2026-04-21 13:37:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Fix activity relation picker (#19898)

Browse source 
## Context
ActivityTargetsInlineCell passed editModeContent via
RecordInlineCellContext, but that context key was no longer read.
Fix aligns the code with the rest of the codebase.

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Weiko 2026-04-21 01:30:23 +02:00 committed by GitHub
parent 192a842f57
commit 5c58254eb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
View file

@ -1,5 +1,5 @@
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { useCallback, useContext, useState } from 'react';
import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips';
import { useActivityTargetObjectRecords } from '@/activities/hooks/useActivityTargetObjectRecords';
@ -13,8 +13,9 @@ import { FieldFocusContextProvider } from '@/object-record/record-field/ui/conte
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { RecordInlineCellContainer } from '@/object-record/record-inline-cell/components/RecordInlineCellContainer';
import { RecordInlineCellContext } from '@/object-record/record-inline-cell/components/RecordInlineCellContext';
import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell';
import { RecordInlineCellEditMode } from '@/object-record/record-inline-cell/components/RecordInlineCellEditMode';
import { MultipleRecordPicker } from '@/object-record/record-picker/multiple-record-picker/components/MultipleRecordPicker';
import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/useGoBackToPreviousDropdownFocusId';
import { IconArrowUpRight, IconPencil } from 'twenty-ui/display';
type ActivityTargetsInlineCellProps = {
@ -37,8 +38,6 @@ export const ActivityTargetsInlineCell = ({
const { activityTargetObjectRecords } =
useActivityTargetObjectRecords(activityRecordId);
const { closeInlineCell } = useInlineCell(componentInstanceId);
const {
fieldDefinition,
isRecordFieldReadOnly: isReadOnly,
@ -54,6 +53,28 @@ export const ActivityTargetsInlineCell = ({
activityId: activityRecordId,
});
const [isRelationPickerOpen, setIsRelationPickerOpen] = useState(false);
const { goBackToPreviousDropdownFocusId } =
useGoBackToPreviousDropdownFocusId();
const handleOpenRelationPicker = useCallback(() => {
openActivityTargetCellEditMode({
recordPickerInstanceId: componentInstanceId,
activityTargetObjectRecords,
});
setIsRelationPickerOpen(true);
}, [
activityTargetObjectRecords,
componentInstanceId,
openActivityTargetCellEditMode,
]);
const handleCloseRelationPicker = useCallback(() => {
setIsRelationPickerOpen(false);
goBackToPreviousDropdownFocusId();
}, [goBackToPreviousDropdownFocusId]);
return (
<RecordFieldsScopeContextProvider
value={{ scopeInstanceId: componentInstanceId }}
@ -80,13 +101,24 @@ export const ActivityTargetsInlineCell = ({
showLabel: showLabel,
readonly: isReadOnly,
labelWidth: fieldDefinition?.labelWidth,
editModeContent: (
label: t`Relations`,
displayModeContent: (
<ActivityTargetChips
activityTargetObjectRecords={activityTargetObjectRecords}
maxWidth={maxWidth}
/>
),
onOpenEditMode: handleOpenRelationPicker,
onCloseEditMode: handleCloseRelationPicker,
}}
>
<RecordInlineCellContainer />
{isRelationPickerOpen && (
<RecordInlineCellEditMode>
<MultipleRecordPicker
focusId={componentInstanceId}
componentInstanceId={componentInstanceId}
onClickOutside={() => {
closeInlineCell();
}}
onClickOutside={handleCloseRelationPicker}
onChange={(morphItem) => {
updateActivityTargetFromCell({
recordPickerInstanceId: componentInstanceId,
@ -95,27 +127,10 @@ export const ActivityTargetsInlineCell = ({
activityTargetObjectRecords,
});
}}
onSubmit={() => {
closeInlineCell();
}}
onSubmit={handleCloseRelationPicker}
/>
),
label: t`Relations`,
displayModeContent: (
<ActivityTargetChips
activityTargetObjectRecords={activityTargetObjectRecords}
maxWidth={maxWidth}
/>
),
onOpenEditMode: () => {
openActivityTargetCellEditMode({
recordPickerInstanceId: componentInstanceId,
activityTargetObjectRecords,
});
},
}}
>
<RecordInlineCellContainer />
</RecordInlineCellEditMode>
)}
</RecordInlineCellContext.Provider>
</FieldContextProvider>
</FieldFocusContextProvider>