Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix(frontend): The "logout" action is still shown even if there is no associated account. (#9478)

Hiep Le11ae4f96c25c
diff --git a/frontend/__tests__/components/user-actions.test.tsx b/frontend/__tests__/components/user-actions.test.tsx
index 3d37f42acb..1b6f59c2e8 100644
--- a/frontend/__tests__/components/user-actions.test.tsx
+++ b/frontend/__tests__/components/user-actions.test.tsx
@@ -21,7 +21,12 @@ describe("UserActions", () => {
});
it("should toggle the user menu when the user avatar is clicked", async () => {
- render(<UserActions onLogout={onLogoutMock} />);
+ render(
+ <UserActions
+ onLogout={onLogoutMock}
+ user={{ avatar_url: "https://example.com/avatar.png" }}
+ />,
+ );
const userAvatar = screen.getByTestId("user-avatar");
await user.click(userAvatar);
@@ -57,15 +62,102 @@ describe("UserActions", () => {
).not.toBeInTheDocument();
});
- test("logout button is always enabled", async () => {
+ it("should NOT show context menu when user is undefined and avatar is clicked", async () => {
render(<UserActions onLogout={onLogoutMock} />);
const userAvatar = screen.getByTestId("user-avatar");
await user.click(userAvatar);
- const logoutOption = screen.getByText("ACCOUNT_SETTINGS$LOGOUT");
- await user.click(logoutOption);
+ // Context menu should NOT appear because user is undefined
+ expect(
+ screen.queryByTestId("account-settings-context-menu"),
+ ).not.toBeInTheDocument();
+ });
- expect(onLogoutMock).toHaveBeenCalledOnce();
+ it("should show context menu even when user has no avatar_url", async () => {
+ render(<UserActions onLogout={onLogoutMock} user={{ avatar_url: "" }} />);
+
+ const userAvatar = screen.getByTestId("user-avatar");
+ await user.click(userAvatar);
+
+ // Context menu SHOULD appear because user object exists (even with empty avatar_url)
+ expect(
+ screen.getByTestId("account-settings-context-menu"),
+ ).toBeInTheDocument();
+ });
+
+ it("should NOT be able to access logout when no user is provided", async () => {
+ render(<UserActions onLogout={onLogoutMock} />);
+
+ const userAvatar = screen.getByTestId("user-avatar");
+ await user.click(userAvatar);
+
+ // Logout option should not be accessible because context menu doesn't appear
+ expect(
+ screen.queryByText("ACCOUNT_SETTINGS$LOGOUT"),
+ ).not.toBeInTheDocument();
+ expect(onLogoutMock).not.toHaveBeenCalled();
+ });
+
+ it("should handle user prop changing from undefined to defined", () => {
+ const { rerender } = render(<UserActions onLogout={onLogoutMock} />);
+
+ // Initially no user - context menu shouldn't work
+ expect(
+ screen.queryByTestId("account-settings-context-menu"),
+ ).not.toBeInTheDocument();
+
+ // Add user prop
+ rerender(
+ <UserActions
+ onLogout={onLogoutMock}
+ user={{ avatar_url: "https://example.com/avatar.png" }}
+ />,
+ );
+
+ // Component should still render correctly
+ expect(screen.getByTestId("user-actions")).toBeInTheDocument();
+ expect(screen.getByTestId("user-avatar")).toBeInTheDocument();
+ });
+
+ it("should handle user prop changing from defined to undefined", async () => {
+ const { rerender } = render(
+ <UserActions
+ onLogout={onLogoutMock}
+ user={{ avatar_url: "https://example.com/avatar.png" }}
+ />,
+ );
+
+ // Click to open menu
+ const userAvatar = screen.getByTestId("user-avatar");
+ await user.click(userAvatar);
+ expect(
+ screen.getByTestId("account-settings-context-menu"),
+ ).toBeInTheDocument();
+
+ // Remove user prop - menu should disappear
+ rerender(<UserActions onLogout={onLogoutMock} />);
+
+ expect(
+ screen.queryByTestId("account-settings-context-menu"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should work with loading state and user provided", async () => {
+ render(
+ <UserActions
+ onLogout={onLogoutMock}
+ user={{ avatar_url: "https://example.com/avatar.png" }}
+ isLoading={true}
+ />,
+ );
+
+ const userAvatar = screen.getByTestId("user-avatar");
+ await user.click(userAvatar);
+
+ // Context menu should still appear even when loading
+ expect(
+ screen.getByTestId("account-settings-context-menu"),
+ ).toBeInTheDocument();
});
});
diff --git a/frontend/src/components/features/sidebar/user-actions.tsx b/frontend/src/components/features/sidebar/user-actions.tsx
index d238ea8ab4..edde8845ae 100644
--- a/frontend/src/components/features/sidebar/user-actions.tsx
+++ b/frontend/src/components/features/sidebar/user-actions.tsx
@@ -33,7 +33,7 @@ export function UserActions({ onLogout, user, isLoading }: UserActionsProps) {
isLoading={isLoading}
/>
- {accountContextMenuIsVisible && (
+ {accountContextMenuIsVisible && !!user && (
<AccountSettingsContextMenu
onLogout={handleLogout}
onClose={closeAccountMenu}