change the time periods

PromptSail · Oct 19, 2024 · 316845a · 316845a
1 parent c8fffc8
commit 316845a
Showing 1 changed file with 13 additions and 25 deletions.
diff --git a/ui/src/hooks/useGetRangeDatesAndGranularity.tsx b/ui/src/hooks/useGetRangeDatesAndGranularity.tsx
@@ -50,15 +50,15 @@ const useGetRangeDatesAndGranularity = (
                             options.push(Period.Weekly);
                         break;
                     case 3: // day
-                        if (end.diff(start, 'd', true) >= 1 && end.diff(start, 'M', true) <= 2)
+                        if (end.diff(start, 'd', true) >= 1 && end.diff(start, 'M', true) <= 3) // Changed from 2 to 3 months
                             options.push(Period.Daily);
                         break;
                     case 4: // hour
-                        if (end.diff(start, 'h', true) >= 1 && end.diff(start, 'h', true) <= 60)
+                        if (end.diff(start, 'h', true) >= 1 && end.diff(start, 'h', true) <= 120)
                             options.push(Period.Hourly);
                         break;
                     case 5: // minutes
-                        if (end.diff(start, 'h', true) <= 5) options.push(Period.Minutely);
+                        if (end.diff(start, 'h', true) <= 12) options.push(Period.Minutely);
                         break;
                     default:
                         break;
@@ -114,44 +114,32 @@ const useGetRangeDatesAndGranularity = (
                     allowClear={false}
                     allowEmpty={false}
                     presets={[
-                        {
-                            label: 'Last 30 minutes',
-                            value: [dayjs().add(-0.5, 'h'), dayjs()]
-                        },
-                        {
-                            label: 'Last hour',
-                            value: [dayjs().add(-1, 'h'), dayjs()]
-                        },
-                        {
-                            label: 'Last 6 hours',
-                            value: [dayjs().add(-6, 'h'), dayjs()]
-                        },
                         {
                             label: 'Last 12 hours',
-                            value: [dayjs().add(-12, 'h'), dayjs()]
+                            value: [dayjs().subtract(12, 'hour'), dayjs()]
                         },
                         {
-                            label: 'Today',
-                            value: [dayjs().startOf('day'), dayjs()]
+                            label: 'Last 24 hours',
+                            value: [dayjs().subtract(24, 'hour'), dayjs()]
                         },
                         {
                             label: 'Yesterday',
                             value: [
-                                dayjs().add(-1, 'd').startOf('day'),
-                                dayjs().add(0, 'd').startOf('day')
+                                dayjs().subtract(1, 'day').startOf('day'),
+                                dayjs().subtract(1, 'day').endOf('day')
                             ]
                         },
                         {
                             label: 'Last 7 Days',
-                            value: [dayjs().add(-7, 'd').startOf('day'), dayjs()]
+                            value: [dayjs().subtract(7, 'day').startOf('day'), dayjs()]
                         },
                         {
-                            label: 'Last 14 Days',
-                            value: [dayjs().add(-14, 'd').startOf('day'), dayjs()]
+                            label: 'Last 30 Days',
+                            value: [dayjs().subtract(30, 'day').startOf('day'), dayjs()]
                         },
                         {
-                            label: 'Last 30 Days',
-                            value: [dayjs().add(-30, 'd').startOf('day'), dayjs()]
+                            label: 'Last 3 Months',
+                            value: [dayjs().subtract(3, 'month').startOf('day'), dayjs()]
                         }
                     ]}
                 />