bug: CE-553 Resolve the issue of GUID in the officer field (#373)

bcgov · Apr 25, 2024 · da2d676 · da2d676
1 parent 56a0233
commit da2d676
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/frontend/src/app/components/containers/complaints/outcomes/hwcr-complaint-assessment.tsx b/frontend/src/app/components/containers/complaints/outcomes/hwcr-complaint-assessment.tsx
@@ -3,7 +3,7 @@ import Option from "../../../../types/app/option";
 import { Button } from "react-bootstrap";
 import { Officer } from "../../../../types/person/person";
 import { useAppDispatch, useAppSelector } from "../../../../hooks/hooks";
-import { selectOfficersByAgency, selectOfficers } from "../../../../store/reducers/officer";
+import { selectOfficersByAgency } from "../../../../store/reducers/officer";
 import {
   getComplaintById,
   selectComplaint,
@@ -62,7 +62,6 @@ export const HWCRComplaintAssessment: FC = () => {
   const { id = "", complaintType = "" } = useParams<ComplaintParams>();
   const { ownedByAgencyCode } = useAppSelector(selectComplaintCallerInformation);
   const officersInAgencyList = useAppSelector(selectOfficersByAgency(ownedByAgencyCode?.agency));
-  const officerList = useAppSelector(selectOfficers);
 
   const assignableOfficers: Option[] =
     officersInAgencyList !== null
@@ -112,7 +111,7 @@ export const HWCRComplaintAssessment: FC = () => {
     if (complaintData) {
       const officer = getSelectedOfficer(assignableOfficers, personGuid, complaintData);
       setSelectedOfficer(officer);
-      dispatch(getAssessment(complaintData.id, officerList ?? undefined));
+      dispatch(getAssessment(complaintData.id));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [complaintData]);

diff --git a/frontend/src/app/components/containers/complaints/outcomes/hwcr-prevention-education.tsx b/frontend/src/app/components/containers/complaints/outcomes/hwcr-prevention-education.tsx
@@ -3,7 +3,7 @@ import Option from "../../../../types/app/option";
 import { Button } from "react-bootstrap";
 import { Officer } from "../../../../types/person/person";
 import { useAppDispatch, useAppSelector } from "../../../../hooks/hooks";
-import { selectOfficersByAgency, selectOfficers } from "../../../../store/reducers/officer";
+import { selectOfficersByAgency } from "../../../../store/reducers/officer";
 import {
   getComplaintById,
   selectComplaint,
@@ -75,7 +75,6 @@ export const HWCRComplaintPrevention: FC = () => {
   const preventionTypeList = useAppSelector(selectPreventionTypeCodeDropdown);
   const { personGuid } = useAppSelector(selectComplaintHeader(complaintType));
   const assigned = useAppSelector(selectComplaintAssignedBy);
-  const officerList = useAppSelector(selectOfficers);
 
   useEffect(() => {
     if (id && (!complaintData || complaintData.id !== id)) {
@@ -87,7 +86,7 @@ export const HWCRComplaintPrevention: FC = () => {
     if (complaintData) {
       const officer = getSelectedOfficer(assignableOfficers, personGuid, complaintData);
       setSelectedOfficer(officer);
-      dispatch(getPrevention(complaintData.id, officerList ?? undefined));
+      dispatch(getPrevention(complaintData.id));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [complaintData]);

diff --git a/frontend/src/app/store/reducers/case-thunks.ts b/frontend/src/app/store/reducers/case-thunks.ts
@@ -52,15 +52,14 @@ export const getCaseFile =
 
 //-- assessment thunks
 export const getAssessment =
-  (complaintIdentifier?: string, officerList?: Officer[]): AppThunk =>
+  (complaintIdentifier?: string): AppThunk =>
   async (dispatch, getState) => {
     const {
       officers: { officers },
     } = getState();
-    const officerListParam = officers ?? officerList;
     const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/case/${complaintIdentifier}`);
     await get<CaseFileDto>(dispatch, parameters).then(async (res) => {
-      const updatedAssessmentData = await parseAssessmentResponse(res, officerListParam);
+      const updatedAssessmentData = await parseAssessmentResponse(res, officers);
       dispatch(setCaseId(res.caseIdentifier));
       dispatch(setAssessment({ assessment: updatedAssessmentData }));
       dispatch(setIsReviewedRequired(res.isReviewRequired));
@@ -258,15 +257,14 @@ const parseAssessmentResponse = async (
 
 //-- prevention and education thunks
 export const getPrevention =
-  (complaintIdentifier?: string, officerList?: Officer[]): AppThunk =>
+  (complaintIdentifier?: string): AppThunk =>
   async (dispatch, getState) => {
     const {
       officers: { officers },
     } = getState();
-    const officerListParam = officers ?? officerList;
     const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/case/${complaintIdentifier}`);
     await get<CaseFileDto>(dispatch, parameters).then(async (res) => {
-      const updatedPreventionData = await parsePreventionResponse(res, officerListParam);
+      const updatedPreventionData = await parsePreventionResponse(res, officers);
       dispatch(setPrevention({ prevention: updatedPreventionData }));
     });
   };

diff --git a/frontend/src/app/store/store.ts b/frontend/src/app/store/store.ts
@@ -8,8 +8,8 @@ const persistConfig = {
   key: "enforcement",
   storage,
   blacklist: ["app"],
-  whitelist: ["codeTables"],
-  version: 6,  // This needs to be incremented every time a new migration is added
+  whitelist: ["codeTables", "officers"],
+  version: 6, // This needs to be incremented every time a new migration is added
   debug: true,
   migrate: createMigrate(migration, { debug: false }),
 };