[PM-30611] show deleted archived items in trash (#18272)

libs/angular/src/vault/components/vault-items.component.ts

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

libs/angular/src/vault/vault-filter/models/vault-filter.model.ts

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