Skip to content

Commit fcfd5df

Browse files
committed
Sorting / filtering bugs
1 parent 6388cdc commit fcfd5df

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/components/ChallengeEditor/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ class ChallengeEditor extends Component {
839839
for (let index = 0; index < phases.length; ++index) {
840840
newChallenge.phases[index].isDurationActive =
841841
moment(newChallenge.phases[index]['scheduledEndDate']).isAfter()
842-
newChallenge.phases[index].isStartTimeActive = index <= 0
842+
newChallenge.phases[index].isStartTimeActive = true
843843
newChallenge.phases[index].isOpen =
844844
newChallenge.phases[index].isDurationActive
845845
}

src/components/ChallengesComponent/ChallengeList/index.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ChallengeList extends Component {
8484
this.setState(
8585
{
8686
searchText,
87-
projectOption,
87+
challengeProjectOption: projectOption,
8888
challengeStatus: projectStatus,
8989
challengeType,
9090
challengeDate
@@ -117,9 +117,10 @@ class ChallengeList extends Component {
117117
* @param {Number} pageNumber page number
118118
*/
119119
handlePageChange (pageNumber) {
120-
const { searchText } = this.state
120+
const { searchText, sortBy, sortOrder } = this.state
121121
const {
122122
page,
123+
perPage,
123124
loadChallengesByPage,
124125
activeProjectId,
125126
dashboard,
@@ -140,7 +141,10 @@ class ChallengeList extends Component {
140141
selfService,
141142
this.getHandle(),
142143
filterChallengeType,
143-
filterDate
144+
filterDate,
145+
sortBy,
146+
sortOrder,
147+
perPage
144148
)
145149
}
146150
}
@@ -310,6 +314,8 @@ class ChallengeList extends Component {
310314

311315
this.setState({
312316
searchText: '',
317+
challengeProjectOption: null,
318+
challengeStatus: '',
313319
challengeType: null,
314320
sortBy: '',
315321
sortOrder: 'asc',

0 commit comments

Comments
 (0)