19302: redefined collapsed panel props Arvados-DCO-1.1-Signed-off-by: Lisa Knox ...

[arvados-workbench2.git] / src / views-components / side-panel / side-panel-collapsed.tsx

diff --git a/src/views-components/side-panel/side-panel-collapsed.tsx b/src/views-components/side-panel/side-panel-collapsed.tsx
index a813b703def6cf491f1622bf7ada03bb13927951..cbfd285da3efc57751f8dd7ed938e3a4981f183c 100644 (file)
--- a/src/views-components/side-panel/side-panel-collapsed.tsx
+++ b/src/views-components/side-panel/side-panel-collapsed.tsx
@@ -2,10 +2,11 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import React, { ReactElement, useState } from 'react'
+import React, { ReactElement } from 'react'
 import { connect } from 'react-redux'
 import { ProjectsIcon, ProcessIcon, FavoriteIcon, ShareMeIcon, TrashIcon, PublicFavoriteIcon, GroupsIcon } from 'components/icon/icon'
-import { List, ListItem, Tooltip } from '@material-ui/core'
+import { TerminalIcon } from 'components/icon/icon'
+import { IconButton, List, ListItem, Tooltip } from '@material-ui/core'
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'
 import { ArvadosTheme } from 'common/custom-theme'
 import { navigateTo } from 'store/navigation/navigation-action'
@@ -19,15 +20,22 @@ import {
     navigateToAllProcesses,
     navigateToTrash,
 } from 'store/navigation/navigation-action'
+import { navigateToUserVirtualMachines } from 'store/navigation/navigation-action'
 import { RouterAction } from 'react-router-redux'
-import { Tree } from 'models/tree'
+import { User } from 'models/user'
 
-type CssRules = 'root' | 'unselected' | 'selected'
+type CssRules = 'button' | 'unselected' | 'selected'
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
-    root: {},
+    button: {
+        width: '40px',
+        height: '40px',
+        paddingLeft: '-2rem',
+        marginLeft: '-0.6rem',
+        marginBottom: '-1rem'
+    },
     unselected: {
-        color: theme.customs.colors.grey700,
+        color: theme.customs.colors.grey600,
     },
     selected: {
         color: theme.palette.primary.main,
@@ -36,11 +44,12 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 
 enum SidePanelCollapsedCategory {
     PROJECTS = 'Home Projects',
-    SHARED_WITH_ME = 'Shared with me',
-    PUBLIC_FAVORITES = 'Public Favorites',
     FAVORITES = 'My Favorites',
-    GROUPS = 'Groups',
+    PUBLIC_FAVORITES = 'Public Favorites',
+    SHARED_WITH_ME = 'Shared with me',
     ALL_PROCESSES = 'All Processes',
+    SHELL_ACCESS = 'Shell Access',
+    GROUPS = 'Groups',
     TRASH = 'Trash',
 }
 
@@ -57,9 +66,9 @@ const sidePanelCollapsedCategories: TCollapsedCategory[] = [
         navTarget: '',
     },
     {
-        name: SidePanelCollapsedCategory.SHARED_WITH_ME,
-        icon: <ShareMeIcon />,
-        navTarget: navigateToSharedWithMe,
+        name: SidePanelCollapsedCategory.FAVORITES,
+        icon: <FavoriteIcon />,
+        navTarget: navigateToFavorites,
     },
     {
         name: SidePanelCollapsedCategory.PUBLIC_FAVORITES,
@@ -67,20 +76,25 @@ const sidePanelCollapsedCategories: TCollapsedCategory[] = [
         navTarget: navigateToPublicFavorites,
     },
     {
-        name: SidePanelCollapsedCategory.FAVORITES,
-        icon: <FavoriteIcon />,
-        navTarget: navigateToFavorites,
-    },
-    {
-        name: SidePanelCollapsedCategory.GROUPS,
-        icon: <GroupsIcon />,
-        navTarget: navigateToGroups,
+        name: SidePanelCollapsedCategory.SHARED_WITH_ME,
+        icon: <ShareMeIcon />,
+        navTarget: navigateToSharedWithMe,
     },
     {
         name: SidePanelCollapsedCategory.ALL_PROCESSES,
         icon: <ProcessIcon />,
         navTarget: navigateToAllProcesses,
     },
+    {
+        name: SidePanelCollapsedCategory.SHELL_ACCESS,
+        icon: <TerminalIcon />,
+        navTarget: navigateToUserVirtualMachines,
+    },
+    {
+        name: SidePanelCollapsedCategory.GROUPS,
+        icon: <GroupsIcon style={{marginLeft: '2px', scale: '85%'}}/>,
+        navTarget: navigateToGroups,
+    },
     {
         name: SidePanelCollapsedCategory.TRASH,
         icon: <TrashIcon />,
@@ -88,20 +102,22 @@ const sidePanelCollapsedCategories: TCollapsedCategory[] = [
     },
 ]
 
-const findSelectedPath = (tree: Tree<any>) => {
-    for (const category in tree) {
-        if (tree[category].active === true) {
-            return tree[category].id
-        }
-    }
-    return null
+type SidePanelCollapsedProps = {
+    user: User,
+    selectedPath: string,
+    navToHome: (uuid: string)=>void,
+    navTo: (navTarget: RouterAction | '')=>void,
 }
 
-const mapStateToProps = (state: RootState) => {
-    return {
-        user: state.auth.user,
-        selectedPath: findSelectedPath(state.treePicker.sidePanelTree),
-    }
+const mapStateToProps = ({auth, properties }: RootState) => {
+        return {
+            user: auth.user,
+            selectedPath: properties.breadcrumbs
+                ? properties.breadcrumbs[0].label !== 'Virtual Machines'
+                ? properties.breadcrumbs[0].label
+                : SidePanelCollapsedCategory.SHELL_ACCESS
+                : SidePanelCollapsedCategory.PROJECTS,
+        }
 }
 
 const mapDispatchToProps = (dispatch: Dispatch) => {
@@ -112,33 +128,32 @@ const mapDispatchToProps = (dispatch: Dispatch) => {
 }
 
 export const SidePanelCollapsed = withStyles(styles)(
-    connect(mapStateToProps, mapDispatchToProps)(({ classes, user, selectedPath, navToHome, navTo }: WithStyles & any) => {
-        const [selectedIcon, setSelectedIcon] = useState(selectedPath)
+    connect(mapStateToProps, mapDispatchToProps)(({ classes, user, selectedPath, navToHome, navTo }: WithStyles & SidePanelCollapsedProps) => {
 
         const handleClick = (cat: TCollapsedCategory) => {
-            setSelectedIcon(cat.name)
             if (cat.name === SidePanelCollapsedCategory.PROJECTS) navToHome(user.uuid)
             else navTo(cat.navTarget)
         }
 
-        const { root, unselected, selected } = classes
+        const { button, unselected, selected } = classes
         return (
-            <List className={root}>
+            <List data-cy='side-panel-collapsed'>
                 {sidePanelCollapsedCategories.map((cat) => (
                     <ListItem
                         key={cat.name}
-                        className={selectedIcon === cat.name ? selected : unselected}
+                        data-cy={`collapsed-${cat.name.toLowerCase().replace(/\s+/g, '-')}`}
                         onClick={() => handleClick(cat)}
-                    >
+                        >
                         <Tooltip
+                            className={selectedPath === cat.name ? selected : unselected}
                             title={cat.name}
                             disableFocusListener
-                        >
-                            {cat.icon}
+                            >
+                            <IconButton className={button}>{cat.icon}</IconButton>
                         </Tooltip>
                     </ListItem>
                 ))}
             </List>
-        )
+        );
     })
 )