From 2b95c786d82c8c8c51672be8ae3eff325e5a6cba Mon Sep 17 00:00:00 2001
From: Will Martin <contact@willmartian.com>
Date: Fri, 3 Mar 2023 09:00:20 -0500
Subject: [PATCH] [SM-595] add project sort to secrets list (#4914)

---
 .../secrets-manager/shared/secrets-list.component.html |  2 +-
 .../secrets-manager/shared/secrets-list.component.ts   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
index 1aa7d4fa684..52a5c2255c8 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
@@ -38,7 +38,7 @@
         </label>
       </th>
       <th bitCell bitSortable="name" default>{{ "name" | i18n }}</th>
-      <th bitCell>{{ "project" | i18n }}</th>
+      <th bitCell bitSortable="projects" [fn]="sortProjects">{{ "project" | i18n }}</th>
       <th bitCell bitSortable="revisionDate">{{ "lastEdited" | i18n }}</th>
       <th bitCell class="tw-w-0">
         <button
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
index 77e086bd5f8..d98631303f2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
@@ -77,4 +77,14 @@ export class SecretsListComponent implements OnDestroy {
       this.restoreSecretsEvent.emit(this.selection.selected);
     }
   }
+
+  sortProjects = (a: SecretListView, b: SecretListView): number => {
+    const aProjects = a.projects;
+    const bProjects = b.projects;
+    if (aProjects.length !== bProjects.length) {
+      return aProjects.length - bProjects.length;
+    }
+
+    return aProjects[0]?.name.localeCompare(bProjects[0].name);
+  };
 }