Merge pull request #9442 from elsamaryv/remove-orphaned-data-tab

Removes Diagnostics > Orphaned Data tab from Application Settings

Author: Fryguy

app/controllers/ops_controller/diagnostics.rb

@@ -287,30 +287,6 @@ def build_empty_log_depot_json
     log_depot_json
   end
 
-  # to delete orphaned records for user that was delete from db
-  def orphaned_records_delete
-    assert_privileges("ops_diagnostics")
-
-    MiqReportResult.delete_by_userid(params[:userid])
-  rescue => bang
-    add_flash(_("Error during Orphaned Records delete for user %{id}: %{message}") % {:id      => params[:userid],
-                                                                                      :message => bang.message}, :error)
-    javascript_flash(:spinner_off => true)
-  else
-    audit = {:event        => "orphaned_record_delete",
-             :message      => "Orphaned Records deleted for userid [#{params[:userid]}]",
-             :target_id    => params[:userid],
-             :target_class => "MiqReport",
-             :userid       => session[:userid]}
-    AuditEvent.success(audit)
-    add_flash(_("Orphaned Records for userid %{id} were successfully deleted") % {:id => params[:userid]})
-    orphaned_records_get
-    render :update do |page|
-      page << javascript_prologue
-      page.replace_html('diagnostics_orphaned_data', :partial => 'diagnostics_savedreports')
-    end
-  end
-
   def diagnostics_server_list
     assert_privileges("ops_diagnostics_server_view")
 
@@ -655,8 +631,6 @@ def diagnostics_set_form_vars
         @selected_server = MiqRegion.my_region
       elsif @sb[:active_tab] == "diagnostics_database"
         database_details
-      elsif @sb[:active_tab] == "diagnostics_orphaned_data"
-        orphaned_records_get
       elsif @sb[:active_tab] == "diagnostics_server_list"
         diagnostics_server_list
       end
@@ -720,10 +694,6 @@ def diagnostics_set_form_vars
     end
   end
 
-  def orphaned_records_get
-    @sb[:orphaned_records] = MiqReportResult.orphaned_counts_by_userid
-  end
-
   # Method to build the server tree (parent is a zone or region instance)
   def build_server_tree(parent)
     @server_tree = if @sb[:diag_tree_type] == "roles"

app/views/ops/_all_tabs.html.haml

@@ -164,8 +164,6 @@
         - if super_admin_user?
           = miq_tab_header("diagnostics_database", @sb[:active_tab]) do
             = _("Database")
-          = miq_tab_header("diagnostics_orphaned_data", @sb[:active_tab]) do
-            = _("Orphaned Data")
       .tab-content
         = miq_tab_content("diagnostics_zones", @sb[:active_tab]) do
           = render :partial => "diagnostics_zones_tab"
@@ -180,8 +178,6 @@
           = miq_tab_content("diagnostics_database", @sb[:active_tab]) do
             - if @sb[:active_tab] == "diagnostics_database"
               = render :partial => "diagnostics_database_tab"
-          = miq_tab_content("diagnostics_orphaned_data", @sb[:active_tab]) do
-            = render :partial => "diagnostics_orphaned_data_tab"
   - when :rbac_tree
     #rbac_details
       = render :partial => "rbac_details_tab"

app/views/ops/_diagnostics_collect_logs_tab.html.haml

@@ -1,7 +1,5 @@
 - if @sb[:active_tab] == "diagnostics_collect_logs"
-  - if x_node.split('-').first == "root"
-    = render :partial => "diagnostics_savedreports"
-  - else
+  - if x_node.split('-').first != "root"
     = render :partial => "layouts/flash_msg"
     = render :partial => "logs_selected"
   %div{:style => "padding-bottom: 20px"}

app/views/ops/_diagnostics_orphaned_data_tab.html.haml

@@ -2457,7 +2457,6 @@
         label_tag_mapping_field_changed
         log_depot_edit
         log_depot_validate
-        orphaned_records_delete
         perf_chart_chooser
         pglogical_save_subscriptions
         pglogical_validate_subscription

app/views/ops/_diagnostics_savedreports.html.haml

@@ -906,7 +906,6 @@ OpsController:
 - log_collection_form_fields
 - log_depot_edit
 - open_url_after_dialog
-- orphaned_records_delete
 - report_data
 - show
 - tl_chooser

config/routes.rb

@@ -52,7 +52,6 @@
     label_tag_mapping_field_changed
     log_depot_edit
     log_depot_validate
-    orphaned_records_delete
     perf_chart_chooser
     rbac_group_edit
     rbac_group_field_changed