From aea193c78d08e3aa55c94d1e7cccb33c4f12b96c Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Fri, 25 Jun 2021 10:12:56 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Conditionally=20show=20cr?=
 =?UTF-8?q?edential=20library=20name=20and=20desc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/translations/resources/en-us.yaml |  3 ++-
 .../scopes/scope/projects/targets.hbs         | 26 +++++++++++--------
 ui/desktop/electron-app/config/cli.js         |  4 +++
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index a23b80821..dd7ea9359 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -152,8 +152,9 @@ session:
     title_plural: Credentials
     secret:
       label: Secret
+    credential_library:
+      title: Credential Library
     actions:
-      detail: Credential library details
       raw-api:
         show: View raw API output
         hide: Hide raw API output
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index b4c0f1a7e..e26742ea1 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|}}
@@ -51,7 +49,9 @@
                 >
                   <:header>
                     <Rose::Dropdown
-                      @text={{t 'resources.session.credential.actions.detail'}}
+                      @text={{t
+                        'resources.session.credential.credential_library.title'
+                      }}
                       @style='condensed'
                       @dropdownRight={{true}}
                       @ignoreClickInside={{true}}
@@ -73,14 +73,18 @@
                         <:key>{{t 'form.type.label'}}</:key>
                         <:value>{{credential.library.type}}</:value>
                       </dropdown.key-value>
-                      <dropdown.key-value>
-                        <:key>{{t 'form.name.label'}}</:key>
-                        <:value>{{credential.library.name}}</:value>
-                      </dropdown.key-value>
-                      <dropdown.key-value>
-                        <:key>{{t 'form.description.label'}}</:key>
-                        <:value>{{credential.library.description}}</:value>
-                      </dropdown.key-value>
+                      {{#if credential.library.name}}
+                        <dropdown.key-value>
+                          <:key>{{t 'form.name.label'}}</:key>
+                          <:value>{{credential.library.name}}</:value>
+                        </dropdown.key-value>
+                      {{/if}}
+                      {{#if credential.library.description}}
+                        <dropdown.key-value>
+                          <:key>{{t 'form.description.label'}}</:key>
+                          <:value>{{credential.library.description}}</:value>
+                        </dropdown.key-value>
+                      {{/if}}
                     </Rose::Dropdown>
                   </:header>
                   <:body>
diff --git a/ui/desktop/electron-app/config/cli.js b/ui/desktop/electron-app/config/cli.js
index 22092de64..9af356e9e 100644
--- a/ui/desktop/electron-app/config/cli.js
+++ b/ui/desktop/electron-app/config/cli.js
@@ -48,6 +48,10 @@ const extract = (artifactPath, destination) => {
 
 module.exports = {
   setup: async () => {
+    if (process.env.BYPASS_CLI_SETUP) {
+      console.warn('WARNING: Bypassing cli setup');
+      return;
+    }
     const artifactPath = await downloadArtifact(artifactVersion);
     await extract(artifactPath, artifactDestination);
   }