X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1a59e5dcc15a9a1aebfd15a08903fcb75efd2aac..d861bd54089e9279cd03b2e4561869ee877b9559:/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 b0478377..a460a518 100644 --- a/src/views-components/main-content-bar/main-content-bar.tsx +++ b/src/views-components/main-content-bar/main-content-bar.tsx @@ -2,43 +2,88 @@ // // SPDX-License-Identifier: AGPL-3.0 -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 React from "react"; + +import { Toolbar, StyleRulesCallback, IconButton, Tooltip, Grid, WithStyles, withStyles } from "@material-ui/core"; +import { DetailsIcon } from "components/icon/icon"; +import { Breadcrumbs } from "views-components/breadcrumbs/breadcrumbs"; import { connect } from 'react-redux'; -import { RootState } from '~/store/store'; -import { matchWorkflowRoute } from '~/routes/routes'; -import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action'; +import { RootState } from 'store/store'; +import * as Routes from 'routes/routes'; +import { toggleDetailsPanel } from 'store/details-panel/details-panel-action'; +import RefreshButton from "components/refresh-button/refresh-button"; +import { loadSidePanelTreeProjects } from "store/side-panel-tree/side-panel-tree-actions"; + +type CssRules = "infoTooltip"; + +const styles: StyleRulesCallback = theme => ({ + infoTooltip: { + marginTop: '-10px', + marginLeft: '10px', + } +}); interface MainContentBarProps { + onRefreshPage: () => void; onDetailsPanelToggle: () => void; buttonVisible: boolean; } -const isWorkflowPath = ({ router }: RootState) => { +const isButtonVisible = ({ router }: RootState) => { const pathname = router.location ? router.location.pathname : ''; - const match = matchWorkflowRoute(pathname); - return !!match; + 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: !isWorkflowPath(state) -}), { - onDetailsPanelToggle: toggleDetailsPanel - })((props: MainContentBarProps) => - - - - - - - {props.buttonVisible ? - - - - : null} - - - ); +export const MainContentBar = + connect((state: RootState) => ({ + buttonVisible: isButtonVisible(state), + projectUuid: state.detailsPanel.resourceUuid, + }), (dispatch) => ({ + onDetailsPanelToggle: () => dispatch(toggleDetailsPanel()), + onRefreshButtonClick: (id) => { + dispatch(loadSidePanelTreeProjects(id)); + } + }))( + withStyles(styles)( + (props: MainContentBarProps & WithStyles & any) => + + + + + + + { + props.onRefreshButtonClick(props.projectUuid); + }} /> + + + {props.buttonVisible && + + + + } + + + + ) + );