Merge pull request #1652 from Spiteless/ts.1651

feat: Restore sort functionality in ProjectList
hackforla · May 31, 2024 · e67c2cd · e67c2cd
2 parents 0f625d8 + b5c431e
commit e67c2cd
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/client/src/pages/ProjectList.js b/client/src/pages/ProjectList.js
@@ -46,16 +46,21 @@ export default function ProjectList() {
 
         if(user?.accessLevel === 'admin') {
           projectData = await projectApiService.fetchProjects();
-          setProjects(projectData);
         }
 
         // if user is not admin, but is a project manager, only show projects they manage
         if (user?.accessLevel !== 'admin' && user?.managedProjects.length > 0) {
           projectData = await projectApiService.fetchPMProjects(user.managedProjects);
-          setProjects(projectData);
         }
-      }
+
+        //sort the projects alphabetically
+        projectData = projectData.sort((a, b) =>
+          a.name?.localeCompare(b.name)
+        );
 
+        setProjects(projectData);
+      }
+
       fetchAllProjects();
     },
     [projectApiService, user.accessLevel, user.managedProjects]