Skip to content

feat: make due field editable Added due field editing functionality t… #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
its-me-abhishek merged 1 commit into from
Nov 29, 2025
Merged

feat: make due field editable Added due field editing functionality t… #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion backend/controllers/edit_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
wait := requestBody.Wait
end := requestBody.End
depends := requestBody.Depends
due := requestBody.Due

if taskID == "" {
http.Error(w, "taskID is required", http.StatusBadRequest)
Expand All @@ -62,7 +63,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
Name: "Edit Task",
Execute: func() error {
logStore.AddLog("INFO", fmt.Sprintf("Editing task ID: %s", taskID), uuid, "Edit Task")
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID, tags, project, start, entry, wait, end, depends)
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID, tags, project, start, entry, wait, end, depends, due)
if err != nil {
logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskID, err), uuid, "Edit Task")
return err
Expand Down
1 change: 1 addition & 0 deletions backend/models/request_body.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type EditTaskRequestBody struct {
Wait string `json:"wait"`
End string `json:"end"`
Depends []string `json:"depends"`
Due string `json:"due"`
}
type CompleteTaskRequestBody struct {
Email string `json:"email"`
Expand Down
12 changes: 11 additions & 1 deletion backend/utils/tw/edit_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
)

func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID string, tags []string, project string, start string, entry string, wait string, end string, depends []string) error {
func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID string, tags []string, project string, start string, entry string, wait string, end string, depends []string, due string) error {
if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
return fmt.Errorf("error deleting Taskwarrior data: %v", err)
}
Expand Down Expand Up @@ -102,6 +102,16 @@ func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID st
}
}

// Handle due date
if due != "" {
// Convert `2025-11-29` -> `2025-11-29T00:00:00`
formattedDue := due + "T00:00:00"

if err := utils.ExecCommand("task", taskID, "modify", "due:"+formattedDue); err != nil {
return fmt.Errorf("failed to set due date %s: %v", formattedDue, err)
}
}

// Sync Taskwarrior again
if err := SyncTaskwarrior(tempDir); err != nil {
return err
Expand Down
8 changes: 4 additions & 4 deletions backend/utils/tw/taskwarrior_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestSyncTaskwarrior(t *testing.T) {
}

func TestEditTaskInATaskwarrior(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", nil, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", nil, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "2025-12-01T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior() failed: %v", err)
} else {
Expand Down Expand Up @@ -68,7 +68,7 @@ func TestAddTaskWithTags(t *testing.T) {
}

func TestEditTaskWithTagAddition(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "+important"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "+important"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "2025-12-01T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with tag addition failed: %v", err)
} else {
Expand All @@ -77,7 +77,7 @@ func TestEditTaskWithTagAddition(t *testing.T) {
}

func TestEditTaskWithTagRemoval(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"-work", "-lowpriority"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"-work", "-lowpriority"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "2025-12-01T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with tag removal failed: %v", err)
} else {
Expand All @@ -86,7 +86,7 @@ func TestEditTaskWithTagRemoval(t *testing.T) {
}

func TestEditTaskWithMixedTagOperations(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "2025-12-01T18:30:00.000Z")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with mixed tag operations failed: %v", err)
} else {
Expand Down
144 changes: 133 additions & 11 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ export const Tasks = (
const [editedEntryDate, setEditedEntryDate] = useState('');
const [isEditingEndDate, setIsEditingEndDate] = useState(false);
const [editedEndDate, setEditedEndDate] = useState('');
const [isEditingDueDate, setIsEditingDueDate] = useState(false);
const [editedDueDate, setEditedDueDate] = useState('');
const [isEditingDepends, setIsEditingDepends] = useState(false);
const [editedDepends, setEditedDepends] = useState<string[]>([]);
const [dependsDropdownOpen, setDependsDropdownOpen] = useState(false);
Expand Down Expand Up @@ -376,7 +378,8 @@ export const Tasks = (
entry: string,
wait: string,
end: string,
depends: string[]
depends: string[],
due: string
) {
try {
await editTaskOnBackend({
Expand All @@ -393,6 +396,7 @@ export const Tasks = (
wait,
end,
depends,
due,
});

console.log('Task edited successfully!');
Expand Down Expand Up @@ -439,7 +443,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.due || ''
);
setIsEditing(false);
};
Expand All @@ -458,7 +463,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.due || ''
);
setIsEditingProject(false);
};
Expand All @@ -478,7 +484,8 @@ export const Tasks = (
task.entry || '',
task.wait,
task.end || '',
task.depends || []
task.depends || [],
task.due || ''
);

setIsEditingWaitDate(false);
Expand All @@ -499,7 +506,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.due || ''
);

setIsEditingStartDate(false);
Expand All @@ -520,7 +528,8 @@ export const Tasks = (
task.entry,
task.wait,
task.end,
task.depends || []
task.depends || [],
task.due || ''
);

setIsEditingEntryDate(false);
Expand All @@ -541,12 +550,35 @@ export const Tasks = (
task.entry,
task.wait,
task.end,
task.depends || []
task.depends || [],
task.due || ''
);

setIsEditingEndDate(false);
};

const handleDueDateSaveClick = (task: Task) => {
task.due = editedDueDate;

handleEditTaskOnBackend(
props.email,
props.encryptionSecret,
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.project,
task.start,
task.entry,
task.wait,
task.end,
task.depends || [],
task.due
);

setIsEditingDueDate(false);
};

const handleDependsSaveClick = (task: Task) => {
task.depends = editedDepends;

Expand All @@ -562,7 +594,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends
task.depends,
task.due || ''
);

setIsEditingDepends(false);
Expand Down Expand Up @@ -598,6 +631,8 @@ export const Tasks = (
setEditedEntryDate('');
setIsEditingEndDate(false);
setEditedEndDate('');
setIsEditingDueDate(false);
setEditedDueDate('');
setIsEditingDepends(false);
setEditedDepends([]);
setDependsDropdownOpen(false);
Expand Down Expand Up @@ -720,7 +755,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.due || ''
);

setIsEditingTags(false);
Expand Down Expand Up @@ -1200,7 +1236,9 @@ export const Tasks = (
<TableRow
id={`task-row-${task.id}`}
key={index}
className={`border-b cursor-pointer ${selectedIndex === index ? 'bg-muted/50' : ''}`}
className={`border-b cursor-pointer ${
selectedIndex === index ? 'bg-muted/50' : ''
}`}
>
{/* Display task details */}
<TableCell className="py-2">
Expand Down Expand Up @@ -1341,7 +1379,91 @@ export const Tasks = (
<TableRow>
<TableCell>Due:</TableCell>
<TableCell>
{formattedDate(task.due)}
{isEditingDueDate ? (
<div className="flex items-center gap-2">
<DatePicker
date={
editedDueDate &&
editedDueDate !== ''
? (() => {
try {
const dateStr =
editedDueDate.includes(
'T'
)
? editedDueDate.split(
'T'
)[0]
: editedDueDate;
const parsed =
new Date(
dateStr +
'T00:00:00'
);
return isNaN(
parsed.getTime()
)
? undefined
: parsed;
} catch {
return undefined;
}
})()
: undefined
}
onDateChange={(date) =>
setEditedDueDate(
date
? format(
date,
'yyyy-MM-dd'
)
: ''
)
}
placeholder="Select due date"
/>
<Button
variant="ghost"
size="icon"
onClick={() =>
handleDueDateSaveClick(task)
}
>
<CheckIcon className="h-4 w-4 text-green-500" />
</Button>
<Button
variant="ghost"
size="icon"
onClick={() =>
setIsEditingDueDate(false)
}
>
<XIcon className="h-4 w-4 text-red-500" />
</Button>
</div>
) : (
<>
<span>
{formattedDate(task.due)}
</span>
<Button
variant="ghost"
size="icon"
onClick={() => {
setIsEditingDueDate(true);
const dueDate = task.due
? task.due.includes('T')
? task.due.split('T')[0]
: task.due
: '';
setEditedDueDate(dueDate);
}}
>
<PencilIcon className="h-4 w-4 text-gray-500" />
</Button>
</>
)}
</TableCell>
</TableRow>
<TableRow>
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/HomeComponents/Tasks/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export const editTaskOnBackend = async ({
wait,
end,
depends,
due,
}: {
email: string;
encryptionSecret: string;
Expand All @@ -108,6 +109,7 @@ export const editTaskOnBackend = async ({
wait: string;
end: string;
depends: string[];
due: string;
}) => {
const response = await fetch(`${backendURL}edit-task`, {
method: 'POST',
Expand All @@ -124,6 +126,7 @@ export const editTaskOnBackend = async ({
wait,
end,
depends,
due,
}),
headers: {
'Content-Type': 'application/json',
Expand Down
Loading