From acbc7607126bfbd700258895e5d7d40b1b26f9c1 Mon Sep 17 00:00:00 2001 From: SolMon9099 Date: Mon, 21 Apr 2025 22:04:07 +0800 Subject: [PATCH] change find mentee page --- frontend/src/components/pages/MenteeGallery.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/pages/MenteeGallery.js b/frontend/src/components/pages/MenteeGallery.js index fb23c2b79..3721b4d5a 100644 --- a/frontend/src/components/pages/MenteeGallery.js +++ b/frontend/src/components/pages/MenteeGallery.js @@ -40,7 +40,7 @@ function Gallery(props) { const location = useLocation(); const [pageLoaded, setPageLoaded] = useState(false); const [allPartners, setAllPartners] = useState([]); - const [selectedPartnerID, setSelectedPartnerID] = useState(undefined); + const [selectedPartnerOrg, setSelectedPartnerOrg] = useState(undefined); const verified = location.state && location.state.verified; const user = useSelector((state) => state.user.user); useEffect(() => { @@ -110,7 +110,9 @@ function Gallery(props) { var temp = []; all_data.map((item) => { temp.push({ - value: item.id ? item.id : item._id["$oid"], + // value: item.id ? item.id : item._id["$oid"], + value: + item.organization + "_" + (item.id ? item.id : item._id["$oid"]), label: item.organization, }); return false; @@ -133,8 +135,12 @@ function Gallery(props) { interests.length === 0 || interests.some((l) => specializs.indexOf(l) >= 0); const matchPartner = - !selectedPartnerID || - (mentee.pair_partner && mentee.pair_partner.id === selectedPartnerID); + !selectedPartnerOrg || + selectedPartnerOrg.length === 0 || + (mentee.pair_partner && + selectedPartnerOrg.includes( + mentee.pair_partner.organization + "_" + mentee.pair_partner.id + )); return matchesLanguages && matchesName && matchInterests && matchPartner; }); }; @@ -165,7 +171,7 @@ function Gallery(props) {