Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-14 20:01:31 +01:00
Code Issues Projects Releases Wiki Activity

[PM-12759] - Admin Console - Link to vault cipher is not opening cipher modal (#12738)

Browse Source 
* fix initial load emission race

* prevent double dialog render

* put logic back in place
This commit is contained in:
Jordan Aasen 2025-01-10 10:00:57 -08:00 committed by GitHub
parent 2a30c27d18
commit b8f57f3464
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/web/src/app/vault/org-vault/vault.component.ts
View File

@ -32,7 +32,6 @@ import {
switchMap,
takeUntil,
tap,
withLatestFrom,
} from "rxjs/operators";
import {
@ -194,6 +193,7 @@ export class VaultComponent implements OnInit, OnDestroy {
protected currentSearchText$: Observable<string>;
protected freeTrial$: Observable<FreeTrial>;
protected resellerWarning$: Observable<ResellerWarning | null>;
protected prevCipherId: string | null = null;
/**
* A list of collections that the user can assign items to and edit those items within.
* @protected
@ -538,25 +538,26 @@ export class VaultComponent implements OnInit, OnDestroy {
firstSetup$
.pipe(
switchMap(() => this.route.queryParams),
// Only process the queryParams if the dialog is not open (only when extension refresh is enabled)
switchMap(() => combineLatest([this.route.queryParams, allCipherMap$])),
filter(() => this.vaultItemDialogRef == undefined || !this.extensionRefreshEnabled),
withLatestFrom(allCipherMap$, allCollections$, organization$),
switchMap(async ([qParams, allCiphersMap]) => {
const cipherId = getCipherIdFromParams(qParams);
if (!cipherId) {
this.prevCipherId = null;
return;
}
const cipher = allCiphersMap[cipherId];
if (cipherId === this.prevCipherId) {
return;
}
this.prevCipherId = cipherId;
const cipher = allCiphersMap[cipherId];
if (cipher) {
let action = qParams.action;
// Default to "view" if extension refresh is enabled
if (action == null && this.extensionRefreshEnabled) {
action = "view";
}
if (action == "showFailedToDecrypt") {
DecryptionFailureDialogComponent.open(this.dialogService, {
cipherIds: [cipherId as CipherId],
@ -569,6 +570,11 @@ export class VaultComponent implements OnInit, OnDestroy {
return;
}
// Default to "view" if extension refresh is enabled
if (action == null && this.extensionRefreshEnabled) {
action = "view";
}
if (action === "view") {
await this.viewCipherById(cipher);
} else {