Merge pull request #5197 from naturalcrit/cleanup-Listpage

Make `updateUrl()` in `listPage` only update Url
This commit is contained in:
Trevor Buckner
2026-11-18 17:30:56 -05:00
committed by GitHub
3 changed files with 30 additions and 36 deletions
+1
View File
@@ -17,6 +17,7 @@ const WithRoute = ({ el: Element, ...rest })=>{
const params = useParams(); const params = useParams();
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
const queryParams = Object.fromEntries(searchParams?.entries() || []); const queryParams = Object.fromEntries(searchParams?.entries() || []);
queryParams.tag = searchParams.getAll('tag');
return <Element {...rest} {...params} query={queryParams} />; return <Element {...rest} {...params} query={queryParams} />;
}; };
@@ -37,8 +37,6 @@ const BrewItem = ({
}); });
}, [brew, reportError]); }, [brew, reportError]);
const updateFilter = useCallback((type, term)=>updateListFilter(type, term), [updateListFilter]);
const renderDeleteBrewLink = ()=>{ const renderDeleteBrewLink = ()=>{
if(!brew.editId) return null; if(!brew.editId) return null;
@@ -132,7 +130,7 @@ const BrewItem = ({
<i className='fas fa-tags' /> <i className='fas fa-tags' />
{brew.tags.map((tag, idx)=>{ {brew.tags.map((tag, idx)=>{
const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
return <span key={idx} className={matches[1]} onClick={()=>updateFilter(tag)}>{matches[2]}</span>; return <span key={idx} className={matches[1]} onClick={()=>updateListFilter(tag)}>{matches[2]}</span>;
})} })}
</div> </div>
) : null} ) : null}
@@ -19,7 +19,7 @@ const DEFAULT_THEME_MODE = 'light';
const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navItems = <></>, reportError = null, query })=>{ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navItems = <></>, reportError = null, query })=>{
const [filterString, setFilterString] = useState(query?.filter || ''); const [filterString, setFilterString] = useState(query?.filter || '');
const [filterTags, setFilterTags] = useState([]); const [filterTags, setFilterTags] = useState(query?.tag || []);
const [sortType, setSortType] = useState(query?.sort || null); const [sortType, setSortType] = useState(query?.sort || null);
const [sortDir, setSortDir] = useState(query?.dir || null); const [sortDir, setSortDir] = useState(query?.dir || null);
const [groupVisibility, setGroupVisibility] = useState({}); const [groupVisibility, setGroupVisibility] = useState({});
@@ -31,7 +31,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
const newSortType = sortType ?? (localStorage.getItem(USERPAGE_SORT_TYPE) || DEFAULT_SORT_TYPE); const newSortType = sortType ?? (localStorage.getItem(USERPAGE_SORT_TYPE) || DEFAULT_SORT_TYPE);
const newSortDir = sortDir ?? (localStorage.getItem(USERPAGE_SORT_DIR) || DEFAULT_SORT_DIR); const newSortDir = sortDir ?? (localStorage.getItem(USERPAGE_SORT_DIR) || DEFAULT_SORT_DIR);
updateUrl(filterString, newSortType, newSortDir); updateUrl(filterString, newSortType, newSortDir, filterTags);
const namedBrewCollection = brewCollection.reduce((visibility, brewGroup)=>{ const namedBrewCollection = brewCollection.reduce((visibility, brewGroup)=>{
visibility[brewGroup.class] = (localStorage.getItem(`${USERPAGE_GROUP_VISIBILITY_PREFIX}_${brewGroup.class}`) ?? 'true') == 'true'; visibility[brewGroup.class] = (localStorage.getItem(`${USERPAGE_GROUP_VISIBILITY_PREFIX}_${brewGroup.class}`) ?? 'true') == 'true';
@@ -57,9 +57,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
key={idx} key={idx}
reportError={reportError} reportError={reportError}
theme={themeMode} theme={themeMode}
updateListFilter={(tag)=>{ updateListFilter={handleFilterTagChange}
updateUrl(filterString, sortType, sortDir, tag);
}}
/> />
)); ));
}; };
@@ -72,7 +70,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
}; };
const handleSortOptionChange = (event)=>{ const handleSortOptionChange = (event)=>{
updateUrl(filterString, event.target.value, sortDir); updateUrl(filterString, event.target.value, sortDir, filterTags);
setSortType(event.target.value); setSortType(event.target.value);
localStorage.setItem(USERPAGE_SORT_TYPE, event.target.value); localStorage.setItem(USERPAGE_SORT_TYPE, event.target.value);
return; return;
@@ -81,7 +79,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
const handleSortDirChange = (event)=>{ const handleSortDirChange = (event)=>{
const newDir = sortDir == 'asc' ? 'desc' : 'asc'; const newDir = sortDir == 'asc' ? 'desc' : 'asc';
updateUrl(filterString, sortType, newDir); updateUrl(filterString, sortType, newDir, filterTags);
setSortDir(newDir); setSortDir(newDir);
localStorage.setItem(USERPAGE_SORT_DIR, newDir); localStorage.setItem(USERPAGE_SORT_DIR, newDir);
return; return;
@@ -100,40 +98,39 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
const handleFilterTextChange = (e)=>{ const handleFilterTextChange = (e)=>{
setFilterString(e.target.value); setFilterString(e.target.value);
updateUrl(e.target.value, sortType, sortDir); updateUrl(e.target.value, sortType, sortDir, filterTags);
return; return;
}; };
const updateUrl = (filterTerm, sortType, sortDir, filterTag = '')=>{ const handleFilterTagChange = (newTag)=>{
let newFilterTags;
const alreadyExists = filterTags.some((t)=>t.toLowerCase() == newTag.toLowerCase());
if(alreadyExists)
newFilterTags = filterTags.filter((t)=>t.toLowerCase() != newTag.toLowerCase());
else
newFilterTags = [...filterTags, newTag];
newFilterTags.sort((a, b)=>{
return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase());
});
setFilterTags(newFilterTags);
updateUrl(filterString, sortType, sortDir, newFilterTags);
};
const updateUrl = (filterTerm, sortType, sortDir, filterTags)=>{
const url = new URL(window.location.href); const url = new URL(window.location.href);
const urlParams = new URLSearchParams(url.search); const urlParams = new URLSearchParams(url.search);
urlParams.set('sort', sortType); urlParams.set('sort', sortType);
urlParams.set('dir', sortDir); urlParams.set('dir', sortDir);
let filterTags = urlParams.getAll('tag'); // Add tags to URL in alphabetical order
if(filterTag != '') {
if(
filterTags.findIndex((tag)=>{
return tag.toLowerCase() == filterTag.toLowerCase();
}) == -1
) {
filterTags.push(filterTag);
} else {
filterTags = filterTags.filter((tag)=>{
return tag.toLowerCase() != filterTag.toLowerCase();
});
}
}
urlParams.delete('tag'); urlParams.delete('tag');
// Add tags to URL in the order they were clicked
filterTags.forEach((tag)=>urlParams.append('tag', tag)); filterTags.forEach((tag)=>urlParams.append('tag', tag));
// Sort tags before updating state
filterTags.sort((a, b)=>{
return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase());
});
setFilterTags(filterTags);
if(!filterTerm) urlParams.delete('filter'); if(!filterTerm) urlParams.delete('filter');
else urlParams.set('filter', filterTerm); else urlParams.set('filter', filterTerm);
@@ -164,9 +161,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
<span <span
key={idx} key={idx}
className={matches[1]} className={matches[1]}
onClick={()=>{ onClick={()=>handleFilterTagChange(tag)}>
updateUrl(filterString, sortType, sortDir, tag);
}}>
{matches[2]} {matches[2]}
</span> </span>
); );