bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-31 00:33:33 +00:00
Code Issues Releases Wiki Activity

cleaned up unnecessary hideTrash

Browse Source
This commit is contained in:
Leslie Xiong
2025-12-16 15:15:19 -05:00
parent d9da68de40
commit ef74e8c3ef
2 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/desktop/src/vault/app/vault-v3/vault-filter/filters/status-filter.component.html
View File

@@ -1,25 +1,21 @@
@if (show()) {
@if (!hideArchive()) {
<bit-nav-item
[icon]="archiveFilter.icon"
[forceActiveStyles]="activeFilter()?.isArchived"
(click)="handleArchiveFilter($event)"
[text]="archiveFilter.name | i18n"
[attr.aria-pressed]="activeFilter()?.isArchived"
[appA11yTitle]="archiveFilter.name | i18n"
/>
@if (!(canArchive$ | async)) {
<app-premium-badge />
}
}
@if (!hideTrash()) {
<bit-nav-item
[icon]="trashFilter.icon"
[forceActiveStyles]="activeFilter()?.isDeleted"
(click)="applyFilter('trash')"
[text]="trashFilter.name | i18n"
[attr.aria-pressed]="activeFilter()?.isDeleted"
[appA11yTitle]="trashFilter.name | i18n"
/>
@if (!hideArchive()) {
<bit-nav-item
[icon]="archiveFilter.icon"
[forceActiveStyles]="activeFilter()?.isArchived"
(click)="handleArchiveFilter($event)"
[text]="archiveFilter.name | i18n"
[attr.aria-pressed]="activeFilter()?.isArchived"
[appA11yTitle]="archiveFilter.name | i18n"
/>
@if (!(canArchive$ | async)) {
<app-premium-badge />
}
}
<bit-nav-item
[icon]="trashFilter.icon"
[forceActiveStyles]="activeFilter()?.isDeleted"
(click)="applyFilter('trash')"
[text]="trashFilter.name | i18n"
[attr.aria-pressed]="activeFilter()?.isDeleted"
[appA11yTitle]="trashFilter.name | i18n"
/>

7
apps/desktop/src/vault/app/vault-v3/vault-filter/filters/status-filter.component.ts
View File

@@ -1,5 +1,5 @@
import { CommonModule } from "@angular/common";
import { Component, viewChild, input, inject, computed } from "@angular/core";
import { Component, viewChild, input, inject } from "@angular/core";
import { combineLatest, firstValueFrom, map, switchMap } from "rxjs";
import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
@@ -22,7 +22,6 @@ export class StatusFilterComponent {
private accountService: AccountService = inject(AccountService);
private cipherArchiveService: CipherArchiveService = inject(CipherArchiveService);
protected readonly hideTrash = input(false);
protected readonly hideArchive = input(false);
protected readonly activeFilter = input<VaultFilter>();
protected readonly archiveFilter: CipherTypeFilter = {
@@ -38,10 +37,6 @@ export class StatusFilterComponent {
icon: "bwi-trash",
};
protected readonly show = computed(() => {
return !(this.hideTrash() && this.hideArchive());
});
protected applyFilter(filterType: CipherStatus) {
let filter: CipherTypeFilter = null;
if (filterType === "archive") {