Align atStart and atEnd length checks, get rid of createSourceIsSelect, add function to reset storage queues for testing

Author: alex-rawlings-yyc

src/__tests__/components/ProjectModals.test.tsx

@@ -268,7 +268,7 @@ describe('ProjectModals', () => {
       expect(setModal).toHaveBeenCalledWith('none');
     });
 
-    it('calls setModal with create and sets createSourceIsSelect when create new is clicked', async () => {
+    it('calls setModal with create when create new is clicked', async () => {
       const { setModal } = renderModals({ modal: 'select' });
       await userEvent.click(screen.getByTestId('select-create-new'));
       expect(setModal).toHaveBeenCalledWith('create');
@@ -282,19 +282,16 @@ describe('ProjectModals', () => {
   });
 
   describe('create modal', () => {
-    it('calls setModal with none when create modal closes without a select source', async () => {
+    it('calls setModal with none when create modal is closed', async () => {
       const { setModal } = renderModals({ modal: 'create' });
       await userEvent.click(screen.getByTestId('create-close'));
       expect(setModal).toHaveBeenCalledWith('none');
     });
 
-    it('calls setModal with select on close when createSourceIsSelect is true', async () => {
-      // To set createSourceIsSelect, we must open create from the select modal.
-      // Render with select open first, then trigger create-new.
+    it('calls setModal with none when create modal is closed after opening from select', async () => {
       const setModal = jest.fn();
       const state = makeWebViewState();
 
-      // Render with select modal so create-new can be clicked
       const { rerender } = render(
         <ProjectModals
           activeProject={undefined}
@@ -305,7 +302,6 @@ describe('ProjectModals', () => {
         />,
       );
       await userEvent.click(screen.getByTestId('select-create-new'));
-      // setModal was called with 'create' — now re-render with modal='create'
       rerender(
         <ProjectModals
           activeProject={undefined}
@@ -317,15 +313,14 @@ describe('ProjectModals', () => {
       );
       setModal.mockClear();
       await userEvent.click(screen.getByTestId('create-close'));
-      expect(setModal).toHaveBeenCalledWith('select');
+      expect(setModal).toHaveBeenCalledWith('none');
     });
 
-    it('keeps the create modal open and does not call setModal when a project is created', async () => {
+    it('selects the created project and calls setModal with none when a project is created', async () => {
       const state = makeWebViewState();
       const { setModal } = renderModals({ modal: 'create', useWebViewState: state });
       await userEvent.click(screen.getByTestId('create-created'));
-      expect(screen.getByTestId('create-modal')).toBeInTheDocument();
-      expect(setModal).not.toHaveBeenCalled();
+      expect(setModal).toHaveBeenCalledWith('none');
     });
   });
 

src/__tests__/services/projectStorage.test.ts

@@ -8,6 +8,7 @@ import {
   getProject,
   getProjectsForSource,
   listProjects,
+  resetQueuesForTesting,
   updateProjectMetadata,
 } from '../../services/projectStorage';
 import { createTestActivationContext } from '../test-helpers';
@@ -62,6 +63,7 @@ function enoentError(): Error {
 
 describe('projectStorage', () => {
   beforeEach(() => {
+    resetQueuesForTesting();
     __mockWriteUserData.mockResolvedValue(undefined);
     __mockDeleteUserData.mockResolvedValue(undefined);
     jest.spyOn(crypto, 'randomUUID').mockReturnValue('00000000-0000-0000-0000-000000000001');

src/components/ContinuousView.tsx

@@ -248,7 +248,7 @@ export default function ContinuousView({
   const phraseRefs = useRef<(HTMLSpanElement | null)[]>([]);
 
   const atStart = phraseEntries.length === 0 || focusPhraseIndex === 0;
-  const atEnd = !phraseEntries.length || focusPhraseIndex >= phraseEntries.length - 1;
+  const atEnd = phraseEntries.length === 0 || focusPhraseIndex >= phraseEntries.length - 1;
   const stripOpacityClass = isVisible ? 'tw:opacity-100' : 'tw:opacity-0';
 
   /**

src/components/ProjectModals.tsx

@@ -58,12 +58,6 @@ export default function ProjectModals({
    */
   const [metadataSourceIsSelect, setMetadataSourceIsSelect] = useState(false);
 
-  /**
-   * Tracks whether the create modal was opened from the select modal, so the correct modal is
-   * restored on close.
-   */
-  const [createSourceIsSelect, setCreateSourceIsSelect] = useState(false);
-
   const resolvedMetadataProject = metadataProject ?? activeProject;
 
   /**
@@ -117,10 +111,7 @@ export default function ProjectModals({
             setActiveProject(project);
             setModal('none');
           }}
-          onCreateNew={() => {
-            setCreateSourceIsSelect(true);
-            setModal('create');
-          }}
+          onCreateNew={() => setModal('create')}
           onClose={() => setModal('none')}
           onViewInfo={handleViewInfo}
         />
@@ -129,11 +120,11 @@ export default function ProjectModals({
       {modal === 'create' && (
         <CreateProjectModal
           projectId={projectId}
-          onClose={() => {
-            setModal(createSourceIsSelect ? 'select' : 'none');
-            setCreateSourceIsSelect(false);
+          onClose={() => setModal('none')}
+          onProjectCreated={(project) => {
+            setActiveProject(project);
+            setModal('none');
           }}
-          onProjectCreated={setActiveProject}
         />
       )}
 

src/services/projectStorage.ts

@@ -287,3 +287,13 @@ export async function deleteProject(token: ExecutionToken, id: string): Promise<
     });
   });
 }
+
+/**
+ * Resets module-level queue state between tests. Jest's `resetMocks` resets mock implementations
+ * but does not re-execute modules, so `indexQueue` and `projectQueues` would otherwise persist
+ * across tests and allow promise chains from one test to bleed into the next.
+ */
+export function resetQueuesForTesting(): void {
+  indexQueue = Promise.resolve();
+  projectQueues.clear();
+}