Merge pull request #324 from publichealthengland/master

Bringing develop up to date

app/server/api/v1/apisearch.js

@@ -226,10 +226,13 @@ const buildMatchQuery = (searchTerm, fuzzy, page, pageSize) => {
 }
 
 const buildPrefixQuery = (searchTerm, page, pageSize) => {
-  let fields = ['name.completion^10']
+  let fields = ['name', 'name.completion^10']
 
   if (searchTerm.length > 2) {
     fields.push(
+      'realName',
+      'realName.completion',
+      'title',
       'title.completion',
       'relatedDrugs.drugName.completion',
       'relatedDrugs.synonyms.completion',

app/server/index.jsx

@@ -86,6 +86,16 @@ if (
   })
 }
 
+if (
+  config.elasticsearch.basicAuth &&
+  config.elasticsearch.basicAuth.username
+) {
+  elasticSearchConf.auth = {
+    username: config.elasticsearch.basicAuth.username,
+    password: config.elasticsearch.basicAuth.password
+  }
+}
+
 const search = new Client(elasticSearchConf)
 
 var store

app/shared/components/AccessibleSearch/component.jsx

@@ -13,9 +13,11 @@ export default class AccessibleSearch extends React.Component {
           if (drug._source.title) {
             return `<span data-type='news' data-slug='${drug._source.slug}'>${drug._source.title}</span>`
             /*eslint-disable */
-          } else if (drug._source.name != drug._source.realName) {
+          } else if (drug._source.realName && drug._source.name !== drug._source.realName) {
             /*eslint-enable */
             return `<span data-type='drug' data-slug='${drug._source.slug}' class='autocomplete__option--background'>${drug._source.name}</span> <span>(${drug._source.realName})</span>`
+          } else if (!drug._source.realName) {
+            return `<span data-type='drug' data-slug='${drug._source.slug}' class='autocomplete__option--background'>${drug._source.name}</span>`
           }
           return `<span data-type='drug' data-slug='${drug._source.slug}' class='autocomplete__option--background'>${drug._source.realName}</span>`
         })

config.preview.yaml

@@ -3,7 +3,9 @@ api: https://preview.talktofrank.com
 robotsDisallow: true
 
 elasticsearch:
-  host: ''
+  basicAuth:
+    username: 'ttf-es-master'
+    password: !!import/single '../config.elasticsearch.password.yaml'
 
 contentful:
   contentHost: 'preview.contentful.com'

config.production.yaml

@@ -7,6 +7,11 @@ contentful:
   contentAccessToken: !!import/single '../config.creds.yaml'
   webhookSecretKey: !!import/single '../config.webhooksecretkey.yaml'
 
+elasticsearch:
+  basicAuth:
+    username: 'ttf-es-master'
+    password: !!import/single '../config.elasticsearch.password.yaml'
+
 robotsDisallow: false
 
 sentry:

config.yaml

@@ -5,8 +5,7 @@ canonicalHost: https://www.talktofrank.com
 robotsDisallow: true
 
 elasticsearch:
-  host: "https://vpc-ttf-prod-sbocvb3kw7ykfpq6jcaj2r4kzi.eu-west-2.es.amazonaws.com/"
-  #  host: 'https://search-talktofrank-elastic-beta-tsq3jroogc3kwgtk4s77uab2he.eu-west-2.es.amazonaws.com/'
+  host: "https://vpc-ttf-prod-v2-rtpivnkf2dom6xuzfp7wuwz7ui.eu-west-2.es.amazonaws.com/"
   amazonES:
     region: "eu-west-2"