From c174762a74940af7d85b498f1cf5d28d641e000a Mon Sep 17 00:00:00 2001
From: Don Walizer <12420708+dwalizer@users.noreply.github.com>
Date: Wed, 22 Nov 2023 14:24:13 -0500
Subject: [PATCH] #2474 Make full name optional

---
 dashboard/src/components/access/RevokeUserAccess.vue | 12 ++++++------
 .../metrics/skill/PostAchievementUsersTable.vue      |  2 +-
 .../src/components/users/UserIdForDisplayMixin.vue   | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dashboard/src/components/access/RevokeUserAccess.vue b/dashboard/src/components/access/RevokeUserAccess.vue
index 9566008d7e..071e9d52f1 100644
--- a/dashboard/src/components/access/RevokeUserAccess.vue
+++ b/dashboard/src/components/access/RevokeUserAccess.vue
@@ -40,7 +40,7 @@ limitations under the License.
                       tableStoredStateId="privateProjectUsersTable"
                       data-cy="privateProjectUsersTable">
         <template v-slot:cell(userId)="data">
-          {{ getUserDisplay(data.item) }}
+          {{ getUserDisplay(data.item, true) }}
 
           <b-button-group class="float-right">
             <b-button @click="revokeAccess(data.value, getUserDisplay(data.item))"
@@ -166,23 +166,23 @@ limitations under the License.
           }
         });
       },
-      getUserDisplay(props) {
+      getUserDisplay(props, fullName = false) {
         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 (fullName && 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)} ${userName}`;
+              return `${userDisplay.substr(0, indexOfDash)}${userName}`;
             }
           }
         }
-        return `${userDisplay} ${userName}`;
+        return `${userDisplay}${userName}`;
       },
     },
   };
diff --git a/dashboard/src/components/metrics/skill/PostAchievementUsersTable.vue b/dashboard/src/components/metrics/skill/PostAchievementUsersTable.vue
index c25b18b52b..8ded88df66 100644
--- a/dashboard/src/components/metrics/skill/PostAchievementUsersTable.vue
+++ b/dashboard/src/components/metrics/skill/PostAchievementUsersTable.vue
@@ -27,7 +27,7 @@ limitations under the License.
                           @page-size-changed="pageSizeChanged"
                           @sort-changed="sortTable">
         <template v-slot:cell(userId)="data">
-          {{ getUserDisplay(data.item) }}
+          {{ getUserDisplay(data.item, true) }}
 
           <b-button-group class="float-right">
             <b-button :to="calculateClientDisplayRoute(data.item)"
diff --git a/dashboard/src/components/users/UserIdForDisplayMixin.vue b/dashboard/src/components/users/UserIdForDisplayMixin.vue
index be149a4bb6..12c497bbcc 100644
--- a/dashboard/src/components/users/UserIdForDisplayMixin.vue
+++ b/dashboard/src/components/users/UserIdForDisplayMixin.vue
@@ -17,23 +17,23 @@ limitations under the License.
   export default {
     name: 'UserIdForDisplayMixin',
     methods: {
-      getUserDisplay(props) {
+      getUserDisplay(props, fullName = false) {
         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 (fullName && 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)} ${userName}`;
+              return `${userDisplay.substr(0, indexOfDash)}${userName}`;
             }
           }
         }
-        return `${userDisplay} ${userName}`;
+        return `${userDisplay}${userName}`;
       },
     },
   };