fix(settings): prevent false unsaved prompts and preserve drafts by waleedlatif1 · Pull Request #8704 · simstudioai/sim

waleedlatif1 · 2026-10-06T23:59:49Z

Summary

Prevent false unsaved prompts from loading, defaults, refetches, and edits reverted to saved values.
Preserve authored drafts and failed saves across workspace and organization settings, including inline creation forms and hidden SSO/provisioning drafts; share link, tab, history, refresh, and pending-request protection.
Remove duplicate dialogs/listeners, keep untouched credential fields current, and reconcile secret rows atomically so later edits cannot leave extra keys or lose existing values. Apply fresh secret snapshots after reverting or saving, and preserve same-page hash drafts across native and programmatic history. Preserve structured-clone history state and expire superseded traversal confirmations while retaining metadata-only updates. Confirmed history traversal discards drafts only when the browser reports an actual route change; no-ops and hashes retain edits, and pending saves still win.

Browser support boundary

Native Back/Forward uses Navigation API indexes or entries tracked by the app. Without the Navigation API, unindexed native entries cannot be cancelled reliably because popstate exposes no direction; those traversals pass through without guessing or rewriting the history stack. Programmatic traversal and beforeunload remain guarded. Unknown classic cross-document traversal may require native confirmation after the shared dialog; permission never suppresses later unload protection.

Type of Change

Bug fix

Testing

196 focused settings and sibling tests; regressions demonstrated red on pre-fix or guard-removal controls.
22 real Next.js App Router browser checks for clean links, Keep editing/discard, native Back/Forward, managed replace links, pending requests, same-page hashes, out-of-range traversal, converted deltas, and cross-origin draft retention.
Root test suite, all-workspace type checking, lint, all 58 audits, docs manifest, and block registry validation.

Checklist

Code follows project style guidelines
Self-reviewed my changes
Tests added/updated and passing (new tests pass the test-audit authoring gate)
No new warnings introduced
I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

vercel · 2026-10-06T23:59:52Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated
docs	Ready	Preview	Oct 7, 2026 3:41am UTC

waleedlatif1 · 2026-10-06T23:59:58Z

@greptile

waleedlatif1 · 2026-10-06T23:59:59Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T00:00:05Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 3 files

_{Reply with feedback, questions, or to request a fix.

Fix all with cubic | Turn on auto-fix | Re-trigger cubic}

greptile-apps · 2026-10-07T00:05:16Z

Confidence Score: 5/5

[Medium risk] Refactors settings unsaved-changes handling across many pages.

This PR appears safe to merge; no new blocking issue was found.

What we checked:

Back without a destination: requestLeave skips discard at confirmation. Drafts are discarded only after the browser reports departure, so a no-op keeps them.

Summary

This PR shares settings navigation protection and keeps authored drafts separate from saved values.

The latest changes wait for an actual history traversal before discarding drafts.
Back or Forward with no destination leaves drafts intact.
A save that starts before traversal keeps the user on the edited page.
All five supplied previous threads are unnumbered. Their original issues are addressed: typed whitespace remains, secret rows reconcile together, saved empty secrets remain valid, row matching uses maps, and same-page history preserves drafts.
No new actionable issues found.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Back or Forward] --> B{Same page?}
  B -->|Yes| C[Traverse and keep draft]
  B -->|No| D{Save pending?}
  D -->|Yes| E[Stay on edited page]
  D -->|No, draft exists| F[Ask before leaving]
  F -->|Keep editing| E
  F -->|Discard| G[Authorize traversal]
  G --> H{Browser reports departure?}
  H -->|No| I[Keep draft]
  H -->|Yes| J[Discard and leave]

_{Reviews (6) · Last reviewed commit: "fix(settings): retain drafts until histo..." · Reviewed by Greptile}

waleedlatif1 · 2026-10-07T01:27:15Z

@greptile

waleedlatif1 · 2026-10-07T01:27:16Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T01:27:21Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 52 files

_{Turn on auto-fix | Re-trigger cubic}

waleedlatif1 · 2026-10-07T01:59:39Z

@greptile

waleedlatif1 · 2026-10-07T01:59:40Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T01:59:45Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 53 files

_{Reply with feedback, questions, or to request a fix.

Fix all with cubic | Turn on auto-fix | Re-trigger cubic}

waleedlatif1 · 2026-10-07T02:46:18Z

@greptile

waleedlatif1 · 2026-10-07T02:46:19Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T02:46:24Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

2 issues found across 53 files

_{You've manually re-run cubic several times on this PR. Each manual re-review checks the full PR again and counts toward your usage quota. To preserve your usage limits, we recommend letting cubic automatically review new commits.

Fix all with cubic | Turn on auto-fix | Re-trigger cubic}

Prompt for AI agents (unresolved issues)


Check if these issues are valid — if so, understand the root cause of each and fix them. When an issue isn't valid or won't be fixed in this PR, reply in its thread with the reason and then resolve the thread. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="apps/sim/components/settings/use-settings-browser-navigation.ts">

<violation number="1" location="apps/sim/components/settings/use-settings-browser-navigation.ts:50">
P2: This stamp also rewrites non-plain structured-clone state: spreading a `Map` drops its entries, and spreading a `Date` drops its value. Stamp only plain-object state and leave other state types intact.</violation>

<violation number="2" location="apps/sim/components/settings/use-settings-browser-navigation.ts:101">
P2: A confirmed traversal beyond the history boundary emits no `popstate`, leaving `allowTraversal` set; a later Back with the same delta then bypasses the dirty-state check and can lose a new draft. Clear this authorization when a traversal is superseded or produces no matching event.</violation>
</file>

waleedlatif1 · 2026-10-07T03:13:31Z

@greptile

waleedlatif1 · 2026-10-07T03:13:32Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T03:13:38Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 53 files

_{You've manually re-run cubic several times on this PR. Each manual re-review checks the full PR again and counts toward your usage quota. To preserve your usage limits, we recommend letting cubic automatically review new commits.

Fix all with cubic | Turn on auto-fix | Re-trigger cubic}

waleedlatif1 · 2026-10-07T03:39:29Z

@greptile

waleedlatif1 · 2026-10-07T03:39:30Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-10-07T03:39:36Z

@cubic-dev-ai review this PR

@waleedlatif1 I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

No issues found across 53 files

Confidence score: 5/5

Automated review surfaced no issues in the provided summaries.
No files require special attention.

_{You've manually re-run cubic several times on this PR. Each manual re-review checks the full PR again and counts toward your usage quota. To preserve your usage limits, we recommend letting cubic automatically review new commits.

Turn on auto-fix | Re-trigger cubic}

vercel Bot deployed to Preview October 7, 2026 00:02 View deployment

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/ee/custom-blocks/components/custom-block-detail.tsx Outdated

greptile-apps Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/ee/custom-blocks/components/custom-block-detail.tsx Outdated

waleedlatif1 added 2 commits October 6, 2026 18:03

fix(settings): prevent false custom block unsaved changes

27cf138

fix(settings): preserve drafts and guard settings navigation

22fe83b

waleedlatif1 force-pushed the codex/settings-unsaved-changes branch from 045b060 to 22fe83b Compare October 7, 2026 01:26

waleedlatif1 changed the title ~~fix(settings): prevent false custom block unsaved changes~~ fix(settings): preserve drafts and guard settings navigation Oct 7, 2026

vercel Bot deployed to Preview October 7, 2026 01:28 View deployment

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

greptile-apps Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/components/secrets/secrets-editor.tsx Outdated

Comment thread apps/sim/components/secrets/secrets-editor.tsx Outdated

Comment thread apps/sim/components/secrets/secrets-editor.tsx Outdated

fix(settings): reconcile saved values and pending secret edits

1000fce

vercel Bot deployed to Preview October 7, 2026 02:02 View deployment

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/components/secrets/secrets-editor.tsx Outdated

Comment thread apps/sim/ee/scim/components/scim-section.tsx Outdated

Comment thread .agents/skills/add-settings-page/SKILL.md Outdated

Comment thread .claude/rules/sim-settings-pages.md Outdated

waleedlatif1 changed the title ~~fix(settings): preserve drafts and guard settings navigation~~ fix(settings): prevent false unsaved prompts and preserve drafts Oct 7, 2026

greptile-apps Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/components/settings/use-settings-browser-navigation.ts Outdated

fix(settings): preserve fresh snapshots and same-page history

6d6cf6a

vercel Bot deployed to Preview October 7, 2026 02:48 View deployment

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/components/settings/use-settings-browser-navigation.ts Outdated

Comment thread apps/sim/components/settings/use-settings-browser-navigation.ts Outdated

fix(settings): expire stale history confirmations safely

ea7eb4d

vercel Bot temporarily deployed to Preview October 7, 2026 03:13 Inactive

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

Comment thread apps/sim/components/settings/use-settings-browser-navigation.ts Outdated

fix(settings): retain drafts until history traversal occurs

f6fe47b

vercel Bot deployed to Preview October 7, 2026 03:41 View deployment

cubic-dev-ai Bot reviewed Oct 7, 2026

View reviewed changes

waleedlatif1 merged commit c5d07cc into staging Oct 7, 2026
36 of 37 checks passed

waleedlatif1 deleted the codex/settings-unsaved-changes branch October 7, 2026 05:48

waleedlatif1 mentioned this pull request Oct 7, 2026

v0.9.15: mship improvements, memory improvements, nextjs bump, plane and ramp integrations, outbox hardening #8748

Merged

Conversation

waleedlatif1 commented Oct 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Browser support boundary

Type of Change

Testing

Checklist

Uh oh!

vercel Bot commented Oct 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

waleedlatif1 commented Oct 6, 2026

Uh oh!

waleedlatif1 commented Oct 6, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

greptile-apps Bot commented Oct 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Confidence Score: 5/5

Summary

Uh oh!

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot commented Oct 7, 2026

Uh oh!

cubic-dev-ai Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

waleedlatif1 commented Oct 7, 2026

Uh oh!

waleedlatif1 commented Oct 6, 2026 •

edited

Loading

vercel Bot commented Oct 6, 2026 •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

greptile-apps Bot commented Oct 7, 2026 •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading

cubic-dev-ai Bot left a comment •

edited

Loading