From 3c629e753b480b85c4618ec850c32a42286c2e5a Mon Sep 17 00:00:00 2001
From: Oliver Peate <oli@shippedcode.com>
Date: Tue, 29 Sep 2020 16:16:03 +0100
Subject: [PATCH] Use search_index_path helper to locate Search assets

This fixes search when Middleman is configured with the http_prefix option.

This is the recommended approach from the Middleman search gem itself,
rather than hardcoding '/search.json'

References:

- https://github.com/manastech/middleman-search#asset-pipeline
- https://github.com/manastech/middleman-search/blob/ed9e5254bb554988c755fc40238d9e9f67b20abe/lib/middleman-search/extension.rb#L29
---
 lib/assets/javascripts/_modules/search.js | 4 +++-
 lib/source/layouts/_search.erb            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/assets/javascripts/_modules/search.js b/lib/assets/javascripts/_modules/search.js
index 689e0f3c..48f6a0b0 100644
--- a/lib/assets/javascripts/_modules/search.js
+++ b/lib/assets/javascripts/_modules/search.js
@@ -16,6 +16,7 @@
     var results
     var query
     var maxSearchEntries = 20
+    var searchIndexPath
 
     this.start = function start ($element) {
       $searchForm = $element.find('form')
@@ -25,6 +26,7 @@
       $searchResults = $searchResultsWrapper.find('.search-results__content')
       $searchResultsTitle = $searchResultsWrapper.find('.search-results__title')
       $searchHelp = $('#search-help')
+      searchIndexPath = $element.data('searchIndexPath')
 
       changeSearchAction()
       changeSearchLabel()
@@ -49,7 +51,7 @@
     this.downloadSearchIndex = function downloadSearchIndex () {
       updateTitle('Loading search results')
       $.ajax({
-        url: '/search.json',
+        url: searchIndexPath,
         cache: true,
         method: 'GET',
         success: function (data) {
diff --git a/lib/source/layouts/_search.erb b/lib/source/layouts/_search.erb
index c40079a0..f738b6fc 100644
--- a/lib/source/layouts/_search.erb
+++ b/lib/source/layouts/_search.erb
@@ -1,5 +1,5 @@
 <% if config[:tech_docs][:enable_search] %>
-<div class="search" data-module="search">
+<div class="search" data-module="search" data-search-index-path="<%= search_index_path %>">
   <form action="https://www.google.co.uk/search" method="get" role="search" class="search__form govuk-!-margin-bottom-4">
     <input type="hidden" name="as_sitesearch" value="<%= config[:tech_docs][:host] %>"/>
     <label class="govuk-label search__label" for="search" aria-hidden="true">