From f9f200d8afc23969dae34950a6d58b06a1b16599 Mon Sep 17 00:00:00 2001 From: Alistair Ross <87852242+AlistairMRoss@users.noreply.github.com> Date: Fri, 20 Oct 2023 16:06:37 +0200 Subject: [PATCH 01/10] Fixed small user edit issue --- .../infosafe/delete/deletemodel/DeletedTask.java | 8 ++++++++ .../deleterepository/DeletedTaskRepository.java | 4 +++- .../primary/controller/TaskController.java | 14 ++++++++++++++ .../infosafe/primary/service/DeleteService.java | 4 ++++ .../infosafe/primary/service/TaskService.java | 6 ++++++ .../infosafe/primary/service/UserService.java | 8 ++++---- .../src/components/Charts/SystemAnalyticsChart.js | 1 + .../src/components/Edit/EditUser.js | 6 +----- 8 files changed, 41 insertions(+), 10 deletions(-) diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deletemodel/DeletedTask.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deletemodel/DeletedTask.java index 43ee49579..fa36baab8 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deletemodel/DeletedTask.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deletemodel/DeletedTask.java @@ -1,5 +1,6 @@ package com.fragile.infosafe.delete.deletemodel; +import com.fragile.infosafe.primary.model.User; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; @@ -7,6 +8,8 @@ import lombok.NoArgsConstructor; import java.util.Date; +import java.util.HashSet; +import java.util.Set; @Data @Builder @@ -24,4 +27,9 @@ public class DeletedTask { private String date_created; private String completionStatus; + @ElementCollection + @CollectionTable(name = "delete_task_users", joinColumns = @JoinColumn(name = "task_id")) + @Column(name = "user_id") + private Set userIds = new HashSet<>(); + } diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deleterepository/DeletedTaskRepository.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deleterepository/DeletedTaskRepository.java index dfc387e24..c5eb70878 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deleterepository/DeletedTaskRepository.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/delete/deleterepository/DeletedTaskRepository.java @@ -2,9 +2,11 @@ import com.fragile.infosafe.delete.deletemodel.DeletedTask; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; @Repository public interface DeletedTaskRepository extends JpaRepository { - + @Query("SELECT COUNT(dt) FROM DeletedTask dt JOIN dt.userIds u WHERE u = :userId") + long countByUserId(int userId); } \ No newline at end of file diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/controller/TaskController.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/controller/TaskController.java index eb7bbbc92..6510d9bef 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/controller/TaskController.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/controller/TaskController.java @@ -10,6 +10,8 @@ import lombok.extern.slf4j.Slf4j; import org.hibernate.sql.Delete; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -50,4 +52,16 @@ public ResponseEntity setCompletedTasks(@RequestBody TaskCompleteRequest public ResponseEntity> getUsersOfTask(@PathVariable("id") int task_id){ return ResponseEntity.ok(service.findUsersOfTask(task_id)); } + + @GetMapping("/getCompleted") + public ResponseEntity getCompletedTasks(){ + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null && authentication.getPrincipal() instanceof User authenticatedUser) { + long count = service.getCompletedTasks(authenticatedUser.getUser_id()); + return ResponseEntity.ok(count); + }else { + return ResponseEntity.notFound().build(); + } + } + } diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java index a4370ac2b..7cb1ce8d9 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import javax.persistence.EntityManager; +import java.util.Collections; import java.util.Optional; @Service @@ -125,6 +126,9 @@ public void deleteTaskAndSaveToSecondary(int task_id, String completion) { de.setTask_description(entityToDelete.getTask_description()); de.setDue_date(entityToDelete.getDue_date()); de.setDate_created(entityToDelete.getDate_created()); + for(User us : entityToDelete.getUsers()){ + de.setUserIds(Collections.singleton(us.getUser_id())); + } de.setCompletionStatus(completion); deletedTaskRepository.save(de); taskRepository.delete(entityToDelete); diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/TaskService.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/TaskService.java index c49e3f603..8f5400a9e 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/TaskService.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/TaskService.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fragile.infosafe.delete.deleterepository.DeletedTaskRepository; import com.fragile.infosafe.primary.model.DataScope; import com.fragile.infosafe.primary.model.Task; import com.fragile.infosafe.primary.model.User; @@ -34,6 +35,7 @@ public class TaskService { private final DeleteService deleteService; private final NotificationsService notificationsService; private final EncryptionService encryptionService; + private final DeletedTaskRepository deletedTaskRepository; public ResponseEntity createTask(TaskRequest request) { try { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -192,4 +194,8 @@ public List findUsersOfTask(int task_id) { userEmails.replaceAll(encryptionService::decryptString); return userEmails; } + + public long getCompletedTasks(int user_id){ + return deletedTaskRepository.countByUserId(user_id); + } } diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/UserService.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/UserService.java index 9cc77f4da..96600daa5 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/UserService.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/UserService.java @@ -43,10 +43,10 @@ public List getAllUsersEmails() { public User updateUser(User user) { user.setRole(roleRepository.findByRole_name(user.getRole().getRole_name())); - user.setFirst_name(encryptionService.decryptString(user.getFirst_name())); - user.setLast_name(encryptionService.decryptString(user.getLast_name())); - user.setEmail(encryptionService.decryptString(user.getEmail())); - user.setPassword(encryptionService.decryptString(user.getPassword())); + user.setFirst_name(encryptionService.encryptString(user.getFirst_name())); + user.setLast_name(encryptionService.encryptString(user.getLast_name())); + user.setEmail(encryptionService.encryptString(user.getEmail())); + user.setPassword(user.getPassword()); return repository.save(user); } diff --git a/frontend/infosafe_frontend/src/components/Charts/SystemAnalyticsChart.js b/frontend/infosafe_frontend/src/components/Charts/SystemAnalyticsChart.js index d603e0c37..5656b970e 100644 --- a/frontend/infosafe_frontend/src/components/Charts/SystemAnalyticsChart.js +++ b/frontend/infosafe_frontend/src/components/Charts/SystemAnalyticsChart.js @@ -71,6 +71,7 @@ const SystemAnalyticsChart = () => { Authorization: "Bearer " + accessToken, }, }), + ]; try { diff --git a/frontend/infosafe_frontend/src/components/Edit/EditUser.js b/frontend/infosafe_frontend/src/components/Edit/EditUser.js index 1b20dff7e..9e92f563b 100644 --- a/frontend/infosafe_frontend/src/components/Edit/EditUser.js +++ b/frontend/infosafe_frontend/src/components/Edit/EditUser.js @@ -39,7 +39,7 @@ const EditUser = ({ user, popupClose, popupOpen , onUserEdited}) => { const handleSubmit = (e) => { e.preventDefault(); - //console.log(values) + console.log(values) fetch('https://infosafe.live/api/user/update/' + user.user_id, { method:"PUT", headers:{"Content-Type":"application/json", @@ -62,10 +62,6 @@ const EditUser = ({ user, popupClose, popupOpen , onUserEdited}) => { Authorization: "Bearer " + sessionStorage.getItem('accessToken') }, }); - // }).then((res) => res.json()) - // .then((result) => { - // setRoleNames(result); - // }); const roles = await response.json(); setRoleNames(roles); } From 5849b722daf07f555826e67d73946344026670d4 Mon Sep 17 00:00:00 2001 From: Alistair Ross <87852242+AlistairMRoss@users.noreply.github.com> Date: Fri, 20 Oct 2023 17:21:40 +0200 Subject: [PATCH 02/10] Fixed small delete and edit user issues --- .../fragile/infosafe/primary/model/Task.java | 1 + .../fragile/infosafe/primary/model/User.java | 12 ++++++++++++ .../infosafe/primary/service/DeleteService.java | 17 +++++++++++++++++ .../src/components/Edit/EditUser.js | 2 ++ 4 files changed, 32 insertions(+) diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/Task.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/Task.java index 7f7006d15..139224e32 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/Task.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/Task.java @@ -38,6 +38,7 @@ public class Task { inverseJoinColumns = @JoinColumn(name = "user_id") ) private Set users = new HashSet<>(); + @Column(nullable = true) private int daysUntilDue; diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/User.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/User.java index 51ee50103..e112e9dd6 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/User.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/model/User.java @@ -59,6 +59,18 @@ public class User implements UserDetails { @OneToMany(mappedBy = "user_id", fetch = FetchType.LAZY) private List accessRequests; + @JsonIgnore + @OneToMany(mappedBy = "user", fetch = FetchType.LAZY) + private List notifications; + + @JsonIgnore + @ManyToMany(mappedBy = "users", fetch = FetchType.LAZY) + private List tasks; + + @JsonIgnore + @ManyToMany(mappedBy = "users", fetch = FetchType.LAZY) + private List dataScopes; + @Override public String toString() { return "User{" + diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java index 7cb1ce8d9..b3787273f 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/DeleteService.java @@ -38,6 +38,7 @@ public class DeleteService { private final DeletedAccessRequestRepository deletedAccessRequestRepository; private final DeletedSupportRequestRepository deletedSupportRequestRepository; private final DeletedRiskRepository deletedRiskRepository; + private final NotificationsRepository notificationsRepository; public void deleteUserAndSaveToSecondary(String email) { Optional entityOptional = userRepository.findByEmail(encryptionService.encryptString(email)); @@ -64,6 +65,22 @@ public void deleteUserAndSaveToSecondary(String email) { asset.setCurrent_assignee(null); asset.setAvailability("Yes"); } + for(Task task : entityToDelete.getTasks()){ + task.getUsers().remove(entityToDelete); + if(task.getUsers().size() == 0){ + deleteTaskAndSaveToSecondary(task.getTask_id(), "Users Deleted"); + }else{ + taskRepository.save(task); + } + } + for(DataScope ds : entityToDelete.getDataScopes()){ + if(entityToDelete != ds.getDataCustodian()){ + ds.getUsers().remove(entityToDelete); + }else{ + return; + } + } + notificationsRepository.deleteAll(entityToDelete.getNotifications()); deletedUserRepository.save(de); userRepository.delete(entityToDelete); } diff --git a/frontend/infosafe_frontend/src/components/Edit/EditUser.js b/frontend/infosafe_frontend/src/components/Edit/EditUser.js index 9e92f563b..980ff8c84 100644 --- a/frontend/infosafe_frontend/src/components/Edit/EditUser.js +++ b/frontend/infosafe_frontend/src/components/Edit/EditUser.js @@ -114,6 +114,7 @@ const EditUser = ({ user, popupClose, popupOpen , onUserEdited}) => { readOnly={true} /> + {user.role.role_name !== "ADMIN" ? (

System Role

{roleNames && roleNames.length > 0 ? ( @@ -128,6 +129,7 @@ const EditUser = ({ user, popupClose, popupOpen , onUserEdited}) => {

Loading...

)}
+ ) : null} From eaaa94fa450296d8165f33e3757ed50b8ea279b6 Mon Sep 17 00:00:00 2001 From: Christof Steyn <56771007+P3TROOS@users.noreply.github.com> Date: Fri, 20 Oct 2023 20:52:44 +0200 Subject: [PATCH 03/10] Changed task status to priority --- .../infosafe_frontend/src/components/Create/CreateTaskPopup.js | 2 +- frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js | 2 +- frontend/infosafe_frontend/src/components/View/ViewTaskPopup.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/infosafe_frontend/src/components/Create/CreateTaskPopup.js b/frontend/infosafe_frontend/src/components/Create/CreateTaskPopup.js index 12d3fe0e5..0634adf39 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 d4b80e1b8..f813e042b 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/View/ViewTaskPopup.js b/frontend/infosafe_frontend/src/components/View/ViewTaskPopup.js index e5ed5b1d2..d12f9e33d 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}

From 26b566888e71d590de27571c411669f352687e92 Mon Sep 17 00:00:00 2001 From: Christof Steyn <56771007+P3TROOS@users.noreply.github.com> Date: Fri, 20 Oct 2023 21:03:53 +0200 Subject: [PATCH 04/10] Fixing delete user async --- frontend/infosafe_frontend/src/components/Subsystems/Users.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/infosafe_frontend/src/components/Subsystems/Users.js b/frontend/infosafe_frontend/src/components/Subsystems/Users.js index 28991dc27..b1e069848 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(); From 9121379c631f754053033270e6fd178bb6c8ab75 Mon Sep 17 00:00:00 2001 From: Christof Steyn <56771007+P3TROOS@users.noreply.github.com> Date: Fri, 20 Oct 2023 21:11:39 +0200 Subject: [PATCH 05/10] Fixed unit tests --- .../src/components/__tests__/Create/CreateTaskPopup.test.js | 2 +- .../src/components/__tests__/Edit/EditTaskPopup.test.js | 2 +- .../src/components/__tests__/View/ViewTaskPopup.test.js | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) 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 b50d29c7c..21be62986 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 1fd98d842..63b1039e5 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 6c1a3c3b7..c485636d0 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(); }); From aae3c8b0c065f5cb250a6c1862830b49c5eb48b3 Mon Sep 17 00:00:00 2001 From: Alistair Ross <87852242+AlistairMRoss@users.noreply.github.com> Date: Sat, 21 Oct 2023 09:44:40 +0200 Subject: [PATCH 06/10] Fixed small things --- .../infosafe/primary/service/AssetService.java | 2 ++ .../infosafe/primary/service/RiskService.java | 16 ++++++++-------- .../primary/service/SupportRequestService.java | 2 +- .../src/components/Edit/EditRisk.js | 4 +--- .../src/components/Edit/EditSupportRequest.js | 8 ++++++-- .../src/components/Edit/EditTaskPopup.js | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetService.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetService.java index e09098b55..87fc0d358 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetService.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/AssetService.java @@ -33,6 +33,7 @@ public List getAllAssets() { decryptedCurrentAssignee.setUser_id(currentAssignee.getUser_id()); decryptedCurrentAssignee.setFirst_name(encryptionService.decryptString(currentAssignee.getFirst_name())); decryptedCurrentAssignee.setLast_name(encryptionService.decryptString(currentAssignee.getLast_name())); + decryptedCurrentAssignee.setEmail(encryptionService.decryptString(currentAssignee.getEmail())); decryptedCurrentAssignee.setRole(currentAssignee.getRole()); asset.setCurrent_assignee(decryptedCurrentAssignee); } @@ -42,6 +43,7 @@ public List getAllAssets() { decryptedPreviousAssignee.setUser_id(previousAssignee.getUser_id()); decryptedPreviousAssignee.setFirst_name(encryptionService.decryptString(previousAssignee.getFirst_name())); decryptedPreviousAssignee.setLast_name(encryptionService.decryptString(previousAssignee.getLast_name())); + decryptedPreviousAssignee.setEmail(encryptionService.decryptString(previousAssignee.getEmail())); decryptedPreviousAssignee.setRole(previousAssignee.getRole()); asset.setPrevious_assignee(decryptedPreviousAssignee); } diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/RiskService.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/RiskService.java index 18c91aa25..030c5565e 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/RiskService.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/RiskService.java @@ -76,15 +76,15 @@ public void reviewRisk(ReviewRiskRequest riskRequest){ } public Risk updateRisk(RiskRequest riskRequest, int risk_id) { Risk risk = riskRepository.findRiskByRiskId(risk_id).get(); - risk.setRisk_description(risk.getRisk_description()); - risk.setRisk_name(risk.getRisk_name()); - risk.setRisk_status(risk.getRisk_status()); - risk.setImpact_rating(risk.getImpact_rating()); - risk.setProbability_rating(risk.getProbability_rating()); - risk.setSuggested_mitigation(risk.getSuggested_mitigation()); + risk.setRisk_description(riskRequest.getRisk_description()); + risk.setRisk_name(riskRequest.getRisk_name()); + risk.setRisk_status(riskRequest.getRisk_status()); + risk.setImpact_rating(riskRequest.getImpact_rating()); + risk.setProbability_rating(riskRequest.getProbability_rating()); + risk.setSuggested_mitigation(riskRequest.getSuggested_mitigation()); risk.setDataScope(dataScopeRepository.findByDataScopeId(riskRequest.getDataScope_id()).get()); - - return riskRepository.save(risk);} + return riskRepository.save(risk); + } private void emailUser(String email, String risk_name, String ds_name){ String subject = "New Risk Alert"; diff --git a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java index d5e31a964..fca805ef8 100644 --- a/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java +++ b/backend/infosafe_backend/src/main/java/com/fragile/infosafe/primary/service/SupportRequestService.java @@ -102,7 +102,7 @@ public SupportRequest updateSupportRequest(SupportRequestRequest supportRequest) updated.setSupport_description(supportRequest.getSupport_description()); updated.setSupport_status(supportRequest.getSupport_status()); updated.setSupport_type(supportRequest.getSupport_type()); - updated.setUser_id(userRepository.findByEmail(encryptionService.encryptString(supportRequest.getUser_email())).isPresent() ? userRepository.findByEmail(encryptionService.encryptString(supportRequest.getUser_email())).get() :null); + updated.setUser_id(userRepository.findByEmail(supportRequest.getUser_email()).isPresent() ? userRepository.findByEmail(supportRequest.getUser_email()).get() :null); updated.setTask_id(taskRepository.findByTaskId(supportRequest.getTask_id()).isPresent() ? taskRepository.findByTaskId(supportRequest.getTask_id()).get() : null); updated.setAsset_id(assetRepository.findByAssetId(supportRequest.getAsset_id()).isPresent() ? assetRepository.findByAssetId(supportRequest.getAsset_id()).get() : null); updated.setDataScope_id(dataScopeRepository.findByDataScopeId(supportRequest.getDataScope_id()).isPresent() ? dataScopeRepository.findByDataScopeId(supportRequest.getDataScope_id()).get() : null); diff --git a/frontend/infosafe_frontend/src/components/Edit/EditRisk.js b/frontend/infosafe_frontend/src/components/Edit/EditRisk.js index 8a33df00b..4e61fafbf 100644 --- a/frontend/infosafe_frontend/src/components/Edit/EditRisk.js +++ b/frontend/infosafe_frontend/src/components/Edit/EditRisk.js @@ -37,8 +37,7 @@ export const EditRisk = ({risk, popupClose, popupOpen, onRiskEdited}) => { const handleSubmit = (e) => { e.preventDefault(); - - console.log(values) + //console.log(values) fetch('https://infosafe.live/api/risk/update/' + risk.risk_id, { method: "POST", headers: { @@ -50,7 +49,6 @@ export const EditRisk = ({risk, popupClose, popupOpen, onRiskEdited}) => { console.log("Updated Risk") onRiskEdited() }) - //console.log(JSON.stringify(values)) popupClose() } diff --git a/frontend/infosafe_frontend/src/components/Edit/EditSupportRequest.js b/frontend/infosafe_frontend/src/components/Edit/EditSupportRequest.js index d03ceae5e..9e6afd237 100644 --- a/frontend/infosafe_frontend/src/components/Edit/EditSupportRequest.js +++ b/frontend/infosafe_frontend/src/components/Edit/EditSupportRequest.js @@ -29,8 +29,12 @@ const EditSupportRequest = ({ support, popupOpen, popupClose, editAllSupport, ed body:JSON.stringify(values) }).then(()=>{ console.log("Updated AccessRequest") - editAllSupport() - editMySupport() + if(editAllSupport !== null){ + editAllSupport(); + }else{ + editMySupport(); + } + }) popupClose() } diff --git a/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js b/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js index d4b80e1b8..278901864 100644 --- a/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js +++ b/frontend/infosafe_frontend/src/components/Edit/EditTaskPopup.js @@ -148,7 +148,7 @@ export const UpdateTask = ({ task, popupClose, popupOpen, onTaskEdited }) => {

Add More Assignees

{users && users.length > 0 ? ( { {subsystem} -
+
{(() => { if (subsystem === 'Users') { return ( -
+