Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Jan 10, 2025
Merged

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

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcf2c08
fix initial load emission race
jaasen-livefront Jan 8, 2025
6cb09c9
prevent double dialog render
jaasen-livefront Jan 8, 2025
cfbe1de
put logic back in place
jaasen-livefront Jan 8, 2025
13d7b73
Merge branch 'main' into PM-12759
jaasen-livefront Jan 8, 2025
2ee1bdd
Merge branch 'main' into PM-12759
jaasen-livefront Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions apps/web/src/app/vault/org-vault/vault.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import {
switchMap,
takeUntil,
tap,
withLatestFrom,
} from "rxjs/operators";

import {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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$])),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe switching this to combineLatest is going to have multiple emissions from the observable. The withLatestFrom was to address this bug previously PM-12678

this change also seems to result in the edit modal being called multiple times. Screen recording below:

PM-12759.mov

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Jingo88 Ok I've added some logic to prevent double rendering. Let me know what you think!

filter(() => this.vaultItemDialogRef == undefined || !this.extensionRefreshEnabled),
withLatestFrom(allCipherMap$, allCollections$, organization$),
switchMap(async ([qParams, allCiphersMap]) => {
const cipherId = getCipherIdFromParams(qParams);

if (!cipherId) {
this.prevCipherId = null;
return;
}

if (cipherId === this.prevCipherId) {
return;
}
const cipher = allCiphersMap[cipherId];

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],
Expand All @@ -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 {
Expand Down
Loading