From ec41801a4246aec0ac1fad32cf04e79a1ab8c0a0 Mon Sep 17 00:00:00 2001
From: Neeraj-gagat <neerajgagat9999@gmail.com>
Date: Sat, 27 Dec 2025 05:56:09 +0530
Subject: [PATCH 1/2] feat:add project picker for taskdialog

---
 .../HomeComponents/Tasks/TaskDialog.tsx       | 106 +++++++++++++++++-
 .../components/HomeComponents/Tasks/Tasks.tsx |   3 +
 .../Tasks/__tests__/TaskDialog.test.tsx       |   3 +
 frontend/src/components/utils/types.ts        |   3 +
 4 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
index 0d5b64c8..a6f1a3db 100644
--- a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
@@ -45,6 +45,9 @@ export const TaskDialog = ({
   editState,
   onUpdateState,
   allTasks,
+  isCreatingNewProject,
+  setIsCreatingNewProject,
+  uniqueProjects,
   onSaveDescription,
   onSaveTags,
   onSavePriority,
@@ -825,7 +828,106 @@ export const TaskDialog = ({
                   <TableCell>
                     {editState.isEditingProject ? (
                       <>
-                        <div className="flex items-center">
+                        <div className="col-span-3 space-y-2 w-[300px]">
+                          <Select
+                            value={
+                              isCreatingNewProject
+                                ? '__CREATE_NEW__'
+                                : editState.editedProject
+                            }
+                            onValueChange={(value) => {
+                              if (value === '__CREATE_NEW__') {
+                                setIsCreatingNewProject(true);
+                                onUpdateState({ editedProject: '' });
+                              } else {
+                                const project =
+                                  value === '__NONE__' ? '' : value;
+                                setIsCreatingNewProject(false);
+                                onUpdateState({ editedProject: project });
+                                onSaveProject(task, project);
+                              }
+                            }}
+                          >
+                            <SelectTrigger
+                              id="project"
+                              data-testid="project-select"
+                            >
+                              <SelectValue
+                                placeholder={
+                                  uniqueProjects.length
+                                    ? 'Select a project'
+                                    : 'No projects yet'
+                                }
+                              >
+                                {isCreatingNewProject
+                                  ? editState.editedProject
+                                    ? `New: ${editState.editedProject}`
+                                    : '+ Create new project…'
+                                  : undefined}
+                              </SelectValue>
+                            </SelectTrigger>
+                            <SelectContent
+                              onWheel={(e) => e.stopPropagation()}
+                              className="max-h-60 overflow-y-auto"
+                            >
+                              <SelectItem value="__CREATE_NEW__">
+                                + Create new project…
+                              </SelectItem>
+                              <SelectItem value="__NONE__">
+                                No project
+                              </SelectItem>
+                              {uniqueProjects.map((project: string) => (
+                                <SelectItem key={project} value={project}>
+                                  {project}
+                                </SelectItem>
+                              ))}
+                            </SelectContent>
+                          </Select>
+
+                          {isCreatingNewProject && (
+                            <div className="flex gap-4 justify-center items-center">
+                              <Input
+                                id="project-name"
+                                placeholder="New project name"
+                                value={editState.editedProject}
+                                autoFocus
+                                onChange={(e) =>
+                                  onUpdateState({
+                                    editedProject: e.target.value,
+                                  })
+                                }
+                              />
+                              <div className="flex justify-center items-center">
+                                <Button
+                                  variant="ghost"
+                                  size="icon"
+                                  onClick={() => {
+                                    onSaveProject(
+                                      task,
+                                      editState.editedProject
+                                    );
+                                    onUpdateState({ isEditingProject: false });
+                                  }}
+                                >
+                                  <CheckIcon className="h-4 w-4 text-green-500" />
+                                </Button>
+                                <Button
+                                  variant="ghost"
+                                  size="icon"
+                                  onClick={() =>
+                                    onUpdateState({
+                                      editedProject: task.project,
+                                      isEditingProject: false,
+                                    })
+                                  }
+                                >
+                                  <XIcon className="h-4 w-4 text-red-500" />
+                                </Button>
+                              </div>
+                            </div>
+                          )}
+                        </div>
+                        {/* <div className="flex items-center">
                           <Input
                             id={`project-${task.id}`}
                             name={`project-${task.id}`}
@@ -860,7 +962,7 @@ export const TaskDialog = ({
                           >
                             <XIcon className="h-4 w-4 text-red-500" />
                           </Button>
-                        </div>
+                        </div> */}
                       </>
                     ) : (
                       <>
diff --git a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
index ff98ab4d..d1ab6728 100644
--- a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx
@@ -1087,6 +1087,9 @@ export const Tasks = (
                             editState={editState}
                             onUpdateState={updateEditState}
                             allTasks={tasks}
+                            uniqueProjects={uniqueProjects}
+                            isCreatingNewProject={isCreatingNewProject}
+                            setIsCreatingNewProject={setIsCreatingNewProject}
                             onSaveDescription={handleSaveDescription}
                             onSaveTags={handleSaveTags}
                             onSavePriority={handleSavePriority}
diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx b/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx
index 05847084..e7c551b0 100644
--- a/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/__tests__/TaskDialog.test.tsx
@@ -85,6 +85,9 @@ describe('TaskDialog Component', () => {
     editState: mockEditState,
     onUpdateState: jest.fn(),
     allTasks: mockAllTasks,
+    uniqueProjects: [],
+    isCreatingNewProject: false,
+    setIsCreatingNewProject: jest.fn(),
     onSaveDescription: jest.fn(),
     onSaveTags: jest.fn(),
     onSavePriority: jest.fn(),
diff --git a/frontend/src/components/utils/types.ts b/frontend/src/components/utils/types.ts
index 61a6357e..76b7a4fa 100644
--- a/frontend/src/components/utils/types.ts
+++ b/frontend/src/components/utils/types.ts
@@ -136,6 +136,9 @@ export interface EditTaskDialogProps {
   editState: EditTaskState;
   onUpdateState: (updates: Partial<EditTaskState>) => void;
   allTasks: Task[];
+  uniqueProjects: string[];
+  isCreatingNewProject: boolean;
+  setIsCreatingNewProject: (value: boolean) => void;
   onSaveDescription: (task: Task, description: string) => void;
   onSaveTags: (task: Task, tags: string[]) => void;
   onSavePriority: (task: Task, priority: string) => void;

From 6712da0cf57a1b48ad2fab12008290d286dbf3cf Mon Sep 17 00:00:00 2001
From: Neeraj-gagat <neerajgagat9999@gmail.com>
Date: Sat, 27 Dec 2025 05:57:52 +0530
Subject: [PATCH 2/2] feat:add project picker for taskdialog

---
 .../HomeComponents/Tasks/TaskDialog.tsx       | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
index a6f1a3db..a5c7d984 100644
--- a/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
+++ b/frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
@@ -927,42 +927,6 @@ export const TaskDialog = ({
                             </div>
                           )}
                         </div>
-                        {/* <div className="flex items-center">
-                          <Input
-                            id={`project-${task.id}`}
-                            name={`project-${task.id}`}
-                            type="text"
-                            value={editState.editedProject}
-                            onChange={(e) =>
-                              onUpdateState({
-                                editedProject: e.target.value,
-                              })
-                            }
-                            className="flex-grow mr-2"
-                          />
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            onClick={() => {
-                              onSaveProject(task, editState.editedProject);
-                              onUpdateState({ isEditingProject: false });
-                            }}
-                          >
-                            <CheckIcon className="h-4 w-4 text-green-500" />
-                          </Button>
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            onClick={() =>
-                              onUpdateState({
-                                editedProject: task.project,
-                                isEditingProject: false,
-                              })
-                            }
-                          >
-                            <XIcon className="h-4 w-4 text-red-500" />
-                          </Button>
-                        </div> */}
                       </>
                     ) : (
                       <>