From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Wed, 27 Nov 2019 20:32:39 +0000 (-0500)
Subject: Merge branch '15803-unsetup' refs #15803
X-Git-Tag: 2.0.0~26
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/2d03b09bc6f29ab1bfe42a2fd3a88f17189e6a52

Merge branch '15803-unsetup' refs #15803

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---

2d03b09bc6f29ab1bfe42a2fd3a88f17189e6a52
diff --cc src/store/tree-picker/tree-picker-actions.ts
index 1ec49141,7229bf63..ff36e3e6
--- a/src/store/tree-picker/tree-picker-actions.ts
+++ b/src/store/tree-picker/tree-picker-actions.ts
@@@ -4,9 -4,9 +4,10 @@@
  
  import { unionize, ofType, UnionOf } from "~/common/unionize";
  import { TreeNode, initTreeNode, getNodeDescendants, TreeNodeStatus, getNode, TreePickerId, Tree } from '~/models/tree';
 +import { createCollectionFilesTree } from "~/models/collection-file";
  import { Dispatch } from 'redux';
  import { RootState } from '~/store/store';
+ import { getUserUuid } from "~/common/getuser";
  import { ServiceRepository } from '~/services/services';
  import { FilterBuilder } from '~/services/api/filter-builder';
  import { pipe, values } from 'lodash/fp';