bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-19 10:54:00 +00:00
Code Issues Releases Wiki Activity

[PM-30890] Desktop Sync Improvements for Archive (#18466)

Browse Source
This commit is contained in:
Jason Ng
2026-01-23 15:22:32 -05:00
committed by jaasen-livefront
parent a1e62100d6
commit 9182a2cc26
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/angular/src/vault/components/vault-items.component.ts
View File

@@ -194,12 +194,7 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnDestroy
return this.searchService.searchCiphers(
userId,
searchText,
[
filter,
this.deletedFilter,
...(this.deleted ? [] : [this.archivedFilter]),
restrictedTypeFilter,
],
[filter, restrictedTypeFilter],
allCiphers,
);
}),

6
libs/angular/src/vault/vault-filter/models/vault-filter.model.ts
View File

@@ -54,6 +54,12 @@ export class VaultFilter {
cipherPassesFilter =
CipherViewLikeUtils.isArchived(cipher) && !CipherViewLikeUtils.isDeleted(cipher);
}
if (this.status !== "archive" && this.status !== "trash" && cipherPassesFilter) {
cipherPassesFilter =
!CipherViewLikeUtils.isArchived(cipher) && !CipherViewLikeUtils.isDeleted(cipher);
}
if (this.cipherType != null && cipherPassesFilter) {
cipherPassesFilter = CipherViewLikeUtils.getType(cipher) === this.cipherType;
}