Skip to content

Commit f21715d

Browse files
lucasbordeauWeiko
authored andcommitted
Fixed new record value context selector sync in activity drawer (#5594)
Forgot to add `<RecordValueSetterEffect recordId={...} />` effect component for activity drawer during refactor.
1 parent 8aecdcd commit f21715d

File tree

2 files changed

+34
-29
lines changed

2 files changed

+34
-29
lines changed

packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import styled from '@emotion/styled';
22

33
import { ActivityEditor } from '@/activities/components/ActivityEditor';
44
import { ActivityEditorEffect } from '@/activities/components/ActivityEditorEffect';
5+
import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect';
56

67
const StyledContainer = styled.div`
78
box-sizing: border-box;
@@ -26,6 +27,7 @@ export const RightDrawerActivity = ({
2627
}: RightDrawerActivityProps) => {
2728
return (
2829
<StyledContainer>
30+
<RecordValueSetterEffect recordId={activityId} />
2931
<ActivityEditorEffect activityId={activityId} />
3032
<ActivityEditor
3133
activityId={activityId}

packages/twenty-front/src/pages/tasks/Tasks.tsx

+32-29
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { PageAddTaskButton } from '@/activities/tasks/components/PageAddTaskButt
66
import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
77
import { TASKS_TAB_LIST_COMPONENT_ID } from '@/activities/tasks/constants/TasksTabListComponentId';
88
import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
9+
import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
910
import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
1011
import { PageBody } from '@/ui/layout/page/PageBody';
1112
import { PageContainer } from '@/ui/layout/page/PageContainer';
@@ -49,36 +50,38 @@ export const Tasks = () => {
4950

5051
return (
5152
<PageContainer>
52-
<RecoilScope CustomRecoilScopeContext={TasksRecoilScopeContext}>
53-
<TasksEffect filterDropdownId={filterDropdownId} />
54-
<PageHeader title="Tasks" Icon={IconCheckbox}>
55-
<PageAddTaskButton />
56-
</PageHeader>
57-
<PageBody>
58-
<StyledTasksContainer>
59-
<TopBar
60-
leftComponent={
61-
<StyledTabListContainer>
62-
<TabList
63-
tabListId={TASKS_TAB_LIST_COMPONENT_ID}
64-
tabs={TASK_TABS}
53+
<RecordFieldValueSelectorContextProvider>
54+
<RecoilScope CustomRecoilScopeContext={TasksRecoilScopeContext}>
55+
<TasksEffect filterDropdownId={filterDropdownId} />
56+
<PageHeader title="Tasks" Icon={IconCheckbox}>
57+
<PageAddTaskButton />
58+
</PageHeader>
59+
<PageBody>
60+
<StyledTasksContainer>
61+
<TopBar
62+
leftComponent={
63+
<StyledTabListContainer>
64+
<TabList
65+
tabListId={TASKS_TAB_LIST_COMPONENT_ID}
66+
tabs={TASK_TABS}
67+
/>
68+
</StyledTabListContainer>
69+
}
70+
rightComponent={
71+
<ObjectFilterDropdownButton
72+
filterDropdownId={filterDropdownId}
73+
key="tasks-filter-dropdown-button"
74+
hotkeyScope={{
75+
scope: RelationPickerHotkeyScope.RelationPicker,
76+
}}
6577
/>
66-
</StyledTabListContainer>
67-
}
68-
rightComponent={
69-
<ObjectFilterDropdownButton
70-
filterDropdownId={filterDropdownId}
71-
key="tasks-filter-dropdown-button"
72-
hotkeyScope={{
73-
scope: RelationPickerHotkeyScope.RelationPicker,
74-
}}
75-
/>
76-
}
77-
/>
78-
<TaskGroups filterDropdownId={filterDropdownId} />
79-
</StyledTasksContainer>
80-
</PageBody>
81-
</RecoilScope>
78+
}
79+
/>
80+
<TaskGroups filterDropdownId={filterDropdownId} />
81+
</StyledTasksContainer>
82+
</PageBody>
83+
</RecoilScope>
84+
</RecordFieldValueSelectorContextProvider>
8285
</PageContainer>
8386
);
8487
};

0 commit comments

Comments
 (0)