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
130 changes: 98 additions & 32 deletions frontend/src/components/HomeComponents/Tasks/TaskDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ export const TaskDialog = ({
editState,
onUpdateState,
allTasks,
isCreatingNewProject,
setIsCreatingNewProject,
uniqueProjects,
onSaveDescription,
onSaveTags,
onSavePriority,
Expand Down Expand Up @@ -825,41 +828,104 @@ export const TaskDialog = ({
<TableCell>
{editState.isEditingProject ? (
<>
<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,
})
<div className="col-span-3 space-y-2 w-[300px]">
<Select
value={
isCreatingNewProject
? '__CREATE_NEW__'
: editState.editedProject
}
className="flex-grow mr-2"
/>
<Button
variant="ghost"
size="icon"
onClick={() => {
onSaveProject(task, editState.editedProject);
onUpdateState({ isEditingProject: false });
onValueChange={(value) => {
if (value === '__CREATE_NEW__') {
setIsCreatingNewProject(true);
onUpdateState({ editedProject: '' });
} else {
const project =
value === '__NONE__' ? '' : value;
setIsCreatingNewProject(false);
onUpdateState({ editedProject: project });
onSaveProject(task, project);
}
}}
>
<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>
<SelectTrigger
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added ✓ ✖ for new project creation option but when you select from exixting project we dont need to save it ising onsaveproject fnc it saves without it

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>
</>
) : (
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/utils/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading