From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Thu, 9 Aug 2018 15:06:53 +0000 (+0200)
Subject: merge master
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/42c529f08bbeccaeb0d4c07f639c74504569c621

merge master

Feature #13902

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
---

42c529f08bbeccaeb0d4c07f639c74504569c621
diff --cc src/views-components/context-menu/action-sets/project-action-set.ts
index 39359e264f,4e7a600288..06ffb9d8f2
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@@ -2,13 -2,15 +2,16 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
+ import { reset } from "redux-form";
+ 
  import { ContextMenuActionSet } from "../context-menu-action-set";
  import { projectActions } from "../../../store/project/project-action";
 -import { NewProjectIcon } from "../../../components/icon/icon";
 +import { NewProjectIcon, MoveToIcon } from "../../../components/icon/icon";
  import { ToggleFavoriteAction } from "../actions/favorite-action";
  import { toggleFavorite } from "../../../store/favorites/favorites-actions";
  import { favoritePanelActions } from "../../../store/favorite-panel/favorite-panel-action";
 +import { openMoveToDialog } from "../../move-to-dialog/move-to-dialog";
+ import { PROJECT_CREATE_DIALOG } from "../../dialog-create/dialog-project-create";
  
  export const projectActionSet: ContextMenuActionSet = [[{
      icon: NewProjectIcon,
diff --cc src/views/workbench/workbench.tsx
index 090e40eda8,ab7ac38bc9..c8d447445a
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -46,7 -47,8 +47,9 @@@ 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 { MoveToProjectDialog } from '../../views-components/move-to-dialog/move-to-dialog';
+ 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;