WIP

eea · Sep 24, 2021 · 57f984e · 57f984e
1 parent 0c2a5d7
commit 57f984e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/index.js b/src/index.js
@@ -33,8 +33,7 @@ const applyConfig = (config) => {
 
     const handler = createHandler({
       urlES: process.env.RAZZLE_PROXY_ES_DSN || 'http://localhost:9200/_all',
-      urlQA:
-        process.env.RAZZLE_PROXY_QA_DSN || 'http://localhost:8000/api/query',
+      urlNLP: process.env.RAZZLE_PROXY_QA_DSN || 'http://localhost:8000/api',
     });
 
     const middleware = express.Router();
@@ -55,10 +54,12 @@ export const installGlobalSearch = (config) => {
   // config.settings.devProxyToApiPath = false;
   config.settings.searchlib = installConfig(config.settings.searchlib);
   config.settings.searchlib.resolve.LeftColumnLayout.component = LeftColumnLayout;
-  config.settings.searchlib.searchui.globalsearch.elastic_index =
-    '_es/globalsearch';
-  config.settings.searchlib.searchui.globalsearch.layoutComponent =
-    'LeftColumnLayout';
+
+  const { globalsearch } = config.settings.searchlib.searchui;
+
+  globalsearch.elastic_index = '_es/globalsearch';
+  globalsearch.layoutComponent = 'LeftColumnLayout';
+
   return config;
 };
 

diff --git a/src/middleware/elasticsearch.js b/src/middleware/elasticsearch.js
@@ -22,7 +22,7 @@ function filterRequests(req, whitelist, retVal) {
 }
 
 function handleQuestionRequest(req, res, params) {
-  const { urlQA } = params;
+  const { urlNLP } = params;
   const { body } = req;
   const { question } = body;
 
@@ -35,7 +35,7 @@ function handleQuestionRequest(req, res, params) {
   };
 
   superagent
-    .post(urlQA)
+    .post(urlNLP)
     .send(qaBody)
     .set('accept', 'application/json')
     .end((err, resp) => {
@@ -48,6 +48,7 @@ function handleSearchRequest(req, res, params) {
   const { urlES } = params;
   const url = `${urlES}/_search`;
 
+  console.log('handle search', url);
   superagent
     .post(url)
     .send(body)
@@ -59,10 +60,10 @@ function handleSearchRequest(req, res, params) {
 
 function handleNlpRequest(req, res, params) {
   const { body } = req;
-  const { urlQA } = params;
+  const { urlNLP } = params;
   const { endpoint } = body;
   delete body.endpoint;
-  const url = `${urlQA}/${endpoint}`;
+  const url = `${urlNLP}/${endpoint}`;
 
   superagent
     .post(url)
@@ -93,19 +94,19 @@ const handleSearch = (req, res, next, params) => {
   }
 };
 
-const handleSettings = (req, res, next, { appName, urlQA, urlES }) => {
+const handleSettings = (req, res, next, { appName, urlNLP, urlES }) => {
   const url = `${urlES}/_settings`;
   superagent.get(url).end((err, resp) => {
     if (resp && resp.body) res.send(resp.body);
   });
 };
 
-const handleDownload = (req, res, next, { appName, urlQA, urlES }) => {
+const handleDownload = (req, res, next, { appName, urlNLP, urlES }) => {
   const appConfig = config.settings.searchlib.searchui[appName];
   download(urlES, appConfig, req, res);
 };
 
-export const createHandler = ({ urlQA, urlES }) => {
+export const createHandler = ({ urlNLP, urlES }) => {
   return function esProxyHandler(req, res, next) {
     const appNames = Object.keys(config.settings.searchlib.searchui);
 
@@ -115,7 +116,12 @@ export const createHandler = ({ urlQA, urlES }) => {
       .find((b) => b);
 
     if (appName) {
-      handleSearch(req, res, next, { appName, urlQA, urlES });
+      const conf = config.settings.searchlib.searchui[appName];
+      handleSearch(req, res, next, {
+        appName,
+        urlNLP,
+        urlES: conf.enableNLP ? urlNLP : urlES,
+      });
       return;
     }
 
@@ -124,7 +130,7 @@ export const createHandler = ({ urlQA, urlES }) => {
       .find((b) => b);
 
     if (appName) {
-      handleSettings(req, res, next, { appName, urlQA, urlES });
+      handleSettings(req, res, next, { appName, urlNLP, urlES });
       return;
     }
 
@@ -133,7 +139,7 @@ export const createHandler = ({ urlQA, urlES }) => {
       .find((b) => b);
 
     if (appName) {
-      handleDownload(req, res, next, { appName, urlQA, urlES });
+      handleDownload(req, res, next, { appName, urlNLP, urlES });
       return;
     }