mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-19 05:08:15 +00:00
Merge pull request #5194 from naturalcrit/cleanup-Listpage
Simplify tag filtering logic on listpage
This commit is contained in:
@@ -202,18 +202,10 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
|
|||||||
const filterTextTest = brewStrings.includes(testString);
|
const filterTextTest = brewStrings.includes(testString);
|
||||||
|
|
||||||
// Filter by user selected tags
|
// Filter by user selected tags
|
||||||
let filterTagTest = true;
|
const filterTagTest = filterTags.every((tag)=>{
|
||||||
if(filterTags.length > 0) {
|
Array.isArray(brew.tags) && //TODO: brew.tags should be converted to array at load so we don't have to catch it here
|
||||||
filterTagTest =
|
brew.tags.some((brewTag)=>brewTag.toLowerCase() == tag.toLowerCase())}
|
||||||
Array.isArray(brew.tags) &&
|
|
||||||
filterTags?.every((tag)=>{
|
|
||||||
return (
|
|
||||||
brew.tags.findIndex((brewTag)=>{
|
|
||||||
return brewTag.toLowerCase() == tag.toLowerCase();
|
|
||||||
}) >= 0
|
|
||||||
);
|
);
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return filterTextTest && filterTagTest;
|
return filterTextTest && filterTagTest;
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user