X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f9dde5c781766b8be71d43d0f031c201a0edcfbb..e954cfb45dbe418c151144cc42847b848c9b0ebf:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 90b2dad0..e852150c 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -3,6 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; +import { connect } from 'react-redux'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; import { Route, Switch } from "react-router"; import { ProjectPanel } from "~/views/project-panel/project-panel"; @@ -80,6 +81,8 @@ import { UserPanel } from '~/views/user-panel/user-panel'; import { UserAttributesDialog } from '~/views-components/user-dialog/attributes-dialog'; import { CreateUserDialog } from '~/views-components/dialog-forms/create-user-dialog'; import { HelpApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/help-dialog'; +import { UserManageDialog } from '~/views-components/user-dialog/manage-dialog'; +import { SetupShellAccountDialog } from '~/views-components/dialog-forms/setup-shell-account-dialog'; import { GroupsPanel } from '~/views/groups-panel/groups-panel'; import { CreateGroupDialog } from '~/views-components/dialog-forms/create-group-dialog'; import { RemoveGroupDialog } from '~/views-components/groups-dialog/remove-dialog'; @@ -88,6 +91,9 @@ import { GroupDetailsPanel } from '~/views/group-details-panel/group-details-pan import { RemoveGroupMemberDialog } from '~/views-components/groups-dialog/member-remove-dialog'; import { GroupMemberAttributesDialog } from '~/views-components/groups-dialog/member-attributes-dialog'; import { AddGroupMembersDialog } from '~/views-components/dialog-forms/add-group-member-dialog'; +import { PartialCopyToCollectionDialog } from '~/views-components/dialog-forms/partial-copy-to-collection-dialog'; +import { PublicFavoritePanel } from '~/views/public-favorites-panel/public-favorites-panel'; +import { LinkAccountPanel } from '~/views/link-account-panel/link-account-panel'; type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; @@ -119,7 +125,12 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ } }); -type WorkbenchPanelProps = WithStyles; +interface WorkbenchDataProps { + isUserActive: boolean; + isNotLinking: boolean; +} + +type WorkbenchPanelProps = WithStyles & WorkbenchDataProps; const defaultSplitterSize = 90; @@ -131,21 +142,21 @@ const getSplitterInitialSize = () => { const saveSplitterSize = (size: number) => localStorage.setItem('splitterSize', size.toString()); export const WorkbenchPanel = - withStyles(styles)(({ classes }: WorkbenchPanelProps) => - - - - + withStyles(styles)((props: WorkbenchPanelProps) => + + + + { props.isUserActive && props.isNotLinking && - - - - + } + + + { props.isNotLinking && } - + @@ -171,6 +182,8 @@ export const WorkbenchPanel = + + @@ -208,6 +221,7 @@ export const WorkbenchPanel = + @@ -225,12 +239,14 @@ export const WorkbenchPanel = + + );