feat(daterangepicker): update last N day presets (#400)

project44 · Jun 14, 2023 · 697e8b9 · 697e8b9
1 parent 119d555
commit 697e8b9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.changeset/good-lizards-love.md b/.changeset/good-lizards-love.md
@@ -0,0 +1,5 @@
+---
+'@project44-manifest/react': minor
+---
+
+add last N days presets
diff --git a/packages/react/src/components/CalendarRanges/defaultDefinedRanges.ts b/packages/react/src/components/CalendarRanges/defaultDefinedRanges.ts
@@ -44,7 +44,8 @@ export const defineds = {
   endOfToday: calendarDate,
   startOfYesterday: addDays(calendarDate, -1),
   endOfYesterday: addDays(calendarDate, -1),
-  startOfWeek: startOfWeek(calendarDate, 'en-US'),
+  sevenDaysAgo: addDays(calendarDate, -7),
+  thirtyDaysAgo: addDays(calendarDate, -30),
   endOfWeek: endOfWeek(calendarDate, 'en-US'),
   startOfLastWeek: startOfWeek(addDays(calendarDate, -7), 'en-US'),
   endOfLastWeek: endOfWeek(addDays(calendarDate, -7), 'en-US'),
@@ -72,19 +73,19 @@ export const getDefaultRanges = (): DefinedRange[] => [
     },
   },
   {
-    key: 'thisWeek',
-    label: 'This Week',
+    key: 'last7Days',
+    label: 'Last 7 days',
     value: {
-      start: defineds.startOfWeek,
-      end: defineds.endOfWeek,
+      start: defineds.sevenDaysAgo,
+      end: defineds.endOfToday,
     },
   },
   {
-    key: 'lastWeek',
-    label: 'Last Week',
+    key: 'last30Days',
+    label: 'Last 30 days',
     value: {
-      start: defineds.startOfLastWeek,
-      end: defineds.endOfLastWeek,
+      start: defineds.thirtyDaysAgo,
+      end: defineds.endOfToday,
     },
   },
   {

diff --git a/packages/react/tests/CalendarRange.test.tsx b/packages/react/tests/CalendarRange.test.tsx
@@ -103,8 +103,8 @@ describe('@project44-manifest/react - CalendarRange', () => {
     expect(results).toBeDefined();
     expect(results).toContainHTML('Today');
     expect(results).toContainHTML('Yesterday');
-    expect(results).toContainHTML('This Week');
-    expect(results).toContainHTML('Last Week');
+    expect(results).toContainHTML('Last 7 days');
+    expect(results).toContainHTML('Last 30 days');
     expect(results).toContainHTML('This Month');
     expect(results).toContainHTML('Last Month');
   });