Skip to content

Commit 2945748

Browse files
authored
fix: add task button Selector value check
1 parent ae19c48 commit 2945748

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

frontend/src/components/HomeComponents/Tasks/ReportsView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ export const ReportsView: React.FC<ReportsViewProps> = ({ tasks }) => {
3636
};
3737

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

4244
return (

frontend/src/components/HomeComponents/Tasks/Tasks.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,11 +1147,11 @@ export const Tasks = (
11471147
<Select
11481148
value={
11491149
isCreatingNewProject
1150-
? ''
1151-
: newTask.project || ''
1150+
? '__CREATE_NEW__'
1151+
: newTask.project || '__NONE__'
11521152
}
11531153
onValueChange={(value: string) => {
1154-
if (value === '') {
1154+
if (value === '__CREATE_NEW__') {
11551155
// User selected "create new project" option
11561156
setIsCreatingNewProject(true);
11571157
setNewTask({ ...newTask, project: '' });
@@ -1175,6 +1175,9 @@ export const Tasks = (
11751175
/>
11761176
</SelectTrigger>
11771177
<SelectContent>
1178+
<SelectItem value="__NONE__">
1179+
No project
1180+
</SelectItem>
11781181
{uniqueProjects.map((project: string) => (
11791182
<SelectItem
11801183
key={project}
@@ -1185,7 +1188,7 @@ export const Tasks = (
11851188
</SelectItem>
11861189
))}
11871190
<SelectItem
1188-
value=""
1191+
value="__CREATE_NEW__"
11891192
data-testid="project-option-create"
11901193
>
11911194
+ Create new project…

frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ describe('Tasks Component', () => {
475475
fireEvent.click(screen.getByRole('button', { name: /add task/i }));
476476

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

480480
const newProjectInput =
481481
await screen.findByPlaceholderText('New project name');

0 commit comments

Comments
 (0)