diff --git a/AppImage/components/system-logs.tsx b/AppImage/components/system-logs.tsx index 7afbf3a..f92e40c 100644 --- a/AppImage/components/system-logs.tsx +++ b/AppImage/components/system-logs.tsx @@ -121,7 +121,7 @@ export function SystemLogs() { const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false) - const [dateFilter, setDateFilter] = useState("now") + const [dateFilter, setDateFilter] = useState("30") // Changed from "now" to "30" to load all recent logs by default const [customDays, setCustomDays] = useState("1") const getApiUrl = (endpoint: string) => { @@ -132,54 +132,48 @@ export function SystemLogs() { } useEffect(() => { + // Initial fetch might be redundant if dateFilter is not "now" anymore, but keeping for now + // if (dateFilter === "now") { fetchAllData() + // } }, []) useEffect(() => { console.log("[v0] Date filter changed:", dateFilter, "Custom days:", customDays) - if (dateFilter !== "now") { - setLoading(true) - fetchSystemLogs() - .then((newLogs) => { - console.log("[v0] Loaded logs for date filter:", dateFilter, "Count:", newLogs.length) - console.log("[v0] First log:", newLogs[0]) - setLogs(newLogs) - setLoading(false) - }) - .catch((err) => { - console.error("[v0] Error loading logs:", err) - setLoading(false) - }) - } else { - fetchAllData() - } + setLoading(true) + fetchSystemLogs() + .then((newLogs) => { + console.log("[v0] Loaded logs for date filter:", dateFilter, "Count:", newLogs.length) + console.log("[v0] First log:", newLogs[0]) + setLogs(newLogs) + setLoading(false) + }) + .catch((err) => { + console.error("[v0] Error loading logs:", err) + setLoading(false) + }) }, [dateFilter, customDays]) useEffect(() => { console.log("[v0] Level or service filter changed:", levelFilter, serviceFilter) - if (levelFilter !== "all" || serviceFilter !== "all") { - setLoading(true) - fetchSystemLogs() - .then((newLogs) => { - console.log( - "[v0] Loaded logs for filters - Level:", - levelFilter, - "Service:", - serviceFilter, - "Count:", - newLogs.length, - ) - setLogs(newLogs) - setLoading(false) - }) - .catch((err) => { - console.error("[v0] Error loading logs:", err) - setLoading(false) - }) - } else if (dateFilter === "now") { - // Only reload all data if we're on "now" and all filters are cleared - fetchAllData() - } + setLoading(true) + fetchSystemLogs() + .then((newLogs) => { + console.log( + "[v0] Loaded logs for filters - Level:", + levelFilter, + "Service:", + serviceFilter, + "Count:", + newLogs.length, + ) + setLogs(newLogs) + setLoading(false) + }) + .catch((err) => { + console.error("[v0] Error loading logs:", err) + setLoading(false) + }) }, [levelFilter, serviceFilter]) const fetchAllData = async () => { @@ -223,11 +217,9 @@ export function SystemLogs() { let apiUrl = getApiUrl("/api/logs") const params = new URLSearchParams() - if (dateFilter !== "now") { - const daysAgo = dateFilter === "custom" ? Number.parseInt(customDays) : Number.parseInt(dateFilter) - params.append("since_days", daysAgo.toString()) - console.log("[v0] Fetching logs since_days:", daysAgo) - } + const daysAgo = dateFilter === "custom" ? Number.parseInt(customDays) : Number.parseInt(dateFilter) + params.append("since_days", daysAgo.toString()) + console.log("[v0] Fetching logs since_days:", daysAgo) if (levelFilter !== "all") { const priorityMap: Record = { @@ -290,7 +282,7 @@ export function SystemLogs() { try { // Generate filename based on active filters const filters = [] - if (dateFilter !== "now") { + if (dateFilter !== "30") { const days = dateFilter === "custom" ? customDays : dateFilter filters.push(`${days}days`) } @@ -313,7 +305,7 @@ export function SystemLogs() { `Total Entries: ${filteredCombinedLogs.length.toLocaleString()}`, ``, `Filters Applied:`, - `- Date Range: ${dateFilter === "now" ? "Current logs" : dateFilter === "custom" ? `${customDays} days ago` : `${dateFilter} days ago`}`, + `- Date Range: ${dateFilter === "custom" ? `${customDays} days ago` : `${dateFilter} days ago`}`, `- Level: ${levelFilter === "all" ? "All Levels" : levelFilter}`, `- Service: ${serviceFilter === "all" ? "All Services" : serviceFilter}`, `- Search: ${searchTerm || "None"}`, @@ -808,12 +800,12 @@ export function SystemLogs() { - Current logs 1 day ago 3 days ago 1 week ago 2 weeks ago 1 month ago + 3 months ago Custom days @@ -891,11 +883,13 @@ export function SystemLogs() {
-
-
{log.service}
-
- {log.timestamp} +
+
+
+ {log.service} +
+
{log.timestamp}
{log.message}