Skip to content

Commit a21b43f

Browse files
fix(mobile): choosing a project for a draft whose project is gone keeps the draft (#26800)
1 parent d47f2e0 commit a21b43f

7 files changed

Lines changed: 94 additions & 15 deletions

File tree

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,15 @@ export function NewTaskDraftScreen(props: {
281281
),
282282
);
283283
// A route naming a draft that is gone, or whose project is gone, also
284-
// returns to the picker.
285-
const isRouteDraftMissing =
286-
props.draftId !== undefined && flow.missingRouteDraftId === props.draftId;
284+
// returns to the picker; a draft that survives goes along with it.
285+
const unopenableRouteDraftKind =
286+
props.draftId !== undefined && flow.unopenableRouteDraft?.draftId === props.draftId
287+
? flow.unopenableRouteDraft.kind
288+
: null;
289+
const pickerDraftId = unopenableRouteDraftKind === "pickProject" ? props.draftId : undefined;
287290
const isProjectPickerReturnActive =
288-
(isReturningToProjectPicker && !requestedInitialProjectAvailable) || isRouteDraftMissing;
291+
(isReturningToProjectPicker && !requestedInitialProjectAvailable) ||
292+
unopenableRouteDraftKind !== null;
289293
const isIncomingShareAwaitingServerConfig = Boolean(
290294
incomingShare?.attachments.some((attachment) => attachment.type === "file") &&
291295
selectedEnvironmentServerConfig === null,
@@ -388,14 +392,18 @@ export function NewTaskDraftScreen(props: {
388392
// Wait for usePreventRemove to disable before replacing, or the transfer guard swallows the fallback.
389393
const frame = requestAnimationFrame(() => {
390394
navigation.dispatch(
391-
StackActions.replace("NewTaskProject", { incomingShareId: props.incomingShareId }),
395+
StackActions.replace("NewTaskProject", {
396+
incomingShareId: props.incomingShareId,
397+
draftId: pickerDraftId,
398+
}),
392399
);
393400
});
394401
return () => cancelAnimationFrame(frame);
395402
}, [
396403
isProjectPickerReturnActive,
397404
isReturningToProjectPicker,
398405
navigation,
406+
pickerDraftId,
399407
props.incomingShareId,
400408
requestedInitialProjectAvailable,
401409
]);

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +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 { retargetSavedNewTaskDraft } from "../../state/use-composer-drafts";
3233
import { useRemoteConnectionStatus } from "../../state/use-remote-environment-registry";
3334
import type { WorkspaceState } from "../../state/workspaceModel";
3435
import { useWorkspaceState } from "../../state/workspace";
@@ -44,6 +45,8 @@ import { useSelectWorkspaceDetail } from "../layout/workspace/useSelectWorkspace
4445

4546
type NewTaskRouteParams = {
4647
readonly incomingShareId?: string | string[];
48+
/** An existing draft whose project is gone; the chosen project takes it over. */
49+
readonly draftId?: string | string[];
4750
readonly prompt?: string | string[];
4851
readonly repo?: string | string[];
4952
readonly pr?: string | string[];
@@ -164,6 +167,9 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
164167
? route.params.incomingShareId[0]
165168
: route.params?.incomingShareId;
166169
const incomingShare = routeShareId ? getShare(routeShareId) : null;
170+
const routeDraftId = Array.isArray(route.params?.draftId)
171+
? route.params.draftId[0]
172+
: route.params?.draftId;
167173
const incomingShareSubtitle = incomingShare
168174
? incomingShare.attachments.length === 0
169175
? "Choose a project for what you shared"
@@ -228,17 +234,34 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
228234
: navigation.getParent();
229235
const rootState = root?.getState();
230236
const threadRoute = rootState?.routes[rootState.index - 1];
231-
if (isDraftThreadRoute(threadRoute)) {
237+
if (routeDraftId === undefined && isDraftThreadRoute(threadRoute)) {
232238
setProject(project);
233239
root?.goBack();
234240
return;
235241
}
242+
// Restamp only on choice, so backing out leaves the draft as it was.
243+
const retargeted =
244+
routeDraftId === undefined
245+
? false
246+
: await retargetSavedNewTaskDraft(routeDraftId, {
247+
environmentId: project.environmentId,
248+
projectId: project.id,
249+
}).then(
250+
(found) => found,
251+
() => null,
252+
);
253+
if (retargeted === null) {
254+
Dialog.alert("Could not change project", "Saved drafts could not be loaded. Try again.");
255+
return;
256+
}
257+
const draftId = retargeted ? routeDraftId : undefined;
236258
selectDetail({
237259
name: "Thread",
238260
params: {
239261
draft: {
240262
environmentId: String(project.environmentId),
241263
projectId: String(project.id),
264+
draftId,
242265
incomingShareId: incomingShare?.id,
243266
},
244267
},

‎apps/mobile/src/features/threads/new-task-flow-provider.tsx‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,14 @@ type NewTaskFlowContextValue = {
168168
/** The flow's project, read when a continuation resumes after an await. */
169169
readonly getSelectedProjectKey: () => string | null;
170170
/**
171-
* The draft id of the route this flow serves when that draft, or its
172-
* project, is gone. Only the topmost draft route is served, so a screen
173-
* compares this with its own draft id.
171+
* The route this flow serves when its draft cannot open: the draft is gone
172+
* (`missing`) or only its project is (`pickProject`). Only the topmost draft
173+
* route is served, so a screen compares `draftId` with its own draft id.
174174
*/
175-
readonly missingRouteDraftId: string | null;
175+
readonly unopenableRouteDraft: {
176+
readonly draftId: string;
177+
readonly kind: "missing" | "pickProject";
178+
} | null;
176179
readonly selectEnvironment: (environmentId: EnvironmentId) => void;
177180
readonly switchEnvironment: (environmentId: EnvironmentId) => Promise<boolean>;
178181
readonly switchingToEnvironmentId: EnvironmentId | null;
@@ -851,8 +854,11 @@ export function NewTaskFlowProvider(
851854
providerGroups,
852855
setProject,
853856
getSelectedProjectKey: () => readFlow().projectKey,
854-
missingRouteDraftId:
855-
routeDraftResolution.kind === "missing" ? (props.routeDraftId ?? null) : null,
857+
unopenableRouteDraft:
858+
props.routeDraftId !== undefined &&
859+
(routeDraftResolution.kind === "missing" || routeDraftResolution.kind === "pickProject")
860+
? { draftId: props.routeDraftId, kind: routeDraftResolution.kind }
861+
: null,
856862
selectEnvironment,
857863
switchEnvironment,
858864
switchingToEnvironmentId,

‎apps/mobile/src/features/threads/new-task-flow-state.test.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,14 @@ describe("resolveRouteDraft", () => {
111111
).toMatchObject({ kind: "open", flow: { environmentId: environmentB } });
112112
});
113113

114-
it("reports a draft that is gone or whose project is gone", () => {
114+
it("reports a draft that is gone", () => {
115115
expect(resolveRouteDraft({ ...base, stamp: undefined })).toEqual({ kind: "missing" });
116+
});
117+
118+
it("asks for a project for the same draft when its project is gone", () => {
116119
expect(
117120
resolveRouteDraft({ ...base, projects: [{ environmentId, id: ProjectId.make("other") }] }),
118-
).toEqual({ kind: "missing" });
121+
).toEqual({ kind: "pickProject" });
119122
});
120123
});
121124

‎apps/mobile/src/features/threads/new-task-flow-state.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ export type RouteDraftResolution =
7575
| { readonly kind: "none" }
7676
| { readonly kind: "pending" }
7777
| { readonly kind: "missing" }
78+
/** The draft survives but its project is gone: pick another for it. */
79+
| { readonly kind: "pickProject" }
7880
| { readonly kind: "open"; readonly flow: NewTaskFlowState };
7981

8082
export function resolveRouteDraft(input: {
@@ -101,7 +103,8 @@ export function resolveRouteDraft(input: {
101103
const loaded = input.projects.some(
102104
(project) => project.environmentId === stamp.environmentId && project.id === stamp.projectId,
103105
);
104-
if (!loaded) return input.stampedEnvironmentLoading ? { kind: "pending" } : { kind: "missing" };
106+
if (!loaded)
107+
return input.stampedEnvironmentLoading ? { kind: "pending" } : { kind: "pickProject" };
105108
return {
106109
kind: "open",
107110
flow: {

‎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)