Merge pull request #3 from tribalwarshelp/SearchPage-dont-show-servers-from-other-version
[ServerPage] don't show servers from other versions
This commit is contained in:
commit
67ea80d9f4
|
@ -16,6 +16,7 @@ export interface Props {
|
||||||
page: number;
|
page: number;
|
||||||
limit: number;
|
limit: number;
|
||||||
q: string;
|
q: string;
|
||||||
|
version: string;
|
||||||
onChangePage: TableFooterProps['onChangePage'];
|
onChangePage: TableFooterProps['onChangePage'];
|
||||||
onChangeRowsPerPage: TableFooterProps['onChangeRowsPerPage'];
|
onChangeRowsPerPage: TableFooterProps['onChangeRowsPerPage'];
|
||||||
}
|
}
|
||||||
|
@ -27,8 +28,9 @@ function ServerTable({
|
||||||
page,
|
page,
|
||||||
onChangePage,
|
onChangePage,
|
||||||
onChangeRowsPerPage,
|
onChangeRowsPerPage,
|
||||||
|
version,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const { servers, total, loading } = useServers(page, limit, q);
|
const { servers, total, loading } = useServers(version, page, limit, q);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table
|
<Table
|
||||||
|
|
|
@ -10,7 +10,12 @@ export type QueryResult = {
|
||||||
total: number;
|
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 skip = q.trim() === '';
|
||||||
const { loading: loadingServers, data } = useQuery<
|
const { loading: loadingServers, data } = useQuery<
|
||||||
ServerList,
|
ServerList,
|
||||||
|
@ -22,6 +27,7 @@ const useServers = (page: number, limit: number, q: string): QueryResult => {
|
||||||
offset: page * limit,
|
offset: page * limit,
|
||||||
sort: ['status DESC', 'key ASC'],
|
sort: ['status DESC', 'key ASC'],
|
||||||
filter: {
|
filter: {
|
||||||
|
versionCode: [version],
|
||||||
keyIEQ: '%' + q + '%',
|
keyIEQ: '%' + q + '%',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
Reference in New Issue
Block a user