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

Fix bug with FilterDropdown on Tasks page

Browse Source
This commit is contained in:
Charles Bochet
2023-09-12 12:26:47 -07:00
parent 9b5e24105b
commit e23b8ecca1
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/modules/activities/tasks/components/TaskList.tsx
View File

@ -20,7 +20,7 @@ const StyledContainer = styled.div`
padding: 8px 24px;
`;
const StyledTitleBar = styled.h3`
const StyledTitleBar = styled.div`
display: flex;
justify-content: space-between;
margin-bottom: ${({ theme }) => theme.spacing(4)};

4
front/src/modules/ui/view-bar/components/FilterDropdownButton.tsx
View File

@ -33,6 +33,10 @@ export function FilterDropdownButton({
const hasOnlyOneEntityFilter =
availableFilters.length === 1 && availableFilters[0].type === 'entity';
if (!availableFilters.length) {
return <></>;
}
return hasOnlyOneEntityFilter ? (
<SingleEntityFilterDropdownButton
context={context}

52
front/src/pages/tasks/Tasks.tsx
View File

@ -3,6 +3,7 @@ import styled from '@emotion/styled';
import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext';
import { PageAddTaskButton } from '@/activities/tasks/components/PageAddTaskButton';
import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext';
import { IconArchive, IconCheck, IconCheckbox } from '@/ui/icon/index';
import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
import { PageBody } from '@/ui/layout/components/PageBody';
@ -44,29 +45,34 @@ export function Tasks() {
return (
<PageContainer>
<RecoilScope SpecificContext={TasksRecoilScopeContext}>
<PageHeader title="Tasks" Icon={IconCheckbox}>
<PageAddTaskButton />
</PageHeader>
<PageBody>
<StyledTasksContainer>
<TopBar
leftComponent={
<StyledTabListContainer>
<TabList context={TasksRecoilScopeContext} tabs={TASK_TABS} />
</StyledTabListContainer>
}
rightComponent={
<FilterDropdownButton
key="tasks-filter-dropdown-button"
context={TasksRecoilScopeContext}
hotkeyScope={RelationPickerHotkeyScope.RelationPicker}
/>
}
/>
<TaskGroups />
</StyledTasksContainer>
</PageBody>
<RecoilScope SpecificContext={DropdownRecoilScopeContext}>
<RecoilScope SpecificContext={TasksRecoilScopeContext}>
<PageHeader title="Tasks" Icon={IconCheckbox}>
<PageAddTaskButton />
</PageHeader>
<PageBody>
<StyledTasksContainer>
<TopBar
leftComponent={
<StyledTabListContainer>
<TabList
context={TasksRecoilScopeContext}
tabs={TASK_TABS}
/>
</StyledTabListContainer>
}
rightComponent={
<FilterDropdownButton
key="tasks-filter-dropdown-button"
context={TasksRecoilScopeContext}
hotkeyScope={RelationPickerHotkeyScope.RelationPicker}
/>
}
/>
<TaskGroups />
</StyledTasksContainer>
</PageBody>
</RecoilScope>
</RecoilScope>
</PageContainer>
);