File tree 4 files changed +10
-6
lines changed
components/challenge-listing
reducers/challenge-listing
4 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -16,14 +16,12 @@ import Listing from './Listing';
16
16
import ChallengeCardPlaceholder from './placeholders/ChallengeCard' ;
17
17
import SRMCard from './SRMCard' ;
18
18
19
- import { updateQuery } from 'utils/url' ;
20
19
import './style.scss' ;
21
20
22
21
// Number of challenge placeholder card to display
23
22
const CHALLENGE_PLACEHOLDER_COUNT = 8 ;
24
23
25
24
export default function ChallengeListing ( props ) {
26
- updateQuery ( { } ) ;
27
25
let challenges = props . challenges ;
28
26
29
27
if ( props . communityFilter ) {
Original file line number Diff line number Diff line change @@ -271,10 +271,12 @@ export function factory(req) {
271
271
272
272
if ( req ) {
273
273
state . filter = req . query . filter ;
274
- if ( ! ! state . filter . startDate && moment ( state . filter . startDate ) . isValid ( ) === false ) {
274
+ if ( ! ! state . filter && ! ! state . filter . startDate
275
+ && moment ( state . filter . startDate ) . isValid ( ) === false ) {
275
276
delete state . filter . startDate ;
276
277
}
277
- if ( ! ! state . filter . endDate && moment ( state . filter . endDate ) . isValid ( ) === false ) {
278
+ if ( ! ! state . filter && ! ! state . filter . endDate
279
+ && moment ( state . filter . endDate ) . isValid ( ) === false ) {
278
280
delete state . filter . endDate ;
279
281
}
280
282
state . selectedCommunityId = req . query . communityId ;
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ import LoadingIndicator from 'components/LoadingIndicator';
8
8
import qs from 'qs' ;
9
9
import React from 'react' ;
10
10
import { SplitRoute } from 'utils/router' ;
11
+ import { updateQuery } from 'utils/url' ;
11
12
12
13
export default function ChallengeListingRoute ( ) {
13
14
return (
@@ -19,6 +20,7 @@ export default function ChallengeListingRoute() {
19
20
/* webpackChunkName: "challenge-listing" */
20
21
'containers/challenge-listing/Listing' ,
21
22
) . then ( ( { default : ChallengeListing } ) => {
23
+ updateQuery ( { } ) ;
22
24
const query = renderProps . location . search ?
23
25
qs . parse ( renderProps . location . search . slice ( 1 ) ) : null ;
24
26
const currencyFromUrl = _ . get ( query , 'currency' ) ;
Original file line number Diff line number Diff line change @@ -29,9 +29,11 @@ export function updateQuery(update) {
29
29
if ( _ . isUndefined ( value ) ) delete query [ key ] ;
30
30
else query [ key ] = value ;
31
31
} ) ;
32
- if ( ! ! query . filter . startDate && moment ( query . filter . startDate ) . isValid ( ) === false ) {
32
+ if ( ! ! query . filter && ! ! query . filter . startDate
33
+ && moment ( query . filter . startDate ) . isValid ( ) === false ) {
33
34
delete query . filter . startDate ;
34
- } else if ( query . filter . endDate && moment ( query . filter . endDate ) . isValid ( ) === false ) {
35
+ } else if ( ! ! query . filter && ! ! query . filter . endDate
36
+ && moment ( query . filter . endDate ) . isValid ( ) === false ) {
35
37
delete query . filter . endDate ;
36
38
}
37
39
You can’t perform that action at this time.
0 commit comments