Merge branch 'master' into 13751-shared-with-me-view

[arvados-workbench2.git] / src / views / workbench / workbench.tsx

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index db389572467c5dbd7d2fddbc4a938d21c57d0e21..9f1ab478ffc63f8f042af94eb6c3dd87dddd3978 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -42,6 +42,7 @@ import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/par
 import { TrashPanel } from "~/views/trash-panel/trash-panel";
 import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
 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' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar';
@@ -126,6 +127,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.SHARED_WITH_ME} component={SharedWithMePanel} />
                                         </Switch>
                                     </Grid>
                                 </Grid>