Make containers view navlist

app/controllers/application_controller/ci_processing.rb

@@ -618,7 +618,7 @@ def process_show_list(options = {})
       bc_name = breadcrumb_name(model)
       bc_name += " - " + session["#{self.class.session_key_prefix}_type".to_sym].titleize if session["#{self.class.session_key_prefix}_type".to_sym]
       bc_name += " (filtered)" if @filters && (!@filters[:tags].blank? || !@filters[:cats].blank?)
-      action = %w(container service vm_cloud vm_infra vm_or_template storage).include?(self.class.table_name) ? "explorer" : "show_list"
+      action = %w(service vm_cloud vm_infra vm_or_template storage).include?(self.class.table_name) ? "explorer" : "show_list"
       @breadcrumbs.clear
       drop_breadcrumb(:name => bc_name, :url => "/#{controller_name}/#{action}")
     end

app/controllers/application_controller/policy_support.rb

@@ -175,7 +175,7 @@ def assign_policies(db)
     end
   end
   %w(image instance vm miq_template
-     container_replicator container_group container_node container_image ems_container).each do |old_name|
+     container container_replicator container_group container_node container_image ems_container).each do |old_name|
     alias_method "#{old_name}_protect".to_sym, :assign_policies
   end
 

app/controllers/container_controller.rb

@@ -6,302 +6,16 @@ class ContainerController < ApplicationController
   after_action :cleanup_action
   after_action :set_session_data
 
-  CONTAINER_X_BUTTON_ALLOWED_ACTIONS = {
-    'container_tag'      => :container_tag_edit,
-    'container_timeline' => :show_timeline,
-    'container_perf'     => :show_performance
-  }
-
-  def x_button
-    generic_x_button(CONTAINER_X_BUTTON_ALLOWED_ACTIONS)
-  end
-
-  # Container show selected, redirect to proper controller
-  def show
-    identify_container(params[:id])
-    node_type = TreeBuilder.get_prefix_for_model(@record.class.base_model)
-    redirect_to :action     => 'explorer',
-                :controller => @record.class.base_model.to_s.underscore,
-                :id         => "#{node_type}-#{@record.id}"
-  end
-
   def show_list
-    redirect_to :controller => "container",
-                :action     => "explorer"
-  end
-
-  def explorer
-    @explorer   = true
-    @lastaction = "explorer"
-    @timeline = @timeline_filter = true    # need to set these to load timelines on container show screen
-
-    # if AJAX request, replace right cell, and return
-    if request.xml_http_request?
-      replace_right_cell
-      return
-    end
-
-    build_accordions_and_trees
-
-    if params[:id]  # If a tree node id came in, show in one of the trees
-      nodetype, id = params[:id].split("-")
-      # treebuilder initializes x_node to root first time in locals_for_render,
-      # need to set this here to force & activate node when link is clicked outside of explorer.
-      @reselect_node = self.x_node = "#{nodetype}-#{to_cid(id)}"
-      get_node_info(x_node)
-    end
-
-    params.instance_variable_get(:@parameters).merge!(session[:exp_parms]) if session[:exp_parms]  # Grab any explorer parm overrides
-    session.delete(:exp_parms)
-    @in_a_form = false
-    render :layout => "application"
     process_show_list(:where_clause => 'containers.deleted_on IS NULL')
   end
 
-  def identify_container(id = nil)
-    @container = @record = identify_record(id || params[:id])
-  end
-
-  # ST clicked on in the explorer right cell
-  def x_show
-    get_tagdata(Container.find(from_cid(params[:id])))
-    identify_container(from_cid(params[:id]))
-    generic_x_show(x_tree(:containers_tree))
-  end
-
-  # Tree node selected in explorer
-  def tree_select
-    @explorer = true
-
-    @lastaction = "explorer"
-    self.x_node = params[:id]
-    @nodetype, id = parse_nodetype_and_id(params[:id])
-
-    if x_tree[:type] == :containers_filter && TreeBuilder.get_model_for_prefix(@nodetype) != "Container"
-      search_id = @nodetype == "root" ? 0 : from_cid(id)
-      adv_search_build(vm_model_from_active_tree(x_active_tree))
-      session[:edit] = @edit              # Set because next method will restore @edit from session
-      listnav_search_selected(search_id) unless params.key?(:search_text) # Clear or set the adv search filter
-      if @edit[:adv_search_applied] &&
-         MiqExpression.quick_search?(@edit[:adv_search_applied][:exp]) &&
-         %w(reload tree_select).include?(params[:action])
-        self.x_node = params[:id]
-        quick_search_show
-        return
-      end
-    end
-
-    replace_right_cell
-  end
-
   private
 
   def textual_group_list
     [%i(properties relationships smart_management), %i(env)]
   end
   helper_method :textual_group_list
 
-  def features
-    [{:role     => "container_accord",
-      :role_any => true,
-      :name     => :containers,
-      :title    => _("Containers")},
-
-     {:role     => "container_filter_accord",
-      :role_any => true,
-      :name     => :containers_filter,
-      :title    => _("Filters")},
-    ].map do |hsh|
-      ApplicationController::Feature.new_with_hash(hsh)
-    end
-  end
-
-  def container_tag_edit
-    container_tag
-    replace_right_cell(:action => "tag")
-  end
-
-  def show_performance
-    return if perfmenu_click?
-    @sb[:action] = params[:display]
-    identify_container(params[:id])
-    @showtype = "performance"
-    perf_gen_init_options
-    @refresh_partial = "layouts/performance"
-    replace_right_cell(:action => "perf")
-  end
-
-  def show_timeline
-    @showtype = "timeline"
-    session[:tl_record_id] = params[:id]
-    @record = Container.find(from_cid(params[:id]))
-    @timeline = @timeline_filter = true
-    @lastaction = "show_timeline"
-    tl_build_timeline # Create the timeline report
-    @refresh_partial = "layouts/tl_show"
-    if params[:refresh]
-      @sb[:action] = "timeline"
-      replace_right_cell
-    end
-    replace_right_cell(:action => 'timeline')
-  end
-
-  # Get all info for the node about to be displayed
-  def get_node_info(treenodeid, _show_list = true)
-    @show_adv_search = true
-    @nodetype, id = parse_nodetype_and_id(valid_active_node(treenodeid))
-    # resetting action that was stored during edit to determine what is being edited
-    @sb[:action] = nil
-    if x_node == "root" || TreeBuilder.get_model_for_prefix(@nodetype) == "MiqSearch"
-      process_show_list(:where_clause => 'containers.deleted_on IS NULL')
-      @right_cell_text = _("All Containers")
-    else
-      show_record(from_cid(id))
-      @right_cell_text = _("%{model} \"%{name}\" (Summary)") % {
-        :name  => @record.name,
-        :model => ui_lookup(:model => TreeBuilder.get_model_for_prefix(@nodetype))}
-    end
-
-    if @edit && @edit.fetch_path(:adv_search_applied, :qs_exp) # If qs is active, save it in history
-      x_history_add_item(:id     => x_node,
-                         :qs_exp => @edit[:adv_search_applied][:qs_exp],
-                         :text   => @right_cell_text)
-    else
-      x_history_add_item(:id => treenodeid, :text => @right_cell_text)  # Add to history pulldown array
-    end
-
-    # After adding to history, add name filter suffix if showing a list
-    unless @search_text.blank?
-      @right_cell_text += _(" (Names with \"%{text}\")") % {:text => @search_text}
-    end
-  end
-
-  # set partial name and cell header for edit screens
-  def set_right_cell_vars(action)
-    case action
-    when "tag"
-      partial = "layouts/tagging"
-      header = _("Edit Tags for Container")
-      action = "container_tag"
-    when "perf"
-      partial = "layouts/performance"
-      header = _("Capacity & Utilization data for Container \"%{container_name}\"") % {:container_name => @record.name}
-      action = nil
-    when "timeline"
-      partial = "layouts/tl_show"
-      header = _("Timelines for Container \"%{container_name}\"") % {:container_name => @record.name}
-      action = nil
-    else
-      action = nil
-    end
-    return partial, action, header
-  end
-
-  # Replace the right cell of the explorer
-  def replace_right_cell(options = {})
-    action, replace_trees = options.values_at(:action, :replace_trees)
-    @explorer = true
-    # Set partial name, action and cell header
-    partial, action_url, @right_cell_text = set_right_cell_vars(action) if action
-    get_node_info(x_node) if !@in_a_form && !params[:display]
-    replace_trees = @replace_trees if @replace_trees  # get_node_info might set this
-    type, = parse_nodetype_and_id(x_node)
-    trees = {}
-    if replace_trees
-      trees[:containers] = build_containers_tree if replace_trees.include?(:containers)
-    end
-    record_showing = type && ["Container"].include?(TreeBuilder.get_model_for_prefix(type))
-    if !@in_a_form && !@sb[:action]
-      v_tb = build_toolbar("x_gtl_view_tb") unless record_showing
-      c_tb = build_toolbar(center_toolbar_filename)
-    end
-    h_tb = build_toolbar("x_history_tb") unless @in_a_form
-
-    # Build presenter to render the JS command for the tree update
-    presenter = ExplorerPresenter.new(
-      :active_tree     => x_active_tree,
-      :right_cell_text => @right_cell_text
-    )
-    r = proc { |opts| render_to_string(opts) }
-
-    replace_trees_by_presenter(presenter, trees)
-
-    if action == "tag"
-      presenter.update(:main_div, r[:partial => partial])
-    elsif params[:display]
-      partial_locals = {:controller => "container", :action_url => @lastaction}
-      if params[:display] == "timeline"
-        partial = "layouts/tl_show"
-      elsif params[:display] == "performance"
-        partial = "layouts/performance"
-      else
-        partial = "layouts/x_gtl"
-      end
-      presenter[:parent_id]    = @record.id           # Set parent rec id for JS function miqGridSort to build URL
-      presenter[:parent_class] = params[:controller] # Set parent class for URL also
-      presenter.update(:main_div, r[:partial => partial, :locals => partial_locals])
-    elsif record_showing
-      presenter.update(:main_div, r[:partial => "container/container_show", :locals => {:controller => "container"}])
-      presenter.hide(:pc_div_1, :paging_div)
-    else
-      presenter.update(:main_div, r[:partial => "layouts/x_gtl"])
-      presenter.update(:paging_div, r[:partial => "layouts/x_pagingcontrols"])
-      presenter.hide(:form_buttons_div).show(:pc_div_1, :paging_div)
-    end
-
-    if %w(tag).include?(action)
-      presenter.show(:form_buttons_div).hide(:pc_div_1, :toolbar).show(:paging_div)
-      locals = {:action_url => action_url}
-      locals[:multi_record] = true # need save/cancel buttons on edit screen even tho @record.id is not there
-      locals[:record_id]    = @sb[:rec_id] || @edit[:object_ids] && @edit[:object_ids][0]
-      presenter.update(:form_buttons_div, r[:partial => "layouts/x_edit_buttons", :locals => locals])
-    end
-
-    presenter[:ajax_action] = {
-      :controller => request.parameters["controller"],
-      :action     => @ajax_action,
-      :record_id  => @record.id
-    } if ['performance', 'timeline'].include?(@sb[:action])
-
-    presenter.replace(:adv_searchbox_div, r[:partial => 'layouts/x_adv_searchbox'])
-
-    presenter[:clear_gtl_list_grid] = @gtl_type && @gtl_type != 'list'
-
-    presenter.reload_toolbars(:history => h_tb, :center => c_tb, :view => v_tb)
-
-    presenter.set_visibility(h_tb.present? || c_tb.present? || v_tb.present?, :toolbar)
-
-    presenter[:record_id] = @record.try(:id)
-
-    # Hide/show searchbox depending on if a list is showing
-    presenter.set_visibility(!(@record || @in_a_form), :adv_searchbox_div)
-    presenter[:clear_search_toggle] = clear_search_status
-
-    presenter[:osf_node] = x_node  # Open, select, and focus on this node
-
-    presenter.hide(:blocker_div) unless @edit && @edit[:adv_search_open]
-    presenter.hide(:quicksearchbox)
-    presenter.lock_tree(x_active_tree, @in_a_form && @edit)
-
-    render :json => presenter.for_render
-  end
-
-  # Build a Containers explorer tree
-  def build_containers_tree
-    TreeBuilderContainers.new("containers_tree", "containers", @sb)
-  end
-
-  def show_record(id = nil)
-    @display = params[:display] || "main" unless pagination_or_gtl_request?
-    @lastaction = "show"
-    @showtype = "main"
-    identify_container(id)
-    return if record_no_longer_exists?(@record)
-  end
-
-  def tagging_explorer_controller?
-    @explorer
-  end
-
   menu_section :cnt
 end

app/controllers/mixins/sandbox.rb

@@ -121,8 +121,6 @@ def x_active_tree
     cb_reports
     configuration_scripts
     condition
-    containers
-    containers_filter
     configuration_manager_cs_filter
     configuration_manager_providers
     customization_templates

app/helpers/application_helper.rb

@@ -851,6 +851,7 @@ def display_adv_search?
        cloud_tenant
        cloud_volume
        configuration_job
+       container
        container_build
        container_group
        container_image
@@ -1272,6 +1273,7 @@ def pdf_page_size_style
                         condition
                         configuration_job
                         configuration_script_source
+                        container
                         container_build
                         container_dashboard
                         container_group
@@ -1377,6 +1379,7 @@ def render_listnav_filename
           cloud_volume_backup
           cloud_volume_snapshot
           configuration_job
+          container
           container_build
           container_group
           container_image
@@ -1444,6 +1447,7 @@ def render_listnav_filename
              cloud_volume_snapshot
              condition
              configuration_job
+             container
              container_build
              container_group
              container_image
@@ -1504,6 +1508,7 @@ def show_adv_search?
       cloud_volume_backup
       cloud_volume_snapshot
       configuration_job
+      container
       container_build
       container_group
       container_image
@@ -1601,8 +1606,6 @@ def miq_tab_content(id, active = nil, options = {}, &_block)
   def tree_with_advanced_search?
     %i(automation_manager_providers
        automation_manager_cs_filter
-       containers
-       containers_filter
        configuration_manager_cs_filter
        configuration_scripts
        configuration_manager_providers

app/helpers/application_helper/toolbar_chooser.rb

@@ -485,6 +485,7 @@ def center_toolbar_filename_classic
               cloud_volume_backup
               cloud_volume_snapshot
               configuration_job
+              container
               container_group
               container_node
               container_service

app/presenters/menu/default_menu.rb

@@ -104,7 +104,7 @@ def container_menu_section
           Menu::Item.new('container_service',        N_('Container Services'),  'container_service',        {:feature => 'container_service_show_list'},               '/container_service'),
           Menu::Item.new('container_replicator',     N_('Replicators'),         'container_replicator',     {:feature => 'container_replicator_show_list'},            '/container_replicator'),
           Menu::Item.new('container_group',          N_('Pods'),                'container_group',          {:feature => 'container_group_show_list'},                 '/container_group'),
-          Menu::Item.new('container',                N_('Containers'),          'containers',               {:feature => 'containers', :any => true},                  '/container/explorer'),
+          Menu::Item.new('container',                N_('Containers'),          'container',                {:feature => 'container_show_list'},                       '/container'),
           Menu::Item.new('container_node',           N_('Container Nodes'),     'container_node',           {:feature => 'container_node_show_list'},                  '/container_node'),
           Menu::Item.new('persistent_volume',        N_('Volumes'),             'persistent_volume',        {:feature => 'persistent_volume_show_list', :any => true}, '/persistent_volume'),
           Menu::Item.new('container_build',          N_('Container Builds'),    'container_build',          {:feature => 'container_build_show_list'},                 '/container_build'),