Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(web): place sign-out action on current device

tianma-if1846350df7d4
diff --git a/apps/web/src/components/SettingsPane.tsx b/apps/web/src/components/SettingsPane.tsx
index 47b3ec7d..12febac9 100644
--- a/apps/web/src/components/SettingsPane.tsx
+++ b/apps/web/src/components/SettingsPane.tsx
@@ -29,7 +29,6 @@ import { FeedbackLink } from "./settings/FeedbackLink";
import { McpConfigCard } from "./settings/McpConfigCard";
import { PreferenceCard } from "./settings/PreferenceCard";
import { PasswordCard } from "./settings/PasswordCard";
-import { SessionCard } from "./settings/SessionCard";
import { UserManagementCard } from "./settings/UserManagementCard";
import { ObjectStorageCard } from "./settings/ObjectStorageCard";
import { AiModelCard } from "./settings/AiModelCard";
@@ -262,8 +261,13 @@ export const SettingsPane = ({
<SettingsGroup>
<AccountInfoCard user={user} />
<PasswordCard authRequired={authRequired} demoMode={demoMode} />
- {demoMode ? null : <LoginDevicesCard authRequired={authRequired} />}
- <SessionCard authRequired={authRequired} isLoggingOut={isLoggingOut} onLogout={onLogout} />
+ {demoMode ? null : (
+ <LoginDevicesCard
+ authRequired={authRequired}
+ isLoggingOut={isLoggingOut}
+ onLogout={onLogout}
+ />
+ )}
</SettingsGroup>
);
default:
diff --git a/apps/web/src/components/settings/LoginDevicesCard.tsx b/apps/web/src/components/settings/LoginDevicesCard.tsx
index 697ae61b..285806e4 100644
--- a/apps/web/src/components/settings/LoginDevicesCard.tsx
+++ b/apps/web/src/components/settings/LoginDevicesCard.tsx
@@ -10,6 +10,8 @@ import { LoginSessionRevokeDialog, type LoginSessionRevokeTarget } from "./Login
interface LoginDevicesCardProps {
authRequired: boolean;
+ isLoggingOut: boolean;
+ onLogout: () => void;
}
type DeviceKind = "mobile" | "tablet" | "desktop" | "unknownDevice";
@@ -66,7 +68,7 @@ const formatSessionTime = (value: string, locale: string) =>
minute: "2-digit",
}).format(new Date(value));
-export const LoginDevicesCard = ({ authRequired }: LoginDevicesCardProps) => {
+export const LoginDevicesCard = ({ authRequired, isLoggingOut, onLogout }: LoginDevicesCardProps) => {
const { t, i18n } = useTranslation();
const queryClient = useQueryClient();
const [revokeTarget, setRevokeTarget] = useState<LoginSessionRevokeTarget | null>(null);
@@ -190,7 +192,16 @@ export const LoginDevicesCard = ({ authRequired }: LoginDevicesCardProps) => {
onClick={() => { setEditingSessionId(session.id); setLabelDraft(session.label ?? ""); }}
><Pencil className="h-4 w-4" /></Button>
)}
- {!session.isCurrent ? (
+ {session.isCurrent ? (
+ <Button
+ size="sm"
+ variant="danger"
+ disabled={isLoggingOut}
+ onClick={onLogout}
+ >
+ {isLoggingOut ? t("session.loggingOut") : t("session.logout")}
+ </Button>
+ ) : (
<Button
size="sm"
variant="danger"
@@ -199,7 +210,7 @@ export const LoginDevicesCard = ({ authRequired }: LoginDevicesCardProps) => {
>
{t("loginDevices.revokeDevice")}
</Button>
- ) : null}
+ )}
</div>
</li>
);
diff --git a/apps/web/src/components/settings/SessionCard.tsx b/apps/web/src/components/settings/SessionCard.tsx
deleted file mode 100644
index a36f9ba7..00000000
--- a/apps/web/src/components/settings/SessionCard.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { LogOut } from "lucide-react";
-import { useTranslation } from "react-i18next";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
-
-interface SessionCardProps {
- authRequired: boolean;
- isLoggingOut: boolean;
- onLogout: () => void;
-}
-
-export const SessionCard = ({ authRequired, isLoggingOut, onLogout }: SessionCardProps) => {
- const { t } = useTranslation();
-
- if (!authRequired) {
- return null;
- }
-
- return (
- <Card className="w-full min-w-0 overflow-hidden border-rose-100 bg-rose-50/30 shadow-none">
- <CardContent className="pt-6">
- <Button
- size="md"
- variant="danger"
- className="bg-rose-600 font-semibold text-white shadow-sm hover:bg-rose-700"
- disabled={isLoggingOut}
- onClick={onLogout}
- >
- <LogOut className="h-4 w-4" />
- {isLoggingOut ? t("session.loggingOut") : t("session.logout")}
- </Button>
- </CardContent>
- </Card>
- );
-};