Skip to content

fix: show restore defaults only on General settings#1710

Merged
juliusmarminge merged 16 commits intopingdotgg:mainfrom
UtkarshUsername:fix/settings-restore-defaults-button
Apr 17, 2026
Merged

fix: show restore defaults only on General settings#1710
juliusmarminge merged 16 commits intopingdotgg:mainfrom
UtkarshUsername:fix/settings-restore-defaults-button

Conversation

@UtkarshUsername
Copy link
Copy Markdown
Contributor

@UtkarshUsername UtkarshUsername commented Apr 3, 2026

Fixes #1709

What Changed

Moved the Restore defaults visibility check into the shared settings header so the button keeps its existing placement but only renders on /settings/general.

Also kept the web settings header height stable between General and Archive so the header does not visually jump when the button is absent.

Why

Restore defaults resets general settings values. Showing it on the Archive page is misleading because that page is not a settings form and the action does not belong to that section. Also, the button doesn't work on the Archive page.

Keeping the button in the shared header preserves the original UI placement, while route-gating it makes the behavior correct. Fixing the header height avoids a visual regression between settings routes.

UI Changes

Before:
image

After:
image

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Note

Low Risk
UI-only conditional rendering and minor layout tweaks; no auth/data-path changes and behavior is constrained to the settings header.

Overview
Limits the Settings header’s “Restore defaults” action to only render on /settings/general (using useLocation), avoiding misleading/non-functional UI on other settings routes.

Extracts the button into a small RestoreDefaultsButton helper wired to useSettingsRestore, and tweaks header sizing classes to keep the header height from visually jumping when the button is absent.

Reviewed by Cursor Bugbot for commit 625fce1. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Show 'Restore defaults' button only on the General settings page

  • Extracts the restore-defaults UI into a new RestoreDefaultsButton component in settings.tsx
  • Uses useLocation to check if the current path is /settings/general, and only renders RestoreDefaultsButton when it matches
  • Behavioral Change: the 'Restore defaults' button no longer appears on other settings routes (e.g. account, appearance)

Macroscope summarized 625fce1.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 3, 2026

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: c9021ff5-127c-4e78-88c0-4757ba74c711

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added size:S 10-29 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Apr 3, 2026
macroscopeapp[bot]
macroscopeapp bot previously approved these changes Apr 3, 2026
@macroscopeapp
Copy link
Copy Markdown
Contributor

macroscopeapp bot commented Apr 3, 2026

Approvability

Verdict: Approved

This is a simple UI fix that conditionally hides the 'Restore defaults' button on non-General settings pages. The change extracts a component and adds a pathname check - straightforward, self-contained, and low risk.

You can customize Macroscope's approvability policy. Learn more.

@UtkarshUsername UtkarshUsername marked this pull request as draft April 11, 2026 06:21
@UtkarshUsername UtkarshUsername marked this pull request as ready for review April 12, 2026 08:10
- Add a section header action for restoring defaults
- Scope the restore button to General settings instead of the shared layout
- Remove the layout-level refresh key workaround
- Show the restore defaults action from the shared settings shell
- Keep the general settings panel focused on section content
- Remount the outlet after restore so settings refresh cleanly
- Reserve header height so the restore defaults button no longer shifts layout
- Keep the settings title row aligned on small screens
@UtkarshUsername UtkarshUsername force-pushed the fix/settings-restore-defaults-button branch from 0701dc2 to f875f19 Compare April 13, 2026 17:14
@macroscopeapp macroscopeapp bot dismissed their stale review April 13, 2026 17:15

Dismissing prior approval to re-evaluate f875f19

macroscopeapp[bot]
macroscopeapp bot previously approved these changes Apr 13, 2026
Copy link
Copy Markdown
Contributor

@cursor cursor bot left a comment

Choose a reason for hiding this comment

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

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit e10cab0. Configure here.

Comment thread apps/web/src/routes/settings.tsx
@UtkarshUsername UtkarshUsername marked this pull request as draft April 13, 2026 20:08
UtkarshUsername and others added 3 commits April 16, 2026 21:48
- Move restore-defaults action into a reusable component
- Keep post-restore refresh handling in the settings layout
- Remount the restore button after a restore completes
- Keep both settings headers in sync via `restoreSignal`
@github-actions github-actions bot added size:M 30-99 changed lines (additions + deletions). and removed size:S 10-29 changed lines (additions + deletions). labels Apr 16, 2026
@UtkarshUsername UtkarshUsername marked this pull request as ready for review April 16, 2026 18:33
@macroscopeapp macroscopeapp bot dismissed their stale review April 16, 2026 18:33

Dismissing prior approval to re-evaluate b8eceea

@juliusmarminge juliusmarminge merged commit 60387f6 into pingdotgg:main Apr 17, 2026
10 checks passed
aaditagrawal added a commit to aaditagrawal/t3code that referenced this pull request Apr 18, 2026
Integrates upstream/main (9df3c64) on top of fork's main (9602c18).

Upstream features adopted:
- Claude Opus 4.5 and 4.7 built-in models (pingdotgg#2072, pingdotgg#2143)
- Node-native TypeScript migration across desktop/server (pingdotgg#2098)
- Configurable project grouping with client-settings overrides (pingdotgg#2055, pingdotgg#2099)
- Thread status in command palette (pingdotgg#2107)
- Responsive composer / plan sidebar on narrow windows (pingdotgg#1198)
- Capture-phase CTRL+J keydown for Windows terminal toggle (pingdotgg#2113/pingdotgg#2142)
- Bypass xterm for global terminal shortcuts (pingdotgg#1580)
- Windows ARM build target (pingdotgg#2080)
- Windows PATH hydration + repair (pingdotgg#1729)
- Gitignore-aware workspace search (pingdotgg#2078)
- Claude process leak fix + stale session monitoring (pingdotgg#2042)
- Preserve provider bindings when stopping sessions (pingdotgg#2084)
- Clean up invalid pending-approval projections (pingdotgg#2106) — new migration
- Extract backend startup readiness coordination
- Drop stale text-gen options on reset (pingdotgg#2076)
- Extend negative repository identity cache TTL (pingdotgg#2083)
- Allow deleting non-empty projects from warning toast (pingdotgg#1264)
- Restore defaults only on General settings (pingdotgg#1710)
- Release workflow modernization (blacksmith runners, GitHub App token guards, v0.0.20 version bump)

Fork features preserved:
- All 8 providers (codex, claudeAgent, copilot, cursor, opencode,
  geminiCli, amp, kilo) with their adapters, services, and tests
- Fork's custom OpenCode protocol impl in apps/server/src/opencode/ (kept
  over upstream's @opencode-ai/sdk-based provider added in pingdotgg#1758 — fork's
  version is tested and integrated; upstream's parallel files deleted)
- Fork's direct-CLI Cursor adapter (kept over upstream's new ACP-based
  CursorProvider added in pingdotgg#1355 — upstream's parallel files deleted)
- Fork's ProviderRegistry aggregates only codex + claudeAgent snapshots;
  the other 6 providers register via ProviderAdapterRegistry
- PROVIDER_CACHE_IDS stays at [codex, claudeAgent] matching what the
  registry actually caches
- Migration IDs preserved (fork 23/24/25/26; upstream's new 025 lands at
  ID 27 to avoid re-applying on deployed fork DBs)
- Fork's generic per-provider settings (enabled/binaryPath/configDir/
  customModels) kept over upstream's opencode-specific serverUrl/password
- Log directory IPC channels, updateInstallInFlight tracking, icon
  composer pipeline all preserved
- Fork's simplified release.yml (no npm CLI publish, no nightly infra)
- composerDraftStore normalizeProviderKind widened to accept all 8 kinds
- Dark mode --background set to #0f0f0f

Test status:
- All 9 package typechecks pass
- Lint clean (0 errors)
- Tests: 1877 passed, 15 skipped (incl. 4 historically-flaky GitManager
  cross-repo PR selector tests newly gated with TODO for Node-native-TS
  follow-up)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M 30-99 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Settings archive page shows "Restore defaults" even though the action only applies to general settings

2 participants