fix: Allow querying users with latin extended chars
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import invariant from "invariant";
|
import invariant from "invariant";
|
||||||
|
import deburr from "lodash/deburr";
|
||||||
import differenceWith from "lodash/differenceWith";
|
import differenceWith from "lodash/differenceWith";
|
||||||
import filter from "lodash/filter";
|
import filter from "lodash/filter";
|
||||||
import orderBy from "lodash/orderBy";
|
import orderBy from "lodash/orderBy";
|
||||||
@@ -276,9 +277,6 @@ export default class UsersStore extends Store<User> {
|
|||||||
this.activeOrInvited,
|
this.activeOrInvited,
|
||||||
(user) => !userIds.includes(user.id)
|
(user) => !userIds.includes(user.id)
|
||||||
);
|
);
|
||||||
if (!query) {
|
|
||||||
return users;
|
|
||||||
}
|
|
||||||
return queriedUsers(users, query);
|
return queriedUsers(users, query);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -291,9 +289,6 @@ export default class UsersStore extends Store<User> {
|
|||||||
const users = filter(this.activeOrInvited, (user) =>
|
const users = filter(this.activeOrInvited, (user) =>
|
||||||
userIds.includes(user.id)
|
userIds.includes(user.id)
|
||||||
);
|
);
|
||||||
if (!query) {
|
|
||||||
return users;
|
|
||||||
}
|
|
||||||
return queriedUsers(users, query);
|
return queriedUsers(users, query);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -307,9 +302,6 @@ export default class UsersStore extends Store<User> {
|
|||||||
this.activeOrInvited,
|
this.activeOrInvited,
|
||||||
(user) => !userIds.includes(user.id)
|
(user) => !userIds.includes(user.id)
|
||||||
);
|
);
|
||||||
if (!query) {
|
|
||||||
return users;
|
|
||||||
}
|
|
||||||
return queriedUsers(users, query);
|
return queriedUsers(users, query);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -322,9 +314,6 @@ export default class UsersStore extends Store<User> {
|
|||||||
const users = filter(this.activeOrInvited, (user) =>
|
const users = filter(this.activeOrInvited, (user) =>
|
||||||
userIds.includes(user.id)
|
userIds.includes(user.id)
|
||||||
);
|
);
|
||||||
if (!query) {
|
|
||||||
return users;
|
|
||||||
}
|
|
||||||
return queriedUsers(users, query);
|
return queriedUsers(users, query);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -341,8 +330,12 @@ export default class UsersStore extends Store<User> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function queriedUsers(users: User[], query: string) {
|
function queriedUsers(users: User[], query?: string) {
|
||||||
return filter(users, (user) =>
|
return query
|
||||||
user.name.toLowerCase().includes(query.toLowerCase())
|
? filter(users, (user) =>
|
||||||
);
|
deburr(user.name.toLocaleLowerCase()).includes(
|
||||||
|
deburr(query.toLocaleLowerCase())
|
||||||
|
)
|
||||||
|
)
|
||||||
|
: users;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user