Merge branch '15803-unsetup' refs #15803

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

diff --cc src/store/store.ts
Simple merge

diff --cc src/store/tree-picker/tree-picker-actions.ts
index 1ec49141e36b8043d2c607ef510132a0dc85ddbe,7229bf63381d0f3935b6a56ea52beeed773e478d..ff36e3e68b855d37a0b670d8331521fec7f2d801
--- 1/src/store/tree-picker/tree-picker-actions.ts
--- 2/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';