Merge remote-tracking branch 'origin/backend/improvements' into backe…

…nd/improvements
COS301-SE-2023 · Oct 21, 2023 · 19149b5 · 19149b5
2 parents aae3c8b + 9121379
commit 19149b5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git 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"
                             />
-                            <p className="createTaskInputLabels">Task Status</p>
+                            <p className="createTaskInputLabels">Task Priority</p>
                             <Dropdown
                                 options={statusOptions}
                                 value={statusOptions.find((option) => option.value === task_status)}

diff --git 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 }) => {
                                 /> ) : (
                                 <p className="editTaskLoading">Loading...</p>
                             )}
-                            <p className="editTaskLabels">Status</p>
+                            <p className="editTaskLabels">Priority</p>
                             <Dropdown
                                 options={statusOptions}
                                 value={statusOptions.find((option) => 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
@@ -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
@@ -120,7 +120,7 @@ return (
                         /> ) : (
                         <p className='viewTaskLoadLabel'>Loading...</p>
                     )}
-                    <p className="viewTaskDisplayLabel">Task Status</p>
+                    <p className="viewTaskDisplayLabel">Task Priority</p>
                     <p className="viewTaskDisplayStatus">{task.task_status}</p>
                     <p className="viewTaskDisplayCompletionDate">Completion Date</p>
                     <p className="viewTaskDisplayCompletionDateData">{task.due_date}</p>

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