From 17b97aa10aa606c08f525876eaf6436b8bad89fe Mon Sep 17 00:00:00 2001
From: Vikas Agarwal <vikas.agarwal@topcoder.com>
Date: Tue, 27 Dec 2016 15:35:50 +0530
Subject: [PATCH] Github issue #372, [Pagination] - keep fixed pagination
 option displaying 5 pages. -- Fixed issue for the case when incorrect results
 were being shown when user hits browser back button after navigating the list
 pages via paginator -- CSS fix as suggested in Github -- Applied light theme
 for the tooltip

---
 src/components/Grid/GridView.scss             |  1 -
 src/components/Grid/PaginationBar.jsx         |  6 ++++--
 .../list/components/Projects/Projects.jsx     | 20 ++++++++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/Grid/GridView.scss b/src/components/Grid/GridView.scss
index ce37a3fcb..219e736ed 100644
--- a/src/components/Grid/GridView.scss
+++ b/src/components/Grid/GridView.scss
@@ -496,7 +496,6 @@
       }
 
       &.go-to-page-pill {
-        // position: inherit;
         .tooltip-target {
           min-width: 27px;
           height: 28px;
diff --git a/src/components/Grid/PaginationBar.jsx b/src/components/Grid/PaginationBar.jsx
index 633c69415..b25face23 100644
--- a/src/components/Grid/PaginationBar.jsx
+++ b/src/components/Grid/PaginationBar.jsx
@@ -37,8 +37,8 @@ const GoToPagePill = ({minPage, maxPage, onPageClick}) => {
   }
   return (
     <li className="go-to-page-pill">
-      <Tooltip popMethod="click">
-        <div className="tooltip-target"><span>...</span></div>
+      <Tooltip popMethod="click" theme="light">
+        <div className="tooltip-target"><a href="javascript:">...</a></div>
         <div className="tooltip-body">
           <div className="go-to-page-tooltip">Go to page: <input type="number" min={minPage} max={maxPage} onKeyUp={handleChange} /></div>
         </div>
@@ -130,6 +130,7 @@ const PaginationBar = enhance(({onPageChange, currentPageNum, totalCount, pageSi
       pagePills.splice(1,
         0,
         <GoToPagePill
+          key="goToPagePill-1"
           onPageClick={ handlePageSelection }
           minPage={currentPageNum - pagesBeforeCurrent + remainingPillsLeft }
           maxPage={currentPageNum}
@@ -141,6 +142,7 @@ const PaginationBar = enhance(({onPageChange, currentPageNum, totalCount, pageSi
       pagePills.splice(pagePills.length - 1,
         0, 
         <GoToPagePill
+          key="goToPagePill-2"
           onPageClick={ handlePageSelection }
           minPage={currentPageNum}
           maxPage={ currentPageNum + pagesAfterCurrent - remainingPillsRight}
diff --git a/src/projects/list/components/Projects/Projects.jsx b/src/projects/list/components/Projects/Projects.jsx
index a3555cd21..5c473e73d 100755
--- a/src/projects/list/components/Projects/Projects.jsx
+++ b/src/projects/list/components/Projects/Projects.jsx
@@ -12,6 +12,7 @@ class Projects extends Component {
     this.sortHandler = this.sortHandler.bind(this)
     this.onPageChange = this.onPageChange.bind(this)
     this.applyFilters = this.applyFilters.bind(this)
+    this.init = this.init.bind(this)
   }
 
   componentDidUpdate() {
@@ -23,13 +24,26 @@ class Projects extends Component {
     window.sessionStorage.setItem('projectsPageScrollTop', scrollingElement.scrollTop)
   }
 
+  componentWillReceiveProps(nextProps) {
+    console.log(nextProps)
+    const prevQueryParams = _.get(this.props, 'location.query', null)
+    const queryParams = _.get(nextProps, 'location.query', null)
+    if (!_.isEqual(prevQueryParams, queryParams)) {
+      this.init(nextProps)
+    }
+  }
+
   componentWillMount() {
+    this.init(this.props)
+  }
+
+  init(props) {
     document.title = 'Projects - Topcoder'
     // this.searchTermFromQuery = this.props.location.query.q || ''
-    const {criteria, loadProjects} = this.props
-    let pageNum = this.props.pageNum
+    const {criteria, loadProjects} = props
+    let pageNum = props.pageNum
     // check for criteria specified in URL.
-    const queryParams = _.get(this.props, 'location.query', null)
+    const queryParams = _.get(props, 'location.query', null)
     if (!_.isEmpty(queryParams)) {
       const initialCriteria = {}
       if (queryParams.sort) initialCriteria.sort = queryParams.sort