-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
Stats: use Redux for Post Trends #5847
Merged
Merged
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
cfa3970
Fix streak selector logic to match API response and add Query component.
timmyc 843d057
Use redux in PostTrends.
timmyc 6d9c8df
Updates per feedback
timmyc 62cef08
Remove old streakList logic
timmyc c3d0852
Change i18n import.
timmyc f3c5c6f
Fix linting issues.
timmyc 9f2837b
Fix getSiteStatsMaxPostsByDay logic
nylen 4d7b773
Remove extraneous 'taxonomy' parameter
nylen 32766f5
Add previously failing test for getSiteStatsMaxPostsByDay
nylen a5af2ef
Add utility function for default statsStreak query
timmyc f3b8862
Minor change to test case.
timmyc 97e3526
Make Day a pure component for least amount of re-renders and connect …
timmyc 02a490a
Updates per feedback.
timmyc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,14 @@ | |
* External dependencies | ||
*/ | ||
import { expect } from 'chai'; | ||
import i18n from 'i18n-calypso'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import { | ||
getSerializedStatsQuery | ||
getSerializedStatsQuery, | ||
getStatsStreakQuery | ||
} from '../utils'; | ||
|
||
describe( 'utils', () => { | ||
|
@@ -35,4 +37,29 @@ describe( 'utils', () => { | |
expect( serializedQuery ).to.eql( serializedQueryTwo ); | ||
} ); | ||
} ); | ||
|
||
describe( 'getStatsStreakQuery()', () => { | ||
it( 'should return the correct default query', () => { | ||
const streakQuery = getStatsStreakQuery( {} ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could omit the |
||
|
||
expect( streakQuery ).to.eql( { | ||
startDate: i18n.moment().subtract( 1, 'year' ).startOf( 'month' ).format( 'YYYY-MM-DD' ), | ||
endDate: i18n.moment().endOf( 'month' ).format( 'YYYY-MM-DD' ), | ||
max: 3000 | ||
} ); | ||
} ); | ||
|
||
it( 'should allow defaults to be over-ridden', () => { | ||
const streakQuery = getStatsStreakQuery( { | ||
startDate: '1999-12-31', | ||
endDate: 'out-of-time' | ||
} ); | ||
|
||
expect( streakQuery ).to.eql( { | ||
startDate: '1999-12-31', | ||
endDate: 'out-of-time', | ||
max: 3000 | ||
} ); | ||
} ); | ||
} ); | ||
} ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not using this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doh good catch. Probably should rip out
streakList
from being passed in as a prop too!