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
34 changes: 17 additions & 17 deletions ui/app/workspace/logs/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ 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 { parseAsSafeArrayOf, parseAsSafeString } from "@/lib/queryParamsParser";
import { parseAsBoolean, parseAsInteger, parseAsString, useQueryStates } from "nuqs";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

export default function LogsPage() {
Expand Down Expand Up @@ -72,20 +72,20 @@ export default function LogsPage() {
const [urlState, setUrlState] = useQueryStates(
{
parent_request_id: parseAsString.withDefault(""),
providers: parseAsArrayOf(parseAsString).withDefault([]),
models: parseAsArrayOf(parseAsString).withDefault([]),
aliases: parseAsArrayOf(parseAsString).withDefault([]),
status: parseAsArrayOf(parseAsString).withDefault([]),
stop_reasons: parseAsArrayOf(parseAsString).withDefault([]),
objects: parseAsArrayOf(parseAsString).withDefault([]),
selected_key_ids: parseAsArrayOf(parseAsString).withDefault([]),
virtual_key_ids: parseAsArrayOf(parseAsString).withDefault([]),
routing_rule_ids: parseAsArrayOf(parseAsString).withDefault([]),
routing_engine_used: parseAsArrayOf(parseAsString).withDefault([]),
user_ids: parseAsArrayOf(parseAsString).withDefault([]),
team_ids: parseAsArrayOf(parseAsString).withDefault([]),
customer_ids: parseAsArrayOf(parseAsString).withDefault([]),
business_unit_ids: parseAsArrayOf(parseAsString).withDefault([]),
providers: parseAsSafeArrayOf.withDefault([]),
models: parseAsSafeArrayOf.withDefault([]),
aliases: parseAsSafeArrayOf.withDefault([]),
status: parseAsSafeArrayOf.withDefault([]),
stop_reasons: parseAsSafeArrayOf.withDefault([]),
objects: parseAsSafeArrayOf.withDefault([]),
selected_key_ids: parseAsSafeArrayOf.withDefault([]),
virtual_key_ids: parseAsSafeArrayOf.withDefault([]),
routing_rule_ids: parseAsSafeArrayOf.withDefault([]),
routing_engine_used: parseAsSafeArrayOf.withDefault([]),
user_ids: parseAsSafeArrayOf.withDefault([]),
team_ids: parseAsSafeArrayOf.withDefault([]),
customer_ids: parseAsSafeArrayOf.withDefault([]),
business_unit_ids: parseAsSafeArrayOf.withDefault([]),
content_search: parseAsSafeString.withDefault(""),
start_time: parseAsInteger.withDefault(defaultTimeRange.startTime),
end_time: parseAsInteger.withDefault(defaultTimeRange.endTime),
Expand All @@ -96,7 +96,7 @@ export default function LogsPage() {
polling: parseAsBoolean.withDefault(true).withOptions({ clearOnDefault: false }),
period: parseAsString.withDefault(hasExplicitTimeRange ? "" : "1h").withOptions({ clearOnDefault: false }),
missing_cost_only: parseAsBoolean.withDefault(false),
cache_hit_types: parseAsArrayOf(parseAsString).withDefault([]),
cache_hit_types: parseAsSafeArrayOf.withDefault([]),
metadata_filters: parseAsString.withDefault(""),
selected_log: parseAsString.withDefault(""),
},
Expand Down
38 changes: 3 additions & 35 deletions ui/app/workspace/providers/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import ModelProviderConfig from "@/app/workspace/providers/views/modelProviderCo
import FullPageLoader from "@/components/fullPageLoader";
import { Badge } from "@/components/ui/badge";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { TruncatedLabel } from "@/components/ui/truncatedLabel";
import { DefaultNetworkConfig, DefaultPerformanceConfig } from "@/lib/constants/config";
import { ProviderIconType, RenderProviderIcon } from "@/lib/constants/icons";
import { ProviderLabels, ProviderNames } from "@/lib/constants/logs";
Expand All @@ -20,7 +21,7 @@ import { RbacOperation, RbacResource, useRbac } from "@enterprise/lib";
import { useNavigate } from "@tanstack/react-router";
import { AlertCircle } from "lucide-react";
import { useQueryState } from "nuqs";
import { useCallback, useEffect, useRef, useState } from "react";
import { useEffect, useState } from "react";
import { toast } from "sonner";
import AddCustomProviderSheet from "./dialogs/addNewCustomProviderSheet";
import ConfirmDeleteProviderDialog from "./dialogs/confirmDeleteProviderDialog";
Expand Down Expand Up @@ -227,7 +228,7 @@ export default function Providers() {
size="sm"
className="h-4 w-4 shrink-0"
/>
<TruncatedName name={label} />
<TruncatedLabel className="flex-1 text-sm">{label}</TruncatedLabel>
<KeyDiscoveryFailedBadge provider={p} />
<ProviderStatusBadge status={p.provider_status} />
{isCustom && (
Expand Down Expand Up @@ -272,39 +273,6 @@ export default function Providers() {
);
}

function TruncatedName({ name }: { name: string }) {
const textRef = useRef<HTMLDivElement>(null);
const [isTruncated, setIsTruncated] = useState(false);

const checkTruncation = useCallback(() => {
const el = textRef.current;
if (el) {
setIsTruncated(el.scrollWidth > el.clientWidth);
}
}, []);

useEffect(() => {
checkTruncation();
window.addEventListener("resize", checkTruncation);
return () => window.removeEventListener("resize", checkTruncation);
}, [checkTruncation, name]);

const inner = (
<div ref={textRef} className="min-w-0 flex-1 truncate text-sm">
{name}
</div>
);

if (!isTruncated) return inner;

return (
<Tooltip>
<TooltipTrigger asChild>{inner}</TooltipTrigger>
<TooltipContent side="right">{name}</TooltipContent>
</Tooltip>
);
}

function ProviderStatusBadge({ status }: { status: ProviderStatus }) {
return status != "active" ? (
<Tooltip>
Expand Down
3 changes: 2 additions & 1 deletion ui/components/filters/logsFilterSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/component
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scrollArea";
import { Skeleton } from "@/components/ui/skeleton";
import { TruncatedLabel } from "@/components/ui/truncatedLabel";
import { RequestTypeLabels, RequestTypes, RoutingEngineUsedLabels, Statuses } from "@/lib/constants/logs";
import { useGetAvailableFilterDataQuery, useGetProvidersQuery } from "@/lib/store";
import type { LogFilters } from "@/lib/types/logs";
Expand Down Expand Up @@ -234,7 +235,7 @@ function CheckboxFilterItem({
return (
<label className="hover:bg-muted/50 flex cursor-pointer items-center gap-2.5 px-3 py-2 text-sm" data-testid={testId}>
<Checkbox checked={checked} onCheckedChange={onCheckedChange} />
<span className={cn("truncate", labelClassName)}>{label}</span>
<TruncatedLabel className={labelClassName}>{label}</TruncatedLabel>
</label>
);
}
Expand Down
3 changes: 2 additions & 1 deletion ui/components/filters/mcpFilterSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/component
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scrollArea";
import { Skeleton } from "@/components/ui/skeleton";
import { TruncatedLabel } from "@/components/ui/truncatedLabel";
import { Statuses } from "@/lib/constants/logs";
import { useGetMCPLogsFilterDataQuery } from "@/lib/store";
import type { MCPToolLogFilters } from "@/lib/types/logs";
Expand Down Expand Up @@ -195,7 +196,7 @@ function CheckboxFilterItem({
return (
<label className="hover:bg-muted/50 flex cursor-pointer items-center gap-2.5 px-3 py-2 text-sm">
<Checkbox checked={checked} onCheckedChange={onCheckedChange} />
<span className={cn("truncate", labelClassName)}>{label}</span>
<TruncatedLabel className={labelClassName}>{label}</TruncatedLabel>
</label>
);
}
Expand Down
54 changes: 54 additions & 0 deletions ui/components/ui/truncatedLabel.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import * as React from "react";
import { useCallback, useLayoutEffect, useState } from "react";

import { cn } from "@/lib/utils";

import { Tooltip, TooltipContent, TooltipTrigger } from "./tooltip";

type TruncatedLabelProps = {
children: React.ReactNode;
className?: string;
tooltip?: React.ReactNode;
tooltipSide?: React.ComponentProps<typeof TooltipContent>["side"];
} & Omit<React.ComponentProps<"span">, "children">;

function TruncatedLabel({ children, className, tooltip, tooltipSide = "right", ...props }: TruncatedLabelProps) {
const [measureEl, setMeasureEl] = useState<HTMLSpanElement | null>(null);
const [isTruncated, setIsTruncated] = useState(false);

const setTextRef = useCallback((node: HTMLSpanElement | null) => {
setMeasureEl(node);
}, []);

useLayoutEffect(() => {
if (!measureEl) return;

const checkTruncation = () => {
setIsTruncated(measureEl.scrollWidth > measureEl.clientWidth);
};

checkTruncation();
const observer = new ResizeObserver(checkTruncation);
observer.observe(measureEl);
return () => observer.disconnect();
}, [measureEl, children]);

const tooltipContent = tooltip ?? (typeof children === "string" ? children : undefined);

const inner = (
<span ref={setTextRef} className={cn("min-w-0 truncate", className)} {...props}>
{children}
</span>
);

if (!isTruncated || tooltipContent == null) return inner;

return (
<Tooltip>
<TooltipTrigger asChild>{inner}</TooltipTrigger>
<TooltipContent side={tooltipSide}>{tooltipContent}</TooltipContent>
</Tooltip>
);
}

export { TruncatedLabel };
20 changes: 20 additions & 0 deletions ui/lib/queryParamsParser.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { describe, expect, test } from "vitest";
import { parseAsSafeArrayOf, parseAsSafeString } from "./queryParamsParser";

describe("parseAsSafeString", () => {
test("roundtrips model names with double slashes", () => {
const model = "gpt://b1g9n2rqsrnikgh0uofm/gpt-oss-120b";
const serialized = parseAsSafeString.serialize(model);
expect(serialized).not.toContain("://");
expect(parseAsSafeString.parse(serialized)).toBe(model);
});
});

describe("parseAsSafeArrayOf", () => {
test("roundtrips multiple models with special characters", () => {
const models = ["gpt://b1g9n2rqsrnikgh0uofm/gpt-oss-20b", "gpt://b1g9n2rqsrnikgh0uofm/gpt-oss-120b"];
const serialized = parseAsSafeArrayOf.serialize(models);
expect(serialized).not.toContain("://");
expect(parseAsSafeArrayOf.parse(serialized)).toEqual(models);
});
});
8 changes: 6 additions & 2 deletions ui/lib/queryParamsParser.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createParser } from "nuqs";
import { createParser, parseAsArrayOf } from "nuqs";

// nuqs's encodeQueryValue skips characters like "/" that TanStack Router's
// navigate({ to }) interprets as path/query delimiters. Full URI-encoding
Expand All @@ -18,4 +18,8 @@ export const parseAsSafeString = createParser({
return value;
}
},
});
});

// Comma-separated filter values (models, providers, etc.) with the same
// encoding guarantees as parseAsSafeString.
export const parseAsSafeArrayOf = parseAsArrayOf(parseAsSafeString);
Loading