From a3fedc61bd9f18a1d03af698945d508d5f2d23c6 Mon Sep 17 00:00:00 2001
From: "Krueger, John" <johnk@linux.com>
Date: Thu, 30 Apr 2026 14:03:45 -0400
Subject: [PATCH] fix an ember bug

what seemed to be happening was that ember kept trying to observe an api backend that had been deleted and no longer had data. This transitions away from that view first, so that it doesn't fall into that trap anymore.
---
 src/api-umbrella/admin-ui/app/mixins/save.js | 19 ++++++++++---------
 test/admin_ui/test_admin_groups.rb           | 16 ++++++++++++++++
 test/admin_ui/test_apis.rb                   | 20 ++++++++++++++++++++
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/api-umbrella/admin-ui/app/mixins/save.js b/src/api-umbrella/admin-ui/app/mixins/save.js
index ba435ca60..c5c6c4a1f 100644
--- a/src/api-umbrella/admin-ui/app/mixins/save.js
+++ b/src/api-umbrella/admin-ui/app/mixins/save.js
@@ -71,16 +71,17 @@ export default Mixin.create({
   destroyRecord(options) {
     bootbox.confirm(options.prompt, (result) => {
       if(result) {
-        this.model.destroyRecord().then(() => {
-          success({
-            title: 'Deleted',
-            text: (isFunction(options.message)) ? options.message(this.model) : options.message,
-            textTrusted: true,
+        const message = (isFunction(options.message)) ? options.message(this.model) : options.message;
+        this.router.transitionTo(options.transitionToRoute).then(() => {
+          this.model.destroyRecord().then(() => {
+            success({
+              title: 'Deleted',
+              text: message,
+              textTrusted: true,
+            });
+          }, function(response) {
+            bootbox.alert('Unexpected error deleting record: ' + response.responseText);
           });
-
-          this.router.transitionTo(options.transitionToRoute);
-        }, function(response) {
-          bootbox.alert('Unexpected error deleting record: ' + response.responseText);
         });
       }
     });
diff --git a/test/admin_ui/test_admin_groups.rb b/test/admin_ui/test_admin_groups.rb
index 9c56762c7..6e24d9c40 100644
--- a/test/admin_ui/test_admin_groups.rb
+++ b/test/admin_ui/test_admin_groups.rb
@@ -71,4 +71,20 @@ def test_update
       "backend_manage",
     ].sort, admin_group.permission_ids.sort)
   end
+
+  def test_delete_shows_success_notification_and_no_error
+    admin_group = FactoryBot.create(:admin_group, :name => "Delete Me Group")
+
+    admin_login
+    visit "/admin/#/admin_groups/#{admin_group.id}/edit"
+    assert_field("Group Name", :with => "Delete Me Group")
+
+    find("a.remove-action", :text => /Delete Admin Group/).click
+    click_button("OK")
+
+    assert_text("Successfully deleted")
+    refute_text("Unexpected error deleting record")
+
+    assert_nil(AdminGroup.where(:id => admin_group.id).first)
+  end
 end
diff --git a/test/admin_ui/test_apis.rb b/test/admin_ui/test_apis.rb
index b53f92659..5bcc8533a 100644
--- a/test/admin_ui/test_apis.rb
+++ b/test/admin_ui/test_apis.rb
@@ -432,4 +432,24 @@ def test_nested_select_menu_behavior_inside_modals
       assert_select("HTTP Method", :selected => "OPTIONS")
     end
   end
+
+  def test_delete_shows_success_notification_and_no_error
+    api = FactoryBot.create(:api_backend, :name => "Delete Me API")
+
+    admin_login
+    visit "/admin/#/apis/#{api.id}/edit"
+    assert_field("Name", :with => "Delete Me API")
+
+    # Click the "Delete API" link in the form, then confirm in the bootbox.
+    find("a.remove-action", :text => /Delete API/).click
+    click_button("OK")
+
+    # The success pnotify must appear...
+    assert_text("Successfully deleted")
+    # ...and the misleading error alert must NOT.
+    refute_text("Unexpected error deleting record")
+
+    # And the record must actually be gone.
+    assert_nil(ApiBackend.where(:id => api.id).first)
+  end
 end