fix: Ce 1112 (#679)

bcgov · Oct 1, 2024 · dbc31a9 · dbc31a9
1 parent 99acf57
commit dbc31a9
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/frontend/src/app/components/containers/complaints/complaint-filter.tsx b/frontend/src/app/components/containers/complaints/complaint-filter.tsx
@@ -13,7 +13,7 @@ import {
   selectGirTypeCodeDropdown,
   selectComplaintReceivedMethodDropdown,
 } from "../../../store/reducers/code-table";
-import { selectOfficersDropdown } from "../../../store/reducers/officer";
+import { selectOfficersByAgencyDropdown } from "../../../store/reducers/officer";
 import COMPLAINT_TYPES from "../../../types/app/complaint-types";
 import DatePicker from "react-datepicker";
 import { CompSelect } from "../../common/comp-select";
@@ -46,11 +46,11 @@ export const ComplaintFilter: FC<Props> = ({ type }) => {
     dispatch,
   } = useContext(ComplaintFilterContext);
 
-  let officers = useAppSelector(selectOfficersDropdown(false));
-  if (officers && officers[0]?.value !== "Unassigned") {
-    officers.unshift({ value: "Unassigned", label: "Unassigned" });
-  }
   const agency = getUserAgency();
+  let officersByAgency = useAppSelector(selectOfficersByAgencyDropdown(agency));
+  if (officersByAgency && officersByAgency[0]?.value !== "Unassigned") {
+    officersByAgency.unshift({ value: "Unassigned", label: "Unassigned" });
+  }
   const natureOfComplaintTypes = useAppSelector(selectHwcrNatureOfComplaintCodeDropdown);
   const speciesTypes = useAppSelector(selectSpeciesCodeDropdown);
   const statusTypes = useAppSelector(selectComplaintStatusWithPendingCodeDropdown);
@@ -224,9 +224,8 @@ export const ComplaintFilter: FC<Props> = ({ type }) => {
                   <div>
                     <button
                       aria-label="Previous Month"
-                      className={`react-datepicker__navigation react-datepicker__navigation--previous ${
-                        customHeaderCount === 1 ? "datepicker-nav-hidden" : "datepicker-nav-visible"
-                      }`}
+                      className={`react-datepicker__navigation react-datepicker__navigation--previous ${customHeaderCount === 1 ? "datepicker-nav-hidden" : "datepicker-nav-visible"
+                        }`}
                       onClick={decreaseMonth}
                     >
                       <span
@@ -245,9 +244,8 @@ export const ComplaintFilter: FC<Props> = ({ type }) => {
                     </span>
                     <button
                       aria-label="Next Month"
-                      className={`react-datepicker__navigation react-datepicker__navigation--next ${
-                        customHeaderCount === 1 ? "datepicker-nav-hidden" : "datepicker-nav-visible"
-                      }`}
+                      className={`react-datepicker__navigation react-datepicker__navigation--next ${customHeaderCount === 1 ? "datepicker-nav-hidden" : "datepicker-nav-visible"
+                        }`}
                       onClick={increaseMonth}
                     >
                       <span
@@ -413,7 +411,7 @@ export const ComplaintFilter: FC<Props> = ({ type }) => {
                   classNames={{
                     menu: () => "top-layer-select",
                   }}
-                  options={officers}
+                  options={officersByAgency}
                   defaultOption={{ label: "Unassigned", value: "Unassigned" }}
                   placeholder="Select"
                   enableValidation={false}