From 53d19912115c316bd1038d65b337dad05b43be16 Mon Sep 17 00:00:00 2001
From: Whitewater <me@waterwater.moe>
Date: Wed, 31 May 2023 09:41:25 -0700
Subject: [PATCH] chore: update page group naming (#2628)

---
 .../src/components/page-list/use-date-group.tsx  | 12 ++++++------
 .../component/src/stories/page-list.stories.tsx  | 16 +++++++++++++++-
 packages/i18n/src/resources/en.json              |  6 +++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/packages/component/src/components/page-list/use-date-group.tsx b/packages/component/src/components/page-list/use-date-group.tsx
index 65101f1e34..ba403f4d35 100644
--- a/packages/component/src/components/page-list/use-date-group.tsx
+++ b/packages/component/src/components/page-list/use-date-group.tsx
@@ -39,18 +39,18 @@ export const useDateGroup = ({
       match: (date: Date) => isYesterday(date) && !isToday(date),
     },
     {
-      id: 'lastWeek',
-      label: t['com.affine.lastWeek'](),
+      id: 'last7Days',
+      label: t['com.affine.last7Days'](),
       match: (date: Date) => isLastWeek(date) && !isYesterday(date),
     },
     {
-      id: 'lastMonth',
-      label: t['com.affine.lastMonth'](),
+      id: 'last30Days',
+      label: t['com.affine.last30Days'](),
       match: (date: Date) => isLastMonth(date) && !isLastWeek(date),
     },
     {
-      id: 'lastYear',
-      label: t['com.affine.lastYear'](),
+      id: 'currentYear',
+      label: t['com.affine.currentYear'](),
       match: (date: Date) => isLastYear(date) && !isLastMonth(date),
     },
   ] as const;
diff --git a/packages/component/src/stories/page-list.stories.tsx b/packages/component/src/stories/page-list.stories.tsx
index 62473ba9a3..6a956496a9 100644
--- a/packages/component/src/stories/page-list.stories.tsx
+++ b/packages/component/src/stories/page-list.stories.tsx
@@ -102,7 +102,7 @@ AffineAllPageList.args = {
       favorite: true,
       isPublicPage: false,
       icon: <PageIcon />,
-      title: '2 Favorited Page',
+      title: '2 Favorited Page 2021',
       createDate: new Date('2021-01-02'),
       updatedDate: new Date('2021-01-01'),
       bookmarkPage: () => toast('Bookmark page'),
@@ -111,6 +111,20 @@ AffineAllPageList.args = {
       onOpenPageInNewTab: () => toast('Open page in new tab'),
       removeToTrash: () => toast('Remove to trash'),
     },
+    {
+      pageId: '3',
+      favorite: false,
+      isPublicPage: false,
+      icon: <PageIcon />,
+      title: 'page created in 2023-04-01',
+      createDate: new Date('2023-04-01'),
+      updatedDate: new Date('2023-04-01'),
+      bookmarkPage: () => toast('Bookmark page'),
+      onClickPage: () => toast('Click page'),
+      onDisablePublicSharing: () => toast('Disable public sharing'),
+      onOpenPageInNewTab: () => toast('Open page in new tab'),
+      removeToTrash: () => toast('Remove to trash'),
+    },
   ],
 };
 
diff --git a/packages/i18n/src/resources/en.json b/packages/i18n/src/resources/en.json
index d7a5ac31fc..9bc9eb85a3 100644
--- a/packages/i18n/src/resources/en.json
+++ b/packages/i18n/src/resources/en.json
@@ -286,9 +286,9 @@
   "com.affine.updater.restart-to-update": "Restart to install update",
   "com.affine.today": "Today",
   "com.affine.yesterday": "Yesterday",
-  "com.affine.lastWeek": "Last week",
-  "com.affine.lastMonth": "Last month",
-  "com.affine.lastYear": "Last year",
+  "com.affine.last7Days": "Last 7 Days",
+  "com.affine.last30Days": "Last 30 Days",
+  "com.affine.currentYear": "Current Year",
   "com.affine.earlier": "Earlier",
   "FILE_ALREADY_EXISTS": "File already exists",
   "others": "Others",