Merge branch 'master' into 14566-admin-modal

[arvados-workbench2.git] / src / views-components / main-app-bar / admin-menu.tsx

diff --git a/src/views-components/main-app-bar/admin-menu.tsx b/src/views-components/main-app-bar/admin-menu.tsx
index f754c8578d39fcaa65cb58ce23caaeae27188963..40ba91616e4675ddce7622b68d2168da8bcc6fdc 100644 (file)
--- a/src/views-components/main-app-bar/admin-menu.tsx
+++ b/src/views-components/main-app-bar/admin-menu.tsx
@@ -6,17 +6,17 @@ import * as React from "react";
 import { MenuItem } from "@material-ui/core";
 import { User } from "~/models/user";
 import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu";
-import { ShareMeIcon } from "~/components/icon/icon";
+import { AdminMenuIcon } from "~/components/icon/icon";
 import { DispatchProp, connect } from 'react-redux';
 import { logout } from '~/store/auth/auth-action';
 import { RootState } from "~/store/store";
 import { openRepositoriesPanel } from "~/store/repositories/repositories-actions";
 import { 
-    navigateToSshKeys, navigateToKeepServices, navigateToComputeNodes,
+    navigateToSshKeysAdmin, navigateToKeepServices, navigateToComputeNodes,
     navigateToApiClientAuthorizations
 } from '~/store/navigation/navigation-action';
 import { openAdminVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions";
-import { navigateToUsers } from '~/store/navigation/navigation-action';
+import { openUserPanel } from "~/store/users/users-actions";
 
 interface AdminMenuProps {
     user?: User;
@@ -30,14 +30,14 @@ export const AdminMenu = connect(mapStateToProps)(
     ({ user, dispatch }: AdminMenuProps & DispatchProp<any>) =>
         user
             ? <DropdownMenu
-                icon={<ShareMeIcon />}
+                icon={<AdminMenuIcon />}
                 id="admin-menu"
                 title="Admin Panel">
                 <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
                 <MenuItem onClick={() => dispatch(openAdminVirtualMachines())}>Virtual Machines</MenuItem>
-                <MenuItem onClick={() => dispatch(navigateToSshKeys)}>Ssh Keys</MenuItem>
+                <MenuItem onClick={() => dispatch(navigateToSshKeysAdmin)}>Ssh Keys</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToApiClientAuthorizations)}>Api Tokens</MenuItem>
-                <MenuItem onClick={() => dispatch(navigateToUsers)}>Users</MenuItem>
+                <MenuItem onClick={() => dispatch(openUserPanel())}>Users</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToComputeNodes)}>Compute Nodes</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToKeepServices)}>Keep Services</MenuItem>
                 <MenuItem onClick={() => dispatch(logout())}>Logout</MenuItem>