From 877df73ea5e99e2af8c8a2c39da293f2541ef80f Mon Sep 17 00:00:00 2001 From: Taehee Choi Date: Fri, 25 Mar 2022 00:11:51 -0700 Subject: [PATCH] filter now uses includes --- src/components/home/CallFavouritesDialog.tsx | 54 +++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/src/components/home/CallFavouritesDialog.tsx b/src/components/home/CallFavouritesDialog.tsx index df25dff..63ee88a 100644 --- a/src/components/home/CallFavouritesDialog.tsx +++ b/src/components/home/CallFavouritesDialog.tsx @@ -30,10 +30,7 @@ const CallFavouritesDialog: React.FC = ({ onClose, users, }: Props) => { - const handleClose = () => { - console.log(users); - console.log(selectedValue); onClose(selectedValue); }; @@ -45,7 +42,7 @@ const CallFavouritesDialog: React.FC = ({ if (checked) { setCheckedUuids(checkedUuids.concat([uuid])); } else { - setCheckedUuids(checkedUuids.filter(id => id != uuid)); + setCheckedUuids(checkedUuids.filter((id) => id != uuid)); } }; @@ -56,7 +53,7 @@ const CallFavouritesDialog: React.FC = ({ const favoritesUuids = useAppSelector(selectFavorites); const teamUuids = useAppSelector(selectTeam); - const groupMembersUuids: string[] = + const groupMembersUuids: string[] = group === "Favorites" ? favoritesUuids : teamUuids; const groupMembers = useAppSelector((state) => selectUsers(state, groupMembersUuids) @@ -66,7 +63,11 @@ const CallFavouritesDialog: React.FC = ({ Select who to call: - + = ({ sx={{ pb: 1 }} onChange={(e) => { setInputText(e.target.value); - }} + }} /> - {groupMembers.filter(member => ( - member.name.toLowerCase().slice(0, inputText.length) == inputText.toLowerCase().slice(0, inputText.length) - )).map(member => ( - { - handleCheck(member.uuid, e.target.checked); - }} - control={ - - } - /> - ))} + {groupMembers + .filter((member) => + member.name.toLowerCase().includes(inputText.toLowerCase()) + ) + .map((member) => ( + { + handleCheck(member.uuid, e.target.checked); + }} + control={ + + } + /> + ))}