From faf295d7f28227b644cc67390c33df4b1a9f583c Mon Sep 17 00:00:00 2001
From: nixocio <nixocio@gmail.com>
Date: Mon, 12 Jul 2021 10:36:30 -0400
Subject: [PATCH] Update User screens

* Add `modified` field to user endpoints. The API returns the last login
date as the `modified` field to the users.
* Add modified to user details.
* Modify user form layout to be as per mockups.
* Remove `last name` and  `first name` from user row, since it is
already on the column title.

closes: https://github.com/ansible/awx/issues/5687
closes: https://github.com/ansible/awx/issues/9564
---
 awx/api/serializers.py                        |  1 -
 .../screens/User/UserDetail/UserDetail.jsx    | 10 ++--
 .../User/UserDetail/UserDetail.test.jsx       |  1 +
 .../screens/User/UserList/UserListItem.jsx    | 14 +----
 awx/ui_next/src/screens/User/data.user.json   |  1 +
 .../src/screens/User/shared/UserForm.jsx      | 52 ++++++++++---------
 6 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index ab91385d44..693faa3cbc 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -948,7 +948,6 @@ class UserSerializer(BaseSerializer):
             '*',
             '-name',
             '-description',
-            '-modified',
             'username',
             'first_name',
             'last_name',
diff --git a/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx b/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
index 46dff656f3..546fdee97b 100644
--- a/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
+++ b/awx/ui_next/src/screens/User/UserDetail/UserDetail.jsx
@@ -22,6 +22,7 @@ function UserDetail({ user }) {
     last_name,
     last_login,
     created,
+    modified,
     is_superuser,
     is_system_auditor,
     summary_fields,
@@ -56,14 +57,14 @@ function UserDetail({ user }) {
   return (
     <CardBody>
       <DetailList>
+        <Detail label={t`First Name`} value={`${first_name}`} />
+        <Detail label={t`Last Name`} value={`${last_name}`} />
+        <Detail label={t`Email`} value={email} />
         <Detail
           label={t`Username`}
           value={username}
           dataCy="user-detail-username"
         />
-        <Detail label={t`Email`} value={email} />
-        <Detail label={t`First Name`} value={`${first_name}`} />
-        <Detail label={t`Last Name`} value={`${last_name}`} />
         <Detail label={t`User Type`} value={`${user_type}`} />
         {userAuthType && (
           <Detail
@@ -75,6 +76,9 @@ function UserDetail({ user }) {
           <Detail label={t`Last Login`} value={formatDateString(last_login)} />
         )}
         <Detail label={t`Created`} value={formatDateString(created)} />
+        {modified && (
+          <Detail label={t`Last Modified`} value={formatDateString(modified)} />
+        )}
       </DetailList>
       <CardActionsRow>
         {summary_fields.user_capabilities &&
diff --git a/awx/ui_next/src/screens/User/UserDetail/UserDetail.test.jsx b/awx/ui_next/src/screens/User/UserDetail/UserDetail.test.jsx
index 73389dd726..bee41eb8bd 100644
--- a/awx/ui_next/src/screens/User/UserDetail/UserDetail.test.jsx
+++ b/awx/ui_next/src/screens/User/UserDetail/UserDetail.test.jsx
@@ -30,6 +30,7 @@ describe('<UserDetail />', () => {
     assertDetail('User Type', 'System Administrator');
     assertDetail('Last Login', `11/4/2019, 11:12:36 PM`);
     assertDetail('Created', `10/28/2019, 3:01:07 PM`);
+    assertDetail('Last Modified', `7/12/2021, 7:08:33 PM`);
     assertDetail('Type', `SOCIAL`);
   });
 
diff --git a/awx/ui_next/src/screens/User/UserList/UserListItem.jsx b/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
index 9c0eb312ae..d478f1a5c7 100644
--- a/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
@@ -51,20 +51,10 @@ function UserListItem({ user, isSelected, onSelect, detailUrl, rowIndex }) {
         )}
       </Td>
       <Td dataLabel={t`First Name`}>
-        {user.first_name && (
-          <Fragment>
-            <b css="margin-right: 24px">{t`First Name`}</b>
-            {user.first_name}
-          </Fragment>
-        )}
+        {user.first_name && <Fragment>{user.first_name}</Fragment>}
       </Td>
       <Td dataLabel={t`Last Name`}>
-        {user.last_name && (
-          <Fragment>
-            <b css="margin-right: 24px">{t`Last Name`}</b>
-            {user.last_name}
-          </Fragment>
-        )}
+        {user.last_name && <Fragment>{user.last_name}</Fragment>}
       </Td>
       <Td dataLabel={t`Role`}>{user_type}</Td>
       <ActionsTd dataLabel={t`Actions`}>
diff --git a/awx/ui_next/src/screens/User/data.user.json b/awx/ui_next/src/screens/User/data.user.json
index c9d598f47c..fe68338444 100644
--- a/awx/ui_next/src/screens/User/data.user.json
+++ b/awx/ui_next/src/screens/User/data.user.json
@@ -22,6 +22,7 @@
       }
   },
   "created": "2019-10-28T15:01:07.218634Z",
+  "modified": "2021-07-12T19:08:33.947072Z",
   "username": "admin",
   "first_name": "Admin",
   "last_name": "User",
diff --git a/awx/ui_next/src/screens/User/shared/UserForm.jsx b/awx/ui_next/src/screens/User/shared/UserForm.jsx
index 60ffd35d36..994f780862 100644
--- a/awx/ui_next/src/screens/User/shared/UserForm.jsx
+++ b/awx/ui_next/src/screens/User/shared/UserForm.jsx
@@ -59,6 +59,19 @@ function UserFormFields({ user }) {
 
   return (
     <>
+      <FormField
+        id="user-first-name"
+        label={t`First Name`}
+        name="first_name"
+        type="text"
+      />
+      <FormField
+        id="user-last-name"
+        label={t`Last Name`}
+        name="last_name"
+        type="text"
+      />
+      <FormField id="user-email" label={t`Email`} name="email" type="text" />
       <FormField
         id="user-username"
         label={t`Username`}
@@ -69,7 +82,6 @@ function UserFormFields({ user }) {
         }
         isRequired={!ldapUser && !externalAccount}
       />
-      <FormField id="user-email" label={t`Email`} name="email" type="text" />
       {!ldapUser && !(socialAuthUser && externalAccount) && (
         <>
           <PasswordField
@@ -96,30 +108,7 @@ function UserFormFields({ user }) {
           />
         </>
       )}
-      <FormField
-        id="user-first-name"
-        label={t`First Name`}
-        name="first_name"
-        type="text"
-      />
-      <FormField
-        id="user-last-name"
-        label={t`Last Name`}
-        name="last_name"
-        type="text"
-      />
-      {!user.id && (
-        <OrganizationLookup
-          helperTextInvalid={organizationMeta.error}
-          isValid={!organizationMeta.touched || !organizationMeta.error}
-          onBlur={() => organizationHelpers.setTouched()}
-          onChange={handleOrganizationUpdate}
-          value={organizationField.value}
-          required
-          autoPopulate={!user?.id}
-          validate={required(t`Select a value for this field`)}
-        />
-      )}
+
       {me.is_superuser && (
         <FormGroup
           fieldId="user-type"
@@ -138,6 +127,19 @@ function UserFormFields({ user }) {
           />
         </FormGroup>
       )}
+
+      {!user.id && (
+        <OrganizationLookup
+          helperTextInvalid={organizationMeta.error}
+          isValid={!organizationMeta.touched || !organizationMeta.error}
+          onBlur={() => organizationHelpers.setTouched()}
+          onChange={handleOrganizationUpdate}
+          value={organizationField.value}
+          required
+          autoPopulate={!user?.id}
+          validate={required(t`Select a value for this field`)}
+        />
+      )}
     </>
   );
 }