Merge branch '14013-upload-collection-files-using-webdav'

refs #14013

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --combined src/views/workbench/workbench.tsx
index a2d61d5cd17a209351fa5bf3f228479df5087092,01a92ab4da840004a39c4dbef847a557c743a143..f23a9784ad4846ea647cb3350d0b149f0c3f2756
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -29,6 -29,7 +29,6 @@@ import { CreateProjectDialog } from "~/
  
  import { detailsPanelActions, loadDetails } from "~/store/details-panel/details-panel-action";
  import { contextMenuActions } from "~/store/context-menu/context-menu-actions";
 -import { SidePanelIdentifiers } from '~/store/side-panel/side-panel-reducer';
  import { ProjectResource } from '~/models/project';
  import { ResourceKind } from '~/models/resource';
  import { ContextMenu, ContextMenuKind } from "~/views-components/context-menu/context-menu";
@@@ -49,6 -50,7 +49,7 @@@ import { MultipleFilesRemoveDialog } fr
  import { DialogCollectionCreateWithSelectedFile } from '~/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected';
  import { COLLECTION_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-collection-create';
  import { PROJECT_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-project-create';
+ import { UploadCollectionFilesDialog } from '~/views-components/upload-collection-files-dialog/upload-collection-files-dialog';
  
  const DRAWER_WITDH = 240;
  const APP_BAR_HEIGHT = 100;
@@@ -100,15 -102,14 +101,15 @@@ interface WorkbenchDataProps 
      sidePanelItems: SidePanelItem[];
  }
  
 -interface WorkbenchServiceProps {
 +interface WorkbenchGeneralProps {
      authService: AuthService;
 +    buildInfo: string;
  }
  
  interface WorkbenchActionProps {
  }
  
 -type WorkbenchProps = WorkbenchDataProps & WorkbenchServiceProps & WorkbenchActionProps & DispatchProp<any> & WithStyles<CssRules>;
 +type WorkbenchProps = WorkbenchDataProps & WorkbenchGeneralProps & WorkbenchActionProps & DispatchProp<any> & WithStyles<CssRules>;
  
  interface NavBreadcrumb extends Breadcrumb {
      itemId: string;
@@@ -193,7 -194,6 +194,7 @@@ export const Workbench = withStyles(sty
                                  searchText={this.state.searchText}
                                  user={this.props.user}
                                  menuItems={this.state.menuItems}
 +                                buildInfo={this.props.buildInfo}
                                  {...this.mainAppBarActions} />
                          </div>
                          {user &&
@@@ -223,13 -223,14 +224,13 @@@
                                          toggleActive={itemId => {
                                              this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE));
                                              this.props.dispatch(loadDetails(itemId, ResourceKind.PROJECT));
 -                                            this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                                          }} />
                                  </SidePanel>
                              </Drawer>}
                          <main className={classes.contentWrapper}>
                              <div className={classes.content}>
                                  <Switch>
-                                     <Route path='/' exact render={() => <Redirect to={`/projects/${this.props.authService.getUuid()}`}  />} />
+                                     <Route path='/' exact render={() => <Redirect to={`/projects/${this.props.authService.getUuid()}`} />} />
                                      <Route path="/projects/:id" render={this.renderProjectPanel} />
                                      <Route path="/favorites" render={this.renderFavoritePanel} />
                                      <Route path="/collections/:id" render={this.renderCollectionPanel} />
@@@ -246,6 -247,7 +247,7 @@@
                          <FileRemoveDialog />
                          <MultipleFilesRemoveDialog />
                          <UpdateCollectionDialog />
+                         <UploadCollectionFilesDialog />
                          <UpdateProjectDialog />
                          <CurrentTokenDialog
                              currentToken={this.props.currentToken}
@@@ -330,6 -332,7 +332,6 @@@
                          default:
                              this.props.dispatch(loadDetails(item.uuid, ResourceKind.PROJECT));
                              this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE));
 -                            this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                      }
  
                  }}
@@@ -362,6 -365,7 +364,6 @@@
              }
  
              toggleSidePanelActive = (itemId: string) => {
 -                this.props.dispatch(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(itemId));
                  this.props.dispatch(projectActions.RESET_PROJECT_TREE_ACTIVITY(itemId));
  
                  const panelItem = this.props.sidePanelItems.find(it => it.id === itemId);