From b0c14af9736a00a715582e7e481549645659b09e Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Tue, 9 Feb 2021 11:24:09 -0500
Subject: [PATCH 1/2] feat: Show session proxy details in active sessions in
 target

---
 .../projects/targets/target/sessions.hbs      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
index 48f10efda..e273d7058 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
@@ -19,6 +19,30 @@
             <code>{{session.id}}</code>
           </Copyable>
         </row.cell>
+        <row.cell>
+          {{!--
+            Two if's here because:
+            1) Local proxy info is only relevant if the session is
+                active or pending (aka isCancelable).  Once the session
+                is canceled or in the process thereof, the local proxy
+                may no longer be used.
+            2) The session actually has proxy information associated
+                with it.  It's possible for the user to start sessions
+                from other devices (or even another tab), in which case we
+                won't have the local proxy info available here.
+          --}}
+          {{#if session.isCancelable}}
+            {{#if session.proxy}}
+              <Copyable
+                @text={{session.proxy}}
+                @buttonText={{t "actions.copy-to-clipboard"}}
+                @acknowledgeText={{t "states.copied"}}
+              >
+                <code>{{session.proxy}}</code>
+              </Copyable>
+            {{/if}}
+          {{/if}}
+        </row.cell>
         <row.cell>
           <time datetime={{format-date-iso session.created_time}}>
             {{format-date-iso-human session.created_time}}

From 1fd146939f5b9a37b021093c6de25cce8a68ae51 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Tue, 9 Feb 2021 23:01:06 -0500
Subject: [PATCH 2/2] fix: Connecting from a target view raises toString error

---
 .../templates/scopes/scope/projects/targets/target/-actions.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs
index b82595c94..e59af9f97 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs
@@ -1,3 +1,3 @@
-<Rose::Button @style="primary" {{on "click" (route-action "connect" @model)}}>
+<Rose::Button @style="primary" {{on "click" (route-action "connect" @model.target)}}>
   {{t "resources.session.actions.connect"}}
 </Rose::Button>