Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion frontend/src/components/HomeComponents/Tasks/ReportsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ export const ReportsView: React.FC<ReportsViewProps> = ({ tasks }) => {
};

const dailyData = [{ name: 'Today', ...countStatuses(today) }];
const weeklyData = [{ name: 'This Week', ...countStatuses(startOfWeek) }];
const sevenDaysAgo = getStartOfDay(new Date());
sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
const weeklyData = [{ name: 'This Week', ...countStatuses(sevenDaysAgo) }];
const monthlyData = [{ name: 'This Month', ...countStatuses(startOfMonth) }];

return (
Expand Down
11 changes: 7 additions & 4 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1147,11 +1147,11 @@ export const Tasks = (
<Select
value={
isCreatingNewProject
? ''
: newTask.project || ''
? '__CREATE_NEW__'
: newTask.project || '__NONE__'
}
onValueChange={(value: string) => {
if (value === '') {
if (value === '__CREATE_NEW__') {
// User selected "create new project" option
setIsCreatingNewProject(true);
setNewTask({ ...newTask, project: '' });
Expand All @@ -1175,6 +1175,9 @@ export const Tasks = (
/>
</SelectTrigger>
<SelectContent>
<SelectItem value="__NONE__">
No project
</SelectItem>
{uniqueProjects.map((project: string) => (
<SelectItem
key={project}
Expand All @@ -1185,7 +1188,7 @@ export const Tasks = (
</SelectItem>
))}
<SelectItem
value=""
value="__CREATE_NEW__"
data-testid="project-option-create"
>
+ Create new project…
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ describe('Tasks Component', () => {
fireEvent.click(screen.getByRole('button', { name: /add task/i }));

const projectSelect = await screen.findByTestId('project-select');
fireEvent.change(projectSelect, { target: { value: '' } }); // Empty string triggers "create new project" mode
fireEvent.change(projectSelect, { target: { value: '__CREATE_NEW__' } }); // Empty string triggers "create new project" mode

const newProjectInput =
await screen.findByPlaceholderText('New project name');
Expand Down
Loading