FIX: TreeDropdownField wouldn't render children when using TreeBaseID (…

…fixes #954)

client/src/components/TreeDropdownField/TreeDropdownField.js

@@ -124,6 +124,7 @@ class TreeDropdownField extends Component {
     }
     // No more path means this is the complete tree
     let node = this.props.tree;
+
     // eslint-disable-next-line no-restricted-syntax
     for (const next of path) {
       if (!node.children) {
@@ -182,7 +183,7 @@ class TreeDropdownField extends Component {
   }
 
   getPath(id) {
-    const treePath = this.props.findTreePath(this.props.tree, id);
+    const treePath = this.props.findTreePath(this.props.tree, id, this.props.data.treeBaseId);
     const breadcrumbs = this.getBreadcrumbs(treePath);
 
     return breadcrumbs
@@ -205,7 +206,7 @@ class TreeDropdownField extends Component {
         let newPath = [];
         if (!this.props.data.multiple && this.props.value) {
           // Get path of current node
-          newPath = this.props.findTreePath(treeData, this.props.value);
+          newPath = this.props.findTreePath(treeData, this.props.value, this.props.data.treeBaseId);
           if (newPath) {
             // Revert one level to show parent
             newPath.pop();
@@ -439,8 +440,9 @@ class TreeDropdownField extends Component {
     if (this.hasSearch()) {
       return;
     }
+
     // Find parent path
-    let path = this.props.findTreePath(this.props.tree, id);
+    let path = this.props.findTreePath(this.props.tree, id, this.props.data.treeBaseId);
     if (!path) {
       // Edge case: Path hasn't been loaded yet,
       // so append to current path
@@ -753,6 +755,7 @@ TreeDropdownField.propTypes = {
     showSearch: PropTypes.bool,
     multiple: PropTypes.bool,
     showSelectedPath: PropTypes.bool,
+    treeBaseId: PropTypes.number
   }),
   onLoadingError: PropTypes.func,
   search: PropTypes.string,

client/src/components/TreeDropdownField/treeUtils.js

@@ -14,6 +14,7 @@ export const findTreeByPath = (tree, path) => {
   if (path.length === 0) {
     return tree;
   }
+
   const subPath = path.slice(0);
   const nextID = subPath.shift();
   const subTree = tree.children.find((nextSubTree) => (nextSubTree.id === nextID));
@@ -60,9 +61,10 @@ const findTreeByID = (tree, id) => {
  *
  * @param {Object} tree - Tree to search
  * @param {*} id - id property of node to find path for
+ * @param {*} treeBaseId - tree root id, may be non-zero if a custom root node has been specified
  * @return {Array} - The path to this node, or null if not found
  */
-export const findTreePath = (tree, id) => {
+export const findTreePath = (tree, id, treeBaseId = 0) => {
   // root node
   if (!id) {
     return [];
@@ -85,7 +87,7 @@ export const findTreePath = (tree, id) => {
     // Node found in subtree, shift this id and return
     if (childPath !== null) {
       // Don't add root ID
-      if (tree.id) {
+      if (tree.id && (tree.id !== treeBaseId)) {
         childPath.unshift(tree.id);
       }
       return childPath;