projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[arvados-workbench2.git]
/
src
/
views
/
workbench
/
workbench.tsx
diff --git
a/src/views/workbench/workbench.tsx
b/src/views/workbench/workbench.tsx
index 02b4abf5dfbd15828ce2d3f434c1b239a9463484..fee7652b0ae89fbd619037ecfa6fc81855cd75a3 100644
(file)
--- a/
src/views/workbench/workbench.tsx
+++ b/
src/views/workbench/workbench.tsx
@@
-30,16
+30,20
@@
import { ProcessLogPanel } from '~/views/process-log-panel/process-log-panel';
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 { 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 { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-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';
import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
+import { MoveProcessDialog } from '~/views-components/dialog-forms/move-process-dialog';
import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
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 { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
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 { TrashPanel } from "~/views/trash-panel/trash-panel";
import { TrashPanel } from "~/views/trash-panel/trash-panel";
-import { MainContentBar } from '
../..
/views-components/main-content-bar/main-content-bar';
+import { MainContentBar } from '
~
/views-components/main-content-bar/main-content-bar';
import { Grid } from '@material-ui/core';
import { Grid } from '@material-ui/core';
+import { SharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel';
+import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';
type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';
@@
-102,7
+106,8
@@
export const Workbench = withStyles(styles)(
<MainAppBar
searchText={this.state.searchText}
user={this.props.user}
<MainAppBar
searchText={this.state.searchText}
user={this.props.user}
- onSearch={this.onSearch} />
+ onSearch={this.onSearch}
+ buildInfo={this.props.buildInfo} />
</Grid>
{this.props.user &&
<Grid
</Grid>
{this.props.user &&
<Grid
@@
-124,7
+129,7
@@
export const Workbench = withStyles(styles)(
<Grid item>
<MainContentBar />
</Grid>
<Grid item>
<MainContentBar />
</Grid>
- <Grid xs className={this.props.classes.content}>
+ <Grid
item
xs className={this.props.classes.content}>
<Switch>
<Route path={Routes.PROJECTS} component={ProjectPanel} />
<Route path={Routes.COLLECTIONS} component={CollectionPanel} />
<Switch>
<Route path={Routes.PROJECTS} component={ProjectPanel} />
<Route path={Routes.COLLECTIONS} component={CollectionPanel} />
@@
-132,6
+137,7
@@
export const Workbench = withStyles(styles)(
<Route path={Routes.PROCESSES} component={ProcessPanel} />
<Route path={Routes.TRASH} component={TrashPanel} />
<Route path={Routes.PROCESS_LOGS} component={ProcessLogPanel} />
<Route path={Routes.PROCESSES} component={ProcessPanel} />
<Route path={Routes.TRASH} component={TrashPanel} />
<Route path={Routes.PROCESS_LOGS} component={ProcessLogPanel} />
+ <Route path={Routes.SHARED_WITH_ME} component={SharedWithMePanel} />
</Switch>
</Grid>
</Grid>
</Switch>
</Grid>
</Grid>
@@
-141,21
+147,25
@@
export const Workbench = withStyles(styles)(
</Grid>}
</Grid>
<ContextMenu />
</Grid>}
</Grid>
<ContextMenu />
- <
Snackbar
/>
- <C
reateProject
Dialog />
+ <
CopyCollectionDialog
/>
+ <C
opyProcess
Dialog />
<CreateCollectionDialog />
<CreateCollectionDialog />
- <
RenameFile
Dialog />
- <
PartialCopyCollectio
nDialog />
+ <
CreateProject
Dialog />
+ <
CurrentToke
nDialog />
<FileRemoveDialog />
<FileRemoveDialog />
- <CopyCollectionDialog />
<FileRemoveDialog />
<FileRemoveDialog />
- <MultipleFilesRemoveDialog />
- <UpdateCollectionDialog />
<FilesUploadCollectionDialog />
<FilesUploadCollectionDialog />
- <UpdateProjectDialog />
<MoveCollectionDialog />
<MoveCollectionDialog />
+ <MoveProcessDialog />
<MoveProjectDialog />
<MoveProjectDialog />
- <CurrentTokenDialog />
+ <MultipleFilesRemoveDialog />
+ <PartialCopyCollectionDialog />
+ <ProcessCommandDialog />
+ <RenameFileDialog />
+ <Snackbar />
+ <UpdateCollectionDialog />
+ <UpdateProcessDialog />
+ <UpdateProjectDialog />
</>;
}
</>;
}