From ef3caa2cf011b742419c442ef11334910b6e52ca Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 3 Dec 2018 16:10:35 -0500
Subject: [PATCH 1/2] Set focus when no workspace role is selected

---
 js/components/selector.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/components/selector.js b/js/components/selector.js
index 4e599494..ddc074a6 100644
--- a/js/components/selector.js
+++ b/js/components/selector.js
@@ -84,7 +84,11 @@ export default {
 
     onShow: function () {
       setTimeout(() => { // timeout is a hack to make focus work in Chrome
-        this.$refs.choices.find(choice => choice.selected).$refs.input[0].focus()
+        if (this.$refs.choices.find(choice => choice.selected)) {
+          this.$refs.choices.find(choice => choice.selected).$refs.input[0].focus()
+        } else {
+          this.$refs.choices[0].$refs.input[0].focus()
+        }
       }, 100)
     },
 

From 33546188d5c38ce6e031794b08797d74ef2420ac Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 4 Dec 2018 17:11:21 -0500
Subject: [PATCH 2/2] Refactor to remove repetition

---
 js/components/selector.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/components/selector.js b/js/components/selector.js
index ddc074a6..67f6a30f 100644
--- a/js/components/selector.js
+++ b/js/components/selector.js
@@ -84,8 +84,9 @@ export default {
 
     onShow: function () {
       setTimeout(() => { // timeout is a hack to make focus work in Chrome
-        if (this.$refs.choices.find(choice => choice.selected)) {
-          this.$refs.choices.find(choice => choice.selected).$refs.input[0].focus()
+        const selected = this.$refs.choices.find(choice => choice.selected)
+        if (selected) {
+          selected.$refs.input[0].focus()
         } else {
           this.$refs.choices[0].$refs.input[0].focus()
         }