for merge

Feature #14231

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

diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 36b8eef0ca9efc2e23e6b82e9c50a63238b9883e..e5a1915472c7d39ef3f8d9e67c5160c8d437b1ca 100644 (file)
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -12,7 +12,6 @@ import { openProjectCreateDialog } from '~/store/projects/project-create-actions
 import { openProjectUpdateDialog } from '~/store/projects/project-update-actions';
 import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action";
 import { toggleProjectTrashed } from "~/store/trash/trash-actions";
-import { openFileSelectionDialog } from '../../../store/file-selection/file-selection-actions';
 
 export const projectActionSet: ContextMenuActionSet = [[
     {
@@ -46,7 +45,7 @@ export const projectActionSet: ContextMenuActionSet = [[
     {
         icon: MoveToIcon,
         name: "Move to",
-        execute: (dispatch, resource) => dispatch<any>(openFileSelectionDialog())
+        execute: (dispatch, resource) => dispatch<any>(openMoveProjectDialog(resource))
     },
     {
         icon: CopyIcon,

diff --git a/src/views-components/file-tree-picker/file-tree-picker.tsx b/src/views-components/file-tree-picker/file-tree-picker.tsx
index 9f867cc6fa523374d1b338bb7ac55b9ae8e7c4d4..129cb75015e39dc89315a05239c520eafb9b8b68 100644 (file)
--- a/src/views-components/file-tree-picker/file-tree-picker.tsx
+++ b/src/views-components/file-tree-picker/file-tree-picker.tsx
@@ -62,7 +62,7 @@ enum TreePickerId {
     FAVORITES = 'Favorites'
 }
 
-export const WorkflowTreePicker = connect(undefined, mapDispatchToProps)((props: FileTreePickerProps) =>
+export const FileTreePicker = connect(undefined, mapDispatchToProps)((props: FileTreePickerProps) =>
     <div style={{ display: 'flex', flexDirection: 'column' }}>
         <div style={{ flexGrow: 1, overflow: 'auto' }}>
             <MainFileTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.PROJECTS} />
@@ -159,7 +159,7 @@ export const receiveTreePickerData = (nodeId: string, items: GroupContentsResour
 
 export const FileTreePickerField = (props: WrappedFieldProps) =>
     <div style={{ height: '200px', display: 'flex', flexDirection: 'column' }}>
-        <WorkflowTreePicker onChange={handleChange(props)} />
+        <FileTreePicker onChange={handleChange(props)} />
         {props.meta.dirty && props.meta.error &&
             <Typography variant='caption' color='error'>
                 {props.meta.error}