From 36ec06b06b5274c560e50fa86b7918d3c7267f49 Mon Sep 17 00:00:00 2001
From: Fang Lin <fanglin@uw.edu>
Date: Mon, 10 Jul 2023 13:15:04 -0700
Subject: [PATCH] Fix/muwm 5277 (#2964)

Resolve MUWM-5277
---
 .../_common/course/student/course-eval.vue          |  4 ++--
 myuw_vue/components/profile/user-name.vue           |  4 ++--
 .../teaching/course/grading/delegates.vue           | 11 ++++++++++-
 .../teaching/course/grading/instructors.vue         | 13 +++++++++++--
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/myuw_vue/components/_common/course/student/course-eval.vue b/myuw_vue/components/_common/course/student/course-eval.vue
index 2cdd0b5a8c..39a4159e72 100644
--- a/myuw_vue/components/_common/course/student/course-eval.vue
+++ b/myuw_vue/components/_common/course/student/course-eval.vue
@@ -36,7 +36,7 @@
               :key="`${section.id}-eval-inst-${index}`"
               class="mb-2"
             >
-              <strong>{{ titleCaseName(instructor.instructor_name) }}</strong>
+              <strong>{{ instructor.instructor_name }}</strong>
               <div v-if="hasTitle(instructor)" class="fst-italic text-muted">
                 {{ instructor.instructor_title }}
               </div>
@@ -52,7 +52,7 @@
               <a
                 v-out="'Evaluate instructor'"
                 :href="evalObj.url">
-                {{ titleCaseName(instructor.instructor_name) }}
+                {{ instructor.instructor_name }}
               </a>
               <div v-if="hasTitle(instructor)"
                    class="fst-italic text-muted mb-2"
diff --git a/myuw_vue/components/profile/user-name.vue b/myuw_vue/components/profile/user-name.vue
index 8895c2afa3..f6f6d65536 100644
--- a/myuw_vue/components/profile/user-name.vue
+++ b/myuw_vue/components/profile/user-name.vue
@@ -3,7 +3,7 @@
     <template #panel-body>
       <h2 class="h4 mb-3">
         <span>
-            {{ titleCaseName(name) }}
+            {{ name }}
           <span v-if="hasPronouns" class="myuw-text-md text-uppercase" title="Pronouns">
             ({{ titleCaseName(pronouns) }})
           </span>
@@ -41,7 +41,7 @@ export default {
       return Boolean(this.pronouns && this.pronouns.length);
     },
     name() {
-      return this.displayName ? this.displayName : this.fullName;
+      return this.displayName ? this.displayName : this.fullName;   // MUWM-5134
     },
   },
   mounted() {
diff --git a/myuw_vue/components/teaching/course/grading/delegates.vue b/myuw_vue/components/teaching/course/grading/delegates.vue
index 7a3276237a..4c4386c6d9 100644
--- a/myuw_vue/components/teaching/course/grading/delegates.vue
+++ b/myuw_vue/components/teaching/course/grading/delegates.vue
@@ -9,7 +9,7 @@
         :key="i"
         :class="{ 'mb-1': i === section.grade_submission_delegates.length + 1 }"
       >
-        {{ titleCaseName(delegate.person.display_name) }}
+        {{ delegateDisplayName(delegate.person) }}
         ({{ titleCaseWord(delegate.level) }})
       </li>
     </ul>
@@ -78,5 +78,14 @@ export default {
       };
     },
   },
+  methods: {
+    delegateDisplayName(delegate) {
+      // MUWM-5277
+      if (delegate.display_name) {
+        return delegate.display_name;
+      }
+      return delegate.full_name;
+    },
+  },
 };
 </script>
diff --git a/myuw_vue/components/teaching/course/grading/instructors.vue b/myuw_vue/components/teaching/course/grading/instructors.vue
index 285ce824bb..c186bacca8 100644
--- a/myuw_vue/components/teaching/course/grading/instructors.vue
+++ b/myuw_vue/components/teaching/course/grading/instructors.vue
@@ -10,7 +10,7 @@
         <template #collapsed-body>
           <ul class="list-unstyled mb-0">
             <li v-for="(instructor, i) in section.instructors" :key="i" class="mb-1">
-              {{ titleCaseName(instructor.display_name) }}
+              {{ instructorDisplayName(instructor) }}
             </li>
           </ul>
         </template>
@@ -18,7 +18,7 @@
 
       <ul v-else class="list-unstyled mb-0">
         <li v-for="(instructor, i) in section.instructors" :key="i" class="mb-1">
-          {{ titleCaseName(instructor.display_name) }}
+          {{ instructorDisplayName(instructor) }}
         </li>
       </ul>
     </div>
@@ -75,5 +75,14 @@ export default {
       };
     },
   },
+  methods: {
+    instructorDisplayName(instructor) {
+      // MUWM-5277
+      if (instructor.display_name) {
+        return instructor.display_name;
+      }
+      return instructor.full_name;
+    },
+  },
 };
 </script>