Merge branch 'master' into 13894-default-view-component

refs #13894

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --combined src/views/workbench/workbench.tsx
index 92fe9f6732434e5310cb596e9148866df15828c6,ab7ac38bc90cfae8518974dc867373015c0804b8..ce8e24625aab1e3c03ed1803dfee85f839bd2bbe
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -13,6 -13,7 +13,7 @@@ import { RootState } from "../../store/
  import { MainAppBar, MainAppBarActionProps, MainAppBarMenuItem } from '../../views-components/main-app-bar/main-app-bar';
  import { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs';
  import { push } from 'react-router-redux';
+ import { reset } from 'redux-form';
  import { ProjectTree } from '../../views-components/project-tree/project-tree';
  import { TreeItem } from "../../components/tree/tree";
  import { getTreePath } from '../../store/project/project-reducer';
@@@ -46,6 -47,8 +47,8 @@@ import { RenameFileDialog } from '../..
  import { FileRemoveDialog } from '../../views-components/file-remove-dialog/file-remove-dialog';
  import { MultipleFilesRemoveDialog } from '../../views-components/file-remove-dialog/multiple-files-remove-dialog';
  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';
  
  const DRAWER_WITDH = 240;
  const APP_BAR_HEIGHT = 100;
@@@ -83,8 -86,7 +86,8 @@@ const styles: StyleRulesCallback<CssRul
      content: {
          padding: `${theme.spacing.unit}px ${theme.spacing.unit * 3}px`,
          overflowY: "auto",
 -        flexGrow: 1
 +        flexGrow: 1,
 +        position: 'relative'
      },
      toolbar: theme.mixins.toolbar
  });
@@@ -366,10 -368,12 +369,12 @@@ export const Workbench = withStyles(sty
              }
  
              handleProjectCreationDialogOpen = (itemUuid: string) => {
+                 this.props.dispatch(reset(PROJECT_CREATE_DIALOG));
                  this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid }));
              }
  
              handleCollectionCreationDialogOpen = (itemUuid: string) => {
+                 this.props.dispatch(reset(COLLECTION_CREATE_DIALOG));
                  this.props.dispatch(collectionCreateActions.OPEN_COLLECTION_CREATOR({ ownerUuid: itemUuid }));
              }