Skip to content

Commit db470a3

Browse files
fix(web): legacy collapsed project folders stay collapsed after a save (pingdotgg#35659)
1 parent dbaef80 commit db470a3

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,21 @@ describe("uiStateStore persistence", () => {
267267
expect(persisted.sidebarProjectScopeKey).toBe("github.com/pingdotgg/t3code");
268268
});
269269

270+
it("keeps legacy projects omitted from the expanded list collapsed across a save and reload", () => {
271+
const projectAKey = legacyProjectCwdPreferenceKey("/repo/a");
272+
const projectBKey = legacyProjectCwdPreferenceKey("/repo/b");
273+
const migrated = parsePersistedState({ expandedProjectCwds: ["/repo/a"] });
274+
expect(resolveProjectExpanded(migrated.projectExpandedById, [projectBKey])).toBe(false);
275+
276+
persistState({ ...migrated, pullRequestMergeMethod: "squash" });
277+
const reloaded = parsePersistedState(
278+
JSON.parse(localStorageStub.getItem(PERSISTED_STATE_KEY) ?? "{}") as PersistedUiState,
279+
);
280+
281+
expect(resolveProjectExpanded(reloaded.projectExpandedById, [projectAKey])).toBe(true);
282+
expect(resolveProjectExpanded(reloaded.projectExpandedById, [projectBKey])).toBe(false);
283+
});
284+
270285
it("restores a single-project scope saved before multi-project filtering", () => {
271286
expect(
272287
parsePersistedState({ sidebarProjectScopeKey: "github.com/pingdotgg/t3code" })

‎apps/web/src/uiStateStore.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,10 @@ export function persistState(state: UiState): void {
215215
return;
216216
}
217217
try {
218-
const projectExpandedById = Object.fromEntries(
219-
Object.entries(state.projectExpandedById).filter(
220-
([key]) => key !== LEGACY_PROJECT_EXPANSION_DEFAULT_KEY,
221-
),
222-
);
223218
window.localStorage.setItem(
224219
PERSISTED_STATE_KEY,
225220
JSON.stringify({
226-
projectExpandedById,
221+
projectExpandedById: state.projectExpandedById,
227222
projectOrder: state.projectOrder,
228223
threadLastVisitedAtById: state.threadLastVisitedAtById,
229224
defaultAdvertisedEndpointKey: state.defaultAdvertisedEndpointKey,

0 commit comments

Comments
 (0)