From e8e83d979b852274d90f8df62a0dcc2713d30b60 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Mon, 28 Jun 2021 12:50:39 -0400 Subject: [PATCH 1/2] fix: Use name in connect header -Remove credential purpose UI --- addons/api/addon/models/session.js | 2 -- addons/api/mirage/scenarios/ipc.js | 4 ---- .../app/templates/scopes/scope/projects/targets.hbs | 11 ++++------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/addons/api/addon/models/session.js b/addons/api/addon/models/session.js index 7ec468630..406c10c6c 100644 --- a/addons/api/addon/models/session.js +++ b/addons/api/addon/models/session.js @@ -44,7 +44,6 @@ class SessionCredential { // =attributes rawCredential; library; - purpose; #rawSecretValue; /** @@ -69,7 +68,6 @@ class SessionCredential { this.library = new SessionCredential.Library(id, name, description, type); this.#rawSecretValue = cred.secret; this.rawCredential = cred; - this.purpose = cred.purpose; } } diff --git a/addons/api/mirage/scenarios/ipc.js b/addons/api/mirage/scenarios/ipc.js index 86ffbe83e..a255cff3d 100644 --- a/addons/api/mirage/scenarios/ipc.js +++ b/addons/api/mirage/scenarios/ipc.js @@ -67,7 +67,6 @@ export default function initializeMockIPC(server) { credential_store_id: 'csvlt_Q1HFGt7Jpm', type: 'vault', }, - purpose: 'application', secret: 'just-a-random-string', }, { @@ -78,7 +77,6 @@ export default function initializeMockIPC(server) { credential_store_id: 'csvlt_Q1HFGt7Jpm', type: 'vault', }, - purpose: 'ingress', secret: { key1: 'value 1', key2: true, @@ -93,7 +91,6 @@ export default function initializeMockIPC(server) { credential_store_id: 'csvlt_Q1HFGt7Jpm', type: 'vault', }, - purpose: 'application', secret: 'just-a-random-string', }, { @@ -104,7 +101,6 @@ export default function initializeMockIPC(server) { credential_store_id: 'csvlt_Q1HFGt7Jpm', type: 'vault', }, - purpose: 'egress', secret: { key1: 'value 1', key2: true, diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs index f8929d6a0..5b84f3d5b 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs @@ -41,7 +41,10 @@ @@ -71,12 +74,6 @@ <:key>{{t 'form.type.label'}} <:value>{{credential.library.type}} - {{#if credential.library.name}} - - <:key>{{t 'form.name.label'}} - <:value>{{credential.library.name}} - - {{/if}} {{#if credential.library.description}} <:key>{{t 'form.description.label'}} From d61867ab10c5f0f0e7a7460c09e92e786e666fde Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Mon, 28 Jun 2021 15:09:34 -0400 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Display=20creden?= =?UTF-8?q?tial=20name=20in=20dropdown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scopes/scope/projects/targets.hbs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs index 5b84f3d5b..1f0b434ef 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs @@ -39,13 +39,11 @@ {{#each session.credentials as |credential|}} <:header> @@ -74,6 +72,12 @@ <:key>{{t 'form.type.label'}} <:value>{{credential.library.type}} + {{#if credential.library.name}} + + <:key>{{t 'form.name.label'}} + <:value>{{credential.library.name}} + + {{/if}} {{#if credential.library.description}} <:key>{{t 'form.description.label'}}