[ARVADOS-WORKBENCH2] created: 1.2.0-584-gf9a7cbc

[Git user]

        at  f9a7cbcdce79388e48c0d362027af497252044a4 (commit)


commit f9a7cbcdce79388e48c0d362027af497252044a4
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Oct 11 00:31:58 2018 +0200

    Block picking favorites or shared as picker target
    
    Feature #14252
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views-components/project-tree-picker/project-tree-picker.tsx b/src/views-components/project-tree-picker/project-tree-picker.tsx
index 9139ee7..8679529 100644
--- a/src/views-components/project-tree-picker/project-tree-picker.tsx
+++ b/src/views-components/project-tree-picker/project-tree-picker.tsx
@@ -23,11 +23,13 @@ type ProjectTreePickerProps = Pick<TreePickerProps, 'onContextMenu' | 'toggleIte
 const mapDispatchToProps = (dispatch: Dispatch, props: { onChange: (projectUuid: string) => void }): ProjectTreePickerProps => ({
     onContextMenu: () => { return; },
     toggleItemActive: (nodeId, status, pickerId) => {
-        getNotSelectedTreePickerKind(pickerId)
-            .forEach(pickerId => dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId: '', pickerId })));
-        dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId }));
+        if (nodeId !== TreePickerId.FAVORITES && nodeId !== TreePickerId.SHARED_WITH_ME) {
+            getNotSelectedTreePickerKind(pickerId)
+                .forEach(pickerId => dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId: '', pickerId })));
+            dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId }));
 
-        props.onChange(nodeId);
+            props.onChange(nodeId);
+        }
     },
     toggleItemOpen: (nodeId, status, pickerId) => {
         dispatch<any>(toggleItemOpen(nodeId, status, pickerId));

commit e458b989c77ed7f76af27337357f575847d5ff86
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Oct 11 00:31:22 2018 +0200

    Restore working version of @types/redux-form
    
    Feature #14252
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/package.json b/package.json
index 5bfbef0..1d4a15b 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@types/react-copy-to-clipboard": "4.2.6",
     "@types/react-dropzone": "4.2.2",
     "@types/react-highlight-words": "0.12.0",
-    "@types/redux-form": "7.4.8",
+    "@types/redux-form": "7.4.5",
     "@types/shell-quote": "1.6.0",
     "axios": "0.18.0",
     "classnames": "2.2.6",
diff --git a/yarn.lock b/yarn.lock
index 8c98c4f..e6f3764 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -193,9 +193,9 @@
     "@types/react" "*"
     redux "^3.6.0"
 
-"@types/redux-form at 7.4.8":
-  version "7.4.8"
-  resolved "https://registry.yarnpkg.com/@types/redux-form/-/redux-form-7.4.8.tgz#a423e597b3bae0f559dd1e9ff605f7d4aad30538"
+"@types/redux-form at 7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@types/redux-form/-/redux-form-7.4.5.tgz#fae0fa6cfbc613867093d1e0f6a84db17177305e"
   dependencies:
     "@types/react" "*"
     redux "^3.6.0 || ^4.0.0"

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


hooks/post-receive
--