From 7b11e40981d2f98eb2a8509e2348ceebe2002869 Mon Sep 17 00:00:00 2001 From: Paul Sealock Date: Tue, 15 Jan 2019 15:40:12 +1300 Subject: [PATCH] timeStampFilterDates --- .../client/store/reports/utils.js | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/plugins/woocommerce-admin/client/store/reports/utils.js b/plugins/woocommerce-admin/client/store/reports/utils.js index 8ef2b519ccb..9572a5981b2 100644 --- a/plugins/woocommerce-admin/client/store/reports/utils.js +++ b/plugins/woocommerce-admin/client/store/reports/utils.js @@ -46,9 +46,27 @@ export function getFilterQuery( endpoint, query ) { return {}; } -// export function timeStampFilterDates() { -// -// } +export function timeStampFilterDates( config, activeFilter ) { + if ( 'Date' === config.filters[ activeFilter.key ].input.component ) { + const { rule, value } = activeFilter; + const timeOfDayMap = { + after: 'start', + before: 'end', + }; + let appendedValue; + if ( Array.isArray( value ) ) { + const [ after, before ] = value; + appendedValue = [ + appendTimestamp( moment( after ), timeOfDayMap.after ), + appendTimestamp( moment( before ), timeOfDayMap.before ), + ]; + } else { + appendedValue = appendTimestamp( moment( value ), timeOfDayMap[ rule ] ); + } + return Object.assign( {}, activeFilter, { value: appendedValue } ); + } + return activeFilter; +} export function getQueryFromConfig( config, advancedFilters, query ) { const queryValue = query[ config.param ]; @@ -64,7 +82,7 @@ export function getQueryFromConfig( config, advancedFilters, query ) { return {}; } - return activeFilters.reduce( + return activeFilters.map( filter => timeStampFilterDates( advancedFilters, filter ) ).reduce( ( result, activeFilter ) => { const { key, rule, value } = activeFilter; result[ getUrlKey( key, rule ) ] = value;