Skip to content

fix issue_1788 #1871

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
gondzo merged 1 commit into from
Mar 18, 2018
Merged

fix issue_1788 #1871

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
7 changes: 4 additions & 3 deletions src/projects/list/components/Projects/ProjectsCardView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require('./ProjectsGridView.scss')
const ProjectsCardView = props => {
//const { projects, members, totalCount, criteria, pageNum, applyFilters, sortHandler, onPageChange, error, isLoading, onNewProjectIntent } = props
// TODO: use applyFilters and onNewProjectIntent. Temporary delete to avoid lint errors.
const { projects, members, currentUser, onPageChange, pageNum, totalCount, infiniteAutoload, setInfiniteAutoload, isLoading, projectsStatus, onChangeStatus } = props
const { projects, members, currentUser, onPageChange, pageNum, totalCount, infiniteAutoload, setInfiniteAutoload, isLoading, onChangeStatus } = props
// const currentSortField = _.get(criteria, 'sort', '')

// annotate projects with member data
Expand Down Expand Up @@ -63,8 +63,9 @@ const ProjectsCardView = props => {
{ [...projects, ...placeholders].map(renderProject)}
<div className="project-card"><NewProjectCard /></div>
</InfiniteScroll>
{ !isLoading && !infiniteAutoload && hasMore && <button type="button" className="tc-btn tc-btn-primary" onClick={handleLoadMore} key="loadMore">Load more projects</button>}
{ !isLoading && !hasMore && <span key="end">No more {projectsStatus} projects</span>}
{ hasMore ?
!isLoading && !infiniteAutoload && <button type="button" className="tc-btn tc-btn-primary" onClick={handleLoadMore} key="loadMore">Load more projects</button>
: !isLoading && !infiniteAutoload && <button type="button" className="tc-btn tc-btn-primary" onClick={handleLoadMore} key="loadMore" disabled>Load more projects</button>}
</div>
)
}
Expand Down