Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WD-10833] - Indicate logged-in-user-email #779

Merged
merged 1 commit into from
Jun 4, 2024
Merged

[WD-10833] - Indicate logged-in-user-email #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 47 additions & 22 deletions src/components/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import NavAccordion, { AccordionNavMenu } from "./NavAccordion";
import useEventListener from "@use-it/event-listener";
import { enablePermissionsFeature } from "util/permissions";
import { Location, useLocation } from "react-router-dom";
import { useLoggedInUser } from "context/useLoggedInUser";

const isSmallScreen = () => isWidthBelow(620);

Expand Down Expand Up @@ -41,6 +42,7 @@ const Navigation: FC = () => {
project && !isLoading ? project.name : "default",
);
const { hasCustomVolumeIso } = useSupportedFeatures();
const { loggedInUserName, loggedInUserID, authMethod } = useLoggedInUser();
const enablePermissions = enablePermissionsFeature();
const [scroll, setScroll] = useState(false);
const location = useLocation();
Expand Down Expand Up @@ -418,24 +420,6 @@ const Navigation: FC = () => {
Settings
</NavLink>
</li>
{isOidc && (
<li className="p-side-navigation__item">
<a
className="p-side-navigation__link"
title="Log out"
onClick={() => {
logout();
softToggleMenu();
}}
>
<Icon
className="is-light p-side-navigation__icon"
name="power-off"
/>{" "}
Log out
</a>
</li>
)}
</>
)}
{!isAuthenticated && (
Expand All @@ -449,7 +433,7 @@ const Navigation: FC = () => {
<Icon
className="is-light p-side-navigation__icon"
name="profile"
/>{" "}
/>
Login
</NavLink>
</li>
Expand All @@ -464,6 +448,29 @@ const Navigation: FC = () => {
},
)}
>
{isAuthenticated && (
<li className="p-side-navigation__item">
<div
className="p-side-navigation__link"
title={`${loggedInUserName} (${loggedInUserID})`}
>
{authMethod == "tls" ? (
<Icon
className="p-side-navigation__icon is-dark"
name="lock-locked"
/>
) : authMethod == "oidc" ? (
<Icon
className="p-side-navigation__icon is-dark"
name="profile"
/>
) : (
<></>
)}
<div className="u-truncate">{loggedInUserName}</div>
</div>
</li>
)}
<li className="p-side-navigation__item">
<a
className="p-side-navigation__link"
Expand All @@ -475,7 +482,7 @@ const Navigation: FC = () => {
<Icon
className="p-side-navigation__icon"
name="information"
/>{" "}
/>
Documentation
</a>
</li>
Expand All @@ -490,7 +497,7 @@ const Navigation: FC = () => {
<Icon
className="is-light p-side-navigation__icon"
name="share"
/>{" "}
/>
Discussion
</a>
</li>
Expand All @@ -505,10 +512,28 @@ const Navigation: FC = () => {
<Icon
className="is-light p-side-navigation__icon"
name="code"
/>{" "}
/>
Report a bug
</a>
</li>
{isOidc && (
<li className="p-side-navigation__item">
<a
className="p-side-navigation__link"
title="Log out"
onClick={() => {
logout();
softToggleMenu();
}}
>
<Icon
className="is-light p-side-navigation__icon p-side-logout"
name="export"
/>
Log out
</a>
</li>
)}
</ul>
</div>
</div>
Expand Down
23 changes: 23 additions & 0 deletions src/context/useLoggedInUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { useQuery } from "@tanstack/react-query";
import { useSettings } from "./useSettings";
import { fetchIdentity } from "api/auth-identities";
import { queryKeys } from "util/queryKeys";

export const useLoggedInUser = () => {
const { data: settings } = useSettings();

const id = settings?.auth_user_name || "";
const authMethod = settings?.auth_user_method || "";

const { data: identity } = useQuery({
queryKey: [queryKeys.identities, id],
queryFn: () => fetchIdentity(id, authMethod),
enabled: !!id && !!authMethod,
});

return {
loggedInUserName: identity?.name,
loggedInUserID: id,
authMethod,
};
};
4 changes: 4 additions & 0 deletions src/sass/_pattern_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@
}
}

.p-side-logout {
rotate: 90deg;
}

.accordion-nav-menu {
align-items: center;
display: flex;
Expand Down
Loading