Skip to content

The only tool you need to know what is happening and how to fix it.

cleanup

dduxc3abde03b56f
diff --git a/frontend/src/lib/utils/url-params.ts b/frontend/src/lib/utils/url-params.ts
new file mode 100644
index 00000000..045cb749
--- /dev/null
+++ b/frontend/src/lib/utils/url-params.ts
@@ -0,0 +1,101 @@
+import { browser } from '$app/environment';
+import { goto } from '$app/navigation';
+import { CalendarDate } from '@internationalized/date';
+import { getNow, parseISO } from './formatters';
+
+ '30m': 30,
+ '60m': 60,
+ '3h': 180,
+ '6h': 360,
+ '12h': 720,
+ '24h': 1440,
+ '3d': 4320,
+ '7d': 10080,
+ '1M': 43200,
+ '3M': 129600
+};
+
+export function getTimeRangeFromPreset(presetValue: string, timezone: string): { from: Date; to: Date } {
+ const minutes = presetMinutes[presetValue] || 360;
+ const now = getNow(timezone);
+ const from = now.minus({ minutes });
+ return { from: from.toJSDate(), to: now.toJSDate() };
+}
+
+export function dateToCalendarDate(date: Date): CalendarDate {
+ return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate());
+}
+
+export function dateToTimeString(date: Date): string {
+ return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+}
+
+export type TimeRangeParams = {
+ preset: string | null;
+ from: Date | null;
+ to: Date | null;
+};
+
+export function parseTimeRangeFromUrl(timezone: string, defaultPreset = '6h'): TimeRangeParams {
+ if (!browser) return { preset: defaultPreset, from: null, to: null };
+
+ const params = new URLSearchParams(window.location.search);
+ const presetParam = params.get('preset');
+ const fromParam = params.get('from');
+ const toParam = params.get('to');
+
+ // If preset is specified, use it
+ if (presetParam && presetMinutes[presetParam]) {
+ return { preset: presetParam, from: null, to: null };
+ }
+
+ // If custom from/to specified
+ if (fromParam && toParam) {
+ const fromDt = parseISO(fromParam, timezone);
+ const toDt = parseISO(toParam, timezone);
+ if (fromDt.isValid && toDt.isValid) {
+ return { preset: null, from: fromDt.toJSDate(), to: toDt.toJSDate() };
+ }
+ }
+
+ // Default to preset
+ return { preset: defaultPreset, from: null, to: null };
+}
+
+export function getResolvedTimeRange(
+ params: TimeRangeParams,
+ timezone: string
+): { from: Date; to: Date } {
+ if (params.preset) {
+ return getTimeRangeFromPreset(params.preset, timezone);
+ }
+ return { from: params.from!, to: params.to! };
+}
+
+export type UpdateUrlOptions = {
+ pushToHistory?: boolean;
+};
+
+export function updateUrl(
+ params: Record<string, string | null | undefined>,
+ options: UpdateUrlOptions = {}
+): void {
+ if (!browser) return;
+
+ const { pushToHistory = true } = options;
+ const urlParams = new URLSearchParams();
+
+ for (const [key, value] of Object.entries(params)) {
+ if (value != null && value !== '') {
+ urlParams.set(key, value);
+ }
+ }
+
+ const newUrl = `${window.location.pathname}?${urlParams.toString()}`;
+
+ goto(newUrl, {
+ replaceState: !pushToHistory,
+ noScroll: true,
+ keepFocus: true
+ });
+}
diff --git a/frontend/src/routes/metrics/+page.svelte b/frontend/src/routes/metrics/+page.svelte
index 7585062e..6f1a7b1c 100644
--- a/frontend/src/routes/metrics/+page.svelte
+++ b/frontend/src/routes/metrics/+page.svelte
@@ -1,7 +1,6 @@
<script lang="ts">
import { onMount } from 'svelte';
import { browser } from '$app/environment';
- import { goto } from '$app/navigation';
import { Button } from '$lib/components/ui/button';
import { RefreshCw, Code } from 'lucide-svelte';
import ServerFilter from '$lib/components/dashboard/server-filter.svelte';
@@ -19,10 +18,19 @@
import { api } from '$lib/api';
import { projectsState } from '$lib/state/projects.svelte';
import { getTimezone } from '$lib/state/timezone.svelte';
- import { getNow, parseISO, toUTCISO, calendarDateTimeToLuxon, formatDateTime } from '$lib/utils/formatters';
+ import { toUTCISO, calendarDateTimeToLuxon, formatDateTime } from '$lib/utils/formatters';
import { TimeRangePicker } from '$lib/components/ui/time-range-picker';
import { CalendarDate } from '@internationalized/date';
import { getServerColorMap } from '$lib/utils/server-colors';
+ import {
+ presetMinutes,
+ getTimeRangeFromPreset,
+ dateToCalendarDate,
+ dateToTimeString,
+ parseTimeRangeFromUrl,
+ getResolvedTimeRange,
+ updateUrl
+ } from '$lib/utils/url-params';
const timezone = $derived(getTimezone());
@@ -58,30 +66,8 @@
// Compute server color map for consistent colors across all charts
const serverColorMap = $derived(getServerColorMap(availableServers()));
- // Preset definitions (must match TimeRangePicker)
- const presetMinutes: Record<string, number> = {
- '30m': 30,
- '60m': 60,
- '3h': 180,
- '6h': 360,
- '12h': 720,
- '24h': 1440,
- '3d': 4320,
- '7d': 10080,
- '1M': 43200,
- '3M': 129600
- };
-
- // Calculate time range from preset
- function getTimeRangeFromPresetLocal(presetValue: string): { from: Date; to: Date } {
- const minutes = presetMinutes[presetValue] || 360;
- const now = getNow(timezone);
- const from = now.minus({ minutes });
- return { from: from.toJSDate(), to: now.toJSDate() };
- }
-
- // Parse URL params
- function parseUrlParams(): {
+ // Parse extended URL params (includes servers and tab)
+ function parseMetricsUrlParams(): {
preset: string | null;
from: Date | null;
to: Date | null;
@@ -89,10 +75,8 @@
tab: MetricsTab;
} {
if (!browser) return { preset: '6h', from: null, to: null, servers: [], tab: 'application' };
+
const params = new URLSearchParams(window.location.search);
- const presetParam = params.get('preset');
- const fromParam = params.get('from');
- const toParam = params.get('to');
const serversParam = params.get('servers');
const tabParam = params.get('tab') as MetricsTab | null;
@@ -101,34 +85,13 @@
? tabParam
: 'application';
- if (presetParam && presetMinutes[presetParam]) {
- return { preset: presetParam, from: null, to: null, servers, tab };
- }
-
- if (fromParam && toParam) {
- const fromDt = parseISO(fromParam, timezone);
- const toDt = parseISO(toParam, timezone);
- if (fromDt.isValid && toDt.isValid) {
- return { preset: null, from: fromDt.toJSDate(), to: toDt.toJSDate(), servers, tab };
- }
- }
-
- return { preset: '6h', from: null, to: null, servers, tab };
- }
-
- function dateToCalendarDate(date: Date): CalendarDate {
- return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate());
- }
-
- function dateToTimeString(date: Date): string {
- return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+ const timeParams = parseTimeRangeFromUrl(timezone);
+ return { ...timeParams, servers, tab };
}
// Initialize from URL or defaults
- const initialUrlParams = parseUrlParams();
- const initialRange = initialUrlParams.preset
- ? getTimeRangeFromPresetLocal(initialUrlParams.preset)
- : { from: initialUrlParams.from!, to: initialUrlParams.to! };
+ const initialUrlParams = parseMetricsUrlParams();
+ const initialRange = getResolvedTimeRange(initialUrlParams, timezone);
let selectedPreset = $state<string | null>(initialUrlParams.preset);
let fromDate = $state<CalendarDate>(dateToCalendarDate(initialRange.from));
@@ -141,51 +104,37 @@
activeTab = initialUrlParams.tab;
// Update URL with current state
- function updateUrl(pushToHistory = true) {
+ function updateMetricsUrl(pushToHistory = true) {
if (!browser) return;
- const params = new URLSearchParams();
- params.set('tab', activeTab);
+ const params: Record<string, string | null | undefined> = {
+ tab: activeTab
+ };
if (selectedPreset) {
- params.set('preset', selectedPreset);
+ params.preset = selectedPreset;
} else {
- params.set('from', getFromDateTimeUTC());
- params.set('to', getToDateTimeUTC());
+ params.from = getFromDateTimeUTC();
+ params.to = getToDateTimeUTC();
}
if (selectedServers.length > 0 && selectedServers.length < availableServers().length) {
- params.set('servers', selectedServers.join(','));
+ params.servers = selectedServers.join(',');
}
- const newUrl = `${window.location.pathname}?${params.toString()}`;
-
- goto(newUrl, {
- replaceState: !pushToHistory,
- noScroll: true,
- keepFocus: true
- });
+ updateUrl(params, { pushToHistory });
}
// Handle browser back/forward navigation
function handlePopState() {
- const urlParams = parseUrlParams();
-
- if (urlParams.preset) {
- selectedPreset = urlParams.preset;
- const range = getTimeRangeFromPresetLocal(urlParams.preset);
- fromDate = dateToCalendarDate(range.from);
- fromTime = dateToTimeString(range.from);
- toDate = dateToCalendarDate(range.to);
- toTime = dateToTimeString(range.to);
- } else if (urlParams.from && urlParams.to) {
- selectedPreset = null;
- fromDate = dateToCalendarDate(urlParams.from);
- fromTime = dateToTimeString(urlParams.from);
- toDate = dateToCalendarDate(urlParams.to);
- toTime = dateToTimeString(urlParams.to);
- }
-
+ const urlParams = parseMetricsUrlParams();
+ const range = getResolvedTimeRange(urlParams, timezone);
+
+ selectedPreset = urlParams.preset;
+ fromDate = dateToCalendarDate(range.from);
+ fromTime = dateToTimeString(range.from);
+ toDate = dateToCalendarDate(range.to);
+ toTime = dateToTimeString(range.to);
selectedServers = urlParams.servers;
activeTab = urlParams.tab;
@@ -314,7 +263,7 @@
// Load only the active tab's data (lazy loading)
function loadActiveTab(pushToHistory = true) {
- if (pushToHistory) updateUrl(true);
+ if (pushToHistory) updateMetricsUrl(true);
// Update shared time domain
sharedTimeDomain = [new Date(getFromDateTimeUTC()), new Date(getToDateTimeUTC())];
@@ -334,7 +283,7 @@
// Force reload (for refresh button & time range change)
function reloadActiveTab() {
- updateUrl(true);
+ updateMetricsUrl(true);
sharedTimeDomain = [new Date(getFromDateTimeUTC()), new Date(getToDateTimeUTC())];
// Clear all cached data when time range changes
@@ -366,13 +315,13 @@
function handleTabChange(tab: string) {
activeTab = tab as MetricsTab;
loadActiveTab(false);
- updateUrl(false);
+ updateMetricsUrl(false);
}
// Client-side server filtering - NO API call needed
function handleServerSelectionChange(servers: string[]) {
selectedServers = servers;
- updateUrl(false);
+ updateMetricsUrl(false);
}
// Handle drag-to-zoom selection from chart overlay
diff --git a/frontend/src/routes/transactions/+page.svelte b/frontend/src/routes/transactions/+page.svelte
index a8c53b18..374b90a4 100644
--- a/frontend/src/routes/transactions/+page.svelte
+++ b/frontend/src/routes/transactions/+page.svelte
@@ -1,9 +1,7 @@
<script lang="ts">
import { onMount, onDestroy } from 'svelte';
- import { browser } from '$app/environment';
- import { goto } from '$app/navigation';
import { api } from '$lib/api';
- import { formatDuration, getNow, luxonToCalendarDateTime, parseISO, toUTCISO, calendarDateTimeToLuxon } from '$lib/utils/formatters';
+ import { formatDuration, toUTCISO, calendarDateTimeToLuxon } from '$lib/utils/formatters';
import { getTimezone } from '$lib/state/timezone.svelte';
import * as Table from "$lib/components/ui/table";
import { Button } from "$lib/components/ui/button";
@@ -14,11 +12,20 @@
import { TableEmptyState } from "$lib/components/ui/table-empty-state";
import { PaginationFooter } from "$lib/components/ui/pagination-footer";
import { TimeRangePicker } from "$lib/components/ui/time-range-picker";
- import { CalendarDate, getLocalTimeZone, today } from "@internationalized/date";
+ import { CalendarDate } from "@internationalized/date";
import { projectsState } from '$lib/state/projects.svelte';
import { createRowClickHandler } from '$lib/utils/navigation';
import { resolve } from '$app/paths';
- import PageHeader from '$lib/components/issues/page-header.svelte';
+ import PageHeader from '$lib/components/issues/page-header.svelte';
+ import {
+ presetMinutes,
+ getTimeRangeFromPreset,
+ dateToCalendarDate,
+ dateToTimeString,
+ parseTimeRangeFromUrl,
+ getResolvedTimeRange,
+ updateUrl
+ } from '$lib/utils/url-params';
const timezone = $derived(getTimezone());
@@ -44,67 +51,9 @@
let total = $state(0);
let totalPages = $state(0);
- // Preset definitions (must match TimeRangePicker)
- const presetMinutes: Record<string, number> = {
- '30m': 30,
- '60m': 60,
- '3h': 180,
- '6h': 360,
- '12h': 720,
- '24h': 1440,
- '3d': 4320,
- '7d': 10080,
- '1M': 43200,
- '3M': 129600,
- };
-
- // Helper functions
- function getTimeRangeFromPresetLocal(presetValue: string): { from: Date; to: Date } {
- const minutes = presetMinutes[presetValue] || 360;
- const now = getNow(timezone);
- const from = now.minus({ minutes });
- return { from: from.toJSDate(), to: now.toJSDate() };
- }
-
- function dateToCalendarDate(date: Date): CalendarDate {
- return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate());
- }
-
- function dateToTimeString(date: Date): string {
- return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
- }
-
- // Parse URL params - supports preset OR from/to
- function parseUrlParams(): { preset: string | null; from: Date | null; to: Date | null } {
- if (!browser) return { preset: '6h', from: null, to: null };
- const params = new URLSearchParams(window.location.search);
- const presetParam = params.get('preset');
- const fromParam = params.get('from');
- const toParam = params.get('to');
-
- // If preset is specified, use it
- if (presetParam && presetMinutes[presetParam]) {
- return { preset: presetParam, from: null, to: null };
- }
-
- // If custom from/to specified
- if (fromParam && toParam) {
- const fromDt = parseISO(fromParam, timezone);
- const toDt = parseISO(toParam, timezone);
- if (fromDt.isValid && toDt.isValid) {
- return { preset: null, from: fromDt.toJSDate(), to: toDt.toJSDate() };
- }
- }
-
- // Default to 6h preset
- return { preset: '6h', from: null, to: null };
- }
-
// Initialize from URL
- const initialUrlParams = parseUrlParams();
- const initialRange = initialUrlParams.preset
- ? getTimeRangeFromPresetLocal(initialUrlParams.preset)
- : { from: initialUrlParams.from!, to: initialUrlParams.to! };
+ const initialUrlParams = parseTimeRangeFromUrl(timezone);
+ const initialRange = getResolvedTimeRange(initialUrlParams, timezone);
// Date Range State
let selectedPreset = $state<string | null>(initialUrlParams.preset);
@@ -114,43 +63,25 @@
let toTime = $state(dateToTimeString(initialRange.to));
// Update URL with current time range
- function updateUrl(pushToHistory = true) {
- const params = new URLSearchParams();
-
- if (selectedPreset) {
- params.set('preset', selectedPreset);
- } else {
- params.set('from', getFromDateTimeUTC());
- params.set('to', getToDateTimeUTC());
- }
-
- const newUrl = `${window.location.pathname}?${params.toString()}`;
-
- goto(newUrl, {
- replaceState: !pushToHistory,
- noScroll: true,
- keepFocus: true
- });
+ function updateTimeRangeUrl(pushToHistory = true) {
+ updateUrl(
+ selectedPreset
+ ? { preset: selectedPreset }
+ : { from: getFromDateTimeUTC(), to: getToDateTimeUTC() },
+ { pushToHistory }
+ );
}
// Handle browser back/forward navigation
function handlePopState() {
- const urlParams = parseUrlParams();
-
- if (urlParams.preset) {
- selectedPreset = urlParams.preset;
- const range = getTimeRangeFromPresetLocal(urlParams.preset);
- fromDate = dateToCalendarDate(range.from);
- fromTime = dateToTimeString(range.from);
- toDate = dateToCalendarDate(range.to);
- toTime = dateToTimeString(range.to);
- } else if (urlParams.from && urlParams.to) {
- selectedPreset = null;
- fromDate = dateToCalendarDate(urlParams.from);
- fromTime = dateToTimeString(urlParams.from);
- toDate = dateToCalendarDate(urlParams.to);
- toTime = dateToTimeString(urlParams.to);
- }
+ const urlParams = parseTimeRangeFromUrl(timezone);
+ const range = getResolvedTimeRange(urlParams, timezone);
+
+ selectedPreset = urlParams.preset;
+ fromDate = dateToCalendarDate(range.from);
+ fromTime = dateToTimeString(range.from);
+ toDate = dateToCalendarDate(range.to);
+ toTime = dateToTimeString(range.to);
page = 1;
loadData(false);
@@ -219,7 +150,7 @@
error = '';
// Update URL
- updateUrl(pushToHistory);
+ updateTimeRangeUrl(pushToHistory);
try {
const requestBody = {
diff --git a/frontend/src/routes/transactions/[endpoint]/+page.svelte b/frontend/src/routes/transactions/[endpoint]/+page.svelte
index 8626859a..ee3b0b3b 100644
--- a/frontend/src/routes/transactions/[endpoint]/+page.svelte
+++ b/frontend/src/routes/transactions/[endpoint]/+page.svelte
@@ -1,8 +1,7 @@
<script lang="ts">
import { onMount } from 'svelte';
- import { goto } from '$app/navigation';
import { api } from '$lib/api';
- import { formatDuration, formatDurationMs, getStatusColor, formatDateTime, getNow, parseISO, toUTCISO, calendarDateTimeToLuxon } from '$lib/utils/formatters';
+ import { formatDuration, formatDurationMs, getStatusColor, formatDateTime, parseISO, toUTCISO, calendarDateTimeToLuxon } from '$lib/utils/formatters';
import { getTimezone } from '$lib/state/timezone.svelte';
import * as Table from "$lib/components/ui/table";
import { Button } from "$lib/components/ui/button";
@@ -11,14 +10,21 @@
import { ArrowLeft } from "@lucide/svelte";
import { TracewayTableHeader } from "$lib/components/ui/traceway-table-header";
import { TableEmptyState } from "$lib/components/ui/table-empty-state";
- import { CalendarDate, getLocalTimeZone, today } from "@internationalized/date";
+ import { CalendarDate } from "@internationalized/date";
import { ErrorDisplay } from "$lib/components/ui/error-display";
import { projectsState } from '$lib/state/projects.svelte';
import ScopeDisplay from '$lib/components/scope-display.svelte';
import { createRowClickHandler } from '$lib/utils/navigation';
import PaginationFooter from '$lib/components/ui/pagination-footer/pagination-footer.svelte';
- import PageHeader from '$lib/components/issues/page-header.svelte';
- import { resolve } from '$app/paths';
+ import PageHeader from '$lib/components/issues/page-header.svelte';
+ import { resolve } from '$app/paths';
+ import {
+ presetMinutes,
+ getTimeRangeFromPreset,
+ dateToCalendarDate,
+ dateToTimeString,
+ updateUrl
+ } from '$lib/utils/url-params';
const timezone = $derived(getTimezone());
@@ -64,41 +70,11 @@
let total = $state(0);
let totalPages = $state(0);
- // Preset definitions (must match TimeRangePicker)
- const presetMinutes: Record<string, number> = {
- '30m': 30,
- '60m': 60,
- '3h': 180,
- '6h': 360,
- '12h': 720,
- '24h': 1440,
- '3d': 4320,
- '7d': 10080,
- '1M': 43200,
- '3M': 129600,
- };
-
- // Helper functions
- function getTimeRangeFromPresetLocal(presetValue: string): { from: Date; to: Date } {
- const minutes = presetMinutes[presetValue] || 360;
- const now = getNow(timezone);
- const from = now.minus({ minutes });
- return { from: from.toJSDate(), to: now.toJSDate() };
- }
-
- function dateToCalendarDate(date: Date): CalendarDate {
- return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate());
- }
-
- function dateToTimeString(date: Date): string {
- return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
- }
-
- // Initialize from URL params
+ // Initialize from URL params (from page data)
function getInitialRange(): { preset: string | null; from: Date; to: Date } {
// If preset is provided, use it
if (data.preset && presetMinutes[data.preset]) {
- const range = getTimeRangeFromPresetLocal(data.preset);
+ const range = getTimeRangeFromPreset(data.preset, timezone);
return { preset: data.preset, from: range.from, to: range.to };
}
@@ -112,7 +88,7 @@
}
// Default to 6h preset
- const range = getTimeRangeFromPresetLocal('6h');
+ const range = getTimeRangeFromPreset('6h', timezone);
return { preset: '6h', from: range.from, to: range.to };
}
@@ -125,23 +101,13 @@
let fromTime = $state(dateToTimeString(initialRange.from));
let toTime = $state(dateToTimeString(initialRange.to));
- function updateUrl(pushToHistory = true) {
- const params = new URLSearchParams();
-
- if (selectedPreset) {
- params.set('preset', selectedPreset);
- } else {
- params.set('from', getFromDateTimeUTC());
- params.set('to', getToDateTimeUTC());
- }
-
- const newUrl = `${window.location.pathname}?${params.toString()}`;
-
- goto(newUrl, {
- replaceState: !pushToHistory,
- noScroll: true,
- keepFocus: true
- });
+ function updateTimeRangeUrl(pushToHistory = true) {
+ updateUrl(
+ selectedPreset
+ ? { preset: selectedPreset }
+ : { from: getFromDateTimeUTC(), to: getToDateTimeUTC() },
+ { pushToHistory }
+ );
}
// Sorting State
@@ -187,7 +153,7 @@
notFound = false;
errorStatus = 0;
- updateUrl(pushToHistory);
+ updateTimeRangeUrl(pushToHistory);
try {
const requestBody = {