From a10916fc1415d8f8d6c6ab4fd5c12f9b18cccf38 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:15:16 +0200
Subject: [PATCH 01/15] remove falsy values, but do not limit characters

---
 backend/src/schema/resolvers/searches/queryString.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index 5ef84cdce..0045f1c22 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -33,7 +33,7 @@ const matchSomeWordsExactly = (str, boost = 2) => {
 const matchBeginningOfWords = (str) => {
   return str
     .split(' ')
-    .filter((s) => s.length > 3)
+    .filter((s) => s) // remove falsy values
     .map((s) => s + '*')
     .join(' ')
 }

From ca24cf44050342415baef54da3fe86ab9f7ea0e4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:19:15 +0200
Subject: [PATCH 02/15] simplyfy logic, use language ahortcuts

---
 backend/src/schema/resolvers/searches.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 3fdf22da3..3001a28b3 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -223,8 +223,7 @@ export default {
     },
     searchResults: async (_parent, args, context, _resolveInfo) => {
       const { query, limit } = args
-      let userId = null
-      if (context.user) userId = context.user.id
+      let userId = context.user?.id || null 
 
       const searchType = query.replace(/^([!@#&]?).*$/, '$1')
       const searchString = query.replace(/^([!@#&])/, '')

From 6025706b4b2c2bfc8cbb51658f2b40d081698222 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:19:50 +0200
Subject: [PATCH 03/15] fix searchableInput field component to properly
 retrigger search on delete, clear properly etc

---
 .../generic/SearchableInput/SearchableInput.vue | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 2149732c5..8397cccbf 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -14,9 +14,8 @@
       :auto-reset-search="!searchValue"
       :placeholder="$t('search.placeholder')"
       @focus.capture.native="onFocus"
-      @input.native="handleInput"
+      @input.native="onInput"
       @keyup.enter.native="onEnter"
-      @keyup.delete.native="onDelete"
       @keyup.esc.native="clear"
       @blur.capture.native="onBlur"
       @input.exact="onSelect"
@@ -103,11 +102,14 @@ export default {
     onFocus(event) {
       clearTimeout(this.searchProcess)
     },
-    handleInput(event) {
+    onInput(event) {
+      console.log('input', event)
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
+      console.log('input', this.value)
       this.unprocessedSearchInput = this.value
       if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
+        this.clear()
         return
       }
       this.searchProcess = setTimeout(() => {
@@ -122,15 +124,6 @@ export default {
       })
       this.$emit('clearSearch')
     },
-    onDelete(event) {
-      clearTimeout(this.searchProcess)
-      const value = event.target ? event.target.value.trim() : ''
-      if (isEmpty(value)) {
-        this.clear()
-      } else {
-        this.handleInput(event)
-      }
-    },
     clear() {
       this.unprocessedSearchInput = ''
       this.previousSearchTerm = ''

From 33d5758686722128d411450680cefa6af52a5a67 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:35:43 +0200
Subject: [PATCH 04/15] removed comments

---
 webapp/components/generic/SearchableInput/SearchableInput.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 8397cccbf..45ea33bab 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -103,10 +103,8 @@ export default {
       clearTimeout(this.searchProcess)
     },
     onInput(event) {
-      console.log('input', event)
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
-      console.log('input', this.value)
       this.unprocessedSearchInput = this.value
       if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
         this.clear()

From c7fbe9beef8c1dca3549b673e4111dccaa7d9fb5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:36:01 +0200
Subject: [PATCH 05/15] removed test for onDelete event

---
 .../generic/SearchableInput/SearchableInput.spec.js        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.spec.js b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
index cda9150b8..223ee6186 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.spec.js
+++ b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
@@ -63,13 +63,6 @@ describe('SearchableInput.vue', () => {
       expect(select.element.value).toBe('abcd')
     })
 
-    it('calls onDelete when the delete key is pressed', () => {
-      const spy = jest.spyOn(wrapper.vm, 'onDelete')
-      select.trigger('input')
-      select.trigger('keyup.delete')
-      expect(spy).toHaveBeenCalledTimes(1)
-    })
-
     describe('navigating to resource', () => {
       beforeEach(() => {
         propsData = { options: searchResults }

From 4a5c56203b877d166f5667c5e5f9e8ddc488727c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 02:44:46 +0200
Subject: [PATCH 06/15] simplified searchableInput further - fixed on Enter

---
 .../components/generic/SearchableInput/SearchableInput.vue   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 45ea33bab..bc349c9f6 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -78,7 +78,6 @@ export default {
     return {
       searchValue: '',
       value: '',
-      unprocessedSearchInput: '',
       searchProcess: null,
       previousSearchTerm: '',
       delay: 300,
@@ -105,7 +104,6 @@ export default {
     onInput(event) {
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
-      this.unprocessedSearchInput = this.value
       if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
         this.clear()
         return
@@ -118,12 +116,11 @@ export default {
     onEnter(event) {
       this.$router.push({
         path: '/search/search-results',
-        query: { search: this.unprocessedSearchInput },
+        query: { search: this.value },
       })
       this.$emit('clearSearch')
     },
     clear() {
-      this.unprocessedSearchInput = ''
       this.previousSearchTerm = ''
       this.searchValue = ''
       this.$emit('clearSearch')

From 536ef92132fba043d1add9225e56a81cf7765b3b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 03:44:51 +0200
Subject: [PATCH 07/15] more simplifications

---
 .../SearchableInput/SearchableInput.vue       | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index bc349c9f6..c27b16b66 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="searchable-input" aria-label="search" role="search">
     <ds-select
+      ref="select"
       type="search"
       icon="search"
-      v-model="searchValue"
+      v-model="value"
       :id="id"
       label-prop="id"
       :icon-right="null"
@@ -11,7 +12,7 @@
       :loading="loading"
       :filter="(item) => item"
       :no-options-available="emptyText"
-      :auto-reset-search="!searchValue"
+      :auto-reset-search="!value"
       :placeholder="$t('search.placeholder')"
       @focus.capture.native="onFocus"
       @input.native="onInput"
@@ -76,10 +77,8 @@ export default {
   },
   data() {
     return {
-      searchValue: '',
       value: '',
       searchProcess: null,
-      previousSearchTerm: '',
       delay: 300,
     }
   },
@@ -88,7 +87,7 @@ export default {
       return this.isActive && !this.loading ? this.$t('search.failed') : this.$t('search.hint')
     },
     isActive() {
-      return !isEmpty(this.previousSearchTerm)
+      return !isEmpty(this.value)
     },
   },
   methods: {
@@ -109,7 +108,6 @@ export default {
         return
       }
       this.searchProcess = setTimeout(() => {
-        this.previousSearchTerm = this.value
         this.$emit('query', this.value)
       }, this.delay)
     },
@@ -118,22 +116,21 @@ export default {
         path: '/search/search-results',
         query: { search: this.value },
       })
-      this.$emit('clearSearch')
+      this.$refs.select.close()
     },
     clear() {
-      this.previousSearchTerm = ''
-      this.searchValue = ''
+      this.value = ''
+      this.valueBackup = ''
       this.$emit('clearSearch')
       clearTimeout(this.searchProcess)
     },
     onBlur(event) {
-      this.searchValue = this.previousSearchTerm
       clearTimeout(this.searchProcess)
     },
     onSelect(item) {
       this.goToResource(item)
       this.$nextTick(() => {
-        this.searchValue = this.previousSearchTerm
+        this.value = this.$refs.select.$data.searchString
       })
     },
     getRouteName(item) {

From 5c23815a36f3bb969ce604d683c22e815173b77e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 03:50:06 +0200
Subject: [PATCH 08/15] lint fixes

---
 backend/src/schema/resolvers/searches.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 3001a28b3..63d195863 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -223,7 +223,7 @@ export default {
     },
     searchResults: async (_parent, args, context, _resolveInfo) => {
       const { query, limit } = args
-      let userId = context.user?.id || null 
+      const userId = context.user?.id || null 
 
       const searchType = query.replace(/^([!@#&]?).*$/, '$1')
       const searchString = query.replace(/^([!@#&])/, '')

From 6102ce2fffaac45c91c902eacf3891c5bdc55b94 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:05:43 +0200
Subject: [PATCH 09/15] more lint fix

---
 backend/src/schema/resolvers/searches.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 63d195863..a67abe90d 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -223,7 +223,7 @@ export default {
     },
     searchResults: async (_parent, args, context, _resolveInfo) => {
       const { query, limit } = args
-      const userId = context.user?.id || null 
+      const userId = context.user?.id || null
 
       const searchType = query.replace(/^([!@#&]?).*$/, '$1')
       const searchString = query.replace(/^([!@#&])/, '')

From efff3625a9ca30e9dba75b18cb6bcdf1a87374f7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:07:26 +0200
Subject: [PATCH 10/15] properly diferentiate between clearbale search and text
 hints

---
 .../generic/SearchableInput/SearchableInput.vue        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index c27b16b66..987fd596b 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -84,13 +84,16 @@ export default {
   },
   computed: {
     emptyText() {
-      return this.isActive && !this.loading ? this.$t('search.failed') : this.$t('search.hint')
+      return !this.loading && this.isSearchable() ? this.$t('search.failed') : this.$t('search.hint')
     },
     isActive() {
       return !isEmpty(this.value)
     },
   },
   methods: {
+    isSearchable(){
+      return !isEmpty(this.value) && typeof this.value === 'string' && this.value.replace(/\s+/g, '').length >= 3
+    },
     isFirstOfType(option) {
       return (
         this.options.findIndex((o) => o === option) ===
@@ -103,8 +106,8 @@ export default {
     onInput(event) {
       clearTimeout(this.searchProcess)
       this.value = event.target ? event.target.value.replace(/\s+/g, ' ').trim() : ''
-      if (isEmpty(this.value) || this.value.replace(/\s+/g, '').length < 3) {
-        this.clear()
+      if (!this.isSearchable()) {
+        this.$emit('clearSearch')
         return
       }
       this.searchProcess = setTimeout(() => {
@@ -120,7 +123,6 @@ export default {
     },
     clear() {
       this.value = ''
-      this.valueBackup = ''
       this.$emit('clearSearch')
       clearTimeout(this.searchProcess)
     },

From e228b42cc4413b9ac8ff60333cd0d2e0a01a063c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:16:19 +0200
Subject: [PATCH 11/15] lint

---
 .../components/generic/SearchableInput/SearchableInput.vue  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 987fd596b..7bd0e7985 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -92,7 +92,11 @@ export default {
   },
   methods: {
     isSearchable(){
-      return !isEmpty(this.value) && typeof this.value === 'string' && this.value.replace(/\s+/g, '').length >= 3
+      return (
+        !isEmpty(this.value) &&
+        typeof this.value === 'string' &&
+        this.value.replace(/\s+/g, '').length >= 3
+      )
     },
     isFirstOfType(option) {
       return (

From 23588c02ecda09ffce7bcada0620153eced3669a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:24:34 +0200
Subject: [PATCH 12/15] more lint fixes

---
 .../components/generic/SearchableInput/SearchableInput.vue  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 7bd0e7985..a43c266a3 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -84,14 +84,16 @@ export default {
   },
   computed: {
     emptyText() {
-      return !this.loading && this.isSearchable() ? this.$t('search.failed') : this.$t('search.hint')
+      return !this.loading && this.isSearchable() 
+        ? this.$t('search.failed')
+        : this.$t('search.hint')
     },
     isActive() {
       return !isEmpty(this.value)
     },
   },
   methods: {
-    isSearchable(){
+    isSearchable() {
       return (
         !isEmpty(this.value) &&
         typeof this.value === 'string' &&

From c88cbdc9d85f440c37969dca025afd0368432dec Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 04:41:43 +0200
Subject: [PATCH 13/15] last lint

---
 webapp/components/generic/SearchableInput/SearchableInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index a43c266a3..b0e813b45 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -84,7 +84,7 @@ export default {
   },
   computed: {
     emptyText() {
-      return !this.loading && this.isSearchable() 
+      return !this.loading && this.isSearchable()
         ? this.$t('search.failed')
         : this.$t('search.hint')
     },

From 9198ec9a129ae3adc81c226b51423b935ec05c3f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 11:47:30 +0200
Subject: [PATCH 14/15] ensure 3 characters minimum

---
 backend/src/schema/resolvers/searches/queryString.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index 0045f1c22..ad1ba59fa 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -33,7 +33,7 @@ const matchSomeWordsExactly = (str, boost = 2) => {
 const matchBeginningOfWords = (str) => {
   return str
     .split(' ')
-    .filter((s) => s) // remove falsy values
+    .filter((s) => s.length >= 3)
     .map((s) => s + '*')
     .join(' ')
 }

From c2828a31debcb6058f91599c29c665be9e785056 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 12:01:10 +0200
Subject: [PATCH 15/15] word length limitation set to minimum 2

---
 backend/src/schema/resolvers/searches/queryString.js      | 2 +-
 backend/src/schema/resolvers/searches/queryString.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index ad1ba59fa..8f415c5e6 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -33,7 +33,7 @@ const matchSomeWordsExactly = (str, boost = 2) => {
 const matchBeginningOfWords = (str) => {
   return str
     .split(' ')
-    .filter((s) => s.length >= 3)
+    .filter((s) => s.length >= 2)
     .map((s) => s + '*')
     .join(' ')
 }
diff --git a/backend/src/schema/resolvers/searches/queryString.spec.js b/backend/src/schema/resolvers/searches/queryString.spec.js
index 23a746be1..fe3c91d3c 100644
--- a/backend/src/schema/resolvers/searches/queryString.spec.js
+++ b/backend/src/schema/resolvers/searches/queryString.spec.js
@@ -37,7 +37,7 @@ describe('queryString', () => {
 
   describe('globbing for longer words', () => {
     it('globs words with more than three characters', () => {
-      expect(queryString('a couple of words')).toContain('couple* words*')
+      expect(queryString('a couple of words')).toContain('couple* of* words*')
     })
   })
 })