From 27bb1f8cf64ed5f921a452b390187139e5d4f922 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 5 Oct 2020 10:47:59 -0400
Subject: [PATCH 1/5] fix: Update target form name to show it's required status

---
 ui/core/app/components/form/target/index.hbs | 4 ++--
 ui/core/translations/form/en-us.yaml         | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/core/app/components/form/target/index.hbs b/ui/core/app/components/form/target/index.hbs
index 20627adef..e3dfac4ad 100644
--- a/ui/core/app/components/form/target/index.hbs
+++ b/ui/core/app/components/form/target/index.hbs
@@ -17,8 +17,8 @@
     @name="name"
     @type="text"
     @value={{@model.name}}
-    @label={{t "form.name.label"}}
-    @helperText={{t "form.name.help"}}
+    @label={{t "form.name.required.label"}}
+    @helperText={{t "form.name.required.help"}}
     @error={{@model.errors.name}}
   as |field|>
     {{#if @model.errors.name}}
diff --git a/ui/core/translations/form/en-us.yaml b/ui/core/translations/form/en-us.yaml
index 09f562a66..5ad95e39b 100644
--- a/ui/core/translations/form/en-us.yaml
+++ b/ui/core/translations/form/en-us.yaml
@@ -3,6 +3,9 @@ id:
 name:
   label: Name
   help: Optional name for identification purposes
+  required:
+    label: Name
+    help: Name is required for identification purposes
 description:
   label: Description
   help: Optional description for identification purposes

From d4b63d92978c49de0b1e4c22ddc458819ff62a88 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 5 Oct 2020 11:03:05 -0400
Subject: [PATCH 2/5] fix: User account ids should be copyable

---
 .../app/templates/scopes/scope/users/user/accounts.hbs    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
index 66c808da9..8e0715fa5 100644
--- a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
@@ -17,7 +17,13 @@
             {{account.username}}
           </row.headerCell>
           <row.cell>
-            <code>{{account.id}}</code>
+            <Copyable
+              @text={{account.id}}
+              @buttonText={{t "actions.copy-to-clipboard"}}
+              @acknowledgeText={{t "states.copied"}}
+            >
+              <code>{{account.id}}</code>
+            </Copyable>
           </row.cell>
             <row.cell>
             <Rose::Dropdown

From fbfa45aaa8aff64f64a1e3b75b79bb17f3af7dd6 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 5 Oct 2020 11:16:45 -0400
Subject: [PATCH 3/5] fix: Remove "optional" from all form helper text

---
 ui/core/app/components/form/target/index.hbs | 4 ++--
 ui/core/translations/form/en-us.yaml         | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ui/core/app/components/form/target/index.hbs b/ui/core/app/components/form/target/index.hbs
index e3dfac4ad..20627adef 100644
--- a/ui/core/app/components/form/target/index.hbs
+++ b/ui/core/app/components/form/target/index.hbs
@@ -17,8 +17,8 @@
     @name="name"
     @type="text"
     @value={{@model.name}}
-    @label={{t "form.name.required.label"}}
-    @helperText={{t "form.name.required.help"}}
+    @label={{t "form.name.label"}}
+    @helperText={{t "form.name.help"}}
     @error={{@model.errors.name}}
   as |field|>
     {{#if @model.errors.name}}
diff --git a/ui/core/translations/form/en-us.yaml b/ui/core/translations/form/en-us.yaml
index 5ad95e39b..1c91e98f5 100644
--- a/ui/core/translations/form/en-us.yaml
+++ b/ui/core/translations/form/en-us.yaml
@@ -2,13 +2,10 @@ id:
   label: ID
 name:
   label: Name
-  help: Optional name for identification purposes
-  required:
-    label: Name
-    help: Name is required for identification purposes
+  help: Name for identification purposes
 description:
   label: Description
-  help: Optional description for identification purposes
+  help: Description for identification purposes
 type:
   label: Type
   help: The type of the resource, to help differentiate schemas

From f5c3c6e3916c54bf24ac379486720fd694132ca2 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 5 Oct 2020 11:44:42 -0400
Subject: [PATCH 4/5] fix: Update user accounts table name from 'username' to
 'name

---
 ui/core/app/templates/scopes/scope/users/user/accounts.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
index 8e0715fa5..e89dd285b 100644
--- a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
@@ -5,7 +5,7 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.headerCell>{{t 'form.username.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
         <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
         <row.headerCell>{{t "titles.actions"}}</row.headerCell>
       </header.row>
@@ -14,7 +14,7 @@
       {{#each @model.accounts as |account|}}
         <body.row as |row|>
           <row.headerCell>
-            {{account.username}}
+            {{account.displayName}}
           </row.headerCell>
           <row.cell>
             <Copyable

From 509b3f71dc9dcdbc9f175b486289556234cfe70f Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 5 Oct 2020 13:05:36 -0400
Subject: [PATCH 5/5] fix: Update user account columns to show name and
 username

---
 ui/core/app/templates/scopes/scope/users/user/accounts.hbs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
index e89dd285b..e011e4fd1 100644
--- a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
@@ -6,6 +6,7 @@
     <table.header as |header|>
       <header.row as |row|>
         <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+        <row.headerCell>{{t 'form.username.label'}}</row.headerCell>
         <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
         <row.headerCell>{{t "titles.actions"}}</row.headerCell>
       </header.row>
@@ -15,7 +16,11 @@
         <body.row as |row|>
           <row.headerCell>
             {{account.displayName}}
+            <p>{{account.description}}</p>
           </row.headerCell>
+          <row.cell>
+            {{account.username}}
+          </row.cell>
           <row.cell>
             <Copyable
               @text={{account.id}}