TimeFilter: reduced options and fixed dates

Author: matt-aitken

apps/webapp/app/components/runs/v3/SharedFilters.tsx

@@ -95,6 +95,10 @@ const timePeriods = [
     label: "3 days",
     value: "3d",
   },
+  {
+    label: "5 days",
+    value: "5d",
+  },
   {
     label: "7 days",
     value: "7d",
@@ -106,11 +110,7 @@ const timePeriods = [
   {
     label: "30 days",
     value: "30d",
-  },
-  {
-    label: "90 days",
-    value: "90d",
-  },
+  }
 ];
 
 const timeUnits = [
@@ -702,7 +702,7 @@ export function TimeDropdown({
                   onClick={() => {
                     const today = new Date();
                     setFromValue(startOfDay(today));
-                    setToValue(today);
+                    setToValue(endOfDay(today));
                     setActiveSection("dateRange");
                     setValidationError(null);
                     setSelectedQuickDate("today");
@@ -714,33 +714,12 @@ export function TimeDropdown({
                   onClick={() => {
                     const now = new Date();
                     setFromValue(startOfWeek(now, { weekStartsOn: 1 }));
-                    setToValue(now);
+                    setToValue(endOfWeek(now, { weekStartsOn: 1 }));
                     setActiveSection("dateRange");
                     setValidationError(null);
                     setSelectedQuickDate("thisWeek");
                   }}
                 />
-                <QuickDateButton
-                  label="Last weekend"
-                  isActive={selectedQuickDate === "lastWeekend"}
-                  onClick={() => {
-                    const now = new Date();
-                    let saturday: Date;
-                    if (isSaturday(now)) {
-                      saturday = subDays(now, 7);
-                    } else if (isSunday(now)) {
-                      saturday = subDays(now, 8);
-                    } else {
-                      saturday = previousSaturday(now);
-                    }
-                    const sunday = endOfDay(subDays(saturday, -1));
-                    setFromValue(startOfDay(saturday));
-                    setToValue(sunday);
-                    setActiveSection("dateRange");
-                    setValidationError(null);
-                    setSelectedQuickDate("lastWeekend");
-                  }}
-                />
                 <QuickDateButton
                   label="Last week"
                   isActive={selectedQuickDate === "lastWeek"}
@@ -753,20 +732,6 @@ export function TimeDropdown({
                     setSelectedQuickDate("lastWeek");
                   }}
                 />
-                <QuickDateButton
-                  label="Last weekdays"
-                  isActive={selectedQuickDate === "lastWeekdays"}
-                  onClick={() => {
-                    const lastWeek = subWeeks(new Date(), 1);
-                    const monday = startOfWeek(lastWeek, { weekStartsOn: 1 });
-                    const friday = endOfDay(subDays(monday, -4)); // Monday + 4 days = Friday
-                    setFromValue(startOfDay(monday));
-                    setToValue(friday);
-                    setActiveSection("dateRange");
-                    setValidationError(null);
-                    setSelectedQuickDate("lastWeekdays");
-                  }}
-                />
                 <QuickDateButton
                   label="Last month"
                   isActive={selectedQuickDate === "lastMonth"}
@@ -785,24 +750,12 @@ export function TimeDropdown({
                   onClick={() => {
                     const now = new Date();
                     setFromValue(startOfMonth(now));
-                    setToValue(now);
+                    setToValue(endOfMonth(now));
                     setActiveSection("dateRange");
                     setValidationError(null);
                     setSelectedQuickDate("thisMonth");
                   }}
                 />
-                <QuickDateButton
-                  label="Year to date"
-                  isActive={selectedQuickDate === "yearToDate"}
-                  onClick={() => {
-                    const now = new Date();
-                    setFromValue(startOfYear(now));
-                    setToValue(now);
-                    setActiveSection("dateRange");
-                    setValidationError(null);
-                    setSelectedQuickDate("yearToDate");
-                  }}
-                />
               </div>
               {validationError && activeSection === "dateRange" && (
                 <Paragraph variant="extra-small" className="mt-2 text-error">