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

[PM-31938] refactor archive btn logic in web view modal (#18874)

Browse Source 
* refactor showArchiveBtn logic in web view modal
This commit is contained in:
Jason Ng
2026-02-11 17:32:35 -05:00
committed by GitHub
parent 88140604c1
commit 30d3a36c7e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
View File

@@ -10,7 +10,7 @@ import {
OnInit,
viewChild,
} from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
import { Router } from "@angular/router";
import { firstValueFrom, Observable, Subject, switchMap } from "rxjs";
import { map } from "rxjs/operators";
@@ -226,6 +226,9 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
);
protected archiveFlagEnabled$ = this.archiveService.hasArchiveFlagEnabled$;
private readonly archiveFlagEnabled = toSignal(this.archiveFlagEnabled$, {
initialValue: false,
});
protected userId$ = this.accountService.activeAccount$.pipe(getUserId);
@@ -237,6 +240,8 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
switchMap((userId) => this.archiveService.userCanArchive$(userId)),
);
private readonly userCanArchive = toSignal(this.userCanArchive$, { initialValue: false });
protected get isTrashFilter() {
return this.filter?.type === "trash";
}
@@ -293,14 +298,14 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
return this.cipher?.isArchived;
}
private _userCanArchive = false;
protected get showArchiveOptions(): boolean {
return this._userCanArchive && !this.params.isAdminConsoleAction && this.params.mode === "view";
return (
this.archiveFlagEnabled() && !this.params.isAdminConsoleAction && this.params.mode === "view"
);
}
protected get showArchiveBtn(): boolean {
return this.cipher?.canBeArchived;
return this.userCanArchive() && this.cipher?.canBeArchived;
}
protected get showUnarchiveBtn(): boolean {
@@ -355,8 +360,6 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
takeUntilDestroyed(),
)
.subscribe();
this.userCanArchive$.pipe(takeUntilDestroyed()).subscribe((v) => (this._userCanArchive = v));
}
async ngOnInit() {