From 3278d229e8db6b96e0f908a766bf0bb1feea7a4a Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 23 Jun 2021 11:58:48 -0400
Subject: [PATCH 1/5] chore: Update components in connect dialog to latest

---
 addons/core/translations/resources/en-us.yaml |  5 ++
 .../scopes/scope/projects/targets.hbs         | 62 +++++++++++++++++--
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 888cb980b..fc4fa2c65 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -147,6 +147,11 @@ session:
       description: No active sessions available to display yet.
   actions:
     connect: Connect
+  credential:
+    title: Credential
+    title_plural: Credentials
+    actions:
+      detail: Credential library details
 org:
   title: Org
   title_plural: Orgs
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index fb0d61f56..f4fb6811a 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
@@ -19,7 +19,8 @@
         >
           <:body>
             <h3>{{t 'resources.target.messages.proxy_url.title'}}
-              (<code>{{t 'resources.target.types.tcp'}}</code>)</h3>
+              {{!-- (<code>{{t 'resources.target.types.tcp'}}</code>)</h3> --}}
+              ({{t 'resources.target.types.tcp'}})</h3>
             <p>
               <Copyable
                 @text={{session.proxy}}
@@ -30,7 +31,56 @@
               </Copyable>
             </p>
 
-            {{!-- <Rose::Separator />
+            <Rose::Separator />
+
+            {{!-- TODO: Conditional for when credentials aren't available 
+              older versions of cli --}}
+            <h3>{{t 'resources.session.credential.title_plural'}}</h3>
+            <Card
+              @heading={{t 'resources.session.credential.title'}}
+              @icon='app-icons/credentials'
+            >
+              <:header>
+                <Rose::Dropdown @text={{t 'resources.session.credential.actions.detail'}}
+                  @style='condensed'
+                  @dropdownRight={{true}} as |dropdown|>
+                    <dropdown.key-value>
+                      <:key>{{t 'form.id.label'}}</:key>
+                      <:value>cl_nbv9375hLHs</:value>
+                    </dropdown.key-value>
+                    <dropdown.key-value>
+                      <:key>{{t 'form.name.label'}}</:key>
+                      <:value>Key/Value</:value>
+                    </dropdown.key-value>
+                    <dropdown.key-value>
+                      <:key>{{t 'form.description.label'}}</:key>
+                      <:value>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ut nobis, nemo cum omnis saepe reprehenderit eaque non odit iste magni quod voluptatem soluta dolor beatae libero consequatur, perferendis rem molestias.</:value>
+                    </dropdown.key-value>
+                </Rose::Dropdown>
+              </:header>
+              <:body>
+                {{!-- TODO: Iterate through all credentials --}}
+                <Rose::Table @style='condensed' as |table|>
+                  <table.header as |header|>
+                    <header.row as |row|>
+                      <row.headerCell>Key</row.headerCell>
+                      <row.headerCell colspan='2'>Value</row.headerCell>
+                    </header.row>
+                  </table.header>
+                  <table.body as |body|>
+                    <body.row as |row|>
+                      <row.headerCell>foo</row.headerCell>
+                      <row.cell>Value</row.cell>
+                    </body.row>
+                    <body.row as |row|>
+                      <row.headerCell>ttl</row.headerCell>
+                      <row.cell>Test</row.cell>
+                    </body.row>
+                  </table.body>
+                </Rose::Table>
+              </:body>
+            </Card>
+            {{!--  <Rose::Separator />
 
             <h3>Credentials</h3>
 
@@ -94,13 +144,13 @@
               </Rose::Button>
             </div>
             <div>
-              {{! <Rose::LinkButton
-              @route='index'
+              {{!-- <Rose::LinkButton
+              @route='scopes.scope.projects.sessions'
               @style='inline-link-action'
               @iconRight='chevron-right'
             >
-
-            </Rose::LinkButton> }}
+              View sessions
+            </Rose::LinkButton> --}}
             </div>
           </:footer>
         </DialogDetail>

From f0926cba870ef34c040225ef6433675c2287644c Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Wed, 23 Jun 2021 11:37:28 -0700
Subject: [PATCH 2/5] Change flex CSS in card header

---
 ui/desktop/app/styles/app.scss                |  2 +-
 .../scopes/scope/projects/targets.hbs         | 44 +++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 00313f9ea..5aa212672 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -422,7 +422,7 @@ $chevron-down: url("data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%231
     align-items: center;
     border-bottom: sizing.rems(xxxxs) solid var(--ui-gray-subtler-3);
     display: flex;
-    justify-content: flex-start;
+    justify-content: space-between;
     padding: sizing.rems(s) sizing.rems(m);
 
     h2 {
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index f4fb6811a..54ee518d8 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
@@ -33,33 +33,39 @@
 
             <Rose::Separator />
 
-            {{!-- TODO: Conditional for when credentials aren't available 
-              older versions of cli --}}
+            {{! TODO: Conditional for when credentials aren't available
+            older versions of cli }}
             <h3>{{t 'resources.session.credential.title_plural'}}</h3>
             <Card
               @heading={{t 'resources.session.credential.title'}}
               @icon='app-icons/credentials'
             >
               <:header>
-                <Rose::Dropdown @text={{t 'resources.session.credential.actions.detail'}}
+                <Rose::Dropdown
+                  @text={{t 'resources.session.credential.actions.detail'}}
                   @style='condensed'
-                  @dropdownRight={{true}} as |dropdown|>
-                    <dropdown.key-value>
-                      <:key>{{t 'form.id.label'}}</:key>
-                      <:value>cl_nbv9375hLHs</:value>
-                    </dropdown.key-value>
-                    <dropdown.key-value>
-                      <:key>{{t 'form.name.label'}}</:key>
-                      <:value>Key/Value</:value>
-                    </dropdown.key-value>
-                    <dropdown.key-value>
-                      <:key>{{t 'form.description.label'}}</:key>
-                      <:value>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ut nobis, nemo cum omnis saepe reprehenderit eaque non odit iste magni quod voluptatem soluta dolor beatae libero consequatur, perferendis rem molestias.</:value>
-                    </dropdown.key-value>
+                  @dropdownRight={{true}}
+                  as |dropdown|
+                >
+                  <dropdown.key-value>
+                    <:key>{{t 'form.id.label'}}</:key>
+                    <:value>cl_nbv9375hLHs</:value>
+                  </dropdown.key-value>
+                  <dropdown.key-value>
+                    <:key>{{t 'form.name.label'}}</:key>
+                    <:value>Key/Value</:value>
+                  </dropdown.key-value>
+                  <dropdown.key-value>
+                    <:key>{{t 'form.description.label'}}</:key>
+                    <:value>Lorem ipsum dolor, sit amet consectetur adipisicing
+                      elit. Ut nobis, nemo cum omnis saepe reprehenderit eaque
+                      non odit iste magni quod voluptatem soluta dolor beatae
+                      libero consequatur, perferendis rem molestias.</:value>
+                  </dropdown.key-value>
                 </Rose::Dropdown>
               </:header>
               <:body>
-                {{!-- TODO: Iterate through all credentials --}}
+                {{! TODO: Iterate through all credentials }}
                 <Rose::Table @style='condensed' as |table|>
                   <table.header as |header|>
                     <header.row as |row|>
@@ -144,13 +150,13 @@
               </Rose::Button>
             </div>
             <div>
-              {{!-- <Rose::LinkButton
+              {{! <Rose::LinkButton
               @route='scopes.scope.projects.sessions'
               @style='inline-link-action'
               @iconRight='chevron-right'
             >
               View sessions
-            </Rose::LinkButton> --}}
+            </Rose::LinkButton> }}
             </div>
           </:footer>
         </DialogDetail>

From 1f20e2c40c787bdd345492d8100ff22ead444fe9 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Wed, 23 Jun 2021 11:55:15 -0700
Subject: [PATCH 3/5] Fix padding proportions

---
 ui/desktop/app/styles/app.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 5aa212672..7e2357988 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -423,7 +423,7 @@ $chevron-down: url("data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%231
     border-bottom: sizing.rems(xxxxs) solid var(--ui-gray-subtler-3);
     display: flex;
     justify-content: space-between;
-    padding: sizing.rems(s) sizing.rems(m);
+    padding: sizing.rems(s) sizing.rems(s);
 
     h2 {
       @include type.type(s, normal);

From 48cc8596dcb5cd8710269fab795b6c563ab7febc Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Wed, 23 Jun 2021 13:48:51 -0700
Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Finish=20up=20some?=
 =?UTF-8?q?=20styles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Finish up some styles. Deleted old commented code and add a temporary
lint ignore comment for no-bare-strings in targets.hbs
---
 ui/desktop/app/styles/app.scss                | 10 +++-
 .../scopes/scope/projects/targets.hbs         | 57 ++-----------------
 2 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 7e2357988..4abf9c368 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -395,14 +395,20 @@ $chevron-down: url("data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%231
   }
 
   &:not([open]) {
+    .reveal-trigger-text-close {
+      background: $chevron-down no-repeat right center;
+      padding-right: sizing.rems(l);
+    }
+
     .reveal-trigger-text-open {
       display: none;
     }
   }
 
   &[open] {
-    .reveal-trigger {
-      background: url($chevron-up) no-repeat right center;
+    .reveal-trigger-text-open {
+      background: $chevron-up no-repeat right center;
+      padding-right: sizing.rems(l);
     }
 
     .reveal-trigger-text-close {
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index 54ee518d8..cf3eddfc4 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
@@ -1,3 +1,5 @@
+{{! template-lint-disable no-bare-strings  }}
+
 {{page-title (t 'resources.target.title_plural')}}
 
 {{#each @model as |target|}}
@@ -85,41 +87,6 @@
                   </table.body>
                 </Rose::Table>
               </:body>
-            </Card>
-            {{!--  <Rose::Separator />
-
-            <h3>Credentials</h3>
-
-            <Card @heading="Credentials" @icon='app-icons/credentials'>
-              <:header>
-                <Rose::Dropdown
-                  @style="condensed"
-                  @text="Credential library details"
-                  @showCaret={{true}}
-                  as |dropdown|
-                >
-                </Rose::Dropdown>
-              </:header>
-              <:body>
-                <Rose::Table @style='condensed' as |table|>
-                  <table.header as |header|>
-                    <header.row as |row|>
-                      <row.headerCell>Key</row.headerCell>
-                      <row.headerCell colspan='2'>Value</row.headerCell>
-                    </header.row>
-                  </table.header>
-                  <table.body as |body|>
-                    <body.row as |row|>
-                      <row.headerCell>foo</row.headerCell>
-                      <row.cell>Value</row.cell>
-                    </body.row>
-                    <body.row as |row|>
-                      <row.headerCell>ttl</row.headerCell>
-                      <row.cell>Test</row.cell>
-                    </body.row>
-                  </table.body>
-                </Rose::Table>
-              </:body>
               <:footer>
                 <Reveal
                   @textWhenOpen='Hide content'
@@ -127,18 +94,13 @@
                 >
                   <pre>
                     <code>
-  {
-    "auth": null,
-    "lease_duration": 3600,
-    "lease_id": "",
-    "renewable": false
-  }
+                      { "auth": null, "lease_duration": 3600, "lease_id": "",
+                      "renewable": false }
                     </code>
                   </pre>
                 </Reveal>
               </:footer>
-            </Card> --}}
-
+            </Card>
           </:body>
           <:footer>
             <div>
@@ -149,15 +111,6 @@
                 {{t 'actions.close'}}
               </Rose::Button>
             </div>
-            <div>
-              {{! <Rose::LinkButton
-              @route='scopes.scope.projects.sessions'
-              @style='inline-link-action'
-              @iconRight='chevron-right'
-            >
-              View sessions
-            </Rose::LinkButton> }}
-            </div>
           </:footer>
         </DialogDetail>
       {{/unless}}

From a83e6af6de52e6e87e304a3e96ba69be2d1e87f8 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Wed, 23 Jun 2021 14:08:01 -0700
Subject: [PATCH 5/5] Comment code with plain strings

---
 ui/desktop/app/templates/scopes/scope/projects/targets.hbs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index cf3eddfc4..5da77108f 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
@@ -1,5 +1,3 @@
-{{! template-lint-disable no-bare-strings  }}
-
 {{page-title (t 'resources.target.title_plural')}}
 
 {{#each @model as |target|}}
@@ -38,7 +36,7 @@
             {{! TODO: Conditional for when credentials aren't available
             older versions of cli }}
             <h3>{{t 'resources.session.credential.title_plural'}}</h3>
-            <Card
+            {{!-- <Card
               @heading={{t 'resources.session.credential.title'}}
               @icon='app-icons/credentials'
             >
@@ -100,7 +98,7 @@
                   </pre>
                 </Reveal>
               </:footer>
-            </Card>
+            </Card> --}}
           </:body>
           <:footer>
             <div>