admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed new record value context selector sync in activity drawer (#5594)

Browse Source 
Forgot to add `<RecordValueSetterEffect recordId={...} />` effect
component for activity drawer during refactor.
This commit is contained in:
Lucas Bordeau
2024-05-27 13:58:31 +02:00
committed by GitHub
parent 8ee98e0fda
commit 3051f3a790
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ import styled from '@emotion/styled';
import { ActivityEditor } from '@/activities/components/ActivityEditor'; import { ActivityEditor } from '@/activities/components/ActivityEditor';
import { ActivityEditorEffect } from '@/activities/components/ActivityEditorEffect'; import { ActivityEditorEffect } from '@/activities/components/ActivityEditorEffect';
import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect';
const StyledContainer = styled.div` const StyledContainer = styled.div`
box-sizing: border-box; box-sizing: border-box;
@ -26,6 +27,7 @@ export const RightDrawerActivity = ({
}: RightDrawerActivityProps) => { }: RightDrawerActivityProps) => {
return ( return (
<StyledContainer> <StyledContainer>
<RecordValueSetterEffect recordId={activityId} />
<ActivityEditorEffect activityId={activityId} /> <ActivityEditorEffect activityId={activityId} />
<ActivityEditor <ActivityEditor
activityId={activityId} activityId={activityId}

61
packages/twenty-front/src/pages/tasks/Tasks.tsx
View File

@ -6,6 +6,7 @@ import { PageAddTaskButton } from '@/activities/tasks/components/PageAddTaskButt
import { TaskGroups } from '@/activities/tasks/components/TaskGroups'; import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
import { TASKS_TAB_LIST_COMPONENT_ID } from '@/activities/tasks/constants/TasksTabListComponentId'; import { TASKS_TAB_LIST_COMPONENT_ID } from '@/activities/tasks/constants/TasksTabListComponentId';
import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton'; import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope'; import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { PageBody } from '@/ui/layout/page/PageBody'; import { PageBody } from '@/ui/layout/page/PageBody';
import { PageContainer } from '@/ui/layout/page/PageContainer'; import { PageContainer } from '@/ui/layout/page/PageContainer';
@ -49,36 +50,38 @@ export const Tasks = () => {
return ( return (
<PageContainer> <PageContainer>
<RecoilScope CustomRecoilScopeContext={TasksRecoilScopeContext}> <RecordFieldValueSelectorContextProvider>
<TasksEffect filterDropdownId={filterDropdownId} /> <RecoilScope CustomRecoilScopeContext={TasksRecoilScopeContext}>
<PageHeader title="Tasks" Icon={IconCheckbox}> <TasksEffect filterDropdownId={filterDropdownId} />
<PageAddTaskButton /> <PageHeader title="Tasks" Icon={IconCheckbox}>
</PageHeader> <PageAddTaskButton />
<PageBody> </PageHeader>
<StyledTasksContainer> <PageBody>
<TopBar <StyledTasksContainer>
leftComponent={ <TopBar
<StyledTabListContainer> leftComponent={
<TabList <StyledTabListContainer>
tabListId={TASKS_TAB_LIST_COMPONENT_ID} <TabList
tabs={TASK_TABS} tabListId={TASKS_TAB_LIST_COMPONENT_ID}
tabs={TASK_TABS}
/>
</StyledTabListContainer>
}
rightComponent={
<ObjectFilterDropdownButton
filterDropdownId={filterDropdownId}
key="tasks-filter-dropdown-button"
hotkeyScope={{
scope: RelationPickerHotkeyScope.RelationPicker,
}}
/> />
</StyledTabListContainer> }
} />
rightComponent={ <TaskGroups filterDropdownId={filterDropdownId} />
<ObjectFilterDropdownButton </StyledTasksContainer>
filterDropdownId={filterDropdownId} </PageBody>
key="tasks-filter-dropdown-button" </RecoilScope>
hotkeyScope={{ </RecordFieldValueSelectorContextProvider>
scope: RelationPickerHotkeyScope.RelationPicker,
}}
/>
}
/>
<TaskGroups filterDropdownId={filterDropdownId} />
</StyledTasksContainer>
</PageBody>
</RecoilScope>
</PageContainer> </PageContainer>
); );
}; };