From 20ef367b0994ea0d205f3d107a65be99ccf5dc61 Mon Sep 17 00:00:00 2001
From: lgalis <lgalis@redhat.com>
Date: Mon, 20 Mar 2017 14:33:23 -0400
Subject: [PATCH] Display the services with no ancestry , regardless of the
 display value, on both the tree and the right side

---
 app/presenters/tree_builder_services.rb       |  2 +-
 spec/presenters/tree_builder_services_spec.rb | 22 +++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/presenters/tree_builder_services.rb b/app/presenters/tree_builder_services.rb
index 9bca53eef42..9f83b1ca3e9 100644
--- a/app/presenters/tree_builder_services.rb
+++ b/app/presenters/tree_builder_services.rb
@@ -21,7 +21,7 @@ def root_options
 
   # Get root nodes count/array for explorer tree
   def x_get_tree_roots(count_only, _options)
-    all_services = Rbac.filtered(Service.where(:display => true))
+    all_services = Rbac.filtered(Service.where(:ancestry => [nil, ""]))
     if count_only
       all_services.size
     else
diff --git a/spec/presenters/tree_builder_services_spec.rb b/spec/presenters/tree_builder_services_spec.rb
index ac6c8fbf1e0..e91c540b33e 100644
--- a/spec/presenters/tree_builder_services_spec.rb
+++ b/spec/presenters/tree_builder_services_spec.rb
@@ -5,16 +5,11 @@
     create_deep_tree
 
     expect(root_nodes).to eq(
-      @service => {
-        @service_c1 => {
-          @service_c11 => {},
-          @service_c12 => {
-            @service_c121 => {}
-          }
-        },
-        @service_c2 => {}
-      }
-    )
+      @service => {},
+      @service_c1 => {},
+      @service_c2 => {},
+      @service_c3 => {}
+      )
   end
 
   private
@@ -29,12 +24,11 @@ def kid_nodes(node)
 
   def create_deep_tree
     @service      = FactoryGirl.create(:service, :display => true)
-    @service_c1   = FactoryGirl.create(:service, :service => @service, :display => true)
+    @service_c1   = FactoryGirl.create(:service, :display => true)
     @service_c11  = FactoryGirl.create(:service, :service => @service_c1, :display => true)
     @service_c12  = FactoryGirl.create(:service, :service => @service_c1, :display => true)
     @service_c121 = FactoryGirl.create(:service, :service => @service_c12, :display => true)
-    @service_c2   = FactoryGirl.create(:service, :service => @service, :display => true)
-    # hidden
-    @service_c3   = FactoryGirl.create(:service, :service => @service, :display => false)
+    @service_c2   = FactoryGirl.create(:service, :display => true)
+    @service_c3   = FactoryGirl.create(:service, :display => false)
   end
 end