[ARVADOS-WORKBENCH2] updated: 1.2.0-510-g3b5006c

[Git user]

Summary of changes:
 src/views-components/context-menu/action-sets/project-action-set.ts | 3 +--
 src/views-components/file-tree-picker/file-tree-picker.tsx          | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

       via  3b5006ca69bbb5c6f446adfcdd6eeb3a5508f84a (commit)
      from  d0b5089542fbb8daf95e5bd82da2cd710bd2b57a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3b5006ca69bbb5c6f446adfcdd6eeb3a5508f84a
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Tue Oct 2 14:08:15 2018 +0200

    for merge
    
    Feature #14231
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at 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 36b8eef..e5a1915 100644
--- 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 9f867cc..129cb75 100644
--- 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}

-----------------------------------------------------------------------


hooks/post-receive
--