Merge pull request #809 from classtranscribe/hd/improve-admin-instruc…

…tor-list-name-formatting Improve Instructor List Admin Page formatting to check lastName before outputting unknown (Closes #808)
classtranscribe · Jun 2, 2024 · 6e3ffcb · 6e3ffcb
2 parents ec8c00a + d8ba902
commit 6e3ffcb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/screens/Admin/Instructors/InstructorList.jsx b/src/screens/Admin/Instructors/InstructorList.jsx
@@ -29,6 +29,14 @@ export default function InstructorList({ instructors, loading, currUni, onInacti
     setSearchText('');
   };
 
+  const formatInstructorName = (instructor) => {
+    if (!(instructor.firstName || instructor.lastName)) {
+      return "Unknown"; 
+    }
+
+    return `${instructor.firstName || ''} ${instructor.lastName || ''}`.trim();;
+  }
+
   return (
     <>
       <div className="filter">
@@ -48,7 +56,7 @@ export default function InstructorList({ instructors, loading, currUni, onInacti
       </div>
       {result.map((inst) => (
         <AdminListItem
-          header={`${inst.firstName || 'Unknown'} ${inst.lastName || ''}`}
+          header={formatInstructorName(inst)}
           path="instructor"
           inactive={() => onInactive(inst.email)}
           loading={loading}

diff --git a/src/screens/Admin/Instructors/InstructorList.test.js b/src/screens/Admin/Instructors/InstructorList.test.js
@@ -34,7 +34,7 @@ describe('Instructor List', () => {
 
         expect(screen.getByText("Harsh Deep")).toBeVisible();
         expect(screen.getByText("Alan")).toBeVisible();
-        expect(screen.getByText("Unknown Turing")).toBeVisible(); 
+        expect(screen.getByText("Turing")).toBeVisible(); 
 
         expect(screen.getByText("Email: [email protected]")).toBeVisible();
         expect(screen.getByText("Email: [email protected]")).toBeVisible();
@@ -61,7 +61,7 @@ describe('Instructor List', () => {
         await userEvent.click(searchButton);
 
         expect(numberOfInstructors()).toBe(1);
-        expect(screen.getByText("Unknown Turing")).toBeVisible();
+        expect(screen.getByText("Turing")).toBeVisible();
 
         // Email
         await userEvent.clear(searchField);