CE-297 (#217)

Co-authored-by: afwilcox <[email protected]>
bcgov · Dec 5, 2023 · 6a1c704 · 6a1c704
1 parent 5a1ed85
commit 6a1c704
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/backend/src/v1/allegation_complaint/allegation_complaint.service.ts b/backend/src/v1/allegation_complaint/allegation_complaint.service.ts
@@ -289,6 +289,7 @@ export class AllegationComplaintService {
             .person_complaint_xref[0]
         );
       }
+      await queryRunner.commitTransaction();
     } catch (err) {
       this.logger.error(err);
       await queryRunner.rollbackTransaction();

diff --git a/frontend/cypress/e2e/allegation-details-edit.cy.ts b/frontend/cypress/e2e/allegation-details-edit.cy.ts
@@ -161,6 +161,7 @@ describe("Complaint Edit Page spec - Edit Allegation View", () => {
 
     cy.selectItemById("status-select-id", editCallDetails.status);
 
+    cy.get("#officer-assigned-select-id").scrollIntoView();
     cy.selectItemById("officer-assigned-select-id", editCallDetails.assigned);
 
     cy.get("#complaint-description-textarea-id").click({ force: true });
@@ -437,7 +438,7 @@ describe("Complaint Edit Page spec - Edit Allegation View", () => {
     cy.get("#officer-assigned-pair-id label").should(($label) => {
       expect($label).to.contain.text("Officer Assigned");
     });
-    cy.get("#officer-assigned-pair-id .comp-details-input").should("exist");
+    cy.get("#officer-assigned-pair-id .comp-details-input").contains("None");
 
     // Check the Call Details inputs
     // Complaint Location

diff --git a/frontend/cypress/e2e/hwcr-details-edit.cy.ts b/frontend/cypress/e2e/hwcr-details-edit.cy.ts
@@ -408,7 +408,7 @@ describe("Complaint Edit Page spec - Edit View", () => {
     cy.get("#officer-assigned-pair-id label").should(($label) => {
       expect($label).to.contain.text("Officer Assigned");
     });
-    cy.get("#officer-assigned-pair-id .comp-details-input").should("exist");
+    cy.get("#officer-assigned-pair-id .comp-details-input").contains("None");
 
     // Check the Call Details inputs
     // Complaint Location

diff --git a/frontend/src/app/components/common/comp-select.tsx b/frontend/src/app/components/common/comp-select.tsx
@@ -34,9 +34,6 @@ export const CompSelect: FC<Props> = ({
   let items = [...options];
 
   // If "none" is an option, lighten the colour a bit so that it doesn't appear the same as the other selectable options
-  if (defaultOption) {
-    items = [defaultOption, ...options];
-
     styles = {
       ...styles,
       option: (provided, state) => ({
@@ -47,7 +44,6 @@ export const CompSelect: FC<Props> = ({
             : "black",
       }),
     };
-  }
 
   //-- pass through the onChange event
   const handleChange = (s: any) => {

diff --git a/frontend/src/app/components/containers/complaints/complaint-filter.tsx b/frontend/src/app/components/containers/complaints/complaint-filter.tsx
@@ -46,7 +46,11 @@ export const ComplaintFilter: FC<Props> = ({ type, isOpen }) => {
     dispatch,
   } = useContext(ComplaintFilterContext);
 
-  const officers = useAppSelector(selectOfficersDropdown);
+  let officers = useAppSelector(selectOfficersDropdown);
+  if(officers && officers[0]?.value !== "Unassigned")
+  {
+    officers.unshift({value: "Unassigned", label: "Unassigned"})
+  }
   const natureOfComplaintTypes = useAppSelector(
     selectHwcrNatureOfComplaintCodeDropdown
   );

diff --git a/frontend/src/app/components/containers/complaints/details/complaint-details-edit.tsx b/frontend/src/app/components/containers/complaints/details/complaint-details-edit.tsx
@@ -289,6 +289,8 @@ export const ComplaintDetailsEdit: FC = () => {
         }))
       : [];
 
+  assignableOfficers.unshift({value: "Unassigned", label: "None"});
+
   // Get the code table lists to populate the Selects
   const complaintStatusCodes = useSelector(
     selectComplaintStatusCodeDropdown
@@ -530,6 +532,7 @@ export const ComplaintDetailsEdit: FC = () => {
         const { person_guid: officer } = selectedOfficer as any;
 
         if (from(source).any() && from(source).elementAt(0)) {
+          source[0].active_ind = true;
           const assigned = { ...source[0], person_guid: officer };
           source = [assigned];
         } else {
@@ -551,7 +554,6 @@ export const ComplaintDetailsEdit: FC = () => {
 
         update.complaint_identifier = updatedParent;
 
-        setUpdateComplaint(update);
       } else if (from(source).any() && from(source).elementAt(0)) {
         const assigned = { ...source[0], active_ind: false };
         source = [assigned];
@@ -562,8 +564,8 @@ export const ComplaintDetailsEdit: FC = () => {
         };
 
         update.complaint_identifier = updatedParent;
-        setUpdateComplaint(update);
       }
+      setUpdateComplaint(update);
     }
   };
 
@@ -1142,10 +1144,9 @@ export const ComplaintDetailsEdit: FC = () => {
                     onChange={(e) => handleAssignedOfficerChange(e)}
                     className="comp-details-input"
                     options={assignableOfficers}
-                    defaultOption={{ label: "None", value: "Unassigned" }}
                     placeholder="Select"
                     enableValidation={false}
-                    value={selectedAssignedOfficer}
+                    value={(updateComplaint?.complaint_identifier?.person_complaint_xref[0]?.active_ind === true ? selectedAssignedOfficer : { value: "Unassigned", label: "None" })}
                   />
                 </div>
               </div>