X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f75b0aa3966895160535bad24b05c1a763665a5a..55c0fe472ca9938c93a78bbff0e0fb1b5e51a54e:/src/views/workbench/workbench.tsx diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 7103efd1..74bccd0f 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -4,12 +4,12 @@ import React 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"; +import { Route, Switch } from 'react-router'; +import { ProjectPanel } from 'views/project-panel/project-panel'; import { DetailsPanel } from 'views-components/details-panel/details-panel'; import { ArvadosTheme } from 'common/custom-theme'; -import { ContextMenu } from "views-components/context-menu/context-menu"; -import { FavoritePanel } from "../favorite-panel/favorite-panel"; +import { ContextMenu } from 'views-components/context-menu/context-menu'; +import { FavoritePanel } from '../favorite-panel/favorite-panel'; import { TokenDialog } from 'views-components/token-dialog/token-dialog'; import { RichTextEditorDialog } from 'views-components/rich-text-editor-dialog/rich-text-editor-dialog'; import { Snackbar } from 'views-components/snackbar/snackbar'; @@ -24,7 +24,7 @@ import { ChangeWorkflowDialog } from 'views-components/run-process-dialog/change import { CreateProjectDialog } from 'views-components/dialog-forms/create-project-dialog'; import { CreateCollectionDialog } from 'views-components/dialog-forms/create-collection-dialog'; import { CopyCollectionDialog } from 'views-components/dialog-forms/copy-collection-dialog'; -import { CopyProcessDialog } from 'views-components/dialog-forms/copy-process-dialog'; +import { CopyProcessDialog, CopyManyProcessesDialog } from 'views-components/dialog-forms/copy-process-dialog'; import { UpdateCollectionDialog } from 'views-components/dialog-forms/update-collection-dialog'; import { UpdateProcessDialog } from 'views-components/dialog-forms/update-process-dialog'; import { UpdateProjectDialog } from 'views-components/dialog-forms/update-project-dialog'; @@ -34,17 +34,19 @@ import { MoveCollectionDialog } from 'views-components/dialog-forms/move-collect import { FilesUploadCollectionDialog } from 'views-components/dialog-forms/files-upload-collection-dialog'; import { PartialCopyCollectionDialog } from 'views-components/dialog-forms/partial-copy-collection-dialog'; import { RemoveProcessDialog } from 'views-components/process-remove-dialog/process-remove-dialog'; +import { RemoveManyProcessesDialog } from 'views-components/process-remove-many-dialog/process-remove-many-dialog'; import { MainContentBar } from 'views-components/main-content-bar/main-content-bar'; import { Grid } from '@material-ui/core'; -import { TrashPanel } from "views/trash-panel/trash-panel"; +import { TrashPanel } from 'views/trash-panel/trash-panel'; import { SharedWithMePanel } from 'views/shared-with-me-panel/shared-with-me-panel'; import { RunProcessPanel } from 'views/run-process-panel/run-process-panel'; import SplitterLayout from 'react-splitter-layout'; import { WorkflowPanel } from 'views/workflow-panel/workflow-panel'; +import { RegisteredWorkflowPanel } from 'views/workflow-panel/registered-workflow-panel'; import { SearchResultsPanel } from 'views/search-results-panel/search-results-panel'; import { SshKeyPanel } from 'views/ssh-key-panel/ssh-key-panel'; import { SshKeyAdminPanel } from 'views/ssh-key-panel/ssh-key-admin-panel'; -import { SiteManagerPanel } from "views/site-manager-panel/site-manager-panel"; +import { SiteManagerPanel } from 'views/site-manager-panel/site-manager-panel'; import { UserProfilePanel } from 'views/user-profile-panel/user-profile-panel'; import { SharingDialog } from 'views-components/sharing-dialog/sharing-dialog'; import { NotFoundDialog } from 'views-components/not-found-dialog/not-found-dialog'; @@ -99,7 +101,7 @@ import { RestoreCollectionVersionDialog } from 'views-components/collections-dia import { WebDavS3InfoDialog } from 'views-components/webdav-s3-dialog/webdav-s3-dialog'; import { pluginConfig } from 'plugins'; import { ElementListReducer } from 'common/plugintypes'; -import { COLLAPSE_ICON_SIZE } from 'views-components/side-panel-toggle/side-panel-toggle' +import { COLLAPSE_ICON_SIZE } from 'views-components/side-panel-toggle/side-panel-toggle'; import { Banner } from 'views-components/baner/banner'; type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; @@ -107,10 +109,10 @@ type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapp const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { paddingTop: theme.spacing.unit * 7, - background: theme.palette.background.default + background: theme.palette.background.default, }, container: { - position: 'relative' + position: 'relative', }, splitter: { '& > .layout-splitter': { @@ -118,16 +120,16 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, '& > .layout-splitter-disabled': { pointerEvents: 'none', - cursor: 'pointer' - } + cursor: 'pointer', + }, }, asidePanel: { paddingTop: theme.spacing.unit, - height: '100%' + height: '100%', }, contentWrapper: { paddingTop: theme.spacing.unit, - minWidth: 0 + minWidth: 0, }, content: { minWidth: 0, @@ -136,7 +138,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ // Reserve vertical space for app bar + MainContentBar minHeight: `calc(100vh - ${theme.spacing.unit * 16}px)`, display: 'flex', - } + }, }); interface WorkbenchDataProps { @@ -157,71 +159,78 @@ const getSplitterInitialSize = () => { const saveSplitterSize = (size: number) => localStorage.setItem('splitterSize', size.toString()); -let routes = <> - - - - - - - - - - - - - - - - - - - - - - - - - - - -; +let routes = ( + <> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +); -const reduceRoutesFn: (a: React.ReactElement[], - b: ElementListReducer) => React.ReactElement[] = (a, b) => b(a); +const reduceRoutesFn: (a: React.ReactElement[], b: ElementListReducer) => React.ReactElement[] = (a, b) => b(a); routes = React.createElement(React.Fragment, null, pluginConfig.centerPanelList.reduce(reduceRoutesFn, React.Children.toArray(routes.props.children))); const applyCollapsedState = (isCollapsed) => { - const rightPanel: Element = document.getElementsByClassName('layout-pane')[1] - const totalWidth: number = document.getElementsByClassName('splitter-layout')[0]?.clientWidth - const rightPanelExpandedWidth = ((totalWidth-COLLAPSE_ICON_SIZE)) / (totalWidth/100) - if(rightPanel) { - rightPanel.setAttribute('style', `width: ${isCollapsed ? rightPanelExpandedWidth : getSplitterInitialSize()}%`) + const rightPanel: Element = document.getElementsByClassName('layout-pane')[1]; + const totalWidth: number = document.getElementsByClassName('splitter-layout')[0]?.clientWidth; + const rightPanelExpandedWidth = (totalWidth - COLLAPSE_ICON_SIZE) / (totalWidth / 100); + if (rightPanel) { + rightPanel.setAttribute('style', `width: ${isCollapsed ? rightPanelExpandedWidth : getSplitterInitialSize()}%`); } - const splitter = document.getElementsByClassName('layout-splitter')[0] - isCollapsed ? splitter?.classList.add('layout-splitter-disabled') : splitter?.classList.remove('layout-splitter-disabled') - -} + const splitter = document.getElementsByClassName('layout-splitter')[0]; + isCollapsed ? splitter?.classList.add('layout-splitter-disabled') : splitter?.classList.remove('layout-splitter-disabled'); +}; -export const WorkbenchPanel = - withStyles(styles)((props: WorkbenchPanelProps) =>{ +export const WorkbenchPanel = withStyles(styles)((props: WorkbenchPanelProps) => { + //panel size will not scale automatically on window resize, so we do it manually + window.addEventListener('resize', () => applyCollapsedState(props.sidePanelIsCollapsed)); + applyCollapsedState(props.sidePanelIsCollapsed); - //panel size will not scale automatically on window resize, so we do it manually - window.addEventListener('resize', ()=>applyCollapsedState(props.sidePanelIsCollapsed)) - applyCollapsedState(props.sidePanelIsCollapsed) - - return + return ( + {props.sessionIdleTimeout > 0 && } - - {props.isUserActive && props.isNotLinking && - - } - + + {props.isUserActive && props.isNotLinking && ( + + + + )} + {props.isNotLinking && } @@ -246,6 +255,7 @@ export const WorkbenchPanel = + @@ -272,6 +282,7 @@ export const WorkbenchPanel = + @@ -296,5 +307,6 @@ export const WorkbenchPanel = {React.createElement(React.Fragment, null, pluginConfig.dialogs)} - } + ); +});