Skip to content

Commit 02cd582

Browse files
fix(mobile): the project picker waits for saved drafts before retargeting one
A cold-start link to the picker with a draft id could retarget before drafts hydrated, creating an empty entry that overwrote the saved draft. Wait for drafts to load and retarget only a draft that exists. AI-assisted; verified with the tests and tools listed above.
1 parent f71427f commit 02cd582

3 files changed

Lines changed: 44 additions & 6 deletions

File tree

‎apps/mobile/src/features/threads/NewTaskRouteScreen.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ProjectFavicon } from "../../components/ProjectFavicon";
2929
import { useProjects, useServerConfigs } from "../../state/entities";
3030
import { projectEnvironment } from "../../state/projects";
3131
import { useAtomCommand } from "../../state/use-atom-command";
32-
import { retargetNewTaskDraft } from "../../state/use-composer-drafts";
32+
import { retargetSavedNewTaskDraft } from "../../state/use-composer-drafts";
3333
import { useRemoteConnectionStatus } from "../../state/use-remote-environment-registry";
3434
import type { WorkspaceState } from "../../state/workspaceModel";
3535
import { useWorkspaceState } from "../../state/workspace";
@@ -240,19 +240,21 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
240240
return;
241241
}
242242
// Restamp only on choice, so backing out leaves the draft as it was.
243-
if (routeDraftId !== undefined) {
244-
retargetNewTaskDraft(routeDraftId, {
243+
const draftId =
244+
routeDraftId !== undefined &&
245+
(await retargetSavedNewTaskDraft(routeDraftId, {
245246
environmentId: project.environmentId,
246247
projectId: project.id,
247-
});
248-
}
248+
}))
249+
? routeDraftId
250+
: undefined;
249251
selectDetail({
250252
name: "Thread",
251253
params: {
252254
draft: {
253255
environmentId: String(project.environmentId),
254256
projectId: String(project.id),
255-
draftId: routeDraftId,
257+
draftId,
256258
incomingShareId: incomingShare?.id,
257259
},
258260
},

‎apps/mobile/src/state/use-composer-drafts.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ import {
205205
restoreComposerDraftSnapshotState,
206206
restoreCloudComposerDrafts,
207207
retargetNewTaskDraft,
208+
retargetSavedNewTaskDraft,
208209
setComposerDraftText,
209210
insertComposerDraftContext,
210211
insertComposerDraftText,
@@ -1933,6 +1934,30 @@ describe("mobile composer drafts", () => {
19331934
expect(findNewTaskDraftKeys(appAtomRegistry.get(composerDraftsAtom), to)).toEqual([key]);
19341935
});
19351936

1937+
it("retargets a saved new-task draft only after drafts load", async () => {
1938+
const from = {
1939+
environmentId: EnvironmentId.make("environment-1"),
1940+
projectId: ProjectId.make("project-1"),
1941+
};
1942+
const to = {
1943+
environmentId: EnvironmentId.make("environment-1"),
1944+
projectId: ProjectId.make("project-2"),
1945+
};
1946+
const key = createNewTaskDraft(from);
1947+
setComposerDraftText(key, "kept through a cold start");
1948+
await flushComposerDrafts();
1949+
appAtomRegistry.set(composerDraftsAtom, {});
1950+
resetComposerDraftsLoadState();
1951+
1952+
await expect(retargetSavedNewTaskDraft(key, to)).resolves.toBe(true);
1953+
expect(getComposerDraftSnapshot(key)).toMatchObject({
1954+
text: "kept through a cold start",
1955+
project: to,
1956+
});
1957+
await expect(retargetSavedNewTaskDraft(`${key}-gone`, to)).resolves.toBe(false);
1958+
expect(appAtomRegistry.get(composerDraftsAtom)[`${key}-gone`]).toBeUndefined();
1959+
});
1960+
19361961
it("merges persisted option memory without replacing newer choices", async () => {
19371962
composerDraftFileMocks.setDocument({
19381963
schemaVersion: 1,

‎apps/mobile/src/state/use-composer-drafts.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,6 +1999,17 @@ export function retargetNewTaskDraft(
19991999
});
20002000
}
20012001

2002+
/** Retargets a saved draft once drafts load; an absent one is not created. */
2003+
export async function retargetSavedNewTaskDraft(
2004+
draftKey: string,
2005+
project: { readonly environmentId: EnvironmentId; readonly projectId: ProjectId },
2006+
): Promise<boolean> {
2007+
await waitForComposerDraftsLoaded();
2008+
if (appAtomRegistry.get(composerDraftsAtom)[draftKey] === undefined) return false;
2009+
retargetNewTaskDraft(draftKey, project);
2010+
return true;
2011+
}
2012+
20022013
export function findNewTaskDraftKeys(
20032014
drafts: Readonly<Record<string, ComposerDraft>>,
20042015
project: { readonly environmentId: EnvironmentId; readonly projectId: ProjectId },

0 commit comments

Comments
 (0)