Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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(""),
},
Expand Down
3 changes: 2 additions & 1 deletion ui/app/workspace/governance/customers/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -18,7 +19,7 @@ export default function GovernanceCustomersPage() {

const [urlState, setUrlState] = useQueryStates(
{
search: parseAsString.withDefault(""),
search: parseAsSafeString.withDefault(""),
offset: parseAsInteger.withDefault(0),
},
{ history: "push" },
Expand Down
3 changes: 2 additions & 1 deletion ui/app/workspace/governance/virtual-keys/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion ui/app/workspace/logs/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ui/app/workspace/mcp-logs/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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),
Expand Down
21 changes: 21 additions & 0 deletions ui/lib/queryParamsParser.ts
Original file line number Diff line number Diff line change
@@ -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;
}
},
});
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Resolved
Loading