Skip to content

Commit 9b50643

Browse files
committed
fix(web): guard closed view history migration
1 parent 4ea9921 commit 9b50643

2 files changed

Lines changed: 54 additions & 6 deletions

File tree

‎apps/web/src/closedViewStore.test.ts‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
} from "@t3tools/contracts";
88
import { beforeEach, describe, expect, it } from "vite-plus/test";
99

10-
import { useClosedViewStore } from "./closedViewStore";
10+
import { type ClosedViewEntry, useClosedViewStore } from "./closedViewStore";
1111

1212
const refA = scopeThreadRef("env-1" as EnvironmentId, ThreadId.make("thread-A"));
1313
const refB = scopeThreadRef("env-2" as EnvironmentId, ThreadId.make("thread-A"));
@@ -29,6 +29,22 @@ const snapshot: PreviewSessionSnapshot = {
2929
};
3030

3131
describe("closedViewStore", () => {
32+
it.each([null, {}, { entries: null }, { entries: {} }, { entries: "invalid" }])(
33+
"rehydrates malformed older history %j as empty history",
34+
async (state) => {
35+
useClosedViewStore.getState().remember(diff(refA));
36+
const { storage, name } = useClosedViewStore.persist.getOptions();
37+
await storage!.setItem(name!, {
38+
state: state as { entries: ClosedViewEntry[] },
39+
version: 0,
40+
});
41+
await useClosedViewStore.persist.rehydrate();
42+
expect(useClosedViewStore.persist.hasHydrated()).toBe(true);
43+
expect(useClosedViewStore.getState().entries).toEqual([]);
44+
expect(await storage!.getItem(name!)).toEqual({ state: { entries: [] }, version: 1 });
45+
},
46+
);
47+
3248
it("keeps private tabs available in memory without saving their metadata", async () => {
3349
const store = useClosedViewStore.getState();
3450
const publicId = store.remember(diff(refA));
@@ -45,17 +61,39 @@ describe("closedViewStore", () => {
4561
expect(useClosedViewStore.getState().entries.map((entry) => entry.id)).toEqual([publicId]);
4662
});
4763

48-
it("removes private metadata from history saved by earlier versions", async () => {
64+
it("removes private metadata and malformed entries from history saved by earlier versions", async () => {
4965
const store = useClosedViewStore.getState();
5066
const publicId = store.remember(diff(refA));
67+
const browserId = store.remember({
68+
kind: "browser",
69+
threadRef: refA,
70+
snapshot: {
71+
...snapshot,
72+
tabId: "public-tab",
73+
profileId: "default",
74+
navStatus: { _tag: "Success", url: "https://public.example", title: "Public page" },
75+
},
76+
});
5177
store.remember({ kind: "browser", threadRef: refA, snapshot });
5278
const { storage, name } = useClosedViewStore.persist.getOptions();
5379
await storage!.setItem(name!, {
54-
state: { entries: useClosedViewStore.getState().entries },
80+
state: {
81+
entries: [
82+
null,
83+
{},
84+
{ kind: "browser" },
85+
{ kind: "browser", snapshot: null },
86+
...useClosedViewStore.getState().entries,
87+
] as ClosedViewEntry[],
88+
},
5589
version: 0,
5690
});
5791
await useClosedViewStore.persist.rehydrate();
58-
expect(useClosedViewStore.getState().entries.map((entry) => entry.id)).toEqual([publicId]);
92+
expect(useClosedViewStore.persist.hasHydrated()).toBe(true);
93+
expect(useClosedViewStore.getState().entries.map((entry) => entry.id)).toEqual([
94+
browserId,
95+
publicId,
96+
]);
5997
const saved = JSON.stringify(await storage!.getItem(name!));
6098
expect(saved).not.toContain("private.example");
6199
expect(saved).not.toContain("Private page");

‎apps/web/src/closedViewStore.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,18 @@ export const useClosedViewStore = create<ClosedViewStoreState>()(
7777
),
7878
version: 1,
7979
migrate: (persisted) => {
80-
const { entries } = persisted as Pick<ClosedViewStoreState, "entries">;
81-
return { entries: entries.filter(isPersistentView) };
80+
const entries = (persisted as Partial<Pick<ClosedViewStoreState, "entries">> | null)
81+
?.entries;
82+
return {
83+
entries: Array.isArray(entries)
84+
? entries.filter(
85+
(entry) =>
86+
(entry?.kind === "panel-tab" ||
87+
(entry?.kind === "browser" && entry.snapshot != null)) &&
88+
isPersistentView(entry),
89+
)
90+
: [],
91+
};
8292
},
8393
partialize: ({ entries }) => ({ entries: entries.filter(isPersistentView) }),
8494
},

0 commit comments

Comments
 (0)