From a9d9130f01c00703a2557f9de192bee41798fbad Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Thu, 24 Oct 2024 10:51:38 -0700
Subject: [PATCH] [PM-13907] [PM-13849] Browser Refresh - Improve launch login
 UX (#11680)

* [PM-13907] Move canLaunch logic to CipherView

* [PM-13907] Add external link icon to vault list items

* [PM-13907] Remove launch option from more options dropdown

* [PM-13849] Add double click to launch support
---
 apps/browser/src/_locales/en/messages.json    |  9 +++
 .../item-more-options.component.html          |  3 -
 .../item-more-options.component.ts            | 26 --------
 .../vault-list-items-container.component.html | 11 ++++
 .../vault-list-items-container.component.ts   | 59 +++++++++++++++++--
 .../src/vault/models/view/cipher.view.ts      | 10 +++-
 6 files changed, 82 insertions(+), 36 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 087dbbd9dfe..1424533e739 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -578,6 +578,15 @@
   "launchWebsite": {
     "message": "Launch website"
   },
+  "launchWebsiteName": {
+    "message": "Launch website $ITEMNAME$",
+    "placeholders": {
+      "itemname": {
+        "content": "$1",
+        "example": "Secret item"
+      }
+    }
+  },
   "website": {
     "message": "Website"
   },
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
index 03287c75fa9..cedd7736ba7 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
@@ -17,9 +17,6 @@
           {{ "fillAndSave" | i18n }}
         </button>
       </ng-container>
-      <button type="button" bitMenuItem *ngIf="this.canLaunch" (click)="launchCipher()">
-        {{ "launchWebsite" | i18n }}
-      </button>
     </ng-container>
     <button type="button" bitMenuItem (click)="toggleFavorite()">
       {{ favoriteText | i18n }}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
index 8c52ee7ed84..40dbe5911da 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
@@ -19,8 +19,6 @@ import {
 } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
-import { BrowserApi } from "../../../../../platform/browser/browser-api";
-import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
 import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
 import { AddEditQueryParams } from "../add-edit/add-edit-v2.component";
 
@@ -91,30 +89,6 @@ export class ItemMoreOptionsComponent implements OnInit {
     await this.vaultPopupAutofillService.doAutofillAndSave(this.cipher, false);
   }
 
-  /**
-   * Determines if the login cipher can be launched in a new browser tab.
-   */
-  get canLaunch() {
-    return this.cipher.type === CipherType.Login && this.cipher.login.canLaunch;
-  }
-
-  /**
-   * Launches the login cipher in a new browser tab.
-   */
-  async launchCipher() {
-    if (!this.canLaunch) {
-      return;
-    }
-
-    await this.cipherService.updateLastLaunchedDate(this.cipher.id);
-
-    await BrowserApi.createNewTab(this.cipher.login.launchUri);
-
-    if (BrowserPopupUtils.inPopup(window)) {
-      BrowserApi.closePopup(window);
-    }
-  }
-
   /**
    * Toggles the favorite status of the cipher and updates it on the server.
    */
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
index 3a55a93c57a..6be64b17d77 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
@@ -28,6 +28,7 @@
           bit-item-content
           type="button"
           (click)="onViewCipher(cipher)"
+          (dblclick)="launchCipher(cipher)"
           [appA11yTitle]="'viewItemTitle' | i18n: cipher.name"
           class="{{ ItemHeightClass }}"
         >
@@ -60,6 +61,16 @@
               {{ "fill" | i18n }}
             </button>
           </bit-item-action>
+          <bit-item-action *ngIf="!showAutofillButton && cipher.canLaunch">
+            <button
+              type="button"
+              bitIconButton="bwi-external-link"
+              size="small"
+              (click)="launchCipher(cipher)"
+              [attr.aria-label]="'launchWebsiteName' | i18n: cipher.name"
+              [title]="'launchWebsiteName' | i18n: cipher.name"
+            ></button>
+          </bit-item-action>
           <app-item-copy-actions [cipher]="cipher"></app-item-copy-actions>
           <app-item-more-options
             [cipher]="cipher"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
index 615d37cb604..653255ac78d 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
@@ -5,6 +5,8 @@ import { Router, RouterLink } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   BadgeModule,
   BitItemHeight,
@@ -18,6 +20,8 @@ import {
 } from "@bitwarden/components";
 import { OrgIconDirective, PasswordRepromptService } from "@bitwarden/vault";
 
+import { BrowserApi } from "../../../../../platform/browser/browser-api";
+import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
 import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
 import { PopupCipherView } from "../../../views/popup-cipher.view";
 import { ItemCopyActionsComponent } from "../item-copy-action/item-copy-actions.component";
@@ -48,6 +52,12 @@ export class VaultListItemsContainerComponent {
   protected ItemHeightClass = BitItemHeightClass;
   protected ItemHeight = BitItemHeight;
 
+  /**
+   * Timeout used to add a small delay when selecting a cipher to allow for double click to launch
+   * @private
+   */
+  private viewCipherTimeout: number | null;
+
   /**
    * The list of ciphers to display.
    */
@@ -108,21 +118,60 @@ export class VaultListItemsContainerComponent {
     private i18nService: I18nService,
     private vaultPopupAutofillService: VaultPopupAutofillService,
     private passwordRepromptService: PasswordRepromptService,
+    private cipherService: CipherService,
     private router: Router,
   ) {}
 
+  /**
+   * Launches the login cipher in a new browser tab.
+   */
+  async launchCipher(cipher: CipherView) {
+    if (!cipher.canLaunch) {
+      return;
+    }
+
+    // If there is a view action pending, clear it
+    if (this.viewCipherTimeout != null) {
+      window.clearTimeout(this.viewCipherTimeout);
+      this.viewCipherTimeout = null;
+    }
+
+    await this.cipherService.updateLastLaunchedDate(cipher.id);
+
+    await BrowserApi.createNewTab(cipher.login.launchUri);
+
+    if (BrowserPopupUtils.inPopup(window)) {
+      BrowserApi.closePopup(window);
+    }
+  }
+
   async doAutofill(cipher: PopupCipherView) {
     await this.vaultPopupAutofillService.doAutofill(cipher);
   }
 
   async onViewCipher(cipher: PopupCipherView) {
-    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
-    if (!repromptPassed) {
+    // We already have a view action in progress, don't start another
+    if (this.viewCipherTimeout != null) {
       return;
     }
 
-    await this.router.navigate(["/view-cipher"], {
-      queryParams: { cipherId: cipher.id, type: cipher.type },
-    });
+    // Wrap in a timeout to allow for double click to launch
+    this.viewCipherTimeout = window.setTimeout(
+      async () => {
+        try {
+          const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
+          if (!repromptPassed) {
+            return;
+          }
+          await this.router.navigate(["/view-cipher"], {
+            queryParams: { cipherId: cipher.id, type: cipher.type },
+          });
+        } finally {
+          // Ensure the timeout is always cleared
+          this.viewCipherTimeout = null;
+        }
+      },
+      cipher.canLaunch ? 200 : 0,
+    );
   }
 }
diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts
index 028b582db26..3ea3f109be1 100644
--- a/libs/common/src/vault/models/view/cipher.view.ts
+++ b/libs/common/src/vault/models/view/cipher.view.ts
@@ -2,9 +2,8 @@ import { View } from "../../../models/view/view";
 import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
 import { InitializerKey } from "../../../platform/services/cryptography/initializer-key";
 import { DeepJsonify } from "../../../types/deep-jsonify";
-import { LinkedIdType } from "../../enums";
+import { CipherType, LinkedIdType } from "../../enums";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
-import { CipherType } from "../../enums/cipher-type";
 import { LocalData } from "../data/local.data";
 import { Cipher } from "../domain/cipher";
 
@@ -132,6 +131,13 @@ export class CipherView implements View, InitializerMetadata {
     );
   }
 
+  /**
+   * Determines if the cipher can be launched in a new browser tab.
+   */
+  get canLaunch(): boolean {
+    return this.type === CipherType.Login && this.login.canLaunch;
+  }
+
   linkedFieldValue(id: LinkedIdType) {
     const linkedFieldOption = this.linkedFieldOptions?.get(id);
     if (linkedFieldOption == null) {