PI-1449 Fix search suggestions for multi-term queries

ministryofjustice · Sep 21, 2023 · 3af458b · 3af458b
1 parent 4f6decc
commit 3af458b
Show file tree

Hide file tree

Showing 5 changed files with 1,376 additions and 714 deletions.
diff --git a/packages/probation-search-frontend/components/probationSearch/template.njk b/packages/probation-search-frontend/components/probationSearch/template.njk
@@ -29,8 +29,8 @@
                 Did you mean
                 {%- set comma = joiner() %}
                 {%- for suggestion in params.results.suggestions %}{{ comma() }}
-                    <a href="?q={{ suggestion }}" class="govuk-link govuk-link--no-visited-state"
-                       title="Search again using {{ suggestion }}">{{ suggestion }}</a>
+                    <a href="{{ suggestion.url }}" class="govuk-link govuk-link--no-visited-state"
+                       title="Search again using {{ suggestion.text }}">{{ suggestion.text }}</a>
                 {%- endfor %}?
             {% endif %}
         </p>
@@ -46,7 +46,8 @@
               document.getElementById("{{ params.id }}").addEventListener('input', function() {
                 clearTimeout(timeoutId)
                 const url = new URL(location.href)
-                url.searchParams.forEach((value, name) => url.searchParams.delete(name))
+                url.searchParams.delete("matchAllTerms")
+                url.searchParams.delete("providers[]")
                 url.searchParams.set('q', this.value)
                 timeoutId = setTimeout(() => fetch(url).then(async response => {
                   if (response.status === 200) {

diff --git a/packages/probation-search-frontend/data/probationSearchClient.ts b/packages/probation-search-frontend/data/probationSearchClient.ts
@@ -109,6 +109,8 @@ export interface ProbationSearchResult {
 
 export interface Suggestion {
   text: string
+  offset: number
+  length: number
   options: {
     text: string
     freq: number