Skip to content

Commit

Permalink
accountmenu fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tgxn committed Nov 4, 2023
1 parent 51c5ffa commit 9b0ff81
Showing 1 changed file with 18 additions and 45 deletions.
63 changes: 18 additions & 45 deletions src/components/Header/AccountMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ import { parseActorId, getUserRole } from "../../utils.js";
import { setAccountIsLoading, setCurrentUser } from "../../reducers/accountReducer";

import { RoleIcons } from "../Shared/Icons.jsx";
import { Typography } from "@mui/material";

function UserListItem({ user }) {
const dispatch = useDispatch();

const queryClient = useQueryClient();

const { baseUrl, siteData, localPerson, userRole } = getSiteData();
const { localPerson } = getSiteData();

const roleIcon = React.useMemo(() => {
const personRole = getUserRole(user);
Expand All @@ -50,16 +51,6 @@ function UserListItem({ user }) {
console.log("userIcon", userIcon);
return userIcon;
}, [user]);
// if (userRole == "admin") {
// userTooltip = "admin";
// userIcon = <VerifiedUserIcon />;
// }
// if (userRole == "mod") {
// userTooltip = "mod";
// userIcon = <SupervisedUserCircleIcon />;
// }

// const parsedActor = parseActorId(localPerson.actor_id);

return (
<MenuItem
Expand All @@ -81,37 +72,23 @@ function UserListItem({ user }) {
auth: user.jwt,
});

// there must be a user returned in this api call
if (!getSite.my_user) {
// set instance base to the current instance
// setInstanceBase(user.base);
// setUsername(user.site.my_user.local_user_view?.person.name);

throw new Error("jwt does not provide auth, re-authenticate");
}

// if (saveSession) {
// dispatch(addUser(user.base, auth.jwt, getSite));
// } else {
// dispatch(setCurrentUser(user.base, auth.jwt, getSite));
// TODO we need to update the user's details in the saved accounts array too, if this is a saved session
dispatch(setCurrentUser(user.base, user.jwt, getSite));
// }
} catch (e) {
toast(typeof e == "string" ? e : e.message);
} finally {
// setIsLoading(false);

dispatch(setAccountIsLoading(false));
}
}}
>
<ListItemDecorator>
<UserAvatar source={user.site.my_user?.local_user_view?.person.avatar} />
</ListItemDecorator>
{/* {user.site.my_user?.local_user_view?.person.actor_id == localPerson.actor_id ? (
<SwitchAccountIcon sx={{ mr: 1 }} />
) : (
<SwitchAccountIcon sx={{ mr: 1 }} />
)} */}
<ListItemContent>
{user.site.my_user?.local_user_view?.person.name}@{user.base}
</ListItemContent>
Expand All @@ -123,25 +100,10 @@ function UserListItem({ user }) {
export default function AccountMenu() {
const users = useSelector(selectUsers);

const { localPerson, userRole } = getSiteData();

const [anchorEl, setAnchorEl] = React.useState(null);
const [menuOpen, setMenuOpen] = React.useState(false);

const handleClick = (event) => {
if (menuOpen) return handleClose();

setAnchorEl(event.currentTarget);
setMenuOpen(true);
};

const handleClose = () => {
setMenuOpen(false);
setAnchorEl(null);
};
const { localUser, localPerson, userRole } = getSiteData();

let userTooltip = "user";
let userIcon = <AccountBoxIcon />;
let userIcon = RoleIcons[userTooltip]();
if (userRole == "admin") {
userTooltip = "admin";
userIcon = <VerifiedUserIcon />;
Expand All @@ -165,9 +127,20 @@ export default function AccountMenu() {
sx={{
mx: 1,
borderRadius: 4,

// fontSize: "14px",
// overflow: "hidden",
display: "flex",
// flexDirection: "row",
alignItems: "center",
justifyContent: "center",
// gap: 1,
}}
>
{parsedActor.actorName}@{parsedActor.actorBaseUrl} ({userTooltip})
<Typography sx={{ pr: 1 }}>
{parsedActor.actorName}@{parsedActor.actorBaseUrl}
</Typography>{" "}
{userIcon}
</MenuButton>
</BasicInfoTooltip>
<Menu placement="bottom-end">
Expand Down

0 comments on commit 9b0ff81

Please sign in to comment.