From 29b370961e1e0284c54e2d923bf84f4a0662f902 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Fri, 12 Jun 2020 12:50:39 -0400
Subject: [PATCH] Cleanup current uris selection list (#1294)

---
 jslib                                   |  2 +-
 src/_locales/en/messages.json           |  8 ++++++++
 src/popup/vault/add-edit.component.html | 27 ++++++++++++++-----------
 src/popup/vault/add-edit.component.ts   |  7 ++++---
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/jslib b/jslib
index 2b6657a293..28d21ca5df 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 2b6657a293e7be107271ad080c64ccd3f005afb7
+Subproject commit 28d21ca5dfacd1487cd92345d8be9554079fbd96
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 5ba5ad3f55..64a62017bb 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1154,6 +1154,14 @@
   "toggleOptions": {
     "message": "Toggle Options"
   },
+  "toggleCurrentUris": {
+    "message": "Toggle Current URIs",
+    "description": "Toggle the display of the URIs of the currently open tabs in the browser."
+  },
+  "currentUri": {
+    "message": "Current URI",
+    "description": "The URI of one of the current open tabs in the browser."
+  },
   "organization": {
     "message": "Organization",
     "description": "An entity of multiple related people (ex. a team or business organization)."
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index 5db371ea00..8a4e95c1c5 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -69,7 +69,8 @@
                     <div class="box-content-row" appBoxRow>
                         <label for="loginTotp">{{'authenticatorKeyTotp' | i18n}}</label>
                         <input id="loginTotp" type="{{cipher.viewPassword ? 'text' : 'password'}}" name="Login.Totp"
-                            class="monospaced" [(ngModel)]="cipher.login.totp" appInputVerbatim [disabled]="!cipher.viewPassword">
+                            class="monospaced" [(ngModel)]="cipher.login.totp" appInputVerbatim
+                            [disabled]="!cipher.viewPassword">
                     </div>
                 </div>
                 <!-- Card -->
@@ -218,12 +219,15 @@
                         <div class="row-main">
                             <label for="loginUri{{i}}">{{'uriPosition' | i18n : (i + 1)}}</label>
                             <input id="loginUri{{i}}" type="text" name="Login.Uris[{{i}}].Uri" [(ngModel)]="u.uri"
-                                [hidden]="u.showUriOptionsInput === true" placeholder="{{'ex' | i18n}} https://google.com"
-                                inputmode="url" appInputVerbatim>
-                            <select *ngIf="uriOptions != null && uriOptions.length"
-                                id="loginUriOptions{{i}}" name="Login.Uris[{{i}}].Options" [(ngModel)]="u.uri"
-                                [hidden]="u.showUriOptionsInput === false || u.showUriOptionsInput == null || uriOptions == null">
-                                <option *ngFor="let o of uriOptions" [ngValue]="o.url">{{o.url}}</option>
+                                [hidden]="u.showUriOptionsInput === true"
+                                placeholder="{{'ex' | i18n}} https://google.com" inputmode="url" appInputVerbatim>
+                            <label for="loginUriMatch{{i}}" class="sr-only">
+                                {{'currentUri' | i18n}} {{(i + 1)}}
+                            </label>
+                            <select *ngIf="currentUris && currentUris.length" id="currentUris{{i}}"
+                                name="Login.Uris[{{i}}].CurrentUris" [(ngModel)]="u.uri" [hidden]="!u.showCurrentUris">
+                                <option [ngValue]="null">-- {{'select' | i18n}} --</option>
+                                <option *ngFor="let u of currentUris" [ngValue]="u">{{u}}</option>
                             </select>
                             <label for="loginUriMatch{{i}}" class="sr-only">
                                 {{'matchDetection' | i18n}} {{(i + 1)}}
@@ -235,10 +239,9 @@
                             </select>
                         </div>
                         <div class="action-buttons">
-                            <a *ngIf="uriOptions != null && uriOptions.length" class="row-btn" href="#" appStopClick appBlurClick
-                                appA11yTitle="{{'Toggle Input Mode'}}" (click)="toggleUriInput(u)">
-                                <i aria-hidden="true" class="fa fa-lg"
-                                [ngClass]="u.showUriOptionsInput ? 'fa-edit' : 'fa-list'"></i>
+                            <a *ngIf="currentUris && currentUris.length" class="row-btn" href="#" appStopClick
+                                appBlurClick appA11yTitle="{{'toggleCurrentUris' | i18n}}" (click)="toggleUriInput(u)">
+                                <i aria-hidden="true" class="fa fa-lg fa-list"></i>
                             </a>
                             <a class="row-btn" href="#" appStopClick appBlurClick
                                 appA11yTitle="{{'toggleOptions' | i18n}}" (click)="toggleUriOptions(u)">
@@ -393,4 +396,4 @@
             </div>
         </div>
     </content>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/popup/vault/add-edit.component.ts b/src/popup/vault/add-edit.component.ts
index 5d9e90c37e..0a37849b52 100644
--- a/src/popup/vault/add-edit.component.ts
+++ b/src/popup/vault/add-edit.component.ts
@@ -27,7 +27,7 @@ import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/componen
     templateUrl: 'add-edit.component.html',
 })
 export class AddEditComponent extends BaseAddEditComponent {
-    uriOptions: any[];
+    currentUris: string[];
     showAttachments = true;
 
     constructor(cipherService: CipherService, folderService: FolderService,
@@ -84,7 +84,8 @@ export class AddEditComponent extends BaseAddEditComponent {
 
         if (!this.editMode) {
             const tabs = await BrowserApi.tabsQuery({ windowType: 'normal' });
-            this.uriOptions = tabs.filter((tab) => tab.url);
+            this.currentUris = tabs == null ? null :
+                tabs.filter((tab) => tab.url != null && tab.url !== '').map((tab) => tab.url);
         }
 
         window.setTimeout(() => {
@@ -158,6 +159,6 @@ export class AddEditComponent extends BaseAddEditComponent {
 
     toggleUriInput(uri: LoginUriView) {
         const u = (uri as any);
-        u.showUriOptionsInput = !u.showUriOptionsInput;
+        u.showCurrentUris = !u.showCurrentUris;
     }
 }