fix(app-scheduler): show a failed schedule load instead of an empty dialog (6.5.0) (#5995)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: adrians5j

packages/app-scheduler/src/presentation/scheduleDialog/ScheduleDialogPresenter.test.ts

@@ -15,7 +15,7 @@ import { ScheduleDialogPresenter } from "./ScheduleDialogPresenter.js";
  * `cancel()` resolves, and shows the error when they reject. So a failed action must reject,
  * and the dialog must not be left loading.
  */
-const setup = (params: { fail: boolean }) => {
+const setup = (params: { fail: boolean; getExecute?: () => Promise<unknown> }) => {
     const execute = vi.fn(async () => {
         if (params.fail) {
             throw new Error("Could not schedule the action.");
@@ -24,7 +24,9 @@ const setup = (params: { fail: boolean }) => {
     });
 
     const container = new Container();
-    container.registerInstance(GetScheduledActionGateway, { execute: vi.fn() } as any);
+    container.registerInstance(GetScheduledActionGateway, {
+        execute: params.getExecute ?? vi.fn()
+    } as any);
     container.registerInstance(CancelScheduledActionGateway, { execute } as any);
     container.registerInstance(SchedulePublishActionGateway, { execute } as any);
     container.registerInstance(ScheduleUnpublishActionGateway, { execute } as any);
@@ -74,4 +76,33 @@ describe("ScheduleDialogPresenter", () => {
         ).resolves.toBeUndefined();
         expect(presenter.vm.loading).toBe(false);
     });
+
+    /*
+     * The dialog loads the existing schedule before it opens. A failed load used to leave the
+     * entry empty, which reads as "nothing scheduled" and invites scheduling a duplicate.
+     */
+    it("rejects when loading the scheduled action fails", async () => {
+        const presenter = setup({
+            fail: false,
+            getExecute: async () => {
+                throw new Error("Could not fetch scheduled action.");
+            }
+        });
+
+        await expect(presenter.load({ namespace: "cms/article", id: "entry-1" })).rejects.toThrow(
+            "Could not fetch scheduled action."
+        );
+        expect(presenter.vm.loading).toBe(false);
+        expect(presenter.vm.entry).toBeNull();
+    });
+
+    it("resolves with no entry when nothing is scheduled", async () => {
+        const presenter = setup({ fail: false, getExecute: async () => null });
+
+        await expect(
+            presenter.load({ namespace: "cms/article", id: "entry-1" })
+        ).resolves.toBeUndefined();
+        expect(presenter.vm.loading).toBe(false);
+        expect(presenter.vm.entry).toBeNull();
+    });
 });

packages/app-scheduler/src/presentation/scheduleDialog/ScheduleDialogPresenter.ts

@@ -65,10 +65,11 @@ class ScheduleDialogPresenterImpl implements IScheduleDialogPresenter {
                 this.entry = entry;
                 this.loading = false;
             });
-        } catch {
+        } catch (error) {
             runInAction(() => {
                 this.loading = false;
             });
+            throw error;
         }
     }
 

packages/app-scheduler/src/presentation/scheduleDialog/abstractions.ts

@@ -31,6 +31,10 @@ export interface IScheduleDialogPresenterCancelParams {
 
 export interface IScheduleDialogPresenter {
     get vm(): IScheduleDialogPresenterViewModel;
+    /**
+     * Rejects when loading fails. Resolves with `vm.entry` set to null when nothing is scheduled, so
+     * the two can't be confused.
+     */
     load(params: IScheduleDialogPresenterLoadParams): Promise<void>;
     /** Rejects when scheduling fails, so the caller can show the error. */
     schedule(params: IScheduleDialogPresenterScheduleParams): Promise<void>;

packages/app-scheduler/src/presentation/scheduleDialog/useScheduleDialog.tsx

@@ -114,7 +114,20 @@ export const useScheduleDialog = (
             title: `Schedule "${target.title}"`,
             content: <FormComponent presenter={presenter} />,
             formData: async () => {
-                await presenter.load({ namespace, id: target.id });
+                try {
+                    await presenter.load({ namespace, id: target.id });
+                } catch (error) {
+                    /*
+                     * Without the current schedule the dialog can't tell a new action from a
+                     * duplicate, so show the error and close it instead of offering the form.
+                     */
+                    toast.showWarningToast({ title: error.message });
+                    if (dialogClose.current) {
+                        dialogClose.current();
+                        dialogClose.current = null;
+                    }
+                    return {};
+                }
 
                 const entry = presenter.vm.entry;
                 const scheduleOn = entry?.publishOn || entry?.unpublishOn;