diff --git a/frontend/infosafe_frontend/src/components/Create/CreateTaskPopup.js b/frontend/infosafe_frontend/src/components/Create/CreateTaskPopup.js index 12d3fe0e..0634adf3 100644 --- a/frontend/infosafe_frontend/src/components/Create/CreateTaskPopup.js +++ b/frontend/infosafe_frontend/src/components/Create/CreateTaskPopup.js @@ -121,7 +121,7 @@ export const CreateTask = ({popupClose, popupOpen, onTaskAdded}) => { value={task_description} id="taskDescIn" /> -
Task Status
+Task Priority
Loading...
)} -Status
+Priority
Loading...
)} -Task Status
+Task Priority
{task.task_status}
Completion Date
{task.due_date}
diff --git a/frontend/infosafe_frontend/src/components/__tests__/Create/CreateTaskPopup.test.js b/frontend/infosafe_frontend/src/components/__tests__/Create/CreateTaskPopup.test.js index b50d29c7..21be6298 100644 --- a/frontend/infosafe_frontend/src/components/__tests__/Create/CreateTaskPopup.test.js +++ b/frontend/infosafe_frontend/src/components/__tests__/Create/CreateTaskPopup.test.js @@ -14,7 +14,7 @@ describe("CreateTask Component", () => { //expect(screen.getByText("")).toBeInTheDocument(); expect(screen.getByText("Task Description")).toBeInTheDocument(); //expect(screen.getByText("")).toBeInTheDocument(); - expect(screen.getByText("Task Status")).toBeInTheDocument(); + expect(screen.getByText("Task Priority")).toBeInTheDocument(); //expect(screen.getByText("")).toBeInTheDocument(); expect(screen.getByText("Assignees")).toBeInTheDocument(); //expect(screen.getByText("")).toBeInTheDocument(); diff --git a/frontend/infosafe_frontend/src/components/__tests__/Edit/EditTaskPopup.test.js b/frontend/infosafe_frontend/src/components/__tests__/Edit/EditTaskPopup.test.js index 1fd98d84..63b1039e 100644 --- a/frontend/infosafe_frontend/src/components/__tests__/Edit/EditTaskPopup.test.js +++ b/frontend/infosafe_frontend/src/components/__tests__/Edit/EditTaskPopup.test.js @@ -32,7 +32,7 @@ describe("EditTask Component", () => { expect(screen.getByText("description 1")).toBeInTheDocument(); expect(screen.getByText("Assigned Users:")).toBeInTheDocument(); expect(screen.getByText("Add More Assignees")).toBeInTheDocument(); - expect(screen.getByText("Status")).toBeInTheDocument(); + expect(screen.getByText("Priority")).toBeInTheDocument(); expect(screen.getByText("High")).toBeInTheDocument(); expect(screen.getByText("Completion Date")).toBeInTheDocument(); //expect(screen.getByText("2023/10/10")).toBeInTheDocument(); diff --git a/frontend/infosafe_frontend/src/components/__tests__/View/ViewTaskPopup.test.js b/frontend/infosafe_frontend/src/components/__tests__/View/ViewTaskPopup.test.js index 6c1a3c3b..c485636d 100644 --- a/frontend/infosafe_frontend/src/components/__tests__/View/ViewTaskPopup.test.js +++ b/frontend/infosafe_frontend/src/components/__tests__/View/ViewTaskPopup.test.js @@ -7,6 +7,7 @@ describe("ViewTaskPopup Component", () => { task_name: "Task 1", task_description: "Create new users", due_date: "2023-11-11", + task_status: "High", data_scope_id: { ds_name: "Data Scope A" } @@ -25,6 +26,8 @@ describe("ViewTaskPopup Component", () => { expect(screen.getByText("Data Scope A")).toBeInTheDocument(); expect(screen.getByText("Task Description")).toBeInTheDocument(); expect(screen.getByText("Create new users")).toBeInTheDocument(); + expect(screen.getByText("Task Priority")).toBeInTheDocument(); + expect(screen.getByText("High")).toBeInTheDocument(); expect(screen.getByText("Completion Date")).toBeInTheDocument(); expect(screen.getByText("2023-11-11")).toBeInTheDocument(); });