Skip to content

Commit

Permalink
[PM-4871] Remove clickable row in favor of clickable cell content (#6911
Browse files Browse the repository at this point in the history
)

* Improved UX on vault items

* Remove clickable row in vault collections

---------

Co-authored-by: SmithThe4th <gsmith@bitwarden.com>
  • Loading branch information
Spitfireap and gbubemismith authored Feb 14, 2024
1 parent 3edf098 commit 973b95f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 43 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component, EventEmitter, HostBinding, HostListener, Input, Output } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { Component, EventEmitter, Input, Output } from "@angular/core";

import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { CipherType } from "@bitwarden/common/vault/enums";
Expand Down Expand Up @@ -35,16 +34,6 @@ export class VaultCipherRowComponent {

protected CipherType = CipherType;

constructor(
private router: Router,
private activatedRoute: ActivatedRoute,
) {}

@HostBinding("class")
get classes() {
return [].concat(this.disabled ? [] : ["tw-cursor-pointer"]);
}

protected get showTotpCopyButton() {
return (
(this.cipher.login?.hasTotp ?? false) &&
Expand All @@ -56,16 +45,6 @@ export class VaultCipherRowComponent {
return this.cipher.hasOldAttachments && this.cipher.organizationId == null;
}

@HostListener("click")
protected click() {
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.router.navigate([], {
queryParams: { itemId: this.cipher.id },
queryParamsHandling: "merge",
});
}

protected copy(field: "username" | "password" | "totp") {
this.onEvent.emit({ type: "copyField", item: this.cipher, field });
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component, EventEmitter, HostBinding, HostListener, Input, Output } from "@angular/core";
import { Router } from "@angular/router";
import { Component, EventEmitter, Input, Output } from "@angular/core";

import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
Expand Down Expand Up @@ -38,15 +37,7 @@ export class VaultCollectionRowComponent {
@Input() checked: boolean;
@Output() checkedToggled = new EventEmitter<void>();

constructor(
private router: Router,
private i18nService: I18nService,
) {}

@HostBinding("class")
get classes() {
return [].concat(this.disabled ? [] : ["tw-cursor-pointer"]);
}
constructor(private i18nService: I18nService) {}

get collectionGroups() {
if (!(this.collection instanceof CollectionAdminView)) {
Expand All @@ -71,16 +62,6 @@ export class VaultCollectionRowComponent {
}
}

@HostListener("click")
protected click() {
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.router.navigate([], {
queryParams: { collectionId: this.collection.id },
queryParamsHandling: "merge",
});
}

protected edit() {
this.onEvent.next({ type: "editCollection", item: this.collection });
}
Expand Down

0 comments on commit 973b95f

Please sign in to comment.