Action explorer de-explorized version

- This commit includes de-explorized Actions list/details screen with Add/Edit/Delete buttons working. - Updated MiqAction controller spec tests ManageIQ#6819
h-kataria · Feb 8, 2021 · 4a2ba1c · 4a2ba1c
1 parent 6118b83
commit 4a2ba1c
Show file tree

Hide file tree

Showing 15 changed files with 477 additions and 593 deletions.
diff --git a/app/controllers/miq_action_controller.rb b/app/controllers/miq_action_controller.rb
diff --git a/app/helpers/application_helper/button/miq_action_edit.rb b/app/helpers/application_helper/button/miq_action_edit.rb
@@ -1,8 +1,7 @@
-class ApplicationHelper::Button::MiqActionEdit < ApplicationHelper::Button::MiqActionModify
+class ApplicationHelper::Button::MiqActionEdit < ApplicationHelper::Button::Basic
   needs :@record
 
   def disabled?
-    super
     @error_message = _("Default actions can not be changed.") if @record.action_type == "default"
     @error_message.present?
   end

diff --git a/app/helpers/application_helper/page_layouts.rb b/app/helpers/application_helper/page_layouts.rb
@@ -23,6 +23,7 @@ def layout_uses_listnav?
       cloud_topology
       diagnostics
       exception
+      miq_action
       miq_ae_automate_button
       miq_ae_customization
       miq_ae_export

diff --git a/app/helpers/application_helper/toolbar/miq_action_center.rb b/app/helpers/application_helper/toolbar/miq_action_center.rb
@@ -11,8 +11,9 @@ class ApplicationHelper::Toolbar::MiqActionCenter < ApplicationHelper::Toolbar::
           'pficon pficon-edit fa-lg',
           t = N_('Edit this Action'),
           t,
-          :klass     => ApplicationHelper::Button::MiqActionEdit,
-          :url_parms => "?type=basic"),
+          :klass        => ApplicationHelper::Button::MiqActionEdit,
+          :url          => "/edit",
+          :send_checked => true,),
         button(
           :miq_action_delete,
           'pficon pficon-delete fa-lg',
@@ -21,6 +22,7 @@ class ApplicationHelper::Toolbar::MiqActionCenter < ApplicationHelper::Toolbar::
           :klass => ApplicationHelper::Button::MiqActionDelete,
           :data  => {'function'      => 'sendDataWithRx',
                      'function-data' => {:api_url        => 'actions',
+                                         :redirect_url   => '/miq_action/show_list',
                                          :component_name => 'RemoveGenericItemModal',
                                          :controller     => 'provider_dialogs',
                                          :display_field  => 'description',

diff --git a/app/helpers/application_helper/toolbar/miq_actions_center.rb b/app/helpers/application_helper/toolbar/miq_actions_center.rb
@@ -11,7 +11,35 @@ class ApplicationHelper::Toolbar::MiqActionsCenter < ApplicationHelper::Toolbar:
           'pficon pficon-add-circle-o fa-lg',
           t = N_('Add a new Action'),
           t,
+          :url   => "/new",
           :klass => ApplicationHelper::Button::ButtonNewDiscover),
+        button(
+          :miq_action_edit,
+          'pficon pficon-edit fa-lg',
+          t = N_('Edit the selected Action'),
+          t,
+          :url          => "/edit",
+          :url_parms    => "main_div",
+          :send_checked => true,
+          :enabled      => false,
+          :onwhen       => "1"),
+        button(
+          :miq_action_delete,
+          'pficon pficon-delete fa-lg',
+          N_('Delete selected Actions'),
+          N_('Delete Actions'),
+          :enabled      => false,
+          :onwhen       => "1+",
+          :data         => {'function'      => 'sendDataWithRx',
+                            'function-data' => {:api_url        => 'actions',
+                                                :redirect_url   => '/miq_action/show_list',
+                                                :component_name => 'RemoveGenericItemModal',
+                                                :controller     => 'provider_dialogs',
+                                                :display_field  => 'description',
+                                                :modal_text     => N_("Are you sure you want to delete selected Actions?"),
+                                                :modal_title    => N_("Delete Actions")}}
+        ),
+
       ]
     ),
   ])

diff --git a/app/helpers/application_helper/toolbar_chooser.rb b/app/helpers/application_helper/toolbar_chooser.rb
@@ -102,7 +102,7 @@ def center_toolbar_filename_explorer
       center_toolbar_filename_chargeback_report
     elsif @layout == "miq_ae_tools"
       super_admin_user? ? "miq_ae_tools_simulate_center_tb" : nil
-    elsif %w[miq_action miq_alert miq_alert_set miq_event].include?(@layout)
+    elsif %w[miq_alert miq_alert_set miq_event miq_policy].include?(@layout)
       center_toolbar_filename_miq_policy
     elsif @layout == "ops"
       center_toolbar_filename_ops
@@ -229,13 +229,11 @@ def center_toolbar_filename_miq_policy
     case @nodetype
     when "root"
       case x_active_tree
-      when :action_tree then          "miq_actions_center_tb"
       when :alert_tree then           "miq_alerts_center_tb"
       end
     when "p" then   "miq_policy_center_tb"
     when "co" then  "condition_center_tb"
     when "ev" then  "miq_event_center_tb"
-    when "a" then   "miq_action_center_tb"
     when "al" then  "miq_alert_center_tb"
     when "ap" then  "miq_alert_set_center_tb"
     end

diff --git a/app/presenters/menu/default_menu.rb b/app/presenters/menu/default_menu.rb
@@ -230,7 +230,7 @@ def control_menu_section
           Menu::Item.new('miq_policy',        N_('Policies'),        'miq_policy',           {:feature => 'miq_policy_show_list'},         '/miq_policy/show_list'),
           Menu::Item.new('miq_event',         N_('Events'),          'miq_event',            {:feature => 'miq_event_definition_show_list'},      '/miq_event_definition/show_list'),
           Menu::Item.new('condition',         N_('Conditions'),      'condition',            {:feature => 'condition_show_list'},          '/condition/show_list'),
-          Menu::Item.new('miq_action',        N_('Actions'),         'miq_action',           {:feature => 'miq_action', :any => true},     '/miq_action/explorer'),
+          Menu::Item.new('miq_action',        N_('Actions'),         'miq_action',           {:feature => 'miq_action_show_list'},         '/miq_action/show_list'),
           Menu::Item.new('miq_alert_set',     N_('Alert Profiles'),  'miq_alert_set',        {:feature => 'miq_alert_set', :any => true},  '/miq_alert_set/explorer'),
           Menu::Item.new('miq_alert',         N_('Alerts'),          'miq_alert',            {:feature => 'miq_alert', :any => true},      '/miq_alert/explorer'),
           Menu::Item.new('miq_policy_rsop',   N_('Simulation'),      'policy_simulation',    {:feature => 'policy_simulation'},            '/miq_policy_rsop'),