Merge pull request #163 from line/dev

release: 4.2405.36
line · Feb 1, 2024 · 6cb0276 · 6cb0276
2 parents b2aaf7c + 221174d
commit 6cb0276
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/apps/web/src/containers/dashboard/TodayFeedbackCard.tsx b/apps/web/src/containers/dashboard/TodayFeedbackCard.tsx
@@ -20,9 +20,6 @@ import { useTranslation } from 'react-i18next';
 import { DashboardCard } from '@/components';
 import { useOAIQuery } from '@/hooks';
 
-const endDate = dayjs().toISOString();
-const yesterdayEndDate = dayjs().subtract(1, 'day').toISOString();
-
 interface IProps {
   projectId: number;
 }
@@ -34,7 +31,7 @@ const TodayFeedbackCard: React.FC<IProps> = ({ projectId }) => {
     path: '/api/admin/statistics/feedback/count',
     variables: {
       from: dayjs().startOf('day').toISOString(),
-      to: endDate,
+      to: dayjs().endOf('day').toISOString(),
       projectId,
     },
     queryOptions: {
@@ -49,7 +46,7 @@ const TodayFeedbackCard: React.FC<IProps> = ({ projectId }) => {
     path: '/api/admin/statistics/feedback/count',
     variables: {
       from: dayjs().subtract(1, 'day').startOf('day').toISOString(),
-      to: yesterdayEndDate,
+      to: dayjs().subtract(1, 'day').endOf('day').toISOString(),
       projectId,
     },
     queryOptions: {

diff --git a/apps/web/src/containers/dashboard/TotalFeedbackCard.tsx b/apps/web/src/containers/dashboard/TotalFeedbackCard.tsx
@@ -30,7 +30,11 @@ const TotalFeedbackCard: React.FC<IProps> = ({ projectId, from, to }) => {
 
   const { data } = useOAIQuery({
     path: '/api/admin/statistics/feedback/count',
-    variables: { from: from.toISOString(), to: to.toISOString(), projectId },
+    variables: {
+      from: dayjs(from).startOf('day').toISOString(),
+      to: dayjs(to).endOf('day').toISOString(),
+      projectId,
+    },
     queryOptions: {
       refetchOnMount: false,
       refetchOnWindowFocus: false,

diff --git a/apps/web/src/containers/dashboard/TotalIssueCard.tsx b/apps/web/src/containers/dashboard/TotalIssueCard.tsx
@@ -30,7 +30,11 @@ const TotalIssueCard: React.FC<IProps> = ({ from, to, projectId }) => {
 
   const { data } = useOAIQuery({
     path: '/api/admin/statistics/issue/count',
-    variables: { from: from.toISOString(), to: to.toISOString(), projectId },
+    variables: {
+      from: dayjs(from).startOf('day').toISOString(),
+      to: dayjs(to).endOf('day').toISOString(),
+      projectId,
+    },
     queryOptions: {
       refetchOnMount: false,
       refetchOnWindowFocus: false,