X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ec33904efe960ec3e3bddb668d892463171e50bd..011705a4f293a0f5737c021b1ad2c5c87cd0cb03:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index bff328e8..906c649c 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -45,8 +45,10 @@ import SplitterLayout from 'react-splitter-layout'; import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel'; import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel'; import { SshKeyPanel } from '~/views/ssh-key-panel/ssh-key-panel'; +import { SiteManagerPanel } from "~/views/site-manager-panel/site-manager-panel"; import { MyAccountPanel } from '~/views/my-account-panel/my-account-panel'; import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog'; +import { NotFoundDialog } from '~/views-components/not-found-dialog/not-found-dialog'; import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog'; import { ProcessInputDialog } from '~/views-components/process-input-dialog/process-input-dialog'; import { VirtualMachineUserPanel } from '~/views/virtual-machine-panel/virtual-machine-user-panel'; @@ -79,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'; @@ -87,6 +91,13 @@ 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'; +import { FedLogin } from './fed-login'; +import { CollectionsContentAddressPanel } from '~/views/collection-content-address-panel/collection-content-address-panel'; +import { AllProcessesPanel } from '../all-processes-panel/all-processes-panel'; +import { NotFoundPanel } from '../not-found-panel/not-found-panel'; type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; @@ -118,7 +129,12 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ } }); -type WorkbenchPanelProps = WithStyles; +interface WorkbenchDataProps { + isUserActive: boolean; + isNotLinking: boolean; +} + +type WorkbenchPanelProps = WithStyles & WorkbenchDataProps; const defaultSplitterSize = 90; @@ -130,25 +146,26 @@ 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 && } - + + @@ -161,6 +178,7 @@ export const WorkbenchPanel = + @@ -169,6 +187,10 @@ export const WorkbenchPanel = + + + + @@ -206,6 +228,7 @@ export const WorkbenchPanel = + @@ -223,12 +246,16 @@ export const WorkbenchPanel = + + + + - ); \ No newline at end of file + );