From dcff94fbc39a44d30348e9c59d899920b00bac1e Mon Sep 17 00:00:00 2001 From: Johnson Mao <86179381+JohnsonMao@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:37:08 +0800 Subject: [PATCH] Fix/search group (#95) * fix: search group parameters * fix: create group login redirect * remove: unused file --- components/Group/Form/useGroupForm.jsx | 2 +- components/Group/SearchField/SearchInput.jsx | 6 +++--- functions/hello.js | 16 ---------------- redux/sagas/groupSaga.js | 13 ++++++++----- 4 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 functions/hello.js diff --git a/components/Group/Form/useGroupForm.jsx b/components/Group/Form/useGroupForm.jsx index 502ae9f1..96394719 100644 --- a/components/Group/Form/useGroupForm.jsx +++ b/components/Group/Form/useGroupForm.jsx @@ -143,7 +143,7 @@ export default function useGroupForm() { }; useEffect(() => { - if (notLogin) openLoginWindow('/login'); + if (notLogin) openLoginWindow(); }, [notLogin]); return { diff --git a/components/Group/SearchField/SearchInput.jsx b/components/Group/SearchField/SearchInput.jsx index 1a70d086..ff374b58 100644 --- a/components/Group/SearchField/SearchInput.jsx +++ b/components/Group/SearchField/SearchInput.jsx @@ -54,7 +54,7 @@ const SearchInput = () => { const [getSearchParams, pushState] = useSearchParamsManager(); const [keyword, setKeyword] = useState(''); const [isSpeechMode, setIsSpeechMode] = useState(false); - const currentKeyword = getSearchParams('q').toString(); + const currentKeyword = getSearchParams('search').toString(); useEffect(() => { setKeyword(currentKeyword); @@ -67,7 +67,7 @@ const SearchInput = () => { /** @type {(event: SubmitEvent) => void} */ const handleSubmit = (event) => { event.preventDefault(); - pushState('q', keyword); + pushState('search', keyword); }; return ( @@ -75,7 +75,7 @@ const SearchInput = () => { { - return new Response("Hello, world!"); -}; - -// POST requests to /filename with a JSON-encoded body would return "Hello, !" -export const onRequestPost = async ({ request }) => { - const { name } = await request.json(); - return new Response(`Hello, ${name}!`); -}; - -// export default async function handler(req = {}, res) { -// const result = await getVector(req); -// res.setHeader("Cache-Control", "private, max-age=0"); -// res.status(200).json(result?.getVector || result); -// } diff --git a/redux/sagas/groupSaga.js b/redux/sagas/groupSaga.js index 159e88b6..2e122183 100644 --- a/redux/sagas/groupSaga.js +++ b/redux/sagas/groupSaga.js @@ -23,7 +23,7 @@ function* getGroupItems() { category: CATEGORIES, partnerEducationStep: EDUCATION_STEP, isGrouping: true, - q: true, + search: true, }; Object.keys(searchParamsOptions).forEach((key) => { @@ -33,10 +33,13 @@ function* getGroupItems() { if (!searchParam || !option) return; if (Array.isArray(option)) { - urlSearchParams.append(key, searchParam - .split(',') - .filter((item) => option.some((option) => option.label === item)) - .join(',')) + urlSearchParams.append( + key, + searchParam + .split(',') + .filter((item) => option.some((_option) => _option.label === item)) + .join(','), + ); } else { urlSearchParams.append(key, searchParam); }