From 4045ce2d157f2087d0080258d68a442be64064e5 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Wed, 27 Jan 2021 15:34:14 +1000
Subject: [PATCH 1/2] Pass launchCipher down to grandchild for reuse

---
 src/popup/components/action-buttons.component.ts | 11 ++---------
 src/popup/components/ciphers-list.component.html |  3 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/popup/components/action-buttons.component.ts b/src/popup/components/action-buttons.component.ts
index 909d20b8e25..605ca6f63ab 100644
--- a/src/popup/components/action-buttons.component.ts
+++ b/src/popup/components/action-buttons.component.ts
@@ -29,6 +29,7 @@ import { PopupUtilsService } from '../services/popup-utils.service';
 })
 export class ActionButtonsComponent {
     @Output() onView = new EventEmitter<CipherView>();
+    @Output() onLaunch = new EventEmitter<CipherView>();
     @Input() cipher: CipherView;
     @Input() showView = false;
 
@@ -45,15 +46,7 @@ export class ActionButtonsComponent {
     }
 
     launch() {
-        if (this.cipher.type !== CipherType.Login || !this.cipher.login.canLaunch) {
-            return;
-        }
-
-        this.analytics.eventTrack.next({ action: 'Launched URI From Listing' });
-        BrowserApi.createNewTab(this.cipher.login.launchUri);
-        if (this.popupUtilsService.inPopup(window)) {
-            BrowserApi.closePopup(window);
-        }
+        this.onLaunch.emit(this.cipher);
     }
 
     async copy(cipher: CipherView, value: string, typeI18nKey: string, aType: string) {
diff --git a/src/popup/components/ciphers-list.component.html b/src/popup/components/ciphers-list.component.html
index 33c585ad1f3..39217fe5c13 100644
--- a/src/popup/components/ciphers-list.component.html
+++ b/src/popup/components/ciphers-list.component.html
@@ -17,6 +17,7 @@
             <span class="detail">{{c.subTitle}}</span>
         </div>
     </div>
-    <app-action-buttons [cipher]="c" [showView]="showView" (onView)="viewCipher(c)" class="action-buttons">
+    <app-action-buttons [cipher]="c" [showView]="showView" (onView)="viewCipher(c)" (onLaunch)="doubleSelectCipher(c)" 
+        class="action-buttons">
     </app-action-buttons>
 </a>

From ea1a1cc99b6eb74a9008aa0b20a7c5334cba550b Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Thu, 28 Jan 2021 07:45:54 +1000
Subject: [PATCH 2/2] Use consistent naming convention for launchCipher

---
 src/popup/components/action-buttons.component.html | 2 +-
 src/popup/components/action-buttons.component.ts   | 6 +++---
 src/popup/components/ciphers-list.component.html   | 4 ++--
 src/popup/components/ciphers-list.component.ts     | 6 +++---
 src/popup/vault/ciphers.component.html             | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/popup/components/action-buttons.component.html b/src/popup/components/action-buttons.component.html
index 5d81817e9ca..a3caa2c9337 100644
--- a/src/popup/components/action-buttons.component.html
+++ b/src/popup/components/action-buttons.component.html
@@ -2,7 +2,7 @@
     <i class="fa fa-lg fa-list-alt" aria-hidden="true"></i>
 </span>
 <ng-container *ngIf="cipher.type === cipherType.Login">
-    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'launch' | i18n}}" (click)="launch()"
+    <span class="row-btn" appStopClick appStopProp appA11yTitle="{{'launch' | i18n}}" (click)="launchCipher()"
         *ngIf="!showView" [ngClass]="{disabled: !cipher.login.canLaunch}">
         <i class="fa fa-lg fa-share-square-o" aria-hidden="true"></i>
     </span>
diff --git a/src/popup/components/action-buttons.component.ts b/src/popup/components/action-buttons.component.ts
index 605ca6f63ab..8cc92d88422 100644
--- a/src/popup/components/action-buttons.component.ts
+++ b/src/popup/components/action-buttons.component.ts
@@ -29,7 +29,7 @@ import { PopupUtilsService } from '../services/popup-utils.service';
 })
 export class ActionButtonsComponent {
     @Output() onView = new EventEmitter<CipherView>();
-    @Output() onLaunch = new EventEmitter<CipherView>();
+    @Output() launchEvent = new EventEmitter<CipherView>();
     @Input() cipher: CipherView;
     @Input() showView = false;
 
@@ -45,8 +45,8 @@ export class ActionButtonsComponent {
         this.userHasPremiumAccess = await this.userService.canAccessPremium();
     }
 
-    launch() {
-        this.onLaunch.emit(this.cipher);
+    launchCipher() {
+        this.launchEvent.emit(this.cipher);
     }
 
     async copy(cipher: CipherView, value: string, typeI18nKey: string, aType: string) {
diff --git a/src/popup/components/ciphers-list.component.html b/src/popup/components/ciphers-list.component.html
index 39217fe5c13..6c8c4a407b3 100644
--- a/src/popup/components/ciphers-list.component.html
+++ b/src/popup/components/ciphers-list.component.html
@@ -1,4 +1,4 @@
-<a *ngFor="let c of ciphers" (click)="selectCipher(c)" (dblclick)="doubleSelectCipher(c)" href="#" appStopClick
+<a *ngFor="let c of ciphers" (click)="selectCipher(c)" (dblclick)="launchCipher(c)" href="#" appStopClick
     title="{{title}} - {{c.name}}" class="box-content-row box-content-row-flex">
     <div class="row-main">
         <app-vault-icon [cipher]="c"></app-vault-icon>
@@ -17,7 +17,7 @@
             <span class="detail">{{c.subTitle}}</span>
         </div>
     </div>
-    <app-action-buttons [cipher]="c" [showView]="showView" (onView)="viewCipher(c)" (onLaunch)="doubleSelectCipher(c)" 
+    <app-action-buttons [cipher]="c" [showView]="showView" (onView)="viewCipher(c)" (launchEvent)="launchCipher(c)" 
         class="action-buttons">
     </app-action-buttons>
 </a>
diff --git a/src/popup/components/ciphers-list.component.ts b/src/popup/components/ciphers-list.component.ts
index 81b477af3d0..4c1101826c6 100644
--- a/src/popup/components/ciphers-list.component.ts
+++ b/src/popup/components/ciphers-list.component.ts
@@ -15,7 +15,7 @@ import { CipherView } from 'jslib/models/view/cipherView';
 })
 export class CiphersListComponent {
     @Output() onSelected = new EventEmitter<CipherView>();
-    @Output() onDoubleSelected = new EventEmitter<CipherView>();
+    @Output() launchEvent = new EventEmitter<CipherView>();
     @Output() onView = new EventEmitter<CipherView>();
     @Input() ciphers: CipherView[];
     @Input() showView = false;
@@ -27,8 +27,8 @@ export class CiphersListComponent {
         this.onSelected.emit(c);
     }
 
-    doubleSelectCipher(c: CipherView) {
-        this.onDoubleSelected.emit(c);
+    launchCipher(c: CipherView) {
+        this.launchEvent.emit(c);
     }
 
     viewCipher(c: CipherView) {
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
index 05f4eeb0946..3581afa21d1 100644
--- a/src/popup/vault/ciphers.component.html
+++ b/src/popup/vault/ciphers.component.html
@@ -72,7 +72,7 @@
             </div>
             <div class="box-content">
                 <app-ciphers-list [ciphers]="filteredCiphers" title="{{'viewItem' | i18n}}"
-                    (onSelected)="selectCipher($event)" (onDoubleSelected)="launchCipher($event)"></app-ciphers-list>
+                    (onSelected)="selectCipher($event)" (launchEvent)="launchCipher($event)"></app-ciphers-list>
             </div>
         </div>
     </ng-container>