Stats: use today as shortcut ending date / default ending date (#97096)

* use today as ending date * fix start date calculation
Automattic · Dec 5, 2024 · e36d212 · e36d212
1 parent c7302c1
commit e36d212
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/client/components/date-range/use-shortcuts.ts b/client/components/date-range/use-shortcuts.ts
@@ -29,38 +29,36 @@ export const getShortcuts = createSelector(
 		const siteId = getSelectedSiteId( state );
 		const siteToday = getMomentSiteZone( state, siteId );
 		const siteTodayStr = siteToday.format( DATE_FORMAT );
-		const siteYesterday = isNewDateFilteringEnabled
-			? siteToday.clone().subtract( 1, 'days' )
-			: siteToday.clone();
+		const siteYesterday = siteToday.clone().subtract( 1, 'days' );
 		const yesterdayStr = siteYesterday.format( DATE_FORMAT );
 
 		const supportedShortcutList = [
 			{
 				id: 'last_7_days',
 				label: translateFunction( 'Last 7 Days' ),
-				startDate: siteYesterday.clone().subtract( 6, 'days' ).format( DATE_FORMAT ),
-				endDate: yesterdayStr,
+				startDate: siteToday.clone().subtract( 6, 'days' ).format( DATE_FORMAT ),
+				endDate: siteTodayStr,
 				period: DATERANGE_PERIOD.DAY,
 			},
 			{
 				id: 'last_30_days',
 				label: translateFunction( 'Last 30 Days' ),
-				startDate: siteYesterday.clone().subtract( 29, 'days' ).format( DATE_FORMAT ),
-				endDate: yesterdayStr,
+				startDate: siteToday.clone().subtract( 29, 'days' ).format( DATE_FORMAT ),
+				endDate: siteTodayStr,
 				period: DATERANGE_PERIOD.DAY,
 			},
 			{
 				id: 'last_3_months',
 				label: translateFunction( 'Last 90 Days' ),
-				startDate: siteYesterday.clone().subtract( 89, 'days' ).format( DATE_FORMAT ),
-				endDate: yesterdayStr,
+				startDate: siteToday.clone().subtract( 89, 'days' ).format( DATE_FORMAT ),
+				endDate: siteTodayStr,
 				period: DATERANGE_PERIOD.WEEK,
 			},
 			{
 				id: 'last_year',
 				label: translateFunction( 'Last Year' ),
-				startDate: siteYesterday.clone().subtract( 364, 'days' ).format( DATE_FORMAT ),
-				endDate: yesterdayStr,
+				startDate: siteToday.clone().subtract( 364, 'days' ).format( DATE_FORMAT ),
+				endDate: siteTodayStr,
 				period: DATERANGE_PERIOD.MONTH,
 			},
 			{

diff --git a/client/my-sites/stats/site.jsx b/client/my-sites/stats/site.jsx
@@ -338,9 +338,7 @@ class StatsSite extends Component {
 			customChartRange = { chartEnd };
 		} else {
 			customChartRange = {
-				chartEnd: isNewDateFilteringEnabled
-					? momentSiteZone.clone().subtract( 1, 'days' ).format( DATE_FORMAT )
-					: momentSiteZone.format( DATE_FORMAT ),
+				chartEnd: momentSiteZone.format( DATE_FORMAT ),
 			};
 		}
 
@@ -358,7 +356,7 @@ class StatsSite extends Component {
 			// (e.g. months defaulting to 30 days and showing one point)
 			customChartRange.chartStart = momentSiteZone
 				.clone()
-				.subtract( daysInRange, 'days' )
+				.subtract( daysInRange - 1, 'days' )
 				.format( DATE_FORMAT );
 		}
 
@@ -395,9 +393,7 @@ class StatsSite extends Component {
 
 			// For StatsDateControl
 			customChartRange.daysInRange = 7;
-			customChartRange.chartEnd = isNewDateFilteringEnabled
-				? momentSiteZone.clone().subtract( 1, 'days' ).format( DATE_FORMAT )
-				: momentSiteZone.format( DATE_FORMAT );
+			customChartRange.chartEnd = momentSiteZone.format( DATE_FORMAT );
 			customChartRange.chartStart = moment( customChartRange.chartEnd )
 				.subtract( customChartRange.daysInRange - 1, 'days' )
 				.format( DATE_FORMAT );