From b208767072bd024e46960ee60ab6bea4addc35b7 Mon Sep 17 00:00:00 2001
From: "Const.Dave" <const.dave@gmail.com>
Date: Mon, 28 Aug 2023 11:33:24 -0500
Subject: [PATCH 1/6] add autofocus on title

---
 src/components/TestWrapper.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/TestWrapper.vue b/src/components/TestWrapper.vue
index 6578fd05..dfb1b670 100644
--- a/src/components/TestWrapper.vue
+++ b/src/components/TestWrapper.vue
@@ -11,6 +11,7 @@
           </div>
           <v-text-field
             :placeholder="$t('message.enter_brief_charter_name')"
+            autofocus
             outlined
             dense
             :height="35"

From d6051ab54703b102e3d549b1cc59c9878ec957bd Mon Sep 17 00:00:00 2001
From: "Const.Dave" <const.dave@gmail.com>
Date: Mon, 28 Aug 2023 18:11:51 -0500
Subject: [PATCH 2/6] added focus on NotesWrapper

---
 src/components/NotesWrapper.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/NotesWrapper.vue b/src/components/NotesWrapper.vue
index 5f0b957a..3546adb4 100644
--- a/src/components/NotesWrapper.vue
+++ b/src/components/NotesWrapper.vue
@@ -605,6 +605,7 @@ export default {
       this.emojiMenu[`menu-${item.id}`] = false;
     });
     this.fetchNotes();
+    this.$refs.notes.editor.commands.focus();
   },
   methods: {
     async fetchNotes() {

From 0091e8e662327c7d1dc1452eeaaa6c69482a1340 Mon Sep 17 00:00:00 2001
From: "Const.Dave" <const.dave@gmail.com>
Date: Wed, 30 Aug 2023 11:53:42 -0500
Subject: [PATCH 3/6] Autofocus Dialogs and add evidence view

---
 src/components/ControlPanel.vue               | 48 +++++++++++++++++--
 .../dialogs/DeleteConfirmDialog.vue           |  1 +
 src/components/dialogs/NewSessionDialog.vue   |  1 +
 src/components/dialogs/ResetConfirmDialog.vue |  1 +
 src/components/dialogs/SaveConfirmDialog.vue  |  1 +
 src/views/AddEvidence.vue                     |  3 ++
 6 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index cde81b0c..2d4afcb9 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -59,7 +59,7 @@
             block
             :color="currentTheme.primary"
             :style="{ color: currentTheme.white }"
-            @click="deleteConfirmDialog = true"
+            @click="handleDeleteConfirmDialog"
           >
             <v-icon left>mdi-delete</v-icon> {{ $tc("caption.delete", 1) }}
           </v-btn>
@@ -166,7 +166,7 @@
                 small
                 color="default"
                 v-on="on"
-                @click="newSessionDialog = true"
+                @click="handleNewSessionDialog"
               >
                 <v-icon v-if="$vuetify.theme.dark === false">
                   mdi-content-save
@@ -186,7 +186,7 @@
                 small
                 color="default"
                 v-on="on"
-                @click="resetConfirmDialog = true"
+                @click="handleResetConfirmDialog"
               >
                 <v-icon v-if="$vuetify.theme.dark === false">
                   mdi-close-circle
@@ -613,11 +613,13 @@
       />
       <NoteDialog
         v-model="noteDialog"
+        ref="noteDialog"
         @submit-note="addNote"
         :configItem="config"
         :credentialItems="credentials"
       />
       <SummaryDialog
+        ref="SummaryDialog"
         v-model="summaryDialog"
         @submit-summary="addSummary"
         :configItem="config"
@@ -626,23 +628,27 @@
       />
       <DeleteConfirmDialog
         v-model="deleteConfirmDialog"
+        ref="deleteConfirmDialog"
         :text="$t('message.confirm_delete')"
         @confirm="deleteItems"
         @cancel="deleteConfirmDialog = false"
       />
       <ResetConfirmDialog
         v-model="resetConfirmDialog"
+        ref="resetConfirmDialog"
         :text="$t('message.confirm_reset')"
         @confirm="resetSession"
         @cancel="resetConfirmDialog = false"
       />
       <SaveConfirmDialog
         v-model="saveConfirmDialog"
+        ref="saveConfirmDialog"
         :text="$t('message.confirm_session_saved')"
         @confirm="saveConfirmDialog = false"
       />
       <NewSessionDialog
         v-model="newSessionDialog"
+        ref="newSessionDialog"
         :text="$t('message.confirm_save_progress')"
         @save="saveSession(callback)"
         @discard="discardSession(callback)"
@@ -872,12 +878,18 @@ export default {
     // new session
     window.ipc.on("NEW_SESSION", () => {
       this.callback = () => this.clearSession();
-      this.newSessionDialog = true;
+      this.handleNewSessionDialog();
     });
 
     // save session
     window.ipc.on("SAVE_SESSION", () => {
-      this.saveSession(() => (this.saveConfirmDialog = true));
+      this.saveSession(() => {
+        this.saveConfirmDialog = true;
+
+        setTimeout(() => {
+          this.$refs.saveConfirmDialog.$refs.confirmBtn.focus();
+        });
+      });
     });
 
     // reset session
@@ -985,6 +997,12 @@ export default {
         }
       });
     },
+    handleNewSessionDialog() {
+      this.newSessionDialog = true;
+      setTimeout(() => {
+        this.$refs.newSessionDialog.$refs.confirmBtn.$el.focus();
+      }, 100);
+    },
     startNewSession() {
       this.$root.$emit("start-new-session");
       if (!this.checkedStatusOfPreSessionTask) {
@@ -993,6 +1011,12 @@ export default {
       this.$store.commit("setQuickTest", false);
       this.showSourcePickerDialog();
     },
+    handleResetConfirmDialog() {
+      this.resetConfirmDialog = true;
+      setTimeout(() => {
+        this.$refs.resetConfirmDialog.$refs.confirmBtn.$el.focus();
+      }, 100);
+    },
     fetchSources() {
       return new Promise(function (resolver, reject) {
         if (!window.ipc) return reject();
@@ -1032,6 +1056,10 @@ export default {
     showNoteDialog() {
       if (this.viewMode === "normal") {
         this.noteDialog = true;
+        // settimeout
+        setTimeout(() => {
+          this.$refs.noteDialog.$refs.comment.editor.commands.focus();
+        });
       } else {
         if (!window.ipc) return;
         window.ipc.invoke(IPC_HANDLERS.WINDOW, {
@@ -1050,6 +1078,12 @@ export default {
     hideNoteDialog() {
       this.noteDialog = false;
     },
+    handleDeleteConfirmDialog() {
+      this.deleteConfirmDialog = true;
+      setTimeout(() => {
+        this.$refs.deleteConfirmDialog.$refs.confirmBtn.$el.focus();
+      }, 100);
+    },
     startInterval() {
       console.log("start interval");
       if (!this.interval) {
@@ -1180,6 +1214,10 @@ export default {
     showSummaryDialog() {
       if (this.viewMode === "normal") {
         this.summaryDialog = true;
+
+        setTimeout(() => {
+          this.$refs.SummaryDialog.$refs.comment.editor.commandManager.commands.focus();
+        }, 200);
       } else {
         if (!window.ipc) return;
         window.ipc.invoke(IPC_HANDLERS.WINDOW, {
diff --git a/src/components/dialogs/DeleteConfirmDialog.vue b/src/components/dialogs/DeleteConfirmDialog.vue
index 9ca48e7b..d54e287f 100644
--- a/src/components/dialogs/DeleteConfirmDialog.vue
+++ b/src/components/dialogs/DeleteConfirmDialog.vue
@@ -9,6 +9,7 @@
         <v-card-actions>
           <v-btn
             small
+            ref="confirmBtn"
             :color="currentTheme.primary"
             class="text-capitalize btn"
             @click="confirm"
diff --git a/src/components/dialogs/NewSessionDialog.vue b/src/components/dialogs/NewSessionDialog.vue
index 1fe4acb7..7759b34d 100644
--- a/src/components/dialogs/NewSessionDialog.vue
+++ b/src/components/dialogs/NewSessionDialog.vue
@@ -9,6 +9,7 @@
         <v-card-actions>
           <v-btn
             small
+            ref="confirmBtn"
             :color="currentTheme.primary"
             class="text-capitalize btn"
             :style="{ color: currentTheme.white }"
diff --git a/src/components/dialogs/ResetConfirmDialog.vue b/src/components/dialogs/ResetConfirmDialog.vue
index a145fb25..4c2aa697 100644
--- a/src/components/dialogs/ResetConfirmDialog.vue
+++ b/src/components/dialogs/ResetConfirmDialog.vue
@@ -9,6 +9,7 @@
         <v-card-actions>
           <v-btn
             small
+            ref="confirmBtn"
             :color="currentTheme.primary"
             class="text-capitalize btn"
             @click="confirm"
diff --git a/src/components/dialogs/SaveConfirmDialog.vue b/src/components/dialogs/SaveConfirmDialog.vue
index 1c4d17a7..5bb7226a 100644
--- a/src/components/dialogs/SaveConfirmDialog.vue
+++ b/src/components/dialogs/SaveConfirmDialog.vue
@@ -9,6 +9,7 @@
         <v-card-actions>
           <v-btn
             small
+            ref="confirmBtn"
             color="currentTheme.primary"
             class="text-uppercase btn"
             @click="confirm"
diff --git a/src/views/AddEvidence.vue b/src/views/AddEvidence.vue
index 907c5c8e..7878ecd6 100644
--- a/src/views/AddEvidence.vue
+++ b/src/views/AddEvidence.vue
@@ -318,6 +318,9 @@ export default {
       });
     });
 
+    // Focus on comment
+    this.$refs.comment.editor.commands.focus();
+
     this.$root.$on("update-session", this.updateSession);
     this.$root.$on("update-processing", this.updateProcessing);
     this.$root.$on("save-data", this.saveData);

From ff77d36611c578f4a4ceb624cab980cdeccc69e7 Mon Sep 17 00:00:00 2001
From: "Const.Dave" <const.dave@gmail.com>
Date: Wed, 30 Aug 2023 17:20:44 -0500
Subject: [PATCH 4/6] abstract saveConfirm focus to function

---
 src/components/ControlPanel.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index 2d4afcb9..63b4b579 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -644,7 +644,7 @@
         v-model="saveConfirmDialog"
         ref="saveConfirmDialog"
         :text="$t('message.confirm_session_saved')"
-        @confirm="saveConfirmDialog = false"
+        @confirm="handleSaveConfirmDialog"
       />
       <NewSessionDialog
         v-model="newSessionDialog"
@@ -884,11 +884,7 @@ export default {
     // save session
     window.ipc.on("SAVE_SESSION", () => {
       this.saveSession(() => {
-        this.saveConfirmDialog = true;
-
-        setTimeout(() => {
-          this.$refs.saveConfirmDialog.$refs.confirmBtn.focus();
-        });
+        this.handleSaveConfirmDialog();
       });
     });
 
@@ -1017,6 +1013,12 @@ export default {
         this.$refs.resetConfirmDialog.$refs.confirmBtn.$el.focus();
       }, 100);
     },
+    handleSaveConfirmDialog() {
+      this.saveConfirmDialog = true;
+      setTimeout(() => {
+        this.$refs.saveConfirmDialog.$refs.confirmBtn.$el.focus();
+      }, 100);
+    },
     fetchSources() {
       return new Promise(function (resolver, reject) {
         if (!window.ipc) return reject();

From ba5fcde4957a4b986024f7ce9ad7a9a5db470de5 Mon Sep 17 00:00:00 2001
From: dacoaster <david@yatt.ai>
Date: Thu, 31 Aug 2023 17:43:20 -0700
Subject: [PATCH 5/6] Fixed capitalization and standardized focus on editor

---
 src/components/ControlPanel.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index 63b4b579..6ccd143f 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -59,7 +59,7 @@
             block
             :color="currentTheme.primary"
             :style="{ color: currentTheme.white }"
-            @click="handleDeleteConfirmDialog"
+            @click="handleDeleteConfirmDialog()"
           >
             <v-icon left>mdi-delete</v-icon> {{ $tc("caption.delete", 1) }}
           </v-btn>
@@ -92,7 +92,7 @@
             </template>
             <v-card tile>
               <v-list dense>
-                <v-list-item @click="exportItems">
+                <v-list-item @click="exportItems()">
                   <v-list-item-icon class="mr-4">
                     <v-icon>mdi-download</v-icon>
                   </v-list-item-icon>
@@ -145,7 +145,7 @@
                 small
                 color="default"
                 v-on="on"
-                @click="resume"
+                @click="resume()"
               >
                 <v-icon v-if="$vuetify.theme.dark === false">
                   mdi-play-circle
@@ -166,7 +166,7 @@
                 small
                 color="default"
                 v-on="on"
-                @click="handleNewSessionDialog"
+                @click="handleNewSessionDialog()"
               >
                 <v-icon v-if="$vuetify.theme.dark === false">
                   mdi-content-save
@@ -186,7 +186,7 @@
                 small
                 color="default"
                 v-on="on"
-                @click="handleResetConfirmDialog"
+                @click="handleResetConfirmDialog()"
               >
                 <v-icon v-if="$vuetify.theme.dark === false">
                   mdi-close-circle
@@ -445,7 +445,7 @@
                 color="default"
                 :disabled="status === 'pause'"
                 v-on="on"
-                @click="showNoteDialog"
+                @click="showNoteDialog()"
               >
                 <img
                   v-if="$vuetify.theme.dark === false"
@@ -473,7 +473,7 @@
                 color="default"
                 :disabled="status === 'pause'"
                 v-on="on"
-                @click="addMindmap"
+                @click="addMindmap()"
               >
                 <img
                   v-if="$vuetify.theme.dark === false"
@@ -500,7 +500,7 @@
                 small
                 color="default"
                 v-on="on"
-                @click="minimize"
+                @click="minimize()"
               >
                 <img
                   v-if="$vuetify.theme.dark === false"
@@ -538,7 +538,7 @@
             </template>
             <v-list>
               <v-list-item
-                @click="showSourcePickerDialog"
+                @click="showSourcePickerDialog()"
                 :disabled="
                   status === 'pause' || recordVideoStarted || recordAudioStarted
                 "
@@ -619,7 +619,7 @@
         :credentialItems="credentials"
       />
       <SummaryDialog
-        ref="SummaryDialog"
+        ref="summaryDialog"
         v-model="summaryDialog"
         @submit-summary="addSummary"
         :configItem="config"
@@ -1218,7 +1218,7 @@ export default {
         this.summaryDialog = true;
 
         setTimeout(() => {
-          this.$refs.SummaryDialog.$refs.comment.editor.commandManager.commands.focus();
+          this.$refs.summaryDialog.$refs.comment.editor.commands.focus();
         }, 200);
       } else {
         if (!window.ipc) return;

From 5a5f49f62b04bcbb75e4af23ecc0d4ee18ab34a3 Mon Sep 17 00:00:00 2001
From: dacoaster <david@yatt.ai>
Date: Thu, 31 Aug 2023 17:51:32 -0700
Subject: [PATCH 6/6] Some more consistency tweaks

---
 src/components/ControlPanel.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index 6ccd143f..35934f41 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -609,19 +609,19 @@
         :sources="sources"
         :sourceId="sourceId"
         :loaded="loaded"
-        @submit-source="startSession"
+        @submit-source="startSession()"
       />
       <NoteDialog
         v-model="noteDialog"
         ref="noteDialog"
-        @submit-note="addNote"
+        @submit-note="addNote()"
         :configItem="config"
         :credentialItems="credentials"
       />
       <SummaryDialog
         ref="summaryDialog"
         v-model="summaryDialog"
-        @submit-summary="addSummary"
+        @submit-summary="addSummary()"
         :configItem="config"
         :credentialItems="credentials"
         :summary="summary"
@@ -630,21 +630,21 @@
         v-model="deleteConfirmDialog"
         ref="deleteConfirmDialog"
         :text="$t('message.confirm_delete')"
-        @confirm="deleteItems"
+        @confirm="deleteItems()"
         @cancel="deleteConfirmDialog = false"
       />
       <ResetConfirmDialog
         v-model="resetConfirmDialog"
         ref="resetConfirmDialog"
         :text="$t('message.confirm_reset')"
-        @confirm="resetSession"
+        @confirm="resetSession()"
         @cancel="resetConfirmDialog = false"
       />
       <SaveConfirmDialog
         v-model="saveConfirmDialog"
         ref="saveConfirmDialog"
         :text="$t('message.confirm_session_saved')"
-        @confirm="handleSaveConfirmDialog"
+        @confirm="handleSaveConfirmDialog()"
       />
       <NewSessionDialog
         v-model="newSessionDialog"
@@ -656,8 +656,8 @@
       <DurationConfirmDialog
         v-model="durationConfirmDialog"
         :text="$t('message.confirm_proceed_session_time')"
-        @end="end"
-        @proceed="proceed"
+        @end="end()"
+        @proceed="proceed()"
       />
       <AudioErrorDialog
         v-model="audioErrorDialog"
@@ -666,7 +666,7 @@
       />
       <EndSessionDialog
         v-model="endSessionDialog"
-        @proceed="closeEndSessionDialog"
+        @proceed="closeEndSessionDialog()"
         :post-session-data="postSessionData"
       />
     </div>