From aae3bfc8ca09aecab98f518e47f98f055b908adb Mon Sep 17 00:00:00 2001
From: William Moore <w.moore@dundee.ac.uk>
Date: Wed, 4 Oct 2023 12:05:39 +0100
Subject: [PATCH] Use searchengine for ALL auto-complete backend requests for
 front page

---
 .../static/idr_gallery/autocomplete.js        | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/idr_gallery/static/idr_gallery/autocomplete.js b/idr_gallery/static/idr_gallery/autocomplete.js
index 79b9cda3..498b22f3 100644
--- a/idr_gallery/static/idr_gallery/autocomplete.js
+++ b/idr_gallery/static/idr_gallery/autocomplete.js
@@ -199,19 +199,19 @@ $("#maprQuery")
         case_sensitive: case_sensitive,
       };
       let url;
-      // NB: Don't use mapr for some slow queries
-      if (configId === "any" || configId === "cellline") {
+      // We use searchengine for ALL backend queries...
+      // if (configId === "any" || configId === "cellline") {
         // Use searchengine...
         url = `${SEARCH_ENGINE_URL}resources/image/searchvalues/`;
         requestData = { value: request.term };
-      } else {
-        // Use mapr to find auto-complete matches TODO: to be removed
-        url = `${BASE_URL}mapr/api/autocomplete/${configId}/`;
-        requestData.value = case_sensitive
-          ? request.term
-          : request.term.toLowerCase();
-        requestData.query = true; // use a 'like' HQL query
-      }
+      // } else {
+      //   // Use mapr to find auto-complete matches TODO: to be removed
+      //   url = `${BASE_URL}mapr/api/autocomplete/${configId}/`;
+      //   requestData.value = case_sensitive
+      //     ? request.term
+      //     : request.term.toLowerCase();
+      //   requestData.query = true; // use a 'like' HQL query
+      // }
       showSpinner();
       $.ajax({
         dataType: "json",
@@ -223,9 +223,10 @@ $("#maprQuery")
           let queryVal = $("#maprQuery").val().trim();
           let results = [];
           // check that input hasn't changed during the call
-          if ((configId === "any" || configId === "cellline") && request.term.trim() == queryVal) {
+          if (request.term.trim() == queryVal) {
             let filterImageKeys;
             if (allKeys) {
+              // if we've chosen a Mapr-key to filter results...
               filterImageKeys = allKeys.split(",");
             }
             autoCompleteDisplayResults(queryVal, data, filterImageKeys);