From 0b4fd6765e0704a1c1a2ba8407b83c0b1743b128 Mon Sep 17 00:00:00 2001
From: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com>
Date: Tue, 9 Apr 2024 12:05:15 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20modal=20bubbling=20up=20w?=
 =?UTF-8?q?hen=20user=20has=20not=20updated=20model=20(#2227)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-13106
---
 ui/admin/app/components/header-nav/index.hbs | 6 +++++-
 ui/admin/app/routes/scopes/scope.js          | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/admin/app/components/header-nav/index.hbs b/ui/admin/app/components/header-nav/index.hbs
index cc98c3b7a..af36960f3 100644
--- a/ui/admin/app/components/header-nav/index.hbs
+++ b/ui/admin/app/components/header-nav/index.hbs
@@ -4,7 +4,11 @@
 }}
 
 <Rose::Dropdown
-  @text={{this.scope.org.displayName}}
+  @text={{if
+    this.scope.org.isGlobal
+    (t 'titles.global')
+    this.scope.org.displayName
+  }}
   @icon={{if
     this.scope.org.isGlobal
     'flight-icons/svg/globe-16'
diff --git a/ui/admin/app/routes/scopes/scope.js b/ui/admin/app/routes/scopes/scope.js
index 3b8f70bea..79bcd97f3 100644
--- a/ui/admin/app/routes/scopes/scope.js
+++ b/ui/admin/app/routes/scopes/scope.js
@@ -33,17 +33,13 @@ export default class ScopesScopeRoute extends Route {
    * @param {string} params.scope_id
    * @return {Promise{ScopeModel}}
    */
-  model({ scope_id: id }) {
+  async model({ scope_id: id }) {
     // Since only global and org scopes are authenticatable, we can infer type
     // from ID because global has a fixed ID.
     const type = id === 'global' ? 'global' : 'org';
     return this.store.findRecord('scope', id).catch(() => {
       const maybeExistingScope = this.store.peekRecord('scope', id);
       const scopeOptions = { id, type };
-      /* istanbul ignore else */
-      if (type === 'global') {
-        scopeOptions.name = this.intl.t('titles.global');
-      }
       return (
         maybeExistingScope || this.store.createRecord('scope', scopeOptions)
       );