Skip to content

improvement(forking): minor ui improvements#5533

Merged
icecrasher321 merged 2 commits into
stagingfrom
improvement/forking-settings-refresh
Jul 9, 2026
Merged

improvement(forking): minor ui improvements#5533
icecrasher321 merged 2 commits into
stagingfrom
improvement/forking-settings-refresh

Conversation

@icecrasher321

@icecrasher321 icecrasher321 commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator

Summary

Minor UI improvements for new forking feature

Type of Change

  • Other: UX

Testing

Tested manually

Checklist

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

@vercel

vercel Bot commented Jul 9, 2026 •
edited
Loading

Copy link
Copy Markdown

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

1 Skipped Deployment
Project Deployment Actions Updated (UTC)
docs Skipped Skipped Jul 9, 2026 5:37am

Request Review

@cursor

cursor Bot commented Jul 9, 2026 •
edited
Loading

Copy link
Copy Markdown

PR Summary

Medium Risk
Refactors shared settings dirty-state navigation used by Back, section changes, and workspace switch; incorrect leave/defer behavior could drop edits or block navigation. Fork dependent-field shape changes touch API contracts and sync gating but are covered by updated tests.

Overview
Settings unsaved changes now use a single deferred leave callback in useSettingsDirtyStore (requestLeave / confirmLeave) instead of tracking a target settings section. Back, section switches, and workspace switching all run through that guard so dirty fork/sync (and other settings) surfaces prompt before navigation.

Forking UX: copy-resource expandable rows match the settings MCP pattern (bordered --surface-2 panel). Dependent reconfigure data splits nested tool fields into plain title plus optional toolName; the sync UI groups block → tool → field, while blocking/cleared-ref copy still prefixes toolName when labels collide. Rollback is removed from the parent sync detail header and only appears on the Activity view when the last sync is undoable.

Reviewed by Cursor Bugbot for commit 388213b. Configure here.

@greptile-apps

greptile-apps Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Greptile Summary

This PR makes small UI updates around settings navigation and workspace forking. The main changes are:

  • Shared dirty-leave confirmation for settings section, Back, and workspace switching.
  • Nested fork reconfiguration fields split into tool groups with plain field labels.
  • Rollback moved out of the parent sync header and into the activity view.
  • Fork resource picker spacing and containment styling updated.

Confidence Score: 5/5

The changed flow looks mergeable after a small cleanup to fork warning labels.

  • Settings leave confirmation keeps navigation deferred until confirmation.
  • Rollback still uses the existing undoable-run check and confirmation modal.
  • Nested tool warning labels can lose the tool name in one downstream display path.

apps/sim/ee/workspace-forking/lib/mapping/dependent-reconfigs.ts

Important Files Changed

Filename Overview
apps/sim/stores/settings/dirty/store.ts Replaces section-specific pending navigation with a generic deferred leave callback.
apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx Uses the shared dirty-leave callback for settings section switches and Back navigation.
apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx Guards workspace switching with the settings dirty-leave store.
apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx Groups dependent reconfiguration fields under nested tool names.
apps/sim/ee/workspace-forking/lib/mapping/dependent-reconfigs.ts Emits plain field titles plus optional tool names for nested tool dependents.
apps/sim/ee/workspace-forking/lib/remap/remap-references.ts Extends needs-configuration fields with optional nested tool names.
apps/sim/lib/api/contracts/workspace-fork.ts Adds optional toolName to the fork dependent reconfiguration contract.
apps/sim/ee/workspace-forking/components/forks.tsx Moves rollback access from the parent sync detail header to the activity view.

Reviews (1): Last reviewed commit: "improvement(forking): minor ui improveme..." | Re-trigger Greptile

greptile-apps[bot]
greptile-apps Bot reviewed Jul 9, 2026
View reviewed changes
Comment thread apps/sim/ee/workspace-forking/lib/mapping/dependent-reconfigs.ts
@icecrasher321

icecrasher321 commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator Author

bugbot run

cursor[bot]
cursor Bot reviewed Jul 9, 2026
View reviewed changes

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 388213b. Configure here.

@icecrasher321 icecrasher321 merged commit fea3391 into staging Jul 9, 2026
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@greptile-apps greptile-apps[bot] greptile-apps[bot] left review comments
@cursor cursor[bot] cursor[bot] left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@icecrasher321