mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-14 17:12:40 +00:00
Switch to case-insensitive tag comparison
This commit is contained in:
@@ -207,22 +207,28 @@ const ListPage = createClass({
|
|||||||
const testString = _.deburr(this.state.filterString).toLowerCase();
|
const testString = _.deburr(this.state.filterString).toLowerCase();
|
||||||
|
|
||||||
brews = _.filter(brews, (brew)=>{
|
brews = _.filter(brews, (brew)=>{
|
||||||
|
// Filter by user entered text
|
||||||
const brewStrings = _.deburr([
|
const brewStrings = _.deburr([
|
||||||
brew.title,
|
brew.title,
|
||||||
brew.description,
|
brew.description,
|
||||||
brew.tags].join('\n')
|
brew.tags].join('\n')
|
||||||
.toLowerCase());
|
.toLowerCase());
|
||||||
|
|
||||||
return brewStrings.includes(testString);
|
const filterTextTest = brewStrings.includes(testString);
|
||||||
});
|
|
||||||
|
|
||||||
if(this.state.filterTags.length > 0) {
|
// Filter by user selected tags
|
||||||
brews = _.filter(brews, (brew)=>{
|
let filterTagTest = true;
|
||||||
return this.state.filterTags.every((tag)=>{
|
if(this.state.filterTags.length > 0){
|
||||||
return brew.tags?.includes(tag);
|
filterTagTest = this.state.filterTags.every((tag)=>{
|
||||||
|
if(typeof brew.tags == 'string') return false;
|
||||||
|
return brew.tags.findIndex((brewTag)=>{
|
||||||
|
return brewTag.toLowerCase() == tag.toLowerCase();
|
||||||
|
}) >= 0;
|
||||||
});
|
});
|
||||||
});
|
}
|
||||||
}
|
|
||||||
|
return filterTextTest && filterTagTest;
|
||||||
|
});
|
||||||
|
|
||||||
return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
|
return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user