From 3f17435507ff547b43c1e9f7bc76f7730e761aec Mon Sep 17 00:00:00 2001
From: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com>
Date: Mon, 29 Jan 2024 12:00:07 -0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fix=20transition=20aborte?=
 =?UTF-8?q?d=20error=20on=20storage=20bucket=20creation=20(#2119)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-12402
---
 .../scopes/scope/storage-buckets/storage-bucket.js       | 2 +-
 ui/admin/tests/acceptance/storage-buckets/create-test.js | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js b/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js
index a777c8a70..fa450c016 100644
--- a/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js
@@ -33,7 +33,7 @@ export default class ScopesScopeStorageBucketsStorageBucketRoute extends Route {
    */
   redirect(storageBucket) {
     const scope = this.modelFor('scopes.scope');
-    if (storageBucket.scopeID !== scope.id) {
+    if (!scope.isGlobal && storageBucket.scopeID !== scope.id) {
       this.router.replaceWith(
         'scopes.scope.storage-buckets.storage-bucket',
         storageBucket.scopeID,
diff --git a/ui/admin/tests/acceptance/storage-buckets/create-test.js b/ui/admin/tests/acceptance/storage-buckets/create-test.js
index 2b22d3e2d..980727821 100644
--- a/ui/admin/tests/acceptance/storage-buckets/create-test.js
+++ b/ui/admin/tests/acceptance/storage-buckets/create-test.js
@@ -4,7 +4,7 @@
  */
 
 import { module, test } from 'qunit';
-import { visit, currentURL, click, fillIn } from '@ember/test-helpers';
+import { visit, currentURL, click, fillIn, select } from '@ember/test-helpers';
 import { setupApplicationTest } from 'admin/tests/helpers';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
@@ -31,6 +31,8 @@ module('Acceptance | storage-buckets | create', function (hooks) {
   const ROLE_ARN_SELECTOR = '[name="role_arn"]';
   const ACCESS_KEY_SELECTOR = '[name="access_key_id"]';
   const SECRET_KEY_SELECTOR = '[name="secret_access_key"]';
+  const SCOPE_SELECTOR = '[name=scope]';
+
   const instances = {
     scopes: {
       global: null,
@@ -90,7 +92,7 @@ module('Acceptance | storage-buckets | create', function (hooks) {
 
     await click(`[href="${urls.newStorageBucket}"]`);
     await fillIn(NAME_FIELD_SELECTOR, NAME_FIELD_TEXT);
-    await click(`[value="${instances.scopes.org.scope.id}"]`);
+    await select(SCOPE_SELECTOR, instances.scopes.org.id);
 
     assert.dom(BUCKET_NAME_FIELD_SELECTOR).isNotDisabled();
     assert.dom(BUCKET_PREFIX_FIELD_SELECTOR).isNotDisabled();
@@ -102,8 +104,9 @@ module('Acceptance | storage-buckets | create', function (hooks) {
       name: NAME_FIELD_TEXT,
     });
 
+    assert.dom(ALERT_TEXT_SELECTOR).hasText('Saved successfully.');
     assert.strictEqual(storageBucket.name, NAME_FIELD_TEXT);
-    assert.strictEqual(storageBucket.scopeId, instances.scopes.org.scope.id);
+    assert.strictEqual(storageBucket.scopeId, instances.scopes.org.id);
     assert.strictEqual(getStorageBucketCount(), storageBucketCount + 1);
   });