Clear composer drafts when draft threads are removed

- Remove draft prompt state alongside draft thread cleanup - Update tests for terminal context removal and new-thread shortcut

Julius Marminge committed 7 months ago

Commit 94491901 parent 6fe23313 files · +20 −24Browse files

Unified · Split

3 files

apps/web/src/components/ChatView.browser.tsx +13 −23
apps/web/src/composerDraftStore.test.ts +2 −0
apps/web/src/composerDraftStore.ts +5 −1

apps/web/src/components/ChatView.browser.tsx+13−23

 import {
   INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
   type TerminalContextDraft,
+  removeInlineTerminalContextPlaceholder,
 } from "../lib/terminalContext";
 import { isMacPlatform } from "../lib/utils";
 import { getRouter } from "../router";
     }
   });
-  it("keeps backspaced terminal context pills removed when a new one is added", async () => {
+  it("keeps removed terminal context pills removed when a new one is added", async () => {
     const removedLabel = "Terminal 1 lines 1-2";
     const addedLabel = "Terminal 2 lines 9-10";
     useComposerDraftStore.getState().addTerminalContext(
         { timeout: 8_000, interval: 16 },
       );
-      const composerEditor = await waitForComposerEditor();
+      const store = useComposerDraftStore.getState();
-      composerEditor.focus();
+      const currentPrompt = store.draftsByThreadId[THREAD_ID]?.prompt ?? "";
-      composerEditor.dispatchEvent(
+      const nextPrompt = removeInlineTerminalContextPlaceholder(currentPrompt, 0);
-        new KeyboardEvent("keydown", {
+      store.setPrompt(THREAD_ID, nextPrompt.prompt);
-          key: "Backspace",
+      store.removeTerminalContext(THREAD_ID, "ctx-removed");
-          bubbles: true,
-          cancelable: true,
-        }),
-      );
       await vi.waitFor(
         () => {
     });
     try {
-      const useMetaForMod = isMacPlatform(navigator.platform);
+      await waitForNewThreadShortcutLabel();
-      window.dispatchEvent(
+      await waitForServerConfigToApply();
-        new KeyboardEvent("keydown", {
+      const composerEditor = await waitForComposerEditor();
-          key: "o",
+      composerEditor.focus();
-          shiftKey: true,
+      await waitForLayout();
-          metaKey: useMetaForMod,
+      await triggerChatNewShortcutUntilPath(
-          ctrlKey: !useMetaForMod,
-          bubbles: true,
-          cancelable: true,
-        }),
-      );
-      await waitForURL(
         mounted.router,
         (path) => UUID_ROUTE_RE.test(path),
         "Route should have changed to a new draft thread UUID from the shortcut.",

apps/web/src/composerDraftStore.test.ts+2−0

   it("clears draft registration independently", () => {
     const store = useComposerDraftStore.getState();
     store.setProjectDraftThreadId(projectId, threadId);
+    store.setPrompt(threadId, "remove me");
     store.clearDraftThread(threadId);
     expect(useComposerDraftStore.getState().getDraftThreadByProjectId(projectId)).toBeNull();
     expect(useComposerDraftStore.getState().getDraftThread(threadId)).toBeNull();
+    expect(useComposerDraftStore.getState().draftsByThreadId[threadId]).toBeUndefined();
   });
   it("updates branch context on an existing draft thread", () => {

apps/web/src/composerDraftStore.ts+5−1

           const hasProjectMapping = Object.values(state.projectDraftThreadIdByProjectId).includes(
             threadId,
           );
-          if (!hasDraftThread && !hasProjectMapping) {
+          const hasComposerDraft = state.draftsByThreadId[threadId] !== undefined;
+          if (!hasDraftThread && !hasProjectMapping && !hasComposerDraft) {
             return state;
           }
           const nextProjectDraftThreadIdByProjectId = Object.fromEntries(
           ) as Record<ProjectId, ThreadId>;
           const { [threadId]: _removedDraftThread, ...restDraftThreadsByThreadId } =
             state.draftThreadsByThreadId;
+          const { [threadId]: _removedComposerDraft, ...restDraftsByThreadId } =
+            state.draftsByThreadId;
           return {
+            draftsByThreadId: restDraftsByThreadId,
             draftThreadsByThreadId: restDraftThreadsByThreadId,
             projectDraftThreadIdByProjectId: nextProjectDraftThreadIdByProjectId,
           };