Fix autosave form reset bug by ideepakchauhan7 · Pull Request #302 · emdash-cms/emdash

ideepakchauhan7 · 2026-04-06T09:43:16Z

What does this PR do?

Fixes a bug where autosave invalidates the query cache and resets form fields to server state, causing user edits to be lost.

When editing a content entry with many custom fields, autosave fires after 2 seconds of inactivity. Upon success, it was calling queryClient.invalidateQueries(["content", collection, id]), which triggered a refetch from the server. This refetch updated the item prop, which triggered a useEffect in ContentEditor that resets form state (formData, slug, etc.) to server values.

The fix removes the queryClient.invalidateQueries() call from the autosaveMutation onSuccess handler. The local form state remains the source of truth during editing. Manual saves still properly invalidate and refresh the cache.

Closes #295

Type of change

Bug fix

Checklist

I have read CONTRIBUTING.md
pnpm typecheck passes (pre-existing errors in admin package unrelated to this change)
pnpm --silent lint:json | jq '.diagnostics | length' returns 0 (pre-existing errors unrelated to this change)
pnpm format has been run
I have added a changeset (if this PR changes a published package)

Autosave was invalidating the query cache after completion, which triggered a refetch of content data from the server. This refetch updated the item prop, causing a useEffect in ContentEditor to reset form state to the server values, overwriting unsaved user changes. The fix removes the queryClient.invalidateQueries() call from the autosaveMutation onSuccess handler. The local form state remains the source of truth during editing, and manual saves still properly invalidate and refresh the cache. Fixes emdash-cms#295

changeset-bot · 2026-04-06T09:43:25Z

🦋 Changeset detected

Latest commit: 5cb7360

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 9 packages

Name	Type
@emdash-cms/admin	Patch
emdash	Patch
@emdash-cms/cloudflare	Patch
@emdash-cms/auth	Patch
@emdash-cms/blocks	Patch
@emdash-cms/gutenberg-to-portable-text	Patch
@emdash-cms/x402	Patch
create-emdash	Patch
@emdash-cms/plugin-embeds	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

github-actions · 2026-04-06T09:43:33Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

Copilot

Pull request overview

Fixes the content editor autosave behavior so that successful autosaves no longer trigger a React Query refetch that resets in-progress form edits back to server state.

Changes:

Removes queryClient.invalidateQueries(["content", collection, id]) from the autosave mutation onSuccess handler.
Keeps autosave feedback via lastAutosaveAt while leaving manual save/publish flows to continue invalidating queries as before.
Adds a changeset to release the admin package as a patch.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
packages/admin/src/router.tsx	Stops autosave from invalidating the content query cache, preventing editor form state resets after autosave.
.changeset/fix-autosave-form-reset.md	Records the bugfix for a patch release of `@emdash-cms/admin`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

ideepakchauhan7 · 2026-04-06T09:56:25Z

I have read the CLA Document and I hereby sign the CLA

ascorbic · 2026-04-11T16:23:25Z

Can you fix the conflicts?

ideepakchauhan7 · 2026-04-11T16:55:30Z

I’m resolving the merge conflicts now and will push an updated branch shortly.

…osave-reset

ideepakchauhan7 · 2026-04-11T17:05:18Z

Conflicts are fixed now. I merged the latest main into this branch and pushed the updated branch.

pkg-pr-new · 2026-04-11T17:06:24Z

Open in StackBlitz

@emdash-cms/admin

npm i https://pkg.pr.new/@emdash-cms/admin@302

@emdash-cms/auth

npm i https://pkg.pr.new/@emdash-cms/auth@302

@emdash-cms/blocks

npm i https://pkg.pr.new/@emdash-cms/blocks@302

@emdash-cms/cloudflare

npm i https://pkg.pr.new/@emdash-cms/cloudflare@302

emdash

npm i https://pkg.pr.new/emdash@302

create-emdash

npm i https://pkg.pr.new/create-emdash@302

@emdash-cms/gutenberg-to-portable-text

npm i https://pkg.pr.new/@emdash-cms/gutenberg-to-portable-text@302

@emdash-cms/x402

npm i https://pkg.pr.new/@emdash-cms/x402@302

@emdash-cms/plugin-ai-moderation

npm i https://pkg.pr.new/@emdash-cms/plugin-ai-moderation@302

@emdash-cms/plugin-atproto

npm i https://pkg.pr.new/@emdash-cms/plugin-atproto@302

@emdash-cms/plugin-audit-log

npm i https://pkg.pr.new/@emdash-cms/plugin-audit-log@302

@emdash-cms/plugin-color

npm i https://pkg.pr.new/@emdash-cms/plugin-color@302

@emdash-cms/plugin-embeds

npm i https://pkg.pr.new/@emdash-cms/plugin-embeds@302

@emdash-cms/plugin-forms

npm i https://pkg.pr.new/@emdash-cms/plugin-forms@302

@emdash-cms/plugin-webhook-notifier

npm i https://pkg.pr.new/@emdash-cms/plugin-webhook-notifier@302

commit: 5cb7360

…osave-reset

github-actions · 2026-04-11T18:56:14Z

Overlapping PRs

This PR modifies files that are also changed by other open PRs:

fix: Prevent draft autosave state loss and editor overwriting #283 (3 shared files)

This may cause merge conflicts or duplicated work. A maintainer will coordinate.

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-12T11:05:18Z

packages/admin/src/router.tsx

 		onSuccess: () => {
 			setLastAutosaveAt(new Date());
-			// Invalidate content and draft revision so stale cached data
-			// doesn't overwrite the form via the sync effect
-			void queryClient.invalidateQueries({ queryKey: ["content", collection, id] });
-			if (rawItem?.draftRevisionId) {
-				void queryClient.invalidateQueries({
-					queryKey: ["revision", rawItem.draftRevisionId],
-				});
-			}
+			// Keep the editor's local state as the source of truth during autosave.
+			// Invalidating here can refetch slightly older server data and reset the form
+			// while the user is still typing.


Removing the invalidate/refetch on autosave means the local react-query cache for ["content", collection, id] never gets updated with the mutation result. For revision-enabled collections, autosave can create a new draftRevisionId (see core runtime: packages/core/src/emdash-runtime.ts:1534-1549), so leaving the cache stale can cause the editor UI (e.g., Pending changes badge / Publish changes vs Unpublish actions) to remain out of sync until a manual save or reload.

Consider updating the query cache with the autosave mutation result (or at least the revision pointer metadata) in a way that does not trigger the form-reset effect (e.g., store draftRevisionId/updatedAt in separate local state, or adjust the ContentEditor sync effect to ignore autosave-driven item updates).

Copilot · 2026-04-12T11:05:19Z

packages/admin/src/router.tsx

 		onSuccess: () => {
 			setLastAutosaveAt(new Date());
-			// Invalidate content and draft revision so stale cached data
-			// doesn't overwrite the form via the sync effect
-			void queryClient.invalidateQueries({ queryKey: ["content", collection, id] });
-			if (rawItem?.draftRevisionId) {
-				void queryClient.invalidateQueries({
-					queryKey: ["revision", rawItem.draftRevisionId],
-				});
-			}
+			// Keep the editor's local state as the source of truth during autosave.
+			// Invalidating here can refetch slightly older server data and reset the form
+			// while the user is still typing.


This change is meant to prevent form values from reverting after autosave, but the current tests only cover that a second autosave isn’t queued. Please add a regression assertion (unit or e2e) that edits in a field are still present after an autosave completes (i.e., the input value doesn’t reset to the previous server state).

ascorbic · 2026-04-12T11:19:50Z

packages/admin/src/router.tsx

+			// Keep the editor's local state as the source of truth during autosave.
+			// Invalidating here can refetch slightly older server data and reset the form
+			// while the user is still typing.


Instead of removing the invalidation, could you optimistically patch the cache insgtead. Soemthing liek this:

Suggested change

// Keep the editor's local state as the source of truth during autosave.

// Invalidating here can refetch slightly older server data and reset the form

// while the user is still typing.

// Optimistically update the cache so it stays fresh

// without triggering a refetch

queryClient.setQueryData(

["content", collection, id],

(old) => old ? { ...old, data: variables.data ?? old.data, slug: variables.slug ?? old.slug, updatedAt: new Date().toISOString() } : old

);

(not checked)

ascorbic · 2026-04-12T11:21:07Z

packages/admin/tests/components/ContentEditor.test.tsx

 			await expect.element(savedBtn).toBeDisabled();
 		});
+
+		it("does not queue another autosave after a successful autosave", async () => {


This tests doesn't actually test the bug that this is fixing. Could you add a regressoin test?

Copilot AI review requested due to automatic review settings April 6, 2026 09:43

github-actions bot added area/admin size/XS labels Apr 6, 2026

github-actions bot added cla: needed labels Apr 6, 2026

Copilot started reviewing on behalf of ideepakchauhan7 April 6, 2026 09:43 View session

Copilot AI reviewed Apr 6, 2026

View reviewed changes

github-actions bot added a commit that referenced this pull request Apr 6, 2026

@ideepakchauhan7 has signed the CLA in #302

1bb0b1b

github-actions bot added cla: signed and removed cla: needed labels Apr 6, 2026

ideepakchauhan7 added 4 commits April 6, 2026 16:50

Merge branch 'main' into fix-autosave-reset

436be05

Merge branch 'main' into fix-autosave-reset

474c004

Merge branch 'main' into fix-autosave-reset

99f7c5c

Merge branch 'main' into fix-autosave-reset

bb26f11

github-actions bot added the needs-rebase label Apr 9, 2026

ascorbic added the Awaiting author response label Apr 11, 2026

ideepakchauhan7 added 2 commits April 11, 2026 22:32

Merge upstream/main into fix-autosave-reset

d95c74a

Merge remote-tracking branch 'origin/fix-autosave-reset' into fix-aut…

81916f0

…osave-reset

github-actions bot added size/S and removed size/XS needs-rebase labels Apr 11, 2026

Merge branch 'main' into fix-autosave-reset

7ac9904

ideepakchauhan7 added 2 commits April 11, 2026 23:15

Fix repeated autosave after successful autosave

1c07605

Merge remote-tracking branch 'origin/fix-autosave-reset' into fix-aut…

49bee11

…osave-reset

github-actions bot added size/M and removed size/S labels Apr 11, 2026

Stabilize autosave status assertions

dc01feb

github-actions bot added the overlap label Apr 11, 2026

Merge branch 'main' into fix-autosave-reset

eb23ff4

ascorbic requested a review from Copilot April 12, 2026 10:57

Copilot started reviewing on behalf of ascorbic April 12, 2026 10:59 View session

Copilot AI reviewed Apr 12, 2026

View reviewed changes

ascorbic reviewed Apr 12, 2026

View reviewed changes

ideepakchauhan7 and others added 2 commits April 12, 2026 23:25

Merge branch 'main' into fix-autosave-reset

6483708

Patch autosave cache after autosave

8f3c196

github-actions bot added size/L and removed size/M labels Apr 12, 2026

emdashbot bot and others added 6 commits April 12, 2026 18:31

style: format

c82e60b

Add autosave regression coverage

14f95fa

Merge branch 'main' into fix-autosave-reset

714bef2

Merge branch 'main' into fix-autosave-reset

4a5011b

Fix autosave CI follow-ups

c18e25d

Merge branch 'main' into fix-autosave-reset

5cb7360

-			// Keep the editor's local state as the source of truth during autosave.
-			// Invalidating here can refetch slightly older server data and reset the form
-			// while the user is still typing.
+    // Optimistically update the cache so it stays fresh
+    // without triggering a refetch
+    queryClient.setQueryData(
+      ["content", collection, id],
+      (old) => old ? { ...old, data: variables.data ?? old.data, slug: variables.slug ?? old.slug, updatedAt: new Date().toISOString() } : old
+    );

Conversation

ideepakchauhan7 commented Apr 6, 2026

What does this PR do?

Type of change

Checklist

Uh oh!

changeset-bot bot commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

github-actions bot commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

ideepakchauhan7 commented Apr 6, 2026

Uh oh!

ascorbic commented Apr 11, 2026

Uh oh!

ideepakchauhan7 commented Apr 11, 2026

Uh oh!

ideepakchauhan7 commented Apr 11, 2026

Uh oh!

pkg-pr-new bot commented Apr 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Apr 11, 2026

Overlapping PRs

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Apr 12, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 12, 2026

Choose a reason for hiding this comment

Uh oh!

ascorbic Apr 12, 2026

Choose a reason for hiding this comment

Uh oh!

ascorbic Apr 12, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

changeset-bot bot commented Apr 6, 2026 •

edited

Loading

github-actions bot commented Apr 6, 2026 •

edited

Loading

pkg-pr-new bot commented Apr 11, 2026 •

edited

Loading