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
2 changes: 1 addition & 1 deletion backend/controllers/controllers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ func Test_EditTaskHandler_WithDependencies(t *testing.T) {
"email": "test@example.com",
"encryptionSecret": "secret",
"UUID": "test-uuid",
"taskID": "1",
"taskUUID": "task-uuid",
"description": "Edited task with dependencies",
"project": "EditedProject",
"depends": []string{"task-uuid-3"},
Expand Down
12 changes: 6 additions & 6 deletions backend/controllers/edit_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
email := requestBody.Email
encryptionSecret := requestBody.EncryptionSecret
uuid := requestBody.UUID
taskID := requestBody.TaskID
taskUUID := requestBody.TaskUUID
description := requestBody.Description
tags := requestBody.Tags
project := requestBody.Project
Expand All @@ -56,7 +56,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
recur := requestBody.Recur
annotations := requestBody.Annotations

if taskID == "" {
if taskUUID == "" {
http.Error(w, "taskID is required", http.StatusBadRequest)
return
}
Expand All @@ -71,13 +71,13 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
job := Job{
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, due, recur, annotations)
logStore.AddLog("INFO", fmt.Sprintf("Editing task ID: %s", taskUUID), uuid, "Edit Task")
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskUUID, tags, project, start, entry, wait, end, depends, due, recur, annotations)
if err != nil {
logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskID, err), uuid, "Edit Task")
logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskUUID, err), uuid, "Edit Task")
return err
}
logStore.AddLog("INFO", fmt.Sprintf("Successfully edited task ID: %s", taskID), uuid, "Edit Task")
logStore.AddLog("INFO", fmt.Sprintf("Successfully edited task ID: %s", taskUUID), uuid, "Edit Task")
return nil
},
}
Expand Down
14 changes: 7 additions & 7 deletions backend/controllers/modify_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
email := requestBody.Email
encryptionSecret := requestBody.EncryptionSecret
uuid := requestBody.UUID
taskID := requestBody.TaskID
taskUUID := requestBody.TaskUUID
description := requestBody.Description
project := requestBody.Project
priority := requestBody.Priority
Expand All @@ -55,8 +55,8 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Description is required, and cannot be empty!", http.StatusBadRequest)
return
}
if taskID == "" {
http.Error(w, "taskID is required", http.StatusBadRequest)
if taskUUID == "" {
http.Error(w, "taskUUID is required", http.StatusBadRequest)
return
}

Expand All @@ -75,13 +75,13 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
job := Job{
Name: "Modify Task",
Execute: func() error {
logStore.AddLog("INFO", fmt.Sprintf("Modifying task ID: %s", taskID), uuid, "Modify Task")
err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID, tags, depends)
logStore.AddLog("INFO", fmt.Sprintf("Modifying task UUID: %s", taskUUID), uuid, "Modify Task")
err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskUUID, tags, depends)
if err != nil {
logStore.AddLog("ERROR", fmt.Sprintf("Failed to modify task ID %s: %v", taskID, err), uuid, "Modify Task")
logStore.AddLog("ERROR", fmt.Sprintf("Failed to modify task UUID %s: %v", taskUUID, err), uuid, "Modify Task")
return err
}
logStore.AddLog("INFO", fmt.Sprintf("Successfully modified task ID: %s", taskID), uuid, "Modify Task")
logStore.AddLog("INFO", fmt.Sprintf("Successfully modified task UUID: %s", taskUUID), uuid, "Modify Task")
return nil
},
}
Expand Down
4 changes: 2 additions & 2 deletions backend/models/request_body.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type ModifyTaskRequestBody struct {
Email string `json:"email"`
EncryptionSecret string `json:"encryptionSecret"`
UUID string `json:"UUID"`
TaskID string `json:"taskid"`
TaskUUID string `json:"taskuuid"`
Description string `json:"description"`
Project string `json:"project"`
Priority string `json:"priority"`
Expand All @@ -35,7 +35,7 @@ type EditTaskRequestBody struct {
Email string `json:"email"`
EncryptionSecret string `json:"encryptionSecret"`
UUID string `json:"UUID"`
TaskID string `json:"taskid"`
TaskUUID string `json:"taskuuid"`
Description string `json:"description"`
Tags []string `json:"tags"`
Project string `json:"project"`
Expand Down
28 changes: 14 additions & 14 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export const Tasks = (
UUID: string,
description: string,
tags: string[],
taskID: string,
taskUUID: string,
project: string,
start: string,
entry: string,
Expand All @@ -384,7 +384,7 @@ export const Tasks = (
UUID,
description,
tags,
taskID,
taskUUID,
backendURL: url.backendURL,
project,
start,
Expand Down Expand Up @@ -525,7 +525,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand All @@ -549,7 +549,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand All @@ -573,7 +573,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand All @@ -597,7 +597,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand All @@ -621,7 +621,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry,
Expand All @@ -645,7 +645,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry,
Expand All @@ -669,7 +669,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry,
Expand All @@ -693,7 +693,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand Down Expand Up @@ -727,7 +727,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand Down Expand Up @@ -830,7 +830,7 @@ export const Tasks = (
props.UUID,
task.description,
finalTags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand All @@ -851,7 +851,7 @@ export const Tasks = (
props.UUID,
task.description,
task.tags,
task.id.toString(),
task.uuid.toString(),
task.project,
task.start,
task.entry || '',
Expand All @@ -874,7 +874,7 @@ export const Tasks = (
email: props.email,
encryptionSecret: props.encryptionSecret,
UUID: props.UUID,
taskID: task.id.toString(),
taskUUID: task.uuid.toString(),
description: task.description,
project: task.project || '',
priority: priorityValue,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe('editTaskOnBackend', () => {
email: 'test@example.com',
encryptionSecret: 'mockEncryptionSecret',
UUID: 'mockUUID',
taskID: '1',
taskUUID: 'taskUUID',
description: 'Updated',
tags: [],
project: '',
Expand Down Expand Up @@ -142,7 +142,7 @@ describe('editTaskOnBackend', () => {
email: 'test@example.com',
encryptionSecret: 'mockEncryptionSecret',
UUID: 'mockUUID',
taskID: '1',
taskUUID: 'taskUUID',
description: 'Updated',
tags: [],
project: '',
Expand All @@ -168,7 +168,7 @@ describe('modifyTaskOnBackend', () => {
email: 'test@example.com',
encryptionSecret: 'mockEncryptionSecret',
UUID: 'mockUUID',
taskID: '1',
taskUUID: 'taskUUID',
description: 'Updated',
tags: [],
project: '',
Expand All @@ -192,7 +192,7 @@ describe('modifyTaskOnBackend', () => {
email: 'test@example.com',
encryptionSecret: 'mockEncryptionSecret',
UUID: 'mockUUID',
taskID: '1',
taskUUID: 'taskUUID',
description: 'Updated',
tags: [],
project: '',
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/components/HomeComponents/Tasks/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const editTaskOnBackend = async ({
UUID,
description,
tags,
taskID,
taskUUID,
backendURL,
project,
start,
Expand All @@ -149,7 +149,7 @@ export const editTaskOnBackend = async ({
UUID: string;
description: string;
tags: string[];
taskID: string;
taskUUID: string;
backendURL: string;
project: string;
start: string;
Expand All @@ -167,7 +167,7 @@ export const editTaskOnBackend = async ({
email,
encryptionSecret,
UUID,
taskID,
taskUUID,
description,
tags,
project,
Expand All @@ -187,7 +187,7 @@ export const editTaskOnBackend = async ({

if (!response.ok) {
const errorText = await response.text();
throw new Error(errorText || 'Failed to edit task');
throw new Error('321' + errorText || 'Failed to edit task');
}

return response;
Expand All @@ -197,7 +197,7 @@ export const modifyTaskOnBackend = async ({
email,
encryptionSecret,
UUID,
taskID,
taskUUID,
description,
project,
priority,
Expand All @@ -209,7 +209,7 @@ export const modifyTaskOnBackend = async ({
email: string;
encryptionSecret: string;
UUID: string;
taskID: string;
taskUUID: string;
description: string;
project: string;
priority: string;
Expand All @@ -224,7 +224,7 @@ export const modifyTaskOnBackend = async ({
email,
encryptionSecret,
UUID,
taskid: taskID,
taskuuid: taskUUID,
description,
project,
priority,
Expand Down
Loading