21225: Add styles to wrap mutually exclusive tabs and data explorer in same paper

[arvados.git] / services / workbench2 / src / views-components / main-content-bar / main-content-bar.tsx

diff --git a/services/workbench2/src/views-components/main-content-bar/main-content-bar.tsx b/services/workbench2/src/views-components/main-content-bar/main-content-bar.tsx
index 8a32eff5c8e4d3f378dd2048a4a3ec5fc9eebb5a..5999b4855afa057c48a7e603cea5addbd383f4cc 100644 (file)
--- a/services/workbench2/src/views-components/main-content-bar/main-content-bar.tsx
+++ b/services/workbench2/src/views-components/main-content-bar/main-content-bar.tsx
@@ -35,7 +35,6 @@ interface MainContentBarProps {
     onDetailsPanelToggle: () => void;
     buttonVisible: boolean;
     projectUuid: string;
-    routeUuid: string;
 }
 
 const isButtonVisible = ({ router }: RootState) => {
@@ -57,12 +56,11 @@ const isButtonVisible = ({ router }: RootState) => {
 
 const mapStateToProps = (state: RootState) => {
     const currentRoute = state.router.location?.pathname.split('/') || [];
-    const routeUuid = currentRoute[currentRoute.length - 1];
+    const projectUuid = currentRoute[currentRoute.length - 1];
 
     return {
         buttonVisible: isButtonVisible(state),
-        projectUuid: state.detailsPanel.resourceUuid,
-        routeUuid
+        projectUuid,
     }
 };
 
@@ -85,11 +83,11 @@ export const MainContentBar = connect(mapStateToProps, mapDispatchToProps)(withS
                 }} />
             </Grid>
             <Grid item>
-                {props.buttonVisible && <Tooltip title="Additional Info">
+                {props.buttonVisible && <Tooltip title="Additional Info" disableFocusListener>
                     <IconButton data-cy="additional-info-icon"
                         color="inherit"
                         className={props.classes.infoTooltip}
-                        onClick={()=>props.onDetailsPanelToggle(props.routeUuid)}>
+                        onClick={()=>props.onDetailsPanelToggle(props.projectUuid)}>
                         <DetailsIcon />
                     </IconButton>
                 </Tooltip>}