Skip to content

added use of useQueryParameters in AnniversaryReportPage.jsx #2302

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

Merged
merged 1 commit into from
May 1, 2024
Merged

added use of useQueryParameters in AnniversaryReportPage.jsx #2302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 32 additions & 19 deletions web-ui/src/pages/AnniversaryReportPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,47 @@ import SearchBirthdayAnniversaryResults from '../components/search-results/Searc
import { sortAnniversaries } from '../context/util';

import { selectCsrfToken } from '../context/selectors';
import { useQueryParameters } from '../helpers/query-parameters';
Copy link
Collaborator Author

@mvolkmann mvolkmann Apr 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes here are identical to those in the PR at #2301.


const months = [
{ month: 'January' },
{ month: 'February' },
{ month: 'March' },
{ month: 'April' },
{ month: 'May' },
{ month: 'June' },
{ month: 'July' },
{ month: 'August' },
{ month: 'September' },
{ month: 'October' },
{ month: 'November' },
{ month: 'December' }
'January',
'February',
'March',
'April',
'May',
'June',
'July',
'August',
'September',
'October',
'November',
'December'
];

const AnniversaryReportPage = () => {
const currentMonth = new Date().getMonth();
const defaultMonths = [months[currentMonth]];

const { state } = useContext(AppContext);
const csrf = selectCsrfToken(state);
const [searchAnniversaryResults, setSearchAnniversaryResults] = useState([]);
const currentMonth = new Date().getMonth();
const [selectedMonths, setSelectedMonths] = useState([months[currentMonth]]);
const [selectedMonths, setSelectedMonths] = useState(defaultMonths);
const [hasSearched, setHasSearched] = useState(false);

useQueryParameters([
{
name: 'months',
default: defaultMonths,
value: selectedMonths,
setter: setSelectedMonths,
toQP(value) {
return value ? value.join(',') : [];
}
}
]);

const handleSearch = async monthsToSearch => {
const months = monthsToSearch.map(m => m.month);
const anniversaryResults = await getAnniversaries(months, csrf);
const anniversaryResults = await getAnniversaries(monthsToSearch, csrf);
setSearchAnniversaryResults(sortAnniversaries(anniversaryResults));
setHasSearched(true);
};
Expand All @@ -55,13 +69,12 @@ const AnniversaryReportPage = () => {
multiple
id="monthSelect"
options={months}
defaultValue={[months[currentMonth].month]}
defaultValue={defaultMonths}
value={selectedMonths}
onChange={onMonthChange}
isOptionEqualToValue={(option, value) => {
return value ? value.month === option.month : false;
return value ? value === option : false;
}}
getOptionLabel={option => option.month}
renderInput={params => (
<TextField
{...params}
Expand Down