Merge branch 'master' into 15160-replacing-files-during-upload

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

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index cca374d6738e9645f5183871252a20d66311a979..20cbbdea0c9a0b262f976889d5e097243b777c6f 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -90,6 +90,10 @@ 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 { FedLogin } from './fed-login';
+import { CollectionsContentAddressPanel } from '~/views/collection-content-address-panel/collection-content-address-panel';
 
 type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
 
@@ -137,14 +141,14 @@ export const WorkbenchPanel =
         <Grid container item xs className={classes.root}>
             <Grid container item xs className={classes.container}>
                 <SplitterLayout customClassName={classes.splitter} percentage={true}
-                                primaryIndex={0} primaryMinSize={10}
-                                secondaryInitialSize={getSplitterInitialSize()} secondaryMinSize={40}
-                                onSecondaryPaneSizeChange={saveSplitterSize}>
+                    primaryIndex={0} primaryMinSize={10}
+                    secondaryInitialSize={getSplitterInitialSize()} secondaryMinSize={40}
+                    onSecondaryPaneSizeChange={saveSplitterSize}>
                     <Grid container item xs component='aside' direction='column' className={classes.asidePanel}>
                         <SidePanel />
                     </Grid>
                     <Grid container item xs component="main" direction="column" className={classes.contentWrapper}>
-                        <Grid item>
+                        <Grid item xs>
                             <MainContentBar />
                         </Grid>
                         <Grid item xs className={classes.content}>
@@ -173,6 +177,8 @@ export const WorkbenchPanel =
                                 <Route path={Routes.GROUPS} component={GroupsPanel} />
                                 <Route path={Routes.GROUP_DETAILS} component={GroupDetailsPanel} />
                                 <Route path={Routes.LINKS} component={LinkPanel} />
+                                <Route path={Routes.PUBLIC_FAVORITES} component={PublicFavoritePanel} />
+                                <Route path={Routes.COLLECTIONS_CONTENT_ADDRESS} component={CollectionsContentAddressPanel} />
                             </Switch>
                         </Grid>
                     </Grid>
@@ -210,6 +216,7 @@ export const WorkbenchPanel =
             <MultipleFilesRemoveDialog />
             <PublicKeyDialog />
             <PartialCopyCollectionDialog />
+            <PartialCopyToCollectionDialog />
             <ProcessCommandDialog />
             <ProcessInputDialog />
             <ProjectPropertiesDialog />
@@ -236,5 +243,6 @@ export const WorkbenchPanel =
             <UserAttributesDialog />
             <UserManageDialog />
             <VirtualMachineAttributesDialog />
+            <FedLogin />
         </Grid>
     );