From 4173f004594c7d26aea50157723778dae20f52d7 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Mon, 21 Aug 2023 22:05:56 +0000 Subject: [PATCH] Filter signup helper search by active members --- webclient/src/Account.js | 1 + webclient/src/Members.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/webclient/src/Account.js b/webclient/src/Account.js index 18c11fa..4006ecf 100644 --- a/webclient/src/Account.js +++ b/webclient/src/Account.js @@ -309,6 +309,7 @@ export function AccountForm(props) { onChange={handleValues} initial={''} autofocus={''} + filterActive={true} /> } diff --git a/webclient/src/Members.js b/webclient/src/Members.js index 1deab4f..ca410ee 100644 --- a/webclient/src/Members.js +++ b/webclient/src/Members.js @@ -27,7 +27,7 @@ const memberSorts = { }; export function MembersDropdown(props) { - const { token, name, onChange, value, initial, autofocus } = props; + const { token, name, onChange, value, initial, autofocus, filterActive } = props; const [response, setResponse] = useState({ results: [] }); const searchDefault = {seq: 0, q: initial || '', sort: 'newest_active'}; const [search, setSearch] = useState(searchDefault); @@ -36,7 +36,11 @@ export function MembersDropdown(props) { requester('/search/', 'POST', token, search) .then(res => { if (!search.seq || res.seq > response.seq) { - setResponse(res); + if (filterActive) { + setResponse({...res, results: res.results.filter(x => ['Prepaid', 'Current', 'Due', 'Overdue'].includes(x.member.status))}); + } else { + setResponse(res); + } } }) .catch(err => {