X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3641a3638123f272b97cf313a1a1a4d890741383..a0aedfcf68e7b3d4caeee3e36d776ca0b34780bf:/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 6fb419e3..2039f6b8 100644 --- a/src/views-components/main-content-bar/main-content-bar.tsx +++ b/src/views-components/main-content-bar/main-content-bar.tsx @@ -6,10 +6,10 @@ import * as React from "react"; import { Toolbar, IconButton, Tooltip, Grid } from "@material-ui/core"; import { DetailsIcon } from "~/components/icon/icon"; import { Breadcrumbs } from "~/views-components/breadcrumbs/breadcrumbs"; -import { detailsPanelActions } from "~/store/details-panel/details-panel-action"; import { connect } from 'react-redux'; import { RootState } from '~/store/store'; -import { matchWorkflowRoute } from '~/routes/routes'; +import { matchWorkflowRoute, matchRepositoriesRoute } from '~/routes/routes'; +import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action'; interface MainContentBarProps { onDetailsPanelToggle: () => void; @@ -22,10 +22,16 @@ const isWorkflowPath = ({ router }: RootState) => { return !!match; }; +const isRepositoriesPath = ({ router }: RootState) => { + const pathname = router.location ? router.location.pathname : ''; + const match = matchRepositoriesRoute(pathname); + return !!match; +}; + export const MainContentBar = connect((state: RootState) => ({ - buttonVisible: !isWorkflowPath(state) + buttonVisible: !isWorkflowPath(state) && !isRepositoriesPath(state) }), { - onDetailsPanelToggle: detailsPanelActions.TOGGLE_DETAILS_PANEL + onDetailsPanelToggle: toggleDetailsPanel })((props: MainContentBarProps) => @@ -33,11 +39,11 @@ export const MainContentBar = connect((state: RootState) => ({ - {props.buttonVisible ? + {props.buttonVisible && - : null} + } );