#2474 Modify display of user information, modify tests

NationalSecurityAgency · Nov 21, 2023 · dd1af4e · dd1af4e
1 parent e52fc99
commit dd1af4e
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 100 deletions.
diff --git a/dashboard/src/components/access/RevokeUserAccess.vue b/dashboard/src/components/access/RevokeUserAccess.vue
@@ -84,17 +84,7 @@ limitations under the License.
             fields: [
               {
                 key: 'userId',
-                label: 'User Id',
-                sortable: true,
-              },
-              {
-                key: 'firstName',
-                label: 'First Name',
-                sortable: true,
-              },
-              {
-                key: 'lastName',
-                label: 'Last Name',
+                label: 'User',
                 sortable: true,
               },
             ],
@@ -179,16 +169,21 @@ limitations under the License.
       getUserDisplay(props) {
         const userDisplay = props.userIdForDisplay ? props.userIdForDisplay : props.userId;
         const { oAuthProviders } = this.$store.getters.config;
+        let userName = '';
+        console.log(props);
+        if (props.firstName && props.lastName) {
+          userName = `(${props.lastName}, ${props.firstName})`;
+        }
         if (oAuthProviders) {
           const indexOfDash = userDisplay.lastIndexOf('-');
           if (indexOfDash > 0) {
             const provider = userDisplay.substr(indexOfDash + 1);
             if (oAuthProviders.includes(provider)) {
-              return userDisplay.substr(0, indexOfDash);
+              return `${userDisplay.substr(0, indexOfDash)} ${userName}`;
             }
           }
         }
-        return userDisplay;
+        return `${userDisplay} ${userName}`;
       },
     },
   };

diff --git a/dashboard/src/components/users/UserIdForDisplayMixin.vue b/dashboard/src/components/users/UserIdForDisplayMixin.vue
@@ -18,18 +18,23 @@ limitations under the License.
     name: 'UserIdForDisplayMixin',
     methods: {
       getUserDisplay(props) {
+        console.log(props);
         const userDisplay = props.userIdForDisplay ? props.userIdForDisplay : props.userId;
         const { oAuthProviders } = this.$store.getters.config;
+        let userName = '';
+        if (props.firstName && props.lastName) {
+          userName = `(${props.lastName}, ${props.firstName})`;
+        }
         if (oAuthProviders) {
           const indexOfDash = userDisplay.lastIndexOf('-');
           if (indexOfDash > 0) {
             const provider = userDisplay.substr(indexOfDash + 1);
             if (oAuthProviders.includes(provider)) {
-              return userDisplay.substr(0, indexOfDash);
+              return `${userDisplay.substr(0, indexOfDash)} ${userName}`;
             }
           }
         }
-        return userDisplay;
+        return `${userDisplay} ${userName}`;
       },
     },
   };

diff --git a/dashboard/src/components/users/UsersTable.vue b/dashboard/src/components/users/UsersTable.vue
@@ -156,17 +156,7 @@ limitations under the License.
             fields: [
               {
                 key: 'userId',
-                label: 'User Id',
-                sortable: true,
-              },
-              {
-                key: 'firstName',
-                label: 'First Name',
-                sortable: true,
-              },
-              {
-                key: 'lastName',
-                label: 'Last Name',
+                label: 'User',
                 sortable: true,
               },
               {

diff --git a/e2e-tests/cypress/e2e/selfReport_spec.js b/e2e-tests/cypress/e2e/selfReport_spec.js
@@ -1068,35 +1068,35 @@ describe('Self Report Skills Management Tests', () => {
                 colIndex: 0,
                 value: 'user0'
             }, {
-                colIndex: 4,
+                colIndex: 2,
                 value: '100'
             }],
             [{
                 colIndex: 0,
                 value: 'user1'
             }, {
-                colIndex: 4,
+                colIndex: 2,
                 value: '100'
             }],
             [{
                 colIndex: 0,
                 value: 'user2'
             }, {
-                colIndex: 4,
+                colIndex: 2,
                 value: '100'
             }],
             [{
                 colIndex: 0,
                 value: 'user3'
             }, {
-                colIndex: 4,
+                colIndex: 2,
                 value: '100'
             }],
             [{
                 colIndex: 0,
                 value: 'user4'
             }, {
-                colIndex: 4,
+                colIndex: 2,
                 value: '100'
             }],
         ]);