Prevent double notifications

Author: alex-rawlings-yyc

src/__tests__/components/CreateProjectModal.test.tsx

@@ -210,39 +210,6 @@ describe('CreateProjectModal', () => {
     expect(onClose).not.toHaveBeenCalled();
   });
 
-  it('does not call onProjectCreated or onClose when sendCommand returns undefined', async () => {
-    jest.mocked(papi.commands.sendCommand).mockResolvedValue(undefined);
-    const onProjectCreated = jest.fn();
-    const onClose = jest.fn();
-    render(
-      <CreateProjectModal
-        projectId={testProjectId}
-        onClose={onClose}
-        onProjectCreated={onProjectCreated}
-      />,
-    );
-
-    await userEvent.click(screen.getByRole('button', { name: /^create$/i }));
-
-    await waitFor(() => expect(papi.commands.sendCommand).toHaveBeenCalled());
-    expect(onProjectCreated).not.toHaveBeenCalled();
-    expect(onClose).not.toHaveBeenCalled();
-  });
-
-  it('sends an error notification when sendCommand returns undefined', async () => {
-    jest.mocked(papi.commands.sendCommand).mockResolvedValue(undefined);
-    render(<CreateProjectModal projectId={testProjectId} onClose={jest.fn()} />);
-
-    await userEvent.click(screen.getByRole('button', { name: /^create$/i }));
-
-    await waitFor(() =>
-      expect(papi.notifications.send).toHaveBeenCalledWith({
-        message: '%interlinearizer_error_create_project_failed%',
-        severity: 'error',
-      }),
-    );
-  });
-
   it('defaults analysis language to ["und"] when the language input contains only whitespace', async () => {
     render(<CreateProjectModal projectId={testProjectId} onClose={() => {}} />);
 
@@ -264,7 +231,7 @@ describe('CreateProjectModal', () => {
   });
 
   it('disables the create button while a submission is in progress', async () => {
-    let resolveCommand: (value: undefined) => void = () => {};
+    let resolveCommand: (value: string) => void = () => {};
     jest.mocked(papi.commands.sendCommand).mockImplementation(
       () =>
         new Promise((resolve) => {
@@ -277,13 +244,13 @@ describe('CreateProjectModal', () => {
     await userEvent.click(createButton);
 
     expect(createButton).toBeDisabled();
-    resolveCommand(undefined);
+    resolveCommand('not valid json{{{');
 
     await waitFor(() => expect(createButton).not.toBeDisabled());
   });
 
   it('disables the cancel button while a submission is in progress', async () => {
-    let resolveCommand: (value: undefined) => void = () => {};
+    let resolveCommand: (value: string) => void = () => {};
     jest.mocked(papi.commands.sendCommand).mockImplementation(
       () =>
         new Promise((resolve) => {
@@ -296,7 +263,7 @@ describe('CreateProjectModal', () => {
     await userEvent.click(screen.getByRole('button', { name: /^create$/i }));
 
     expect(cancelButton).toBeDisabled();
-    resolveCommand(undefined);
+    resolveCommand('not valid json{{{');
 
     await waitFor(() => expect(cancelButton).not.toBeDisabled());
   });

src/__tests__/components/ProjectMetadataModal.test.tsx

@@ -219,7 +219,7 @@ describe('ProjectMetadataModal', () => {
     );
   });
 
-  it('does not call onProjectSaved or onClose when save sendCommand resolves with a falsy value', async () => {
+  it('does not call onProjectSaved or onClose when save sendCommand resolves with undefined (project not found)', async () => {
     mockSendCommand.mockResolvedValue(undefined);
     const onProjectSaved = jest.fn();
     const onClose = jest.fn();
@@ -234,18 +234,14 @@ describe('ProjectMetadataModal', () => {
     expect(onClose).not.toHaveBeenCalled();
   });
 
-  it('sends an error notification when save sendCommand resolves with a falsy value', async () => {
+  it('does not send a notification when save sendCommand resolves with undefined (project not found)', async () => {
     mockSendCommand.mockResolvedValue(undefined);
     render(<ProjectMetadataModal {...testProps} />);
 
     await userEvent.click(screen.getByRole('button', { name: /^save$/i }));
 
-    await waitFor(() =>
-      expect(papi.notifications.send).toHaveBeenCalledWith({
-        message: '%interlinearizer_error_save_metadata_failed%',
-        severity: 'error',
-      }),
-    );
+    await waitFor(() => expect(mockSendCommand).toHaveBeenCalled());
+    expect(papi.notifications.send).not.toHaveBeenCalled();
   });
 
   it('does not call onProjectSaved, onClose, or send a notification when save sendCommand rejects', async () => {

src/__tests__/main.test.ts

@@ -582,13 +582,11 @@ describe('main', () => {
       expect(__mockSelectProject).not.toHaveBeenCalled();
     });
 
-    it('logs the error, sends an error notification, and returns undefined when storage fails', async () => {
+    it('logs the error, sends an error notification, and rethrows when storage fails', async () => {
       mockCreateProject.mockRejectedValue(new Error('disk full'));
       const handler = await getCreateProjectHandler();
 
-      const result = await handler('src-project', ['en']);
-
-      expect(result).toBeUndefined();
+      await expect(handler('src-project', ['en'])).rejects.toThrow('disk full');
       expect(__mockLogger.error).toHaveBeenCalledWith(
         'Interlinearizer: failed to create project',
         expect.any(Error),
@@ -908,13 +906,11 @@ describe('main', () => {
       expect(result).toBeUndefined();
     });
 
-    it('logs the error, sends an error notification, and returns undefined when storage throws', async () => {
+    it('logs the error, sends an error notification, and rethrows when storage throws', async () => {
       mockUpdateProjectMetadata.mockRejectedValue(new Error('disk full'));
       const handler = await getUpdateProjectMetadataHandler();
 
-      const result = await handler('proj-id', 'My Name', 'My Desc', ['en']);
-
-      expect(result).toBeUndefined();
+      await expect(handler('proj-id', 'My Name', 'My Desc', ['en'])).rejects.toThrow('disk full');
       expect(__mockLogger.error).toHaveBeenCalledWith(
         'Interlinearizer: failed to update project metadata',
         expect.any(Error),

src/components/CreateProjectModal.tsx

@@ -80,13 +80,6 @@ export function CreateProjectModal({
         name.trim() || undefined,
         description.trim() || undefined,
       );
-      if (!projectJson) {
-        await papi.notifications.send({
-          message: '%interlinearizer_error_create_project_failed%',
-          severity: 'error',
-        });
-        return;
-      }
       const parsed: unknown = JSON.parse(projectJson);
       if (!isInterlinearProjectSummary(parsed)) {
         await papi.notifications.send({

src/components/ProjectMetadataModal.tsx

@@ -117,13 +117,7 @@ export function ProjectMetadataModal({
         newLanguages,
         targetProjectId,
       );
-      if (!updatedProjectJson) {
-        await papi.notifications.send({
-          message: '%interlinearizer_error_save_metadata_failed%',
-          severity: 'error',
-        });
-        return;
-      }
+      if (!updatedProjectJson) return;
       onProjectSaved?.({
         name: newName,
         description: newDescription,

src/main.ts

@@ -111,8 +111,7 @@ async function openInterlinearizerForWebView(webViewId?: string): Promise<string
 /**
  * Creates a new interlinearizer project for the given source project. Called from the WebView via
  * `papi.commands.sendCommand` after the user fills in the create-project modal. Returns the
- * persisted project serialized as a JSON string, or `undefined` if storage fails (failure is also
- * logged and shown as a notification).
+ * persisted project serialized as a JSON string.
  *
  * @param sourceProjectId - Platform.Bible project ID of the source text to interlinearize.
  * @param analysisLanguages - BCP 47 tags for languages used in glosses and annotations (e.g.
@@ -121,16 +120,17 @@ async function openInterlinearizerForWebView(webViewId?: string): Promise<string
  *   alignment projects. Omit for analysis-only projects.
  * @param name - Optional user-facing name for the project.
  * @param description - Optional user-facing description for the project.
- * @returns JSON-stringified `InterlinearProject` for the new project, or `undefined` if storage
- *   fails.
+ * @returns JSON-stringified `InterlinearProject` for the new project.
+ * @throws If storage fails. The error is logged and an error notification is sent before rethrowing
+ *   so the frontend `catch` block can suppress it without sending a second notification.
  */
 async function createInterlinearProject(
   sourceProjectId: string,
   analysisLanguages: string[],
   targetProjectId?: string,
   name?: string,
   description?: string,
-): Promise<string | undefined> {
+): Promise<string> {
   try {
     const project = await projectStorage.createProject(
       executionToken,
@@ -149,7 +149,7 @@ async function createInterlinearProject(
         severity: 'error',
       })
       .catch(() => {});
-    return undefined;
+    throw e;
   }
 }
 
@@ -193,8 +193,9 @@ async function deleteInterlinearProject(interlinearProjectId: string): Promise<v
  *   pass the current value to leave it unchanged.
  * @param targetProjectId - New target-project ID; omit to clear the target binding.
  * @returns JSON string of the updated `InterlinearProject`, or `undefined` if the project ID is not
- *   found or if a storage failure occurs (in which case the error is logged and a notification is
- *   sent to the user).
+ *   found.
+ * @throws If storage fails. The error is logged and an error notification is sent before rethrowing
+ *   so the frontend `catch` block can suppress it without sending a second notification.
  */
 async function updateProjectMetadata(
   interlinearProjectId: string,
@@ -221,7 +222,7 @@ async function updateProjectMetadata(
         severity: 'error',
       })
       .catch(() => {});
-    return undefined;
+    throw e;
   }
 }
 

src/types/interlinearizer.d.ts

@@ -24,8 +24,7 @@ declare module 'papi-shared-types' {
     /**
      * Creates a new interlinearizer project for the given source project. Called from the WebView
      * after the user fills in the create-project modal. Returns the persisted `InterlinearProject`
-     * serialized as a JSON string, or `undefined` if project creation fails (failure is logged and
-     * surfaced as an error notification).
+     * serialized as a JSON string.
      *
      * @param sourceProjectId Platform.Bible project ID of the source text to interlinearize.
      * @param analysisLanguages BCP 47 tags for all languages used in glosses and annotations (e.g.
@@ -36,16 +35,17 @@ declare module 'papi-shared-types' {
      *   Omitted for analysis-only projects (LCM, PT9 single-sided).
      * @param name Optional user-facing name for the project.
      * @param description Optional user-facing description for the project.
-     * @returns The persisted `InterlinearProject` as a JSON string, or `undefined` if creation
-     *   fails.
+     * @returns The persisted `InterlinearProject` as a JSON string.
+     * @throws If storage fails. The error is logged and an error notification is sent before
+     *   rethrowing so callers do not need to send a second notification.
      */
     'interlinearizer.createProject': (
       sourceProjectId: string,
       analysisLanguages: string[],
       targetProjectId?: string,
       name?: string,
       description?: string,
-    ) => Promise<string | undefined>;
+    ) => Promise<string>;
 
     /**
      * Returns all interlinearizer projects for the given source project, serialized as a JSON
@@ -98,6 +98,8 @@ declare module 'papi-shared-types' {
      *   target-side text binding).
      * @returns The updated project as a JSON string, or `undefined` if no project with that ID
      *   exists.
+     * @throws If storage fails. The error is logged and an error notification is sent before
+     *   rethrowing so callers do not need to send a second notification.
      */
     'interlinearizer.updateProjectMetadata': (
       interlinearProjectId: string,