Skip to content

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

fix(saved-views): replace default view history state LFE-15092 (#16103)

Nimarc8b46cad28e9
diff --git a/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts b/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
index f49ec75466..798ac3ac8e 100644
--- a/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
+++ b/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
@@ -234,25 +234,30 @@ export function useTableViewManager({
return;
}
+ // Resolve the default before restoring session state so a stored default
+ // can use replace semantics.
+ if (isDefaultLoading) return;
+
// Priority 1: Session storage (from a previous visit to this table)
if (
storedViewId &&
(!isSystemPresetId(storedViewId) || allowBackendSystemPresets)
) {
- setSelectedViewId(storedViewId);
+ setSelectedViewId(
+ storedViewId,
+ storedViewId === defaultViewId ? "replaceIn" : undefined,
+ );
return;
}
- // Priority 2: Default view (wait for query to resolve)
- if (isDefaultLoading) return;
-
+ // Priority 2: Default view
if (defaultViewId) {
if (isSystemPresetId(defaultViewId) && !allowBackendSystemPresets) {
handleSetViewId(null, { updateType: "replaceIn" });
return;
}
setStoredViewId(defaultViewId);
- setSelectedViewId(defaultViewId);
+ setSelectedViewId(defaultViewId, "replaceIn");
return;
}
@@ -484,10 +489,19 @@ export function useTableViewManager({
// restore, and the resolved default view. Classify as "default" when the
// applied view is the resolved default, else treat as a "permalink"
// (deep-link / session-restore) entry (LFE-10781).
+ const isResolvedDefault = requestedViewId === defaultViewId;
applyViewState(selectedViewData, {
- trigger: requestedViewId === defaultViewId ? "default" : "permalink",
+ trigger: isResolvedDefault ? "default" : "permalink",
viewId: requestedViewId,
});
+ // Query-param writes are batched by the app provider, and the final
+ // setter's update type controls the single navigation. Re-setting the
+ // already-selected default viewId last therefore folds all synchronous
+ // saved-view state writes (filters/order/search) into the current history
+ // entry without changing deliberate view selections, which still push.
+ if (isResolvedDefault) {
+ setSelectedViewId(requestedViewId, "replaceIn");
+ }
if (storedViewId !== requestedViewId) {
setStoredViewId(requestedViewId);
}
@@ -505,6 +519,7 @@ export function useTableViewManager({
applyViewState,
storedViewId,
setStoredViewId,
+ setSelectedViewId,
defaultViewId,
isDefaultLoading,
]);
diff --git a/web/src/features/filters/viewStateHistoryWrites.clienttest.tsx b/web/src/features/filters/viewStateHistoryWrites.clienttest.tsx
index d6e73e6271..055923122f 100644
--- a/web/src/features/filters/viewStateHistoryWrites.clienttest.tsx
+++ b/web/src/features/filters/viewStateHistoryWrites.clienttest.tsx
@@ -153,6 +153,7 @@ function ViewManagerHarness({
return (
<div>
<div data-testid="selected-view-id">{selectedViewId ?? "null"}</div>
+ <div data-testid="applied-filter-count">{appliedFilters.length}</div>
<button
onClick={() => handleSetViewId("view-1", { updateType: "replaceIn" })}
>
@@ -237,6 +238,103 @@ describe("view-state URL writes and browser history (LFE-10715)", () => {
}
});
+ it("auto-applies a resolved default view with replacements, not pushes", async () => {
+ // Personal and project defaults have the same resolved client shape. The
+ // manager branches on viewId, not scope, so one regression covers both.
+ mockGetDefaultUseQuery.mockReturnValue({
+ data: { viewId: "view-1", scope: "user" },
+ isLoading: false,
+ });
+ mockGetByIdUseQuery.mockReturnValue({
+ data: {
+ id: "view-1",
+ name: "Resolved default view",
+ tableName: TableViewPresetTableName.Traces,
+ orderBy: null,
+ filters: TEST_FILTERS,
+ columnOrder: [],
+ columnVisibility: {},
+ searchQuery: "",
+ },
+ error: null,
+ isSuccess: true,
+ isError: false,
+ });
+
+ render(<ViewManagerHarness tableName={TableViewPresetTableName.Traces} />);
+
+ await waitFor(() => {
+ expect(screen.getByTestId("selected-view-id").textContent).toBe("view-1");
+ expect(screen.getByTestId("applied-filter-count").textContent).toBe("1");
+ });
+
+ const viewIdWrites = urlParamWrites.filter(
+ (write) => write.key === "viewId",
+ );
+ // One replace selects the resolved default. A later replace is deliberately
+ // queued after its filter state; app-level query-param batching uses this
+ // final setter's update type for the combined navigation.
+ expect(viewIdWrites.length).toBeGreaterThan(1);
+ expect(viewIdWrites.at(-1)).toEqual({
+ key: "viewId",
+ value: "view-1",
+ updateType: "replaceIn",
+ });
+ });
+
+ it("restores a session-stored resolved default without pushing", async () => {
+ sessionStorage.setItem("traces-project-1-viewId", JSON.stringify("view-1"));
+ mockGetDefaultUseQuery.mockReturnValue({
+ data: undefined,
+ isLoading: true,
+ });
+ mockGetByIdUseQuery.mockReturnValue({
+ data: {
+ id: "view-1",
+ name: "Session-stored resolved default",
+ tableName: TableViewPresetTableName.Traces,
+ orderBy: null,
+ filters: TEST_FILTERS,
+ columnOrder: [],
+ columnVisibility: {},
+ searchQuery: "",
+ },
+ error: null,
+ isSuccess: true,
+ isError: false,
+ });
+
+ const { rerender } = render(
+ <ViewManagerHarness tableName={TableViewPresetTableName.Traces} />,
+ );
+
+ expect(screen.getByTestId("selected-view-id").textContent).toBe("null");
+ expect(urlParamWrites.filter((write) => write.key === "viewId")).toEqual(
+ [],
+ );
+
+ mockGetDefaultUseQuery.mockReturnValue({
+ data: { viewId: "view-1", scope: "project" },
+ isLoading: false,
+ });
+ rerender(
+ <ViewManagerHarness tableName={TableViewPresetTableName.Traces} />,
+ );
+
+ await waitFor(() => {
+ expect(screen.getByTestId("selected-view-id").textContent).toBe("view-1");
+ expect(screen.getByTestId("applied-filter-count").textContent).toBe("1");
+ });
+
+ const viewIdWrites = urlParamWrites.filter(
+ (write) => write.key === "viewId",
+ );
+ expect(viewIdWrites.length).toBeGreaterThan(1);
+ for (const write of viewIdWrites) {
+ expect(write.updateType).toBe("replaceIn");
+ }
+ });
+
it("forwards a replaceIn updateType through handleSetViewId", async () => {
render(<ViewManagerHarness tableName={TableViewPresetTableName.Traces} />);