X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8695e9d621330e691fbcc4bbc1d600d91bae2ac6..d56a6b231e95cb9e512051b1dae5ac50f31ee6fe:/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 075aa69a..6e844cc8 100644 --- a/src/views-components/main-app-bar/account-menu.tsx +++ b/src/views-components/main-app-bar/account-menu.tsx @@ -3,42 +3,89 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from "react"; -import { MenuItem } from "@material-ui/core"; -import { User, getUserFullname } from "~/models/user"; +import { MenuItem, Divider } from "@material-ui/core"; +import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; +import { User, getUserDisplayName } from "~/models/user"; import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu"; import { UserPanelIcon } from "~/components/icon/icon"; import { DispatchProp, connect } from 'react-redux'; -import { logout } from '~/store/auth/auth-action'; +import { authActions } from '~/store/auth/auth-action'; import { RootState } from "~/store/store"; import { openCurrentTokenDialog } from '~/store/current-token-dialog/current-token-dialog-actions'; import { openRepositoriesPanel } from "~/store/repositories/repositories-actions"; -import { navigateToSshKeys, navigateToKeepServices } from '~/store/navigation/navigation-action'; -import { openVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions"; +import { + navigateToSiteManager, + navigateToSshKeysUser, + navigateToMyAccount, + navigateToLinkAccount +} from '~/store/navigation/navigation-action'; +import { openUserVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions"; interface AccountMenuProps { user?: User; + currentRoute: string; + workbenchURL: string; + apiToken?: string; + localCluster: string; } const mapStateToProps = (state: RootState): AccountMenuProps => ({ - user: state.auth.user + user: state.auth.user, + currentRoute: state.router.location ? state.router.location.pathname : '', + workbenchURL: state.auth.config.workbenchUrl, + apiToken: state.auth.apiToken, + localCluster: state.auth.localCluster }); -export const AccountMenu = connect(mapStateToProps)( - ({ user, dispatch }: AccountMenuProps & DispatchProp) => +const wb1URL = (route: string) => { + const r = route.replace(/^\//, ""); + if (r.match(/^(projects|collections)\//)) { + return r; + } else if (r.match(/^processes\//)) { + return r.replace(/^processes/, "container_requests"); + } + return ""; +}; + +type CssRules = 'link'; + +const styles: StyleRulesCallback = () => ({ + link: { + textDecoration: 'none', + color: 'inherit' + } +}); + +export const AccountMenuComponent = + ({ user, dispatch, currentRoute, workbenchURL, apiToken, localCluster, classes }: AccountMenuProps & DispatchProp & WithStyles) => user - ? } - id="account-menu" - title="Account Management"> - - {getUserFullname(user)} - - dispatch(openVirtualMachines())}>Virtual Machines - dispatch(openRepositoriesPanel())}>Repositories + ? } + id="account-menu" + title="Account Management" + key={currentRoute}> + + {getUserDisplayName(user)} {user.uuid.substr(0, 5) !== localCluster && `(${user.uuid.substr(0, 5)})`} + + {user.isActive ? <> + dispatch(openUserVirtualMachines())}>Virtual Machines + {!user.isAdmin && dispatch(openRepositoriesPanel())}>Repositories} dispatch(openCurrentTokenDialog)}>Current token - dispatch(navigateToSshKeys)}>Ssh Keys - { user.isAdmin && dispatch(navigateToKeepServices)}>Keep Services } - My account - dispatch(logout())}>Logout - - : null); + dispatch(navigateToSshKeysUser)}>Ssh Keys + dispatch(navigateToSiteManager)}>Site Manager + dispatch(navigateToMyAccount)}>My account + dispatch(navigateToLinkAccount)}>Link account + : null} + + + Switch to Workbench v1 + + dispatch(authActions.LOGOUT({deleteLinkData: true}))}> + Logout + + + : null; + +export const AccountMenu = withStyles(styles)( connect(mapStateToProps)(AccountMenuComponent) );