From e344d342be9c2c290c2ef4c2b7f10ace757506c1 Mon Sep 17 00:00:00 2001 From: Jason Ng Date: Tue, 6 Jan 2026 10:29:15 -0500 Subject: [PATCH] [PM-30135] deleted archived items restored to archive (#18212) --- .../vault-filter/shared/models/filter-function.ts | 6 +++++- libs/common/src/vault/services/cipher.service.spec.ts | 2 +- libs/common/src/vault/services/cipher.service.ts | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts index c15dd51a969..f010c529110 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/filter-function.ts @@ -47,7 +47,11 @@ export function createFilterFunction( if (filter.type === "archive" && !CipherViewLikeUtils.isArchived(cipher)) { return false; } - if (filter.type !== "archive" && CipherViewLikeUtils.isArchived(cipher)) { + if ( + filter.type !== "archive" && + filter.type !== "trash" && + CipherViewLikeUtils.isArchived(cipher) + ) { return false; } } diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts index 50823807fcf..153bb01403c 100644 --- a/libs/common/src/vault/services/cipher.service.spec.ts +++ b/libs/common/src/vault/services/cipher.service.spec.ts @@ -868,7 +868,7 @@ describe("Cipher Service", () => { const result = await firstValueFrom( stateProvider.singleUser.getFake(mockUserId, ENCRYPTED_CIPHERS).state$, ); - expect(result[cipherId].archivedDate).toBeNull(); + expect(result[cipherId].archivedDate).toEqual("2024-01-01T12:00:00.000Z"); expect(result[cipherId].deletedDate).toBeDefined(); }); }); diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts index 3c44b854de7..d25aa62ea3a 100644 --- a/libs/common/src/vault/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -1461,7 +1461,6 @@ export class CipherService implements CipherServiceAbstraction { return; } ciphers[cipherId].deletedDate = new Date().toISOString(); - ciphers[cipherId].archivedDate = null; }; if (typeof id === "string") {