Merge pull request #6230 from ZitaNemeckova/fix_GOD_again

Change toolbar delete buttons for Button and Button Group to use generic code
ManageIQ · Oct 23, 2019 · 6c5707c · 6c5707c
2 parents b59885c + 3073ae1
commit 6c5707c
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 19 deletions.
diff --git a/app/assets/javascripts/components/generic_object/generic-object-definition-toolbar.js b/app/assets/javascripts/components/generic_object/generic-object-definition-toolbar.js
@@ -46,10 +46,6 @@ function genericObjectDefinitionToolbarController(API, miqService, $window) {
       });
     } else if (toolbar.action === 'delete' && currentRecordId) {
       deleteWithAPI('/api/generic_object_definitions/', currentRecordId);
-    } else if (toolbar.action === 'delete_custom_button_set' && currentRecordId) {
-      deleteWithAPI('/api/custom_button_sets/', currentRecordId);
-    } else if (toolbar.action === 'delete_custom_button' && currentRecordId) {
-      deleteWithAPI('/api/custom_buttons/', currentRecordId);
     }
   }
 
@@ -70,8 +66,8 @@ function genericObjectDefinitionToolbarController(API, miqService, $window) {
       .catch(miqService.handleFailure);
   }
 
-  function postAction() {
-    var entityName = toolbar.entityName;
+  function postAction(response) {
+    var entityName = response.name;
     var saveMsg = sprintf(__('%s: "%s" was successfully deleted'), toolbar.entity, entityName);
     if (toolbar.redirectUrl) {
       miqService.redirectBack(saveMsg, 'success', toolbar.redirectUrl);

diff --git a/app/helpers/application_helper/button/basic.rb b/app/helpers/application_helper/button/basic.rb
@@ -14,6 +14,10 @@ def initialize(view_context, view_binding, instance_data, props)
     end
   end
 
+  def data(data)
+    data
+  end
+
   def role_allows_feature?
     # for select buttons RBAC is checked only for nested buttons
     return true if self[:type] == :buttonSelect

diff --git a/app/helpers/application_helper/button/generic_object_definition_button_button_delete.rb b/app/helpers/application_helper/button/generic_object_definition_button_button_delete.rb
@@ -0,0 +1,19 @@
+class ApplicationHelper::Button::GenericObjectDefinitionButtonButtonDelete < ApplicationHelper::Button::Basic
+  needs :@record
+
+  def data(_data)
+    {
+      'function'      => 'sendDataWithRx',
+      'function-data' => {
+        :type       => 'delete',
+        :controller => 'toolbarActions',
+        :payload    => {
+          :entity       => "custom_buttons",
+          :redirect_url => "/generic_object_definition/",
+          :name         => @record.name,
+          :labels       => { :single => _("Button") }
+        }
+      }
+    }
+  end
+end
diff --git a/...helpers/application_helper/button/generic_object_definition_button_button_group_delete.rb b/...helpers/application_helper/button/generic_object_definition_button_button_group_delete.rb
@@ -1,5 +1,23 @@
 class ApplicationHelper::Button::GenericObjectDefinitionButtonButtonGroupDelete < ApplicationHelper::Button::Basic
+  needs :@record
+
   def disabled?
     !@record.custom_buttons.count.zero?
   end
+
+  def data(_data)
+    {
+      'function'      => 'sendDataWithRx',
+      'function-data' => {
+        :type       => 'delete',
+        :controller => 'toolbarActions',
+        :payload    => {
+          :entity       => "custom_button_sets",
+          :redirect_url => "/generic_object_definition/",
+          :name         => @record.name,
+          :labels       => { :single => _("Button Group") }
+        }
+      }
+    }
+  end
 end
diff --git a/app/helpers/application_helper/toolbar/generic_object_definition_button_center.rb b/app/helpers/application_helper/toolbar/generic_object_definition_button_center.rb
@@ -12,12 +12,11 @@ class ApplicationHelper::Toolbar::GenericObjectDefinitionButtonCenter < Applicat
           :url => 'custom_button_edit',
         ),
         button(
-          :ab_button_delete,
+          :custom_button_delete,
           'pficon pficon-delete fa-lg',
-          N_('Remove this Button from Inventory'),
-          :data    => {'function'      => 'sendDataWithRx',
-                       'function-data' => '{"type": "delete_custom_button", "controller": "genericObjectDefinitionToolbarController", "entity": "Button"}'},
+          N_('Remove this Custom Button from Inventory'),
           :confirm => N_("Warning: This Button will be permanently removed!"),
+          :klass   => ApplicationHelper::Button::GenericObjectDefinitionButtonButtonDelete
         )
       ]
     )

diff --git a/app/helpers/application_helper/toolbar/generic_object_definition_button_group_center.rb b/app/helpers/application_helper/toolbar/generic_object_definition_button_group_center.rb
@@ -18,13 +18,11 @@ class ApplicationHelper::Toolbar::GenericObjectDefinitionButtonGroupCenter < App
           :url => 'custom_button_new',
         ),
         button(
-          :ab_button_delete,
+          :custom_button_set_delete,
           'pficon pficon-delete fa-lg',
-          N_('Remove this Button Group from Inventory'),
-          :data    => {'function'      => 'sendDataWithRx',
-                       'function-data' => '{"type": "delete_custom_button_set", "controller": "genericObjectDefinitionToolbarController", "entity": "Button Group"}'},
+          N_('Remove this Custom Button Group from Inventory'),
+          :confirm => N_("Warning: This Custom Button Group will be permanently removed!"),
           :klass   => ApplicationHelper::Button::GenericObjectDefinitionButtonButtonGroupDelete,
-          :confirm => N_("Warning: This Button Group will be permanently removed!"),
         ),
       ]
     )

diff --git a/app/helpers/application_helper/toolbar_builder.rb b/app/helpers/application_helper/toolbar_builder.rb
@@ -112,7 +112,7 @@ def build_select_button(bgi, index)
   def apply_common_props(button, input)
     button.update(
       :color        => input[:color],
-      :data         => input[:data],
+      :data         => button.data(input[:data]),
       :hidden       => button[:hidden] || !!input[:hidden],
       :icon         => input[:icon],
       :name         => button[:id],

diff --git a/app/javascript/toolbar-actions/delete.js b/app/javascript/toolbar-actions/delete.js
@@ -23,12 +23,17 @@ export function generateMessages(results) {
   }, { false: 0, true: 0 });
 }
 
-export function APIDelete(entity, resources, labels) {
+export function APIDelete(entity, resources, labels = { single: '', multiple: '' }, redirectUrl, name) {
   API.post(`/api/${entity}`, {
     action: 'delete',
     resources,
   }).then((data) => {
-    showMessage(generateMessages(data.results), labels);
+    if (redirectUrl) {
+      miqFlashLater({ message: sprintf(__('%s: "%s" was successfully deleted'), labels.single, name) });
+      window.location.href = redirectUrl;
+    } else {
+      showMessage(generateMessages(data.results), labels);
+    };
     return data;
   });
 }
@@ -41,6 +46,6 @@ export function onDelete(data, resources) {
   if (data.customAction) {
     customActionDelete(data, resources);
   } else {
-    APIDelete(data.entity, resources, data.labels);
+    APIDelete(data.entity, resources, data.labels, data.redirect_url, data.name);
   }
 }