Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Ce 1112 #679

Merged
merged 6 commits into from
Oct 1, 2024
Merged

fix: Ce 1112 #679

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3e7818
Filters on the agency type - WIP here but will need checking for non …
gregorylavery Sep 27, 2024
3ff7851
Code tidy up. Confirmed the officers are filtered to remove read only…
gregorylavery Sep 27, 2024
1daa8bf
Tweak to add in the 'Unassigned' entry to the dropdown listing.
gregorylavery Oct 1, 2024
fdfc0e4
Merge branch 'release/orca' into CE-1112
gregorylavery Oct 1, 2024
05128f0
Removed the now unused officers variable.
gregorylavery Oct 1, 2024
354d314
Removed an unused import to fix a code smell issue.
gregorylavery Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions frontend/src/app/components/containers/complaints/complaint-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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}
Expand Down
Loading