Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(web): wait for dataset item route params before tRPC (#16964)

cursor[bot]ee50e54b08f8
diff --git a/web/src/features/datasets/components/DatasetItemDetailPage.tsx b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
index 701671ce23..503cee4047 100644
--- a/web/src/features/datasets/components/DatasetItemDetailPage.tsx
+++ b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
@@ -60,10 +60,16 @@ export const DatasetItemDetailPage = ({
(tab) => !isExperimentsBetaActive || tab.value !== DATASET_ITEM_TABS.RUNS,
);
- const dataset = api.datasets.byId.useQuery({
- datasetId,
- projectId,
- });
+ const routeReady =
+ Boolean(projectId) && Boolean(datasetId) && Boolean(itemId);
+
+ const dataset = api.datasets.byId.useQuery(
+ {
+ datasetId,
+ projectId,
+ },
+ { enabled: routeReady },
+ );
const item = api.datasets.itemByIdAtVersion.useQuery(
{
datasetId,
@@ -71,6 +77,7 @@ export const DatasetItemDetailPage = ({
datasetItemId: itemId,
},
{
+ enabled: routeReady,
refetchOnWindowFocus: false, // breaks dirty form state
},
);
diff --git a/web/src/hooks/useReadyRouteParams.clienttest.tsx b/web/src/hooks/useReadyRouteParams.clienttest.tsx
index c73be8db3c..827f9d1f67 100644
--- a/web/src/hooks/useReadyRouteParams.clienttest.tsx
+++ b/web/src/hooks/useReadyRouteParams.clienttest.tsx
@@ -63,4 +63,31 @@ describe("useReadyRouteParams", () => {
params: { projectId: "p1", userId: "u1" },
});
});
+
+ test("dataset item detail is not ready until project, dataset, and item ids hydrate", () => {
+ mockQuery({});
+
+ const { result } = renderHook(() =>
+ useReadyRouteParams(["projectId", "datasetId", "itemId"]),
+ );
+
+ expect(result.current).toEqual({ ready: false });
+ });
+
+ test("dataset item detail is ready once all three route ids are strings", () => {
+ mockQuery({
+ projectId: "p1",
+ datasetId: "d1",
+ itemId: "i1",
+ });
+
+ const { result } = renderHook(() =>
+ useReadyRouteParams(["projectId", "datasetId", "itemId"]),
+ );
+
+ expect(result.current).toEqual({
+ ready: true,
+ params: { projectId: "p1", datasetId: "d1", itemId: "i1" },
+ });
+ });
});
diff --git a/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/index.tsx b/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/index.tsx
index 92cb77ebfd..29f53c34f5 100644
--- a/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/index.tsx
+++ b/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/index.tsx
@@ -1,4 +1,3 @@
-import { useRouter } from "next/router";
import { DATASET_ITEM_TABS } from "@/src/features/navigation/utils/dataset-item-tabs";
import { DatasetItemDetailPage } from "@/src/features/datasets/components/DatasetItemDetailPage";
import { DatasetItemViewModeContent } from "@/src/features/datasets/components/DatasetItemViewModeContent";
@@ -14,13 +13,32 @@ import { Button } from "@/src/components/ui/button";
import useSessionStorage from "@/src/components/useSessionStorage";
import { History, PanelRightOpen } from "lucide-react";
import { useState } from "react";
+import {
+ RouteParamsPendingFallback,
+ useReadyRouteParams,
+} from "@/src/hooks/useReadyRouteParams";
-function DatasetItemContent() {
- const router = useRouter();
- const projectId = router.query.projectId as string;
- const datasetId = router.query.datasetId as string;
- const itemId = router.query.itemId as string;
+export default function DatasetItemPage() {
+ const route = useReadyRouteParams(["projectId", "datasetId", "itemId"]);
+ if (!route.ready) return <RouteParamsPendingFallback />;
+ return (
+ <DatasetItemContent
+ projectId={route.params.projectId}
+ datasetId={route.params.datasetId}
+ itemId={route.params.itemId}
+ />
+ );
+}
+function DatasetItemContent({
+ projectId,
+ datasetId,
+ itemId,
+}: {
+ projectId: string;
+ datasetId: string;
+ itemId: string;
+}) {
const { selectedVersion, resetToLatest } = useDatasetVersion();
const isViewingOldVersion = selectedVersion !== null;
@@ -31,6 +49,9 @@ function DatasetItemContent() {
const [isVersionPanelOpen, setIsVersionPanelOpen] =
useState(!!selectedVersion);
+ const routeReady =
+ Boolean(projectId) && Boolean(datasetId) && Boolean(itemId);
+
// Fetch current item
const item = api.datasets.itemByIdAtVersion.useQuery(
{
@@ -39,6 +60,7 @@ function DatasetItemContent() {
datasetItemId: itemId,
},
{
+ enabled: routeReady,
refetchOnWindowFocus: false,
},
);
@@ -52,22 +74,28 @@ function DatasetItemContent() {
version: selectedVersion!,
},
{
- enabled: selectedVersion !== null,
+ enabled: routeReady && selectedVersion !== null,
},
);
// Fetch dataset
- const dataset = api.datasets.byId.useQuery({
- datasetId,
- projectId,
- });
+ const dataset = api.datasets.byId.useQuery(
+ {
+ datasetId,
+ projectId,
+ },
+ { enabled: routeReady },
+ );
// Fetch item version history for sidebar indicators
- const itemVersionHistory = api.datasets.itemVersionHistory.useQuery({
- projectId,
- datasetId,
- itemId,
- });
+ const itemVersionHistory = api.datasets.itemVersionHistory.useQuery(
+ {
+ projectId,
+ datasetId,
+ itemId,
+ },
+ { enabled: routeReady },
+ );
// Check if item was changed at selected version (enables diff toggle)
// Use 1 second tolerance to account for potential timestamp precision issues
@@ -183,5 +211,3 @@ function DatasetItemContent() {
</DatasetItemDetailPage>
);
}
-
-export default DatasetItemContent;
diff --git a/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/runs.tsx b/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/runs.tsx
index 222189f817..597b956328 100644
--- a/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/runs.tsx
+++ b/web/src/pages/project/[projectId]/datasets/[datasetId]/items/[itemId]/runs.tsx
@@ -4,12 +4,33 @@ import { DatasetRunItemsByItemTable } from "@/src/features/datasets/components/D
import { DATASET_ITEM_TABS } from "@/src/features/navigation/utils/dataset-item-tabs";
import { DatasetItemDetailPage } from "@/src/features/datasets/components/DatasetItemDetailPage";
import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
+import {
+ RouteParamsPendingFallback,
+ useReadyRouteParams,
+} from "@/src/hooks/useReadyRouteParams";
-function DatasetItemRuns() {
+export default function DatasetItemRunsPage() {
+ const route = useReadyRouteParams(["projectId", "datasetId", "itemId"]);
+ if (!route.ready) return <RouteParamsPendingFallback />;
+ return (
+ <DatasetItemRuns
+ projectId={route.params.projectId}
+ datasetId={route.params.datasetId}
+ itemId={route.params.itemId}
+ />
+ );
+}
+
+function DatasetItemRuns({
+ projectId,
+ datasetId,
+ itemId,
+}: {
+ projectId: string;
+ datasetId: string;
+ itemId: string;
+}) {
const router = useRouter();
- const projectId = router.query.projectId as string;
- const datasetId = router.query.datasetId as string;
- const itemId = router.query.itemId as string;
// The per-item runs view reads legacy dataset_run_items and has no
// events-backed equivalent, so fast-preview (v4) users are redirected back to
@@ -44,5 +65,3 @@ function DatasetItemRuns() {
</DatasetItemDetailPage>
);
}
-
-export default DatasetItemRuns;