From 07f092d7c30a8881926bbc84144cc99fc6b5f3a3 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Fri, 29 Jan 2021 14:18:03 -0500
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fixes=20issue=20where?=
 =?UTF-8?q?=20scope=20nav=20is=20empty=20after=20login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/routes/scopes/scope.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ui/admin/app/routes/scopes/scope.js b/ui/admin/app/routes/scopes/scope.js
index 705c8d168..32c7945c0 100644
--- a/ui/admin/app/routes/scopes/scope.js
+++ b/ui/admin/app/routes/scopes/scope.js
@@ -67,16 +67,27 @@ export default class ScopesScopeRoute extends Route {
     this.scope.org = selectedOrg;
     this.scope.project = selectedProject;
     this.scopes = { orgs, projects, selectedOrg, selectedProject };
+    // Update the controller (if exists), since setupController is only
+    // called once the first time the route is activated.  It is not called
+    // again on route refreshes.
+    if (this.controller) this.setControllerProperties(this.scopes);
   }
 
   /**
    * Adds the scopes hash to the controller context (see `afterModel`).
    * @param {Controller} controller
    */
-  setupController(controller) {
+  setupController(/* controller */) {
     super.setupController(...arguments);
-    const scopes = this.scopes;
-    controller.setProperties({ scopes });
+    this.setControllerProperties(this.scopes);
+  }
+
+  /**
+   * Updates the controller's `scopes`.
+   * @param {array} scopes
+   */
+  setControllerProperties(scopes) {
+    this.controller.setProperties({ scopes });
   }
 
   /**

From 2ed8a4beafa7107b1d3744b53bac32171f1c284a Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Fri, 29 Jan 2021 14:44:18 -0500
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20welcome=20auth=20meth?=
 =?UTF-8?q?ods=20must=20have=20type=20specified=20in=20link?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/templates/scopes/scope/auth-methods/index.hbs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
index 0d10df1b5..e0c150dfa 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -77,7 +77,9 @@
           <message.description>
             {{t 'resources.auth-method.messages.welcome.description'}}
           </message.description>
-          <message.link @route="scopes.scope.auth-methods.new">
+          <message.link
+            @route="scopes.scope.auth-methods.new"
+            @query={{hash type="password"}}>
             <Rose::Icon @name="plus-circle-outline" />
             {{t 'titles.new'}}
           </message.link>