File tree 2 files changed +10
-10
lines changed
2 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ import _ from 'lodash';
7
7
import LoadingIndicator from 'components/LoadingIndicator' ;
8
8
import qs from 'qs' ;
9
9
import React from 'react' ;
10
+ import moment from 'moment' ;
10
11
import { SplitRoute } from 'utils/router' ;
11
12
import { updateQuery } from 'utils/url' ;
12
13
@@ -20,9 +21,17 @@ export default function ChallengeListingRoute() {
20
21
/* webpackChunkName: "challenge-listing" */
21
22
'containers/challenge-listing/Listing' ,
22
23
) . then ( ( { default : ChallengeListing } ) => {
23
- updateQuery ( { } ) ;
24
24
const query = renderProps . location . search ?
25
25
qs . parse ( renderProps . location . search . slice ( 1 ) ) : null ;
26
+ if ( query . filter && query . filter . startDate
27
+ && ! moment ( query . filter . startDate ) . isValid ( ) ) {
28
+ delete query . filter . startDate ;
29
+ }
30
+ if ( query . filter && query . filter . endDate
31
+ && ! moment ( query . filter . endDate ) . isValid ( ) ) {
32
+ delete query . filter . endDate ;
33
+ }
34
+ updateQuery ( { filter : query . filter } ) ;
26
35
const currencyFromUrl = _ . get ( query , 'currency' ) ;
27
36
const prizeMode = currencyFromUrl && `money-${ currencyFromUrl } ` ;
28
37
return (
Original file line number Diff line number Diff line change 6
6
7
7
import _ from 'lodash' ;
8
8
import qs from 'qs' ;
9
- import moment from 'moment' ;
10
9
11
10
/**
12
11
* If executed client-side (determined in this case by the presence of global
@@ -29,14 +28,6 @@ export function updateQuery(update) {
29
28
if ( _ . isUndefined ( value ) ) delete query [ key ] ;
30
29
else query [ key ] = value ;
31
30
} ) ;
32
- if ( ! ! query . filter && ! ! query . filter . startDate
33
- && moment ( query . filter . startDate ) . isValid ( ) === false ) {
34
- delete query . filter . startDate ;
35
- } else if ( ! ! query . filter && ! ! query . filter . endDate
36
- && moment ( query . filter . endDate ) . isValid ( ) === false ) {
37
- delete query . filter . endDate ;
38
- }
39
-
40
31
query = `?${ qs . stringify ( query , { encode : false } ) } ` ;
41
32
window . history . replaceState ( window . history . state , '' , query ) ;
42
33
}
You can’t perform that action at this time.
0 commit comments