qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-12-22 18:22:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bugfix] use match-sorter for filtering domain blocks (#1270)

Browse source
This commit is contained in:
f0x52 2022-12-16 12:19:58 +01:00 committed by GitHub
parent 1d24c1c283
commit 2b0342b231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
web/source/settings/admin/federation.js
View file

@ -31,6 +31,7 @@ const adminActions = require("../redux/reducers/admin").actions;
const submit = require("../lib/submit"); const submit = require("../lib/submit");
const BackButton = require("../components/back-button"); const BackButton = require("../components/back-button");
const Loading = require("../components/loading"); const Loading = require("../components/loading");
const { matchSorter } = require("match-sorter");
const base = "/settings/admin/federation"; const base = "/settings/admin/federation";
@ -79,6 +80,10 @@ function InstanceOverview() {
const blockedInstances = Redux.useSelector(state => state.admin.blockedInstances); const blockedInstances = Redux.useSelector(state => state.admin.blockedInstances);
const [_location, setLocation] = useLocation(); const [_location, setLocation] = useLocation();
const filteredInstances = React.useMemo(() => {
return matchSorter(Object.values(blockedInstances), filter, {keys: ["domain"]});
}, [blockedInstances, filter]);
function filterFormSubmit(e) { function filterFormSubmit(e) {
e.preventDefault(); e.preventDefault();
setLocation(`${base}/${filter}`); setLocation(`${base}/${filter}`);
@ -96,7 +101,7 @@ function InstanceOverview() {
<Link to={`${base}/${filter}`}><a className="button">Add block</a></Link> <Link to={`${base}/${filter}`}><a className="button">Add block</a></Link>
</form> </form>
<div className="list"> <div className="list">
{Object.values(blockedInstances).filter((a) => a.domain.startsWith(filter)).map((entry) => { {filteredInstances.map((entry) => {
return ( return (
<Link key={entry.domain} to={`${base}/${entry.domain}`}> <Link key={entry.domain} to={`${base}/${entry.domain}`}>
<a className="entry nounderline"> <a className="entry nounderline">