diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js index 1d672aafb1..aa42e1846c 100644 --- a/scm-ui/src/repos/containers/Overview.js +++ b/scm-ui/src/repos/containers/Overview.js @@ -36,7 +36,7 @@ type Props = { // dispatched functions fetchRepos: string => void, - fetchReposByPage: (string, number) => void, + fetchReposByPage: (link: string, page: number, filter?: string) => void, fetchReposByLink: string => void, // context props @@ -71,6 +71,9 @@ class Overview extends React.Component { subtitle={t("overview.subtitle")} loading={loading} error={error} + filter={filter => { + this.props.fetchReposByPage(this.props.reposLink, this.props.page, filter); + }} > {this.renderList()} {this.renderPageActionCreateButton()} @@ -151,8 +154,8 @@ const mapDispatchToProps = dispatch => { fetchRepos: (link: string) => { dispatch(fetchRepos(link)); }, - fetchReposByPage: (link: string, page: number) => { - dispatch(fetchReposByPage(link, page)); + fetchReposByPage: (link: string, page: number, filter?: string) => { + dispatch(fetchReposByPage(link, page, filter)); }, fetchReposByLink: (link: string) => { dispatch(fetchReposByLink(link)); diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js index fa89dc42a6..cd48f89fea 100644 --- a/scm-ui/src/repos/modules/repos.js +++ b/scm-ui/src/repos/modules/repos.js @@ -46,7 +46,12 @@ export function fetchRepos(link: string) { return fetchReposByLink(link); } -export function fetchReposByPage(link: string, page: number) { +export function fetchReposByPage(link: string, page: number, filter?: string) { + if (filter) { + return fetchReposByLink( + `${link}?page=${page - 1}&q=${decodeURIComponent(filter)}` + ); + } return fetchReposByLink(`${link}?page=${page - 1}`); } diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js index c7d5412209..c83a4d9b94 100644 --- a/scm-ui/src/users/modules/users.js +++ b/scm-ui/src/users/modules/users.js @@ -45,10 +45,12 @@ export function fetchUsers(link: string) { export function fetchUsersByPage(link: string, page: number, filter?: string) { // backend start counting by 0 - if(filter) { - return fetchUsersByLink(link + "?page=" + (page - 1) + "&q=" + decodeURIComponent(filter)); + if (filter) { + return fetchUsersByLink( + `${link}?page=${page - 1}&q=${decodeURIComponent(filter)}` + ); } - return fetchUsersByLink(link + "?page=" + (page - 1)); + return fetchUsersByLink(`${link}?page=${page - 1}`); } export function fetchUsersByLink(link: string) { @@ -156,9 +158,7 @@ export function createUser(link: string, user: User, callback?: () => void) { callback(); } }) - .catch(error => - dispatch(createUserFailure(error)) - ); + .catch(error => dispatch(createUserFailure(error))); }; }