From c1cfd41c53c62f4066242526e7e360a2ad2ad628 Mon Sep 17 00:00:00 2001 From: Suresh Chaudhary Date: Thu, 28 May 2026 10:29:38 +0530 Subject: [PATCH] fix: add support for escaped characters in URL query parameters --- .../components/user-groups/teamsView.tsx | 3 ++- .../workspace/governance/customers/page.tsx | 3 ++- .../governance/virtual-keys/page.tsx | 3 ++- ui/app/workspace/logs/page.tsx | 3 ++- ui/app/workspace/mcp-logs/page.tsx | 3 ++- ui/lib/queryParamsParser.ts | 21 +++++++++++++++++++ 6 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 ui/lib/queryParamsParser.ts diff --git a/ui/app/_fallbacks/enterprise/components/user-groups/teamsView.tsx b/ui/app/_fallbacks/enterprise/components/user-groups/teamsView.tsx index eba8bb4cf40..7bf74fbae88 100644 --- a/ui/app/_fallbacks/enterprise/components/user-groups/teamsView.tsx +++ b/ui/app/_fallbacks/enterprise/components/user-groups/teamsView.tsx @@ -3,6 +3,7 @@ import FullPageLoader from "@/components/fullPageLoader"; import { useDebouncedValue } from "@/hooks/useDebounce"; import { getErrorMessage, useGetCustomersQuery, useGetTeamsQuery, useGetVirtualKeysQuery } from "@/lib/store"; import { RbacOperation, RbacResource, useRbac } from "@enterprise/lib"; +import { parseAsSafeString } from "@/lib/queryParamsParser"; import { parseAsInteger, parseAsString, useQueryStates } from "nuqs"; import { useEffect, useRef } from "react"; import { toast } from "sonner"; @@ -18,7 +19,7 @@ export function TeamsView() { const [urlState, setUrlState] = useQueryStates( { - search: parseAsString.withDefault(""), + search: parseAsSafeString.withDefault(""), offset: parseAsInteger.withDefault(0), selected_team: parseAsString.withDefault(""), }, diff --git a/ui/app/workspace/governance/customers/page.tsx b/ui/app/workspace/governance/customers/page.tsx index f8f9d307f46..0ab897b09f3 100644 --- a/ui/app/workspace/governance/customers/page.tsx +++ b/ui/app/workspace/governance/customers/page.tsx @@ -3,6 +3,7 @@ import FullPageLoader from "@/components/fullPageLoader"; import { useDebouncedValue } from "@/hooks/useDebounce"; import { getErrorMessage, useGetCustomersQuery, useGetTeamsQuery, useGetVirtualKeysQuery } from "@/lib/store"; import { RbacOperation, RbacResource, useRbac } from "@enterprise/lib"; +import { parseAsSafeString } from "@/lib/queryParamsParser"; import { parseAsInteger, parseAsString, useQueryStates } from "nuqs"; import { useEffect, useRef } from "react"; import { toast } from "sonner"; @@ -18,7 +19,7 @@ export default function GovernanceCustomersPage() { const [urlState, setUrlState] = useQueryStates( { - search: parseAsString.withDefault(""), + search: parseAsSafeString.withDefault(""), offset: parseAsInteger.withDefault(0), }, { history: "push" }, diff --git a/ui/app/workspace/governance/virtual-keys/page.tsx b/ui/app/workspace/governance/virtual-keys/page.tsx index 4dfbc8d9edb..84b2bc75ec3 100644 --- a/ui/app/workspace/governance/virtual-keys/page.tsx +++ b/ui/app/workspace/governance/virtual-keys/page.tsx @@ -8,6 +8,7 @@ import { useGetVirtualKeysQuery, } from "@/lib/store"; import { RbacOperation, RbacResource, useRbac } from "@enterprise/lib"; +import { parseAsSafeString } from "@/lib/queryParamsParser"; import { parseAsInteger, parseAsString, useQueryStates } from "nuqs"; import { useEffect, useRef } from "react"; import { toast } from "sonner"; @@ -29,7 +30,7 @@ export default function GovernanceVirtualKeysPage() { const [urlState, setUrlState] = useQueryStates( { - search: parseAsString.withDefault(""), + search: parseAsSafeString.withDefault(""), customer_id: parseAsString.withDefault(""), team_id: parseAsString.withDefault(""), offset: parseAsInteger.withDefault(0), diff --git a/ui/app/workspace/logs/page.tsx b/ui/app/workspace/logs/page.tsx index f9c5831d5a2..469fdad2dfc 100644 --- a/ui/app/workspace/logs/page.tsx +++ b/ui/app/workspace/logs/page.tsx @@ -26,6 +26,7 @@ import { RbacOperation, RbacResource, useRbac } from "@enterprise/lib"; import NumberFlow from "@number-flow/react"; import { useLocation } from "@tanstack/react-router"; import { AlertCircle, BarChart, CheckCircle, Clock, DollarSign, Hash, Info } from "lucide-react"; +import { parseAsSafeString } from "@/lib/queryParamsParser"; import { parseAsArrayOf, parseAsBoolean, parseAsInteger, parseAsString, useQueryStates } from "nuqs"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; @@ -85,7 +86,7 @@ export default function LogsPage() { team_ids: parseAsArrayOf(parseAsString).withDefault([]), customer_ids: parseAsArrayOf(parseAsString).withDefault([]), business_unit_ids: parseAsArrayOf(parseAsString).withDefault([]), - content_search: parseAsString.withDefault(""), + content_search: parseAsSafeString.withDefault(""), start_time: parseAsInteger.withDefault(defaultTimeRange.startTime), end_time: parseAsInteger.withDefault(defaultTimeRange.endTime), limit: parseAsInteger.withDefault(25), // Default fallback, actual value calculated based on table height diff --git a/ui/app/workspace/mcp-logs/page.tsx b/ui/app/workspace/mcp-logs/page.tsx index e8e24e72ef4..1e9ef02c333 100644 --- a/ui/app/workspace/mcp-logs/page.tsx +++ b/ui/app/workspace/mcp-logs/page.tsx @@ -19,6 +19,7 @@ import { RbacOperation, RbacResource, useRbac } from "@enterprise/lib"; import NumberFlow from "@number-flow/react"; import { useLocation } from "@tanstack/react-router"; import { AlertCircle, CheckCircle, Clock, DollarSign, Hash } from "lucide-react"; +import { parseAsSafeString } from "@/lib/queryParamsParser"; import { parseAsArrayOf, parseAsBoolean, parseAsInteger, parseAsString, useQueryStates } from "nuqs"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { createMCPColumns } from "./views/columns"; @@ -52,7 +53,7 @@ export default function MCPLogsPage() { server_labels: parseAsArrayOf(parseAsString).withDefault([]), status: parseAsArrayOf(parseAsString).withDefault([]), virtual_key_ids: parseAsArrayOf(parseAsString).withDefault([]), - content_search: parseAsString.withDefault(""), + content_search: parseAsSafeString.withDefault(""), start_time: parseAsInteger.withDefault(defaultTimeRange.startTime), end_time: parseAsInteger.withDefault(defaultTimeRange.endTime), limit: parseAsInteger.withDefault(50), diff --git a/ui/lib/queryParamsParser.ts b/ui/lib/queryParamsParser.ts new file mode 100644 index 00000000000..49e3087d110 --- /dev/null +++ b/ui/lib/queryParamsParser.ts @@ -0,0 +1,21 @@ +import { createParser } from "nuqs"; + +// nuqs's encodeQueryValue skips characters like "/" that TanStack Router's +// navigate({ to }) interprets as path/query delimiters. Full URI-encoding +// the value prevents any special character from breaking navigation. +export const parseAsSafeString = createParser({ + parse: (value: string) => { + try { + return decodeURIComponent(value); + } catch { + return value; + } + }, + serialize: (value: string) => { + try { + return encodeURIComponent(value); + } catch { + return value; + } + }, +});