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

option.value === task_status)} diff --git a/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js b/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js index 27890186..f821efff 100644 --- a/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js +++ b/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js @@ -160,7 +160,7 @@ export const UpdateTask = ({ task, popupClose, popupOpen, onTaskEdited }) => { /> ) : (

Loading...

)} -

Status

+

Priority

option.value === task.task_status)} diff --git a/frontend/infosafe_frontend/src/components/Subsystems/Users.js b/frontend/infosafe_frontend/src/components/Subsystems/Users.js index 28991dc2..b1e06984 100644 --- a/frontend/infosafe_frontend/src/components/Subsystems/Users.js +++ b/frontend/infosafe_frontend/src/components/Subsystems/Users.js @@ -82,6 +82,7 @@ export const Users = () => { throw new Error("Network response was not ok"); } else { console.log("user deleted"); + fetchAllUsers(); } return response.json(); diff --git a/frontend/infosafe_frontend/src/components/View/ViewTaskPopup.js b/frontend/infosafe_frontend/src/components/View/ViewTaskPopup.js index e5ed5b1d..d12f9e33 100644 --- a/frontend/infosafe_frontend/src/components/View/ViewTaskPopup.js +++ b/frontend/infosafe_frontend/src/components/View/ViewTaskPopup.js @@ -120,7 +120,7 @@ return ( /> ) : (

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(); });