Add retired services node

app/controllers/service_controller.rb

@@ -36,6 +36,10 @@ def show
     redirect_to :action => 'show', :controller => record.class.base_model.to_s.underscore, :id => record.id
   end
 
+  def show_list
+    redirect_to :action => 'explorer', :flash_msg => @flash_array.try(:fetch_path, 0, :message)
+  end
+
   def explorer
     @explorer   = true
     @lastaction = "explorer"
@@ -216,6 +220,14 @@ def get_node_info(treenodeid)
       @gtl_type = "grid"
       @items_per_page = ONE_MILLION
       @view, @pages = get_view(Vm, :parent => @record, :parent_method => :all_vms, :all_pages => true)  # Get the records (into a view) and the paginator
+    when "Hash"
+      if id == "asrv"
+        process_show_list(:where_clause => "retired is false and ancestry is null")
+        @right_cell_text = _("Active Services")
+      else
+        process_show_list(:where_clause => "retired is true and ancestry is null")
+        @right_cell_text = _("Retired Services")
+      end
     else      # Get list of child Catalog Items/Services of this node
       if x_node == "root"
         process_show_list(:where_clause => "ancestry is null")

app/helpers/application_helper/button/service_retire.rb

@@ -0,0 +1,8 @@
+class ApplicationHelper::Button::ServiceRetire < ApplicationHelper::Button::Basic
+  needs :@record
+
+  def disabled?
+    @error_message = _('Service is already retired') if @record.retired
+    @error_message.present?
+  end
+end

app/helpers/application_helper/toolbar/retired_services_center.rb

@@ -0,0 +1,4 @@
+class ApplicationHelper::Toolbar::RetiredServicesCenter < ApplicationHelper::Toolbar::Basic
+  include ApplicationHelper::Toolbar::Service::VmdbMixin
+  include ApplicationHelper::Toolbar::Service::PolicyMixin
+end

app/helpers/application_helper/toolbar/service/lifecycle_mixin.rb

@@ -0,0 +1,31 @@
+module ApplicationHelper::Toolbar::Service::LifecycleMixin
+  def self.included(included_class)
+    included_class.button_group('service_lifecycle', [
+      included_class.select(
+        :service_lifecycle_choice,
+        'fa fa-recycle fa-lg',
+        t = N_('Lifecycle'),
+        t,
+        :enabled => false,
+        :items   => [
+          included_class.button(
+            :service_retire,
+            'fa fa-clock-o fa-lg',
+            N_('Set Retirement Dates for the selected items'),
+            N_('Set Retirement Dates'),
+            :enabled   => false,
+            :url_parms => "main_div",
+            :onwhen    => "1+"),
+          included_class.button(
+            :service_retire_now,
+            'fa fa-clock-o fa-lg',
+            N_('Retire the selected items'),
+            N_('Retire selected items'),
+            :url_parms => "main_div",
+            :confirm   => N_("Retire the selected items?"),
+            :enabled   => false,
+            :onwhen    => "1+"),
+        ]),
+    ])
+  end
+end

app/helpers/application_helper/toolbar/service/policy_mixin.rb

@@ -0,0 +1,24 @@
+module ApplicationHelper::Toolbar::Service::PolicyMixin
+  def self.included(included_class)
+    included_class.button_group('service_policy', [
+      included_class.select(
+        :service_policy_choice,
+        'fa fa-shield fa-lg',
+        t = N_('Policy'),
+        t,
+        :enabled => false,
+        :onwhen  => "1+",
+        :items   => [
+          included_class.button(
+            :service_tag,
+            'pficon pficon-edit fa-lg',
+            N_('Edit tags for the selected Items'),
+            N_('Edit Tags'),
+            :url_parms => "main_div",
+            :enabled   => false,
+            :onwhen    => "1+"),
+        ]
+      ),
+    ])
+  end
+end

app/helpers/application_helper/toolbar/service/vmdb_mixin.rb

@@ -0,0 +1,42 @@
+module ApplicationHelper::Toolbar::Service::VmdbMixin
+  def self.included(included_class)
+    included_class.button_group('service_vmdb', [
+      included_class.select(
+        :service_vmdb_choice,
+        'fa fa-cog fa-lg',
+        t = N_('Configuration'),
+        t,
+        :enabled => false,
+        :onwhen  => "1+",
+        :items   => [
+          included_class.button(
+            :service_edit,
+            'pficon pficon-edit fa-lg',
+            N_('Select a single service to edit'),
+            N_('Edit Selected Service'),
+            :url_parms => "main_div",
+            :enabled   => false,
+            :onwhen    => "1"),
+          included_class.button(
+            :service_delete,
+            'pficon pficon-delete fa-lg',
+            N_('Remove selected Services'),
+            N_('Remove Services'),
+            :url_parms => "main_div",
+            :enabled   => false,
+            :confirm   => N_("Warning: The selected Services and ALL of their components will be permanently removed!"),
+            :onwhen    => "1+"),
+          included_class.separator,
+          included_class.button(
+            :service_ownership,
+            'pficon pficon-user fa-lg',
+            N_('Set Ownership for the selected Services'),
+            N_('Set Ownership'),
+            :url_parms => "main_div",
+            :enabled   => false,
+            :onwhen    => "1+"),
+        ]
+      ),
+    ])
+  end
+end

app/helpers/application_helper/toolbar/service_center.rb

@@ -62,15 +62,19 @@ class ApplicationHelper::Toolbar::ServiceCenter < ApplicationHelper::Toolbar::Ba
         button(
           :service_retire,
           'fa fa-clock-o fa-lg',
-          N_('Set Retirement Dates for this Service'),
-          N_('Set Retirement Date')),
+          t = N_('Set Retirement Date for this Service'),
+          t,
+          :confirm => N_("Set Retirement this Service?"),
+          :klass   => ApplicationHelper::Button::ServiceRetire
+        ),
         button(
           :service_retire_now,
           'fa fa-clock-o fa-lg',
           t = N_('Retire this Service'),
           t,
           :confirm => N_("Retire this Service?"),
-          :klass   => ApplicationHelper::Button::ServiceRetireNow),
+          :klass   => ApplicationHelper::Button::ServiceRetireNow
+        ),
       ]
     ),
   ])

app/helpers/application_helper/toolbar/services_center.rb

@@ -1,89 +1,5 @@
 class ApplicationHelper::Toolbar::ServicesCenter < ApplicationHelper::Toolbar::Basic
-  button_group('service_vmdb', [
-    select(
-      :service_vmdb_choice,
-      'fa fa-cog fa-lg',
-      t = N_('Configuration'),
-      t,
-      :enabled => false,
-      :onwhen  => "1+",
-      :items   => [
-        button(
-          :service_edit,
-          'pficon pficon-edit fa-lg',
-          N_('Select a single service to edit'),
-          N_('Edit Selected Service'),
-          :url_parms => "main_div",
-          :enabled   => false,
-          :onwhen    => "1"),
-        button(
-          :service_delete,
-          'pficon pficon-delete fa-lg',
-          N_('Remove selected Services'),
-          N_('Remove Services'),
-          :url_parms => "main_div",
-          :confirm   => N_("Warning: The selected Services and ALL of their components will be permanently removed!"),
-          :enabled   => false,
-          :onwhen    => "1+"),
-        separator,
-        button(
-          :service_ownership,
-          'pficon pficon-user fa-lg',
-          N_('Set Ownership for the selected Services'),
-          N_('Set Ownership'),
-          :url_parms => "main_div",
-          :enabled   => false,
-          :onwhen    => "1+"),
-      ]
-    ),
-  ])
-  button_group('service_policy', [
-    select(
-      :service_policy_choice,
-      'fa fa-shield fa-lg',
-      t = N_('Policy'),
-      t,
-      :enabled => false,
-      :onwhen  => "1+",
-      :items   => [
-        button(
-          :service_tag,
-          'pficon pficon-edit fa-lg',
-          N_('Edit tags for the selected Items'),
-          N_('Edit Tags'),
-          :url_parms => "main_div",
-          :enabled   => false,
-          :onwhen    => "1+"),
-      ]
-    ),
-  ])
-  button_group('service_lifecycle', [
-    select(
-      :service_lifecycle_choice,
-      'fa fa-recycle fa-lg',
-      t = N_('Lifecycle'),
-      t,
-      :enabled => false,
-      :onwhen  => "1+",
-      :items   => [
-        button(
-          :service_retire,
-          'fa fa-clock-o fa-lg',
-          N_('Set Retirement Dates for the selected items'),
-          N_('Set Retirement Dates'),
-          :url_parms => "main_div",
-          :enabled   => false,
-          :onwhen    => "1+"),
-        button(
-          :service_retire_now,
-          'fa fa-clock-o fa-lg',
-          N_('Retire the selected items'),
-          N_('Retire selected items'),
-          :url_parms => "main_div",
-          :confirm   => N_("Retire the selected items?"),
-          :enabled   => false,
-          :onwhen    => "1+"),
-      ]
-    ),
-  ])
+  include ApplicationHelper::Toolbar::Service::VmdbMixin
+  include ApplicationHelper::Toolbar::Service::PolicyMixin
+  include ApplicationHelper::Toolbar::Service::LifecycleMixin
 end

app/helpers/application_helper/toolbar_chooser.rb

@@ -215,6 +215,8 @@ def center_toolbar_filename_services
     elsif x_active_tree == :svcs_tree
       if TreeBuilder.get_model_for_prefix(@nodetype) == "Service"
         return "service_center_tb"
+      elsif x_node == 'xx-rsrv'
+        return "retired_services_center_tb"
       else
         return "services_center_tb"
       end

app/presenters/tree_builder_services.rb

@@ -6,7 +6,7 @@ class TreeBuilderServices < TreeBuilder
   def tree_init_options(_tree_name)
     {
       :leaf     => "Service",
-      :full_ids => true
+      :add_root => false
     }
   end
 
@@ -16,20 +16,32 @@ def set_locals_for_render
   end
 
   def root_options
-    {
-      :title   => t = _("All Services"),
-      :tooltip => t
-    }
+    { }
   end
 
   # Get root nodes count/array for explorer tree
   def x_get_tree_roots(count_only, _options)
-    all_services = Rbac.filtered(Service.where(:display => true))
+    objects = []
+    objects.push(:id            => "asrv",
+                 :text          => _("Active Services"),
+                 :icon          => "pficon pficon-folder-close",
+                 :load_children => true,
+                 :tip           => _("Active Services"))
+    objects.push(:id            => "rsrv",
+                 :text          => _("Retired Services"),
+                 :icon          => "pficon pficon-folder-close",
+                 :load_children => true,
+                 :tip           => _("Retired Services"))
+    count_only_or_objects(count_only, objects)
+  end
+
+  def x_get_tree_custom_kids(object, count_only, _options)
+    services = Rbac.filtered(Service.where(:retired => object[:id] != 'asrv', :ancestry => [nil, ""]))
     if count_only
-      all_services.size
+      services.size
     else
-      MiqPreloader.preload(all_services.to_a, :picture)
-      Service.arrange_nodes(all_services.sort_by { |n| [n.ancestry.to_s, n.name.downcase] })
+      MiqPreloader.preload(services.to_a, :picture)
+      Service.arrange_nodes(services.sort_by { |n| [n.ancestry.to_s, n.name.downcase] })
     end
   end
 end

spec/presenters/tree_builder_services_spec.rb

@@ -4,17 +4,15 @@
   it "generates tree" do
     create_deep_tree
 
-    expect(root_nodes).to eq(
-      @service => {
-        @service_c1 => {
-          @service_c11 => {},
-          @service_c12 => {
-            @service_c121 => {}
-          }
-        },
-        @service_c2 => {}
-      }
+    expect(root_nodes.size).to eq(2)
+    active_nodes = kid_nodes(root_nodes[0])
+    retired_nodes = kid_nodes(root_nodes[1])
+    expect(active_nodes).to eq(
+      @service => {},
+      @service_c1 => {},
+      @service_c2 => {}
     )
+    expect(retired_nodes).to eq(@service_c3 => {})
   end
 
   private
@@ -24,17 +22,17 @@ def root_nodes
   end
 
   def kid_nodes(node)
-    builder.send(:x_get_tree_service_kids, node, false)
+    builder.send(:x_get_tree_custom_kids, node, false, {})
   end
 
   def create_deep_tree
-    @service      = FactoryGirl.create(:service, :display => true)
-    @service_c1   = FactoryGirl.create(:service, :service => @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)
+    @service      = FactoryGirl.create(:service, :display => true, :retired => false)
+    @service_c1   = FactoryGirl.create(:service, :display => true, :retired => false)
+    @service_c11  = FactoryGirl.create(:service, :service => @service_c1, :display => true, :retired => false)
+    @service_c12  = FactoryGirl.create(:service, :service => @service_c1, :display => true, :retired => false)
+    @service_c121 = FactoryGirl.create(:service, :service => @service_c12, :display => true, :retired => false)
+    @service_c2   = FactoryGirl.create(:service, :display => true, :retired => false)
     # hidden
-    @service_c3   = FactoryGirl.create(:service, :service => @service, :display => false)
+    @service_c3   = FactoryGirl.create(:service, :retired => true)
   end
 end