authorgravatar for 73941998+UtkarshUsername@users.noreply.github.comUtkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com> 2026-04-18 02:19:18+05:30
committergravatar for noreply@github.comGitHub <noreply@github.com> 2026-04-17 13:49:18-07:00
log60387f67e99d68eba414d2c2e00c8ccdb145b0c3
treeba57c2d1a0e73493d1434bff087c1087572c302a
parentce94feeea156e77f465c0330e89c0cb77eb0196f
signature Signed by PGP key B5690EEEBB952194

fix: show restore defaults only on General settings (#1710)

1 files changed, 31 insertions(+), 27 deletions(-)

apps/web/src/routes/settings.tsx+31-27
...@@ -1,5 +1,5 @@...@@ -1,5 +1,5 @@
1import { RotateCcwIcon } from "lucide-react";1import { RotateCcwIcon } from "lucide-react";
2import { Outlet, createFileRoute, redirect } from "@tanstack/react-router";2import { Outlet, createFileRoute, redirect, useLocation } from "@tanstack/react-router";
3import { useEffect, useState } from "react";3import { useEffect, useState } from "react";
44
5import { useSettingsRestore } from "../components/settings/SettingsPanels";5import { useSettingsRestore } from "../components/settings/SettingsPanels";
...@@ -7,11 +7,27 @@ import { Button } from "../components/ui/button";...@@ -7,11 +7,27 @@ import { Button } from "../components/ui/button";
7import { SidebarInset, SidebarTrigger } from "../components/ui/sidebar";7import { SidebarInset, SidebarTrigger } from "../components/ui/sidebar";
8import { isElectron } from "../env";8import { isElectron } from "../env";
99
10function RestoreDefaultsButton({ onRestored }: { onRestored: () => void }) {
11 const { changedSettingLabels, restoreDefaults } = useSettingsRestore(onRestored);
12
13 return (
14 <Button
15 size="xs"
16 variant="outline"
17 disabled={changedSettingLabels.length === 0}
18 onClick={() => void restoreDefaults()}
19 >
20 <RotateCcwIcon className="size-3.5" />
21 Restore defaults
22 </Button>
23 );
24}
25
10function SettingsContentLayout() {26function SettingsContentLayout() {
27 const location = useLocation();
11 const [restoreSignal, setRestoreSignal] = useState(0);28 const [restoreSignal, setRestoreSignal] = useState(0);
12 const { changedSettingLabels, restoreDefaults } = useSettingsRestore(() =>29 const showRestoreDefaults = location.pathname === "/settings/general";
13 setRestoreSignal((value) => value + 1),30 const handleRestored = () => setRestoreSignal((value) => value + 1);
14 );
1531
16 useEffect(() => {32 useEffect(() => {
17 const onKeyDown = (event: KeyboardEvent) => {33 const onKeyDown = (event: KeyboardEvent) => {
...@@ -33,20 +49,14 @@ function SettingsContentLayout() {...@@ -33,20 +49,14 @@ function SettingsContentLayout() {
33 <div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background text-foreground">49 <div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background text-foreground">
34 {!isElectron && (50 {!isElectron && (
35 <header className="border-b border-border px-3 py-2 sm:px-5">51 <header className="border-b border-border px-3 py-2 sm:px-5">
36 <div className="flex items-center gap-2">52 <div className="flex min-h-7 items-center gap-2 sm:min-h-6">
37 <SidebarTrigger className="size-7 shrink-0 md:hidden" />53 <SidebarTrigger className="size-7 shrink-0 md:hidden" />
38 <span className="text-sm font-medium text-foreground">Settings</span>54 <span className="text-sm font-medium text-foreground">Settings</span>
39 <div className="ms-auto flex items-center gap-2">55 {showRestoreDefaults ? (
40 <Button56 <div className="ms-auto flex items-center gap-2">
41 size="xs"57 <RestoreDefaultsButton onRestored={handleRestored} />
42 variant="outline"58 </div>
43 disabled={changedSettingLabels.length === 0}59 ) : null}
44 onClick={() => void restoreDefaults()}
45 >
46 <RotateCcwIcon className="size-3.5" />
47 Restore defaults
48 </Button>
49 </div>
50 </div>60 </div>
51 </header>61 </header>
52 )}62 )}
...@@ -56,17 +66,11 @@ function SettingsContentLayout() {...@@ -56,17 +66,11 @@ function SettingsContentLayout() {
56 <span className="text-xs font-medium tracking-wide text-muted-foreground/70">66 <span className="text-xs font-medium tracking-wide text-muted-foreground/70">
57 Settings67 Settings
58 </span>68 </span>
59 <div className="ms-auto flex items-center gap-2">69 {showRestoreDefaults ? (
60 <Button70 <div className="ms-auto flex items-center gap-2">
61 size="xs"71 <RestoreDefaultsButton onRestored={handleRestored} />
62 variant="outline"72 </div>
63 disabled={changedSettingLabels.length === 0}73 ) : null}
64 onClick={() => void restoreDefaults()}
65 >
66 <RotateCcwIcon className="size-3.5" />
67 Restore defaults
68 </Button>
69 </div>
70 </div>74 </div>
71 )}75 )}
7276