X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3367b1ff2a1d1050bb435f7bc8230c03435b2529..d4068786fd7136cfe21c3ef3ad3040f57ed3385a:/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 6fb419e367..16fa2a9c21 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, matchSshKeysRoute } 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 isSshKeysPath = ({ router }: RootState) => { + const pathname = router.location ? router.location.pathname : ''; + const match = matchSshKeysRoute(pathname); + return !!match; +}; + export const MainContentBar = connect((state: RootState) => ({ - buttonVisible: !isWorkflowPath(state) + buttonVisible: !isWorkflowPath(state) && !isSshKeysPath(state) }), { - onDetailsPanelToggle: detailsPanelActions.TOGGLE_DETAILS_PANEL + onDetailsPanelToggle: toggleDetailsPanel })((props: MainContentBarProps) =>