Skip to content

Github issue #372, [Pagination] - keep fixed pagination option displaying 5 pages. #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 1 commit into from
Dec 27, 2016
Merged

Github issue #372, [Pagination] - keep fixed pagination option displaying 5 pages. #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/components/Grid/GridView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@
}

&.go-to-page-pill {
// position: inherit;
.tooltip-target {
min-width: 27px;
height: 28px;
Expand Down
6 changes: 4 additions & 2 deletions src/components/Grid/PaginationBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down
20 changes: 17 additions & 3 deletions src/projects/list/components/Projects/Projects.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
Expand Down