From 2fba8025b07d2381996a9699b3745f8ad08e1ffc Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 27 Oct 2020 14:57:56 -0400
Subject: [PATCH] chore

---
 ui/core/app/routes/scopes/scope.js     |  2 +-
 ui/core/app/templates/scopes/scope.hbs | 66 ++++++++++++++++++--------
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/ui/core/app/routes/scopes/scope.js b/ui/core/app/routes/scopes/scope.js
index 179fbc865..95b31260d 100644
--- a/ui/core/app/routes/scopes/scope.js
+++ b/ui/core/app/routes/scopes/scope.js
@@ -48,7 +48,7 @@ export default class ScopesScopeRoute extends Route {
       .catch(() => A([]));
     if (model.isProject) {
       projects = await this.store.query('scope', { scope_id: model.scopeID })
-        .catch(() => A([]))
+        .catch(() => A([]));
     }
     // Then pull out the "selected" scopes, if relevant
     let selectedOrg, selectedProject;
diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs
index ec91c3722..a490c2148 100644
--- a/ui/core/app/templates/scopes/scope.hbs
+++ b/ui/core/app/templates/scopes/scope.hbs
@@ -5,7 +5,7 @@
 
       {{#if @model.isGlobal}}
         <Rose::Nav::Sidebar @title={{t "titles.general"}} as |nav|>
-          <nav.link @route="scopes.scope">
+          <nav.link @route="scopes.scope.index">
             <Rose::Icon
               @name="app-icons/org"
               @size="medium" />
@@ -16,7 +16,15 @@
 
       {{#if @model.isOrg}}
         <Rose::Nav::Sidebar @title={{t "titles.general"}} as |nav|>
-          <nav.link @route="scopes.scope">
+          {{#if this.session.data.authenticated.isGlobal}}
+            <nav.link @route="scopes.scope.index" @model="global">
+              <Rose::Icon
+                @name="app-icons/org"
+                @size="medium" />
+              {{t "resources.org.title_plural"}}
+            </nav.link>
+          {{/if}}
+          <nav.link @route="scopes.scope.index">
             <Rose::Icon
               @name="app-icons/project"
               @size="medium" />
@@ -25,6 +33,43 @@
         </Rose::Nav::Sidebar>
       {{/if}}
 
+      {{#if @model.isProject}}
+        <Rose::Nav::Sidebar @title={{t "titles.general"}} as |nav|>
+          {{#if this.session.data.authenticated.isGlobal}}
+            <nav.link @route="scopes.scope.index" @model="global">
+              <Rose::Icon
+                @name="app-icons/org"
+                @size="medium" />
+              {{t "resources.org.title_plural"}}
+            </nav.link>
+          {{/if}}
+          <nav.link @route="scopes.scope.index" @model={{@model.scopeID}}>
+            <Rose::Icon
+              @name="app-icons/project"
+              @size="medium" />
+            {{t "resources.project.title_plural"}}
+          </nav.link>
+        </Rose::Nav::Sidebar>
+        {{!-- TODO:  after scope awareness refactor, update groups and roles
+                     to support project scopes --}}
+        {{!--
+        <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
+          <nav.link @route="scopes.scope.groups">
+            <Rose::Icon
+              @name="app-icons/group"
+              @size="medium" />
+            {{t "resources.group.title_plural"}}
+          </nav.link>
+          <nav.link @route="scopes.scope.roles">
+            <Rose::Icon
+              @name="app-icons/roles"
+              @size="medium" />
+            {{t "resources.role.title_plural"}}
+          </nav.link>
+        </Rose::Nav::Sidebar>
+        --}}
+      {{/if}}
+
       {{#unless @model.isProject}}
         <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
           <nav.link @route="scopes.scope.users">
@@ -54,23 +99,6 @@
         </Rose::Nav::Sidebar>
       {{/unless}}
 
-      {{#if @model.isProject}}
-        <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
-          <nav.link @route="scopes.scope.groups">
-            <Rose::Icon
-              @name="app-icons/group"
-              @size="medium" />
-            {{t "resources.group.title_plural"}}
-          </nav.link>
-          <nav.link @route="scopes.scope.roles">
-            <Rose::Icon
-              @name="app-icons/roles"
-              @size="medium" />
-            {{t "resources.role.title_plural"}}
-          </nav.link>
-        </Rose::Nav::Sidebar>
-      {{/if}}
-
     </sidebarLayout.sidebar>
   {{/if}}