Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

fixes issue#66 #568

Merged
merged 4 commits into from
Jul 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion client/src/pages/Search/Global.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,19 @@ export default function SearchGlobal({ keyword }) {
setWindowWidth(window.innerWidth);
};

/**
* Sets the new page number and gets the new set of users
* @param {Number} newPageNumber The new page number
*/
const onChangePage = async (newPageNumber) => {
if (window) {
window.scrollTo({
top: 0,
});
}
searchContext.changePageNumber(newPageNumber);
};

const onWholeContentClick = (evt) => {
if (dropdownRef.current && !dropdownRef.current.contains(evt.target)) {
setSortByDropdownShown(false);
Expand Down Expand Up @@ -346,7 +359,11 @@ export default function SearchGlobal({ keyword }) {
})}
</div>
<div>
<Pagination currentPage={page} numPages={totalPages} />
<Pagination
currentPage={page}
numPages={totalPages}
onChangePage={onChangePage}
/>
</div>
</div>
)}
Expand Down
5 changes: 5 additions & 0 deletions client/src/pages/Search/Groups.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ export default function SearchGroups() {
* @param {Number} newPageNumber The new page number
*/
const onChangePage = async (newPageNumber) => {
if (window) {
window.scrollTo({
top: 0,
});
}
setPage(newPageNumber);
await getMembersInGroup(selectedGroup.id, newPageNumber);
};
Expand Down
5 changes: 1 addition & 4 deletions client/src/services/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ export default () => {
await loginWithRedirect({
redirect_uri: window.location.origin,
});
} else if (
error.response &&
error.response.data.message
) {
} else if (error.response && error.response.data.message) {
const modError = new Error(error.response.data.message);
return Promise.reject(modError);
}
Expand Down