projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14505-admin-groups-panel'
[arvados.git]
/
src
/
views-components
/
main-app-bar
/
account-menu.tsx
diff --git
a/src/views-components/main-app-bar/account-menu.tsx
b/src/views-components/main-app-bar/account-menu.tsx
index ec95e38a33cfbba5f5eb9a7d292457307f02511a..53a5753d0c2130380ce900efa2c1f6f73b33698d 100644
(file)
--- a/
src/views-components/main-app-bar/account-menu.tsx
+++ b/
src/views-components/main-app-bar/account-menu.tsx
@@
-17,19
+17,22
@@
import { openRepositoriesPanel } from '~/store/repositories/repositories-actions
interface AccountMenuProps {
user?: User;
interface AccountMenuProps {
user?: User;
+ currentRoute: string;
}
const mapStateToProps = (state: RootState): AccountMenuProps => ({
}
const mapStateToProps = (state: RootState): AccountMenuProps => ({
- user: state.auth.user
+ user: state.auth.user,
+ currentRoute: state.router.location ? state.router.location.pathname : ''
});
export const AccountMenu = connect(mapStateToProps)(
});
export const AccountMenu = connect(mapStateToProps)(
- ({ user, dispatch }: AccountMenuProps & DispatchProp<any>) =>
+ ({ user, dispatch
, currentRoute
}: AccountMenuProps & DispatchProp<any>) =>
user
? <DropdownMenu
icon={<UserPanelIcon />}
id="account-menu"
user
? <DropdownMenu
icon={<UserPanelIcon />}
id="account-menu"
- title="Account Management">
+ title="Account Management"
+ key={currentRoute}>
<MenuItem>
{getUserFullname(user)}
</MenuItem>
<MenuItem>
{getUserFullname(user)}
</MenuItem>