@carlonicora/nextjs-jsonapi 6.23.0 → 6.24.0

package/src/components/forms/EditorSheet.tsx

@@ -93,6 +93,11 @@ export type EditorSheetProps<T extends FieldValues> = {
    *  sheet stays open with the form unchanged. Use it for a last confirmation
    *  (e.g. "this information will be deleted") that must not close the sheet. */
   onBeforeSubmit?: (values: T) => Promise<boolean> | boolean;
+  /** Optional. Called when `onSubmit` throws. Return `true` when the caller
+   *  showed its own message for that error: the generic "could not save" toast
+   *  is then skipped. Either way the sheet stays open with the user's input.
+   *  Omitted, every error shows the generic toast (the default). */
+  onSubmitError?: (error: unknown) => boolean;
   onReset: () => T;
   isFormDirty?: () => boolean;
 
@@ -150,6 +155,7 @@ export function EditorSheet<T extends FieldValues>({
   form,
   onSubmit,
   onBeforeSubmit,
+  onSubmitError,
   onReset,
   isFormDirty: isFormDirtyProp,
   entityType,
@@ -250,6 +256,7 @@ export function EditorSheet<T extends FieldValues>({
           }
         }
       } catch (error) {
+        if (onSubmitError?.(error)) return;
         errorToast({
           title: isEdit ? t("generic.errors.update") : t("generic.errors.create"),
           error,
@@ -259,6 +266,7 @@ export function EditorSheet<T extends FieldValues>({
     [
       onSubmit,
       onBeforeSubmit,
+      onSubmitError,
       setOpen,
       onSuccess,
       onSaved,

package/src/components/forms/__tests__/EditorSheet.spec.tsx

@@ -248,6 +248,36 @@ describe("EditorSheet", () => {
         error,
       });
     });
+
+    it("skips the generic error toast when onSubmitError handles the error", async () => {
+      const { errorToast: mockErrorToast } = await import("../../errors/errorToast");
+      vi.mocked(mockErrorToast).mockClear();
+      const error = new Error("402:TRIAL_START_FAILED");
+      const onSubmit = vi.fn().mockRejectedValue(error);
+      const onSubmitError = vi.fn().mockReturnValue(true);
+      render(<TestEditor dialogOpen={true} onSubmit={onSubmit} onSubmitError={onSubmitError} />);
+
+      await userEvent.type(screen.getByTestId("name-input"), "Test Name");
+      await userEvent.click(screen.getByTestId("modal-button-create"));
+
+      expect(onSubmitError).toHaveBeenCalledWith(error);
+      expect(mockErrorToast).not.toHaveBeenCalled();
+      expect(screen.getByTestId("name-input")).toHaveValue("Test Name");
+    });
+
+    it("still shows the generic error toast when onSubmitError does not handle the error", async () => {
+      const { errorToast: mockErrorToast } = await import("../../errors/errorToast");
+      vi.mocked(mockErrorToast).mockClear();
+      const error = new Error("Network error");
+      const onSubmit = vi.fn().mockRejectedValue(error);
+      const onSubmitError = vi.fn().mockReturnValue(false);
+      render(<TestEditor dialogOpen={true} onSubmit={onSubmit} onSubmitError={onSubmitError} />);
+
+      await userEvent.type(screen.getByTestId("name-input"), "Test Name");
+      await userEvent.click(screen.getByTestId("modal-button-create"));
+
+      expect(mockErrorToast).toHaveBeenCalledWith({ title: "generic.errors.create", error });
+    });
   });
 
   describe("onBeforeSubmit", () => {