From 7103f9f44efb17b2decc290b65c966a754d81b0c Mon Sep 17 00:00:00 2001
From: Kenia <19161242+kaxcode@users.noreply.github.com>
Date: Tue, 11 May 2021 11:35:15 -0400
Subject: [PATCH] ui: Add conditionals to Lock Session list items (#10121)

* Add conditionals to Lock Session list items

* Add changelog

* Show ID in details if there is a name to go in title

* Add copy-button if ID is in the title

* Update TTL conditional

* Update .changelog/10121.txt

Co-authored-by: John Cowen <johncowen@users.noreply.github.com>

Co-authored-by: John Cowen <johncowen@users.noreply.github.com>
---
 .changelog/10121.txt                             |  3 +++
 .../consul/lock-session/list/index.hbs           | 16 ++++++++++++++++
 .../app/styles/components/composite-row.scss     |  1 -
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 .changelog/10121.txt

diff --git a/.changelog/10121.txt b/.changelog/10121.txt
new file mode 100644
index 000000000..be1e3250f
--- /dev/null
+++ b/.changelog/10121.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Add conditionals to lock sessions tab
+```
diff --git a/ui/packages/consul-ui/app/components/consul/lock-session/list/index.hbs b/ui/packages/consul-ui/app/components/consul/lock-session/list/index.hbs
index d0dcd35ac..4957468e5 100644
--- a/ui/packages/consul-ui/app/components/consul/lock-session/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/lock-session/list/index.hbs
@@ -1,9 +1,20 @@
 {{#if (gt items.length 0)}}
 <ListCollection @items={{items}} class="consul-lock-session-list" as |item index|>
   <BlockSlot @name="header">
+  {{#if item.Name}}
     <span>{{item.Name}}</span>
+  {{else}}
+    <span>
+      {{item.ID}}
+      <CopyButton
+        @value={{item.ID}}
+        @name="ID"
+      />
+    </span>
+  {{/if}}
   </BlockSlot>
   <BlockSlot @name="details">
+    {{#if item.Name}}
     <dl>
       <dt>
         <CopyButton
@@ -13,6 +24,7 @@
       </dt>
       <dd>{{item.ID}}</dd>
     </dl>
+    {{/if}}
     <dl class="lock-delay">
       <dt>
         <Tooltip>
@@ -27,7 +39,11 @@
           TTL
         </Tooltip>
       </dt>
+    {{#if (eq item.TTL "")}}
+      <dd data-test-session-ttl={{item.TTL}}>-</dd>
+    {{else}}
       <dd data-test-session-ttl={{item.TTL}}>{{item.TTL}}</dd>
+    {{/if}}
     </dl>
     <dl class="behavior">
       <dt>
diff --git a/ui/packages/consul-ui/app/styles/components/composite-row.scss b/ui/packages/consul-ui/app/styles/components/composite-row.scss
index 40cf5f036..c971cd240 100644
--- a/ui/packages/consul-ui/app/styles/components/composite-row.scss
+++ b/ui/packages/consul-ui/app/styles/components/composite-row.scss
@@ -57,7 +57,6 @@
   margin-left: 4px;
 }
 %composite-row-detail .copy-button {
-  margin-right: 4px;
   margin-top: 2px;
 }
 %composite-row .copy-button button {