Skip to content

[codex] fix standalone recurrence scope prompt #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Uarmagan merged 1 commit into from
Jun 1, 2026
Merged

[codex] fix standalone recurrence scope prompt #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions packages/web/src/views/Week/components/Draft/hooks/state/useDraftConfirmation.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,28 @@ describe("useDraftConfirmation", () => {
expect(discard).not.toHaveBeenCalled();
});

it("submits an existing standalone draft made recurring without opening the update scope dialog", async () => {
const draft = createDraft({
recurrence: {
rule: ["FREQ=WEEKLY;COUNT=4"],
},
});
const { discard, result, submit } = renderDraftConfirmation({ draft });

await act(async () => {
await result.current.onSubmit(draft);
});

expect(result.current.isRecurrenceUpdateScopeDialogOpen).toBe(false);
expect(result.current.finalDraft).toBeNull();
expect(submit).toHaveBeenCalledTimes(1);
expect(submit).toHaveBeenCalledWith(
draft,
RecurringEventUpdateScope.THIS_EVENT,
);
expect(discard).toHaveBeenCalledTimes(1);
});

it("submits a single-occurrence recurring instance without opening the update scope dialog", async () => {
const baseEventId = new ObjectId().toString();
const baseEvent = createDraft({
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/views/Week/components/Draft/hooks/state/useDraftConfirmation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ export const useDraftConfirmation = ({
const draftIsInstance = ObjectId.isValid(
_draft.recurrence?.eventId ?? "",
);
const draftIsRecurring = Array.isArray(rule) || draftIsInstance;
const isExistingDraft = Boolean(_draft._id) || draftIsInstance;
const isRecurringEvent =
isExistingDraft && (isRecurrence() || draftIsRecurring);
isExistingDraft && (isRecurrence() || draftIsInstance);
const instanceEvent = isInstance() || draftIsInstance;
const toStandAlone = instanceEvent && rule === null;
const hasMultipleOccurrences = hasMultipleRecurrenceOccurrences(
Expand Down