From 8ca345c89d27faf617629582f645f3f928a13967 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Tue, 8 Sep 2020 10:25:52 -0400
Subject: [PATCH 1/2] fix: Add empty org message attributes to translation file

---
 ui/core/translations/en-us.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 20e0b4740..12e5dd2a5 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -76,6 +76,7 @@ titles:
   overview: Overview
   settings: Settings
   empty-set: No Items Yet
+  orgs-welcome: Welcome to Orgs
   projects-welcome: Welcome to Projects
   host-catalogs-welcome: Welcome to Host Catalogs
   host-sets-welcome: Welcome to Host Sets
@@ -103,6 +104,7 @@ titles:
 descriptions:
   host-catalogs: Overview of collections of hosts and host sets.
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
+  orgs-welcome: Create your orgs here.
   projects-welcome: Projects allow you to create and manage host catalogs. To start, create a project.
   host-catalogs-welcome: Host catalogs allow you to configure to collect and create hosts and host sets. To start, create a host catalog.
   host-sets-welcome: Configure a static host set in this host catalog.

From 4621711001181c5972ef43ac02b46b4443c07318 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 8 Sep 2020 11:32:36 -0400
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20pass=20IDs=20instead?=
 =?UTF-8?q?=20of=20models=20to=20link-to?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/core/app/templates/scopes/scope/authenticate.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/core/app/templates/scopes/scope/authenticate.hbs b/ui/core/app/templates/scopes/scope/authenticate.hbs
index 75a60893f..010282a00 100644
--- a/ui/core/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/core/app/templates/scopes/scope/authenticate.hbs
@@ -15,7 +15,7 @@
         @icon="user-organization"
       as |dropdown|>
         {{#each this.sortedScopes as |scope|}}
-          <dropdown.link @route="scopes.scope.authenticate" @model={{scope}}>
+          <dropdown.link @route="scopes.scope.authenticate" @model={{scope.id}}>
             {{scope.displayName}}
           </dropdown.link>
         {{/each}}
@@ -25,7 +25,7 @@
 
       <Rose::Nav::Tabs as |nav|>
         {{#each @model.authMethods as |authMethod|}}
-          <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod}}>
+          <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
             {{t (concat "auth.method-types." authMethod.type)}}
           </nav.link>
         {{/each}}