[BZ 1082767] Group view does not display proper content when user rea…

…ches AutoGroup via URL Fixed ResourceGroupTreeView to optionaly select target group after tree is loaded
rhq-project · Mar 31, 2014 · 78cceb5 · 78cceb5
1 parent 6b6edc5
commit 78cceb5
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/...i/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/...i/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -363,7 +363,28 @@ private void loadTreeTypes(final ClusterFlyweight root) {
 
                 public void onTypesLoaded(Map<Integer, ResourceType> types) {
                     ResourceGroupTreeView.this.typeMap = types;
-                    loadTree(root);
+                    ResourceGroupEnhancedTreeNode rootNode = loadTree(root);
+                    ResourceGroupEnhancedTreeNode selectedNode = null;
+                    if (currentGroup != null) {
+                        if (currentGroup.getClusterKey() != null) {
+                            // a child cluster node leaf was selected
+                            selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().find(
+                                ResourceGroupEnhancedTreeNode.CLUSTER_KEY, currentGroup.getClusterKey());
+                        } else {
+                            // the top root node, representing the group itself, was selected
+                            selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().findById(
+                                String.valueOf(currentGroup.getId()));
+                        }
+                    }
+                    if (selectedNode != null) {
+                        TreeNode[] parents = treeGrid.getTree().getParents(selectedNode);
+                        treeGrid.getTree().openFolders(parents);
+                        treeGrid.getTree().openFolder(selectedNode);
+                        treeGrid.selectRecord(selectedNode);
+                    } else {
+                        treeGrid.getTree().openFolder(rootNode);
+                        treeGrid.selectRecord(rootNode);
+                    }
                 }
             });
     }
@@ -394,7 +415,7 @@ private void renderAutoCluster(ResourceGroup backingGroup) {
         }
     }
 
-    private void loadTree(ClusterFlyweight root) {
+    private ResourceGroupEnhancedTreeNode loadTree(ClusterFlyweight root) {
         ClusterKey rootKey = new ClusterKey(root.getGroupId());
         ResourceGroupEnhancedTreeNode fakeRoot = new ResourceGroupEnhancedTreeNode("fakeRootNode");
         fakeRoot.setID(FAKE_ROOT_ID);
@@ -420,8 +441,7 @@ private void loadTree(ClusterFlyweight root) {
         org.rhq.coregui.client.util.TreeUtility.printTree(tree);
 
         treeGrid.setData(tree);
-        treeGrid.getTree().openFolder(rootNode);
-        treeGrid.selectRecord(rootNode);
+        return rootNode;
     }
 
     public void loadTree(ResourceGroupEnhancedTreeNode parentNode, ClusterFlyweight parentClusterGroup,