Exclude current search route from history suggestions and populate input with matching query

Author: kommunarr

src/renderer/components/ft-input/ft-input.js

@@ -172,7 +172,7 @@ export default defineComponent({
       this.$emit('input', val)
     },
 
-    handleClearTextClick: function ({ programmaticallyTriggered = false }) {
+    handleClearTextClick: function () {
       // No action if no input text
       if (!this.inputDataPresent) { return }
 
@@ -183,9 +183,7 @@ export default defineComponent({
       this.$refs.input.value = ''
 
       // Focus on input element after text is clear for better UX
-      if (!programmaticallyTriggered) {
-        this.$refs.input.focus()
-      }
+      this.$refs.input.focus()
 
       this.$emit('clear')
     },
@@ -244,10 +242,12 @@ export default defineComponent({
       this.searchState.showOptions = false
       if (this.visibleDataList[index].route) {
         this.inputData = `ft:${this.visibleDataList[index].route}`
+        this.$emit('input', this.inputData)
+        this.inputData = this.$refs.input.value = this.visibleDataList[index].name
       } else {
         this.inputData = this.visibleDataList[index]
+        this.$emit('input', this.inputData)
       }
-      this.$emit('input', this.inputData)
       this.handleClick()
     },
 

src/renderer/components/top-nav/top-nav.js

@@ -127,7 +127,7 @@ export default defineComponent({
       if (!this.enableSearchSuggestions) {
         return
       }
-      return this.lastSuggestionQuery === '' ? this.$store.getters.getLatestUniqueSearchHistoryEntries : this.searchSuggestionsDataList
+      return this.lastSuggestionQuery === '' ? this.$store.getters.getLatestUniqueSearchHistoryEntries(this.$router.currentRoute.fullPath) : this.searchSuggestionsDataList
     },
   },
   watch: {
@@ -177,7 +177,6 @@ export default defineComponent({
       clearLocalSearchSuggestionsSession()
 
       if (queryText.startsWith('ft:')) {
-        this.$refs.searchInput.handleClearTextClick({ programmaticallyTriggered: true })
         const adjustedQuery = queryText.substring(3)
         openInternalPath({
           path: adjustedQuery,

src/renderer/store/modules/search-history.js

@@ -12,10 +12,10 @@ const getters = {
     return state.searchHistoryEntries
   },
 
-  getLatestUniqueSearchHistoryEntries: (state) => {
+  getLatestUniqueSearchHistoryEntries: (state) => (routeToExclude) => {
     const nameSet = new Set()
     return state.searchHistoryEntries.filter((entry) => {
-      if (nameSet.has(entry.name)) {
+      if (nameSet.has(entry.name) || routeToExclude === entry.route) {
         return false
       }