Merge pull request #568 from topcoder-platform/issues/timor/66

fixes issue#66

Author: callmekatootie

client/src/pages/Search/Global.jsx

@@ -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);
@@ -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>
       )}

client/src/pages/Search/Groups.jsx

@@ -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);
   };

client/src/services/api.js

@@ -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);
       }