Prefer favourite ciphers over last used / name

Badbird5907 · Mar 1, 2024 · aa2b7c2 · aa2b7c2
1 parent 8d528c2
commit aa2b7c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
@@ -292,7 +292,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     });
 
     this.loginCiphers = this.loginCiphers.sort((a, b) =>
-      this.cipherService.sortCiphersByLastUsedThenName(a, b),
+      this.cipherService.sortCiphersByFavouriteThenLastUsedThenName(a, b),
     );
     this.isLoading = this.loaded = true;
   }

diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
@@ -219,6 +219,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
       this.ciphers = this.ciphers.filter(
         (c) => !this.vaultFilterService.filterCipherForSelectedVault(c),
       );
+      this.ciphers = this.ciphers.sort((a, b) =>
+        this.cipherService.sortCiphersByFavouriteThenLastUsedThenName(a, b),
+      );
       return;
     }
     this.searchPending = true;
@@ -236,6 +239,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
       this.ciphers = this.ciphers.filter(
         (c) => !this.vaultFilterService.filterCipherForSelectedVault(c),
       );
+      this.ciphers = this.ciphers.sort((a, b) =>
+        this.cipherService.sortCiphersByFavouriteThenLastUsedThenName(a, b),
+      );
       this.searchPending = false;
     }, timeout);
   }

diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts
@@ -74,6 +74,7 @@ export abstract class CipherService {
   deleteAttachmentWithServer: (id: string, attachmentId: string) => Promise<void>;
   sortCiphersByLastUsed: (a: CipherView, b: CipherView) => number;
   sortCiphersByLastUsedThenName: (a: CipherView, b: CipherView) => number;
+  sortCiphersByFavouriteThenLastUsedThenName: (a: CipherView, b: CipherView) => number;
   getLocaleSortingFunction: () => (a: CipherView, b: CipherView) => number;
   softDelete: (id: string | string[]) => Promise<any>;
   softDeleteWithServer: (id: string, asAdmin?: boolean) => Promise<any>;

diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
@@ -825,6 +825,16 @@ export class CipherService implements CipherServiceAbstraction {
     return this.getLocaleSortingFunction()(a, b);
   }
 
+  sortCiphersByFavouriteThenLastUsedThenName(a: CipherView, b: CipherView): number {
+    if (a.favorite && !b.favorite) {
+      return -1;
+    }
+    if (!a.favorite && b.favorite) {
+      return 1;
+    }
+    return this.sortCiphersByLastUsedThenName(a, b);
+  }
+
   getLocaleSortingFunction(): (a: CipherView, b: CipherView) => number {
     return (a, b) => {
       let aName = a.name;