X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/addb01b6d7636a8963ddb1eff4799ebc96f44739..297ccba9513f02ebfa6e13ab8831eb0b195b6dc3:/src/views/workbench/workbench.tsx?ds=sidebyside diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 1202529cbc..ae8a8f842d 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React from 'react'; +import React, { useState, useCallback } from 'react'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; import { Route, Switch } from "react-router"; import { ProjectPanel } from "views/project-panel/project-panel"; @@ -20,7 +20,6 @@ import { MultipleFilesRemoveDialog } from 'views-components/file-remove-dialog/m import { Routes } from 'routes/routes'; import { SidePanel } from 'views-components/side-panel/side-panel'; import { ProcessPanel } from 'views/process-panel/process-panel'; -import { ProcessLogPanel } from 'views/process-log-panel/process-log-panel'; import { ChangeWorkflowDialog } from 'views-components/run-process-dialog/change-workflow-dialog'; import { CreateProjectDialog } from 'views-components/dialog-forms/create-project-dialog'; import { CreateCollectionDialog } from 'views-components/dialog-forms/create-collection-dialog'; @@ -34,7 +33,6 @@ import { MoveProjectDialog } from 'views-components/dialog-forms/move-project-di import { MoveCollectionDialog } from 'views-components/dialog-forms/move-collection-dialog'; import { FilesUploadCollectionDialog } from 'views-components/dialog-forms/files-upload-collection-dialog'; import { PartialCopyCollectionDialog } from 'views-components/dialog-forms/partial-copy-collection-dialog'; -import { ProcessCommandDialog } from 'views-components/process-command-dialog/process-command-dialog'; import { RemoveProcessDialog } from 'views-components/process-remove-dialog/process-remove-dialog'; import { MainContentBar } from 'views-components/main-content-bar/main-content-bar'; import { Grid } from '@material-ui/core'; @@ -80,9 +78,9 @@ 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 { DeactivateDialog } from 'views-components/user-dialog/deactivate-dialog'; -import { SetupShellAccountDialog } from 'views-components/dialog-forms/setup-shell-account-dialog'; +import { ActivateDialog } from 'views-components/user-dialog/activate-dialog'; +import { SetupDialog } from 'views-components/user-dialog/setup-dialog'; import { GroupsPanel } from 'views/groups-panel/groups-panel'; import { RemoveGroupDialog } from 'views-components/groups-dialog/remove-dialog'; import { GroupAttributesDialog } from 'views-components/groups-dialog/attributes-dialog'; @@ -159,7 +157,6 @@ let routes = <> - @@ -188,6 +185,18 @@ const reduceRoutesFn: (a: React.ReactElement[], routes = React.createElement(React.Fragment, null, pluginConfig.centerPanelList.reduce(reduceRoutesFn, React.Children.toArray(routes.props.children))); +const Banner = () => { + const [visible, setVisible] = useState(true); + const hideBanner = useCallback(() => setVisible(false), []); + + return visible ? + : null; +} + export const WorkbenchPanel = withStyles(styles)((props: WorkbenchPanelProps) => @@ -243,7 +252,6 @@ export const WorkbenchPanel = - @@ -261,7 +269,6 @@ export const WorkbenchPanel = - @@ -269,11 +276,13 @@ export const WorkbenchPanel = - + + + {React.createElement(React.Fragment, null, pluginConfig.dialogs)} );