infra
/
etesync
2
0
Fork 0
Code Issues Pull Requests Packages Activity

Tasks: moves Sidebar specific logic into Sidebar component 

also adds amount to Due Today filter
master
Andrew P Maney 2020-03-17 15:02:18 -07:00 committed by Tom Hacohen
parent 2980305beb
commit 8ba7709653
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/Tasks/Sidebar.tsx
View File

@ -10,6 +10,9 @@ import { setSettings } from '../../store/actions';
import { StoreState } from '../../store';
import { List, ListItem, ListSubheader } from '../../widgets/List';
import { TaskType } from '../../pim-types';
import moment from 'moment';
interface ListItemPropsType {
name: string | null;
@ -39,8 +42,17 @@ function SidebarListItem(props: ListItemPropsType) {
);
}
export default function Sidebar(props: { tags: Map<string, number>, totalTasks: number }) {
const { tags, totalTasks } = props;
export default function Sidebar(props: { tasks: TaskType[] }) {
const { tasks } = props;
// TODO: memoize
const amountDueToday = tasks.filter((x) => x.dueDate && moment(x.dueDate.toJSDate()).isSame(moment(), 'day')).length;
// TODO: memoize
const tags = new Map<string, number>();
tasks.forEach((task) => task.tags.forEach((tag) => {
tags.set(tag, (tags.get(tag) ?? 0) + 1);
}));
const tagsList = [...tags].sort(([a], [b]) => a.localeCompare(b)).map(([tag, amount]) => (
<SidebarListItem
@ -54,8 +66,8 @@ export default function Sidebar(props: { tags: Map<string, number>, totalTasks:
return (
<List dense>
<SidebarListItem name={null} primaryText="All" icon={<InboxIcon />} amount={totalTasks} />
<SidebarListItem name="today" primaryText="Due today" icon={<TodayIcon />} />
<SidebarListItem name={null} primaryText="All" icon={<InboxIcon />} amount={tasks.length} />
<SidebarListItem name="today" primaryText="Due today" icon={<TodayIcon />} amount={amountDueToday} />
<ListSubheader>Tags</ListSubheader>
{tagsList}

8
src/components/Tasks/TaskList.tsx
View File

@ -58,12 +58,6 @@ export default React.memo(function TaskList(props: PropsType) {
entries = potentialEntries;
}
// TODO: memoize
const tags = new Map<string, number>();
potentialEntries.forEach((entry) => entry.tags.forEach((tag) => {
tags.set(tag, (tags.get(tag) ?? 0) + 1);
}));
// sort
const sortedEntries = sortSelector(entries);
@ -84,7 +78,7 @@ export default React.memo(function TaskList(props: PropsType) {
<Grid container spacing={4}>
<Grid item xs={3} style={{ borderRight: `1px solid ${theme.palette.divider}` }}>
<Sidebar totalTasks={potentialEntries.length} tags={tags} />
<Sidebar tasks={potentialEntries} />
</Grid>
<Grid item xs>