From 0590b96d2be6de0052dbff2a264d3856c46d3338 Mon Sep 17 00:00:00 2001
From: Jae Yun Kim <jaeyk14@uci.edu>
Date: Sun, 11 Jan 2026 01:49:01 -0800
Subject: [PATCH] Initial commit

---
 .../component/admin/user/admin-user.component.html          | 6 +++++-
 .../dashboard/component/admin/user/admin-user.component.ts  | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/dashboard/component/admin/user/admin-user.component.html b/frontend/src/app/dashboard/component/admin/user/admin-user.component.html
index e3f3d5a2ec7..77d12b84458 100644
--- a/frontend/src/app/dashboard/component/admin/user/admin-user.component.html
+++ b/frontend/src/app/dashboard/component/admin/user/admin-user.component.html
@@ -69,7 +69,11 @@
             nzType="search"></span>
         </nz-filter-trigger>
       </th>
-      <th>Affiliation</th>
+      <th
+        [nzSortFn]="sortByAffiliation"
+        [nzSortDirections]="['ascend', 'descend']">
+        Affiliation
+      </th>
       <th
         [nzSortFn]="sortByComment"
         [nzSortDirections]="['ascend', 'descend']"
diff --git a/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts b/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
index 30545117cce..345737df37c 100644
--- a/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
+++ b/frontend/src/app/dashboard/component/admin/user/admin-user.component.ts
@@ -187,6 +187,11 @@ export class AdminUserComponent implements OnInit {
     return compare === 0 ? a.uid - b.uid : compare;
   };
 
+  public sortByAffiliation: NzTableSortFn<User> = (a: User, b: User) => {
+    const compare = (b.affiliation || "").localeCompare(a.affiliation || "");
+    return compare === 0 ? a.uid - b.uid : compare;
+  };
+
   reset(): void {
     this.nameSearchValue = "";
     this.emailSearchValue = "";