X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/dd89200ad6fdbfa337fdbab5f54def8712c6746c..eb4491eea9ba873845f7a5796d139d19977f8112:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index a7f14aad..a38afb7a 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; import Drawer from '@material-ui/core/Drawer'; import { connect, DispatchProp } from "react-redux"; -import { Route, RouteComponentProps, Switch } from "react-router"; +import { Route, RouteComponentProps, Switch, Redirect } from "react-router"; import { login, logout } from "~/store/auth/auth-action"; import { User } from "~/models/user"; import { RootState } from "~/store/store"; @@ -42,6 +42,7 @@ import { CollectionPanel } from '../collection-panel/collection-panel'; import { loadCollection, loadCollectionTags } from '~/store/collection-panel/collection-panel-action'; import { getCollectionUrl } from '~/models/collection'; import { UpdateCollectionDialog } from '~/views-components/update-collection-dialog/update-collection-dialog.'; +import { UpdateProjectDialog } from '~/views-components/update-project-dialog/update-project-dialog'; import { AuthService } from "~/services/auth-service/auth-service"; import { RenameFileDialog } from '~/views-components/rename-file-dialog/rename-file-dialog'; import { FileRemoveDialog } from '~/views-components/file-remove-dialog/file-remove-dialog'; @@ -86,7 +87,8 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ content: { padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`, overflowY: "auto", - flexGrow: 1 + flexGrow: 1, + position: 'relative' }, toolbar: theme.mixins.toolbar }); @@ -227,6 +229,7 @@ export const Workbench = withStyles(styles)(
+ } /> @@ -243,6 +246,7 @@ export const Workbench = withStyles(styles)( + { this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(itemId)); this.props.dispatch(projectActions.RESET_PROJECT_TREE_ACTIVITY(itemId)); + const panelItem = this.props.sidePanelItems.find(it => it.id === itemId); if (panelItem && panelItem.activeAction) { - panelItem.activeAction(this.props.dispatch); + panelItem.activeAction(this.props.dispatch, this.props.authService.getUuid()); } }