Skip to content

Commit 3f9f197

Browse files
author
Vikas Agarwal
committed
Github issue #320 [Search] - when filters are hide don't take them into consideration
-- Better way to handle the criteria change. Earlier it was modifying the criteria from the props which was causing no change in state even if we are dispatching and handling GET_PROJECTS_SEARCH_CRITERIA action.
1 parent 436b950 commit 3f9f197

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/components/TopBar/TopBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class TopBar extends Component {
9595
if (isProjectDetails) {
9696
return <ProjectToolBar isPowerUser={isPowerUser} logo={logo} avatar={avatar} project={project} />
9797
}
98-
const noOfFilters = _.keys(criteria).length - 1
98+
const noOfFilters = _.keys(criteria).length - 1 // -1 for default sort criteria
9999

100100
return (
101101
// <Sticky>

src/projects/list/components/Projects/Projects.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ class Projects extends Component {
2222
// check for criteria specified in URL.
2323
const queryParams = _.get(this.props, 'location.query', null)
2424
if (!_.isEmpty(queryParams)) {
25-
if (queryParams.sort) criteria.sort = queryParams.sort
26-
if (queryParams.name) criteria.name = decodeURIComponent(queryParams.name)
27-
if (queryParams.status) criteria.status = queryParams.status
28-
if (queryParams.type) criteria.type = queryParams.type
29-
if (queryParams.memberOnly) criteria.memberOnly = queryParams.memberOnly
25+
const initialCriteria = {}
26+
if (queryParams.sort) initialCriteria.sort = queryParams.sort
27+
if (queryParams.name) initialCriteria.name = decodeURIComponent(queryParams.name)
28+
if (queryParams.status) initialCriteria.status = queryParams.status
29+
if (queryParams.type) initialCriteria.type = queryParams.type
30+
if (queryParams.memberOnly) initialCriteria.memberOnly = queryParams.memberOnly
3031
if (queryParams.page) pageNum = parseInt(queryParams.page)
31-
loadProjects(criteria, pageNum)
32+
loadProjects(initialCriteria, pageNum)
3233
} else {
3334
this.routeWithParams(criteria, pageNum)
3435
}

src/projects/reducers/projectSearch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function(state = initialState, action) {
2828
})
2929
case GET_PROJECTS_SEARCH_CRITERIA:
3030
return Object.assign({}, state, {
31-
criteria: Object.assign({}, action.criteria ),
31+
criteria: action.criteria,
3232
pageNum: action.pageNum
3333
})
3434
case CLEAR_PROJECT_SEARCH:

0 commit comments

Comments
 (0)