[WIP] De explorization of infra networking pages

app/controllers/application_controller/tags.rb

@@ -93,7 +93,7 @@ def tagging_edit_tags_cancel
     add_flash(_("Tag Edit was cancelled by the user"))
     session[:tag_items] = nil # reset tag_items in session
     @edit = nil # clean out the saved info
-    if tagging_explorer_controller?
+    if tagging_explorer_controller? && @lastaction != 'show_list'
       @sb[:action] = nil
       replace_right_cell
     else
@@ -109,7 +109,7 @@ def tagging_edit_tags_save
     tagging_save_tags
 
     @edit = nil # clean out the saved info
-    if tagging_explorer_controller?
+    if tagging_explorer_controller? && @lastaction != 'show_list'
       @sb[:action] = nil
       replace_right_cell
     else

app/controllers/infra_networking_controller.rb

@@ -6,11 +6,15 @@ class InfraNetworkingController < ApplicationController
   after_action :set_session_data
 
   include Mixins::GenericSessionMixin
-  include Mixins::ExplorerPresenterMixin
+  # include Mixins::ExplorerPresenterMixin
   include Mixins::FindRecord
   include Mixins::CustomButtonDialogFormMixin
   include Mixins::BreadcrumbsMixin
 
+  INFRA_X_BUTTON_ALLOWED_ACTIONS = {
+    "infra_networking_tag"      => :infra_networking_tag
+  }.freeze
+
   def self.model
     Switch
   end
@@ -20,16 +24,25 @@ def self.table_name
   end
 
   def show_list
-    flash_to_session
-    redirect_to(:action => 'explorer')
+    @lastaction = "showlist"
+    @center_toolbar = 'infra_networkings'
+    process_show_list(:dbname => :switch, :gtl_dbname => :switch, :named_scope => :shareable)
   end
 
-  alias_method :index, :show_list
+  # alias_method :index, :show_list
 
   def tagging_explorer_controller?
     @explorer
   end
 
+  def show_searchbar?
+    @record.nil?
+  end
+
+  def display_back_button?
+    false
+  end
+
   def tree_select
     @lastaction = "explorer"
     @sb[:action] = nil
@@ -75,6 +88,15 @@ def load_or_clear_adv_search
     end
   end
 
+  def show
+    assert_privileges("infra_networking_view")
+    @center_toolbar = 'infra_networking'
+    @lastaction = "show"
+    @display = 'main'
+    @showtype = 'main'
+    @switch = @record = identify_record(params[:id], Switch)
+  end
+
   def x_show
     assert_privileges("infra_networking_view")
     @switch = @record = identify_record(params[:id], Switch)
@@ -100,15 +122,24 @@ def show_record(_id = nil)
     @center_toolbar = 'infra_networking'
   end
 
-  def explorer
-    @explorer = true
-    @lastaction = "explorer"
+  # def explorer
+  #   @explorer = true
+  #   @lastaction = "explorer"
 
-    build_accordions_and_trees
-    @in_a_form = false
+  #   build_accordions_and_trees
+  #   @in_a_form = false
 
-    render :layout => "application"
-  end
+  #   render :layout => "application"
+  # end
+
+  # def index
+  #   @lastaction = "index"
+
+  #   build_accordions_and_trees
+  #   @in_a_form = false
+
+  #   render :layout => "application"
+  # end
 
   def tagging
     assert_privileges("infra_networking_tag")
@@ -119,6 +150,8 @@ def tagging
   def button
     if params[:pressed] == "custom_button"
       custom_buttons
+    else
+      tag(self.class.model)
     end
   end
 
@@ -142,6 +175,28 @@ def download_summary_pdf
     super
   end
 
+  def hosts
+    db = params[:db] || controller_name
+    db = 'switch' if db == 'infra_networking'
+    # binding.pry
+    return unless init_show_variables(db)
+
+    @lastaction = "hosts"
+    id = params[:show] || params[:x_show]
+    if id.present?
+      # binding.pry
+      @item = @record.hosts.find(id)
+      item_breadcrumbs(_("Hosts"), 'hosts')
+      @view = get_db_view(Host)
+      show_item
+    else
+      # binding.pry
+      drop_breadcrumb(:name => _("%{name} (Hosts)") % {:name => @record.name},
+                      :url  => "/#{controller_name}/hosts/#{@record.id}")
+      show_details(Host, :association => "hosts")
+    end
+  end
+
   private
 
   def textual_group_list
@@ -299,6 +354,11 @@ def replace_right_cell(options = {})
       return
     end
 
+    if params[:action] == 'button' && params[:pressed] == 'infra_networking_tag'
+      tagging
+      return
+    end
+
     if action_type == "dialog_form_button_pressed"
       presenter = set_custom_button_dialog_presenter(options)
       render :json => presenter.for_render
@@ -440,10 +500,9 @@ def show_details(db, options = {})
                              :conditions  => conditions,
                              :clickable   => clickable,
                              :dbname      => "#{@db}item") # Get the records into a view & paginator
-
-    if @explorer # In explorer?
-      @refresh_partial = @showtype.to_s
-      replace_right_cell
+    # binding.pry
+    if association == 'hosts' # In explorer?
+      render "hosts"
     elsif request.xml_http_request?
       render :update do |page|
         page << javascript_prologue

app/helpers/application_helper.rb

@@ -233,6 +233,9 @@ def view_to_url(view, parent = nil)
     association = view_to_association(view, parent)
     if association.nil?
       controller, action = db_to_controller(view.db)
+      if controller == "switch" && action == "show"
+        return url_for_only_path(:action => action)
+      end
       if controller == "ems_cloud" && action == "show"
         return ems_clouds_path
       end
@@ -1110,6 +1113,7 @@ def pdf_page_size_style
                              security_group
                              services
                              storage
+                             switch
                              templates].freeze
 
   def render_download_view_tb?

app/helpers/infra_networking_helper/textual_summary.rb

@@ -8,7 +8,7 @@ def textual_group_properties
   end
 
   def textual_group_relationships
-    TextualGroup.new(_("Relationships"), %i[hosts custom_button_events])
+    TextualGroup.new(_("Relationships"), %i[hosts custom_button_events lans])
   end
 
   def textual_group_smart_management
@@ -28,6 +28,11 @@ def textual_hosts
     h
   end
 
+  def textual_lans
+    portgroups = @record.lans.map(&:name)
+    {:label => _("Portgroup"), :icon => "pficon pficon-network", :value => portgroups.join(', ')}
+  end
+
   def textual_custom_button_events
     return nil unless User.current_user.super_admin_user? || User.current_user.admin?
 

app/presenters/menu/default_menu.rb

@@ -97,7 +97,7 @@ def infrastructure_menu_section
           Menu::Item.new('resource_pool',     N_('Resource Pools'),    'resource_pool',              {:feature => 'resource_pool_show_list'},         '/resource_pool/show_list'),
           Menu::Item.new('storage',           N_('Datastores'),        'storage',                    {:feature => 'storage_show_list'},               '/storage/explorer'),
           Menu::Item.new('pxe',               N_('PXE'),               'pxe',                        {:feature => 'pxe', :any => true},               '/pxe/explorer'),
-          Menu::Item.new('switch',            N_('Networking'),        'infra_networking',           {:feature => 'infra_networking', :any => true},  '/infra_networking/explorer'),
+          Menu::Item.new('switch',            N_('Networking'),        'infra_networking',           {:feature => 'infra_networking', :any => true},  '/infra_networking/show_list'),
         ])
       end
 

app/views/infra_networking/hosts.html.haml

@@ -0,0 +1,10 @@
+- content_for :search do
+  = render(:partial => "layouts/x_adv_searchbox")
+  = render(:partial => 'layouts/quick_search')
+
+-# Showing a list of hosts
+#main_div
+  = render(:partial => 'layouts/gtl')
+-# Show Search box
+:javascript
+  #{javascript_show_if_exists("adv_searchbox_div")}

app/views/infra_networking/show.html.haml

@@ -0,0 +1,2 @@
+#main_div
+    = render :partial => "layouts/textual_groups_generic"

app/views/infra_networking/show_list.html.haml

@@ -0,0 +1,10 @@
+- content_for :search do
+  = render(:partial => "layouts/x_adv_searchbox")
+  = render(:partial => 'layouts/quick_search')
+
+-# Showing a list of switches
+#main_div
+  = render(:partial => 'layouts/gtl')
+-# Show Search box
+:javascript
+  #{javascript_show_if_exists("adv_searchbox_div")}

config/routes.rb

@@ -1779,6 +1779,7 @@
         tagging
         tagging_edit
         x_show
+        show
       ),
       :post => %w(
         button