Merge branch '17426-plug-ins' refs #17426

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

diff --git a/src/views-components/main-content-bar/main-content-bar.tsx b/src/views-components/main-content-bar/main-content-bar.tsx
index c8565d62b1844c70e3c0eec7459b02e497dc9a28..60adab66c01d01097ff88532fdb97432694b8f2d 100644 (file)
--- a/src/views-components/main-content-bar/main-content-bar.tsx
+++ b/src/views-components/main-content-bar/main-content-bar.tsx
@@ -30,39 +30,53 @@ interface MainContentBarProps {
 
 const isButtonVisible = ({ router }: RootState) => {
     const pathname = router.location ? router.location.pathname : '';
-    return !Routes.matchWorkflowRoute(pathname) && !Routes.matchUserVirtualMachineRoute(pathname) &&
-        !Routes.matchAdminVirtualMachineRoute(pathname) && !Routes.matchRepositoriesRoute(pathname) &&
-        !Routes.matchSshKeysAdminRoute(pathname) && !Routes.matchSshKeysUserRoute(pathname) &&
-        !Routes.matchSiteManagerRoute(pathname) &&
-        !Routes.matchKeepServicesRoute(pathname) && !Routes.matchComputeNodesRoute(pathname) &&
-        !Routes.matchApiClientAuthorizationsRoute(pathname) && !Routes.matchUsersRoute(pathname) &&
-        !Routes.matchMyAccountRoute(pathname) && !Routes.matchLinksRoute(pathname);
+    return Routes.matchCollectionsContentAddressRoute(pathname) ||
+        Routes.matchPublicFavoritesRoute(pathname) ||
+        Routes.matchGroupDetailsRoute(pathname) ||
+        Routes.matchGroupsRoute(pathname) ||
+        Routes.matchUsersRoute(pathname) ||
+        Routes.matchSearchResultsRoute(pathname) ||
+        Routes.matchSharedWithMeRoute(pathname) ||
+        Routes.matchProcessRoute(pathname) ||
+        Routes.matchCollectionRoute(pathname) ||
+        Routes.matchProjectRoute(pathname) ||
+        Routes.matchAllProcessesRoute(pathname) ||
+        Routes.matchTrashRoute(pathname) ||
+        Routes.matchFavoritesRoute(pathname);
+
+    /* return !Routes.matchWorkflowRoute(pathname) && !Routes.matchUserVirtualMachineRoute(pathname) &&
+     *     !Routes.matchAdminVirtualMachineRoute(pathname) && !Routes.matchRepositoriesRoute(pathname) &&
+     *     !Routes.matchSshKeysAdminRoute(pathname) && !Routes.matchSshKeysUserRoute(pathname) &&
+     *     !Routes.matchSiteManagerRoute(pathname) &&
+     *     !Routes.matchKeepServicesRoute(pathname) && !Routes.matchComputeNodesRoute(pathname) &&
+     *     !Routes.matchApiClientAuthorizationsRoute(pathname) && !Routes.matchUsersRoute(pathname) &&
+     *     !Routes.matchMyAccountRoute(pathname) && !Routes.matchLinksRoute(pathname); */
 };
 
 export const MainContentBar =
     connect((state: RootState) => ({
         buttonVisible: isButtonVisible(state)
     }), {
-        onDetailsPanelToggle: toggleDetailsPanel,
-    })(
-        withStyles(styles)(
-            (props: MainContentBarProps & WithStyles<CssRules> & any) =>
-                <Toolbar>
-                    <Grid container>
-                        <Grid item xs alignItems="center">
-                            <Breadcrumbs />
-                        </Grid>
-                        <Grid item>
-                            <RefreshButton />
-                        </Grid>
-                        <Grid item>
-                            {props.buttonVisible && <Tooltip title="Additional Info">
-                                <IconButton color="inherit" className={props.classes.infoTooltip} onClick={props.onDetailsPanelToggle}>
-                                    <DetailsIcon />
-                                </IconButton>
-                            </Tooltip>}
+            onDetailsPanelToggle: toggleDetailsPanel,
+        })(
+            withStyles(styles)(
+                (props: MainContentBarProps & WithStyles<CssRules> & any) =>
+                    <Toolbar>
+                        <Grid container>
+                            <Grid container item xs alignItems="center">
+                                <Breadcrumbs />
+                            </Grid>
+                            <Grid item>
+                                <RefreshButton />
+                            </Grid>
+                            <Grid item>
+                                {props.buttonVisible && <Tooltip title="Additional Info">
+                                    <IconButton color="inherit" className={props.classes.infoTooltip} onClick={props.onDetailsPanelToggle}>
+                                        <DetailsIcon />
+                                    </IconButton>
+                                </Tooltip>}
+                            </Grid>
                         </Grid>
-                    </Grid>
-                </Toolbar>
-        )
-    );
+                    </Toolbar>
+            )
+        );