twhelp/version.tribalwarshelp.com
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3 from tribalwarshelp/SearchPage-dont-show-servers-from-other-version

Browse Source 
[ServerPage] don't show servers from other versions
This commit is contained in:
Dawid Wysokiński 2021-01-06 18:14:27 +01:00 committed by GitHub
commit 67ea80d9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/features/SearchPage/components/ServerTable/ServerTable.tsx
View File

@ -16,6 +16,7 @@ export interface Props {
page: number;
limit: number;
q: string;
version: string;
onChangePage: TableFooterProps['onChangePage'];
onChangeRowsPerPage: TableFooterProps['onChangeRowsPerPage'];
}
@ -27,8 +28,9 @@ function ServerTable({
page,
onChangePage,
onChangeRowsPerPage,
version,
}: Props) {
const { servers, total, loading } = useServers(page, limit, q);
const { servers, total, loading } = useServers(version, page, limit, q);
return (
<Table

8
src/features/SearchPage/components/ServerTable/useServers.ts
View File

@ -10,7 +10,12 @@ export type QueryResult = {
total: number;
};
const useServers = (page: number, limit: number, q: string): QueryResult => {
const useServers = (
version: string,
page: number,
limit: number,
q: string
): QueryResult => {
const skip = q.trim() === '';
const { loading: loadingServers, data } = useQuery<
ServerList,
@ -22,6 +27,7 @@ const useServers = (page: number, limit: number, q: string): QueryResult => {
offset: page * limit,
sort: ['status DESC', 'key ASC'],
filter: {
versionCode: [version],
keyIEQ: '%' + q + '%',
},
},