From ccca65b9bef7eb3455abb41d4a7bebb5ac5c7656 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 7 Jan 2021 17:45:12 -0500
Subject: [PATCH] fix: Desktop: Move sidebar into projects template

---
 .../routes/scopes/scope/projects/sessions.js  | 11 ++++----
 ui/desktop/app/templates/scopes/scope.hbs     | 26 +------------------
 .../app/templates/scopes/scope/projects.hbs   | 26 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
index 7430c7764..3c34044f7 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
@@ -33,12 +33,11 @@ export default class ScopesScopeProjectsSessionsRoute extends Route {
     );
 
     // Filter sessions to current user
-    let sessions = projectSessions.map(sessions => {
-      return sessions.filter(session => {
-        console.log(session.user_id, userId)
-        return session.user_id === userId
-      });
-    }).flat();
+    let sessions = projectSessions.map(
+      sessions => sessions.filter(
+        session => session.user_id === userId
+      )
+    ).flat();
 
     const sessionAggregates = await all(
       sessions.map(session => hash({
diff --git a/ui/desktop/app/templates/scopes/scope.hbs b/ui/desktop/app/templates/scopes/scope.hbs
index 6a8cd0d89..e2147cab0 100644
--- a/ui/desktop/app/templates/scopes/scope.hbs
+++ b/ui/desktop/app/templates/scopes/scope.hbs
@@ -1,25 +1 @@
-<Rose::Layout::Sidebar as |sidebarLayout|>
-  <sidebarLayout.sidebar>
-    <Rose::Nav::Sidebar as |nav|>
-      <nav.link @route="scopes.scope.projects.targets">
-        <Rose::Icon
-          @name="app-icons/target"
-          @size="medium" />
-          {{t "resources.target.title_plural"}}
-      </nav.link>
-
-      <nav.link @route="scopes.scope.projects.sessions">
-        <Rose::Icon
-          @name="app-icons/action-session"
-          @size="medium" />
-          {{t "resources.session.title_plural"}}
-      </nav.link>
-    </Rose::Nav::Sidebar>
-  </sidebarLayout.sidebar>
-
-  <sidebarLayout.body>
-    <main>
-      {{outlet}}
-    </main>
-  </sidebarLayout.body>
-</Rose::Layout::Sidebar>
+{{outlet}}
\ No newline at end of file
diff --git a/ui/desktop/app/templates/scopes/scope/projects.hbs b/ui/desktop/app/templates/scopes/scope/projects.hbs
index c24cd6895..6a8cd0d89 100644
--- a/ui/desktop/app/templates/scopes/scope/projects.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects.hbs
@@ -1 +1,25 @@
-{{outlet}}
+<Rose::Layout::Sidebar as |sidebarLayout|>
+  <sidebarLayout.sidebar>
+    <Rose::Nav::Sidebar as |nav|>
+      <nav.link @route="scopes.scope.projects.targets">
+        <Rose::Icon
+          @name="app-icons/target"
+          @size="medium" />
+          {{t "resources.target.title_plural"}}
+      </nav.link>
+
+      <nav.link @route="scopes.scope.projects.sessions">
+        <Rose::Icon
+          @name="app-icons/action-session"
+          @size="medium" />
+          {{t "resources.session.title_plural"}}
+      </nav.link>
+    </Rose::Nav::Sidebar>
+  </sidebarLayout.sidebar>
+
+  <sidebarLayout.body>
+    <main>
+      {{outlet}}
+    </main>
+  </sidebarLayout.body>
+</Rose::Layout::Sidebar>