From e12372fe602dff3844fb9f36b1d831489cfd9dce Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 8 Jun 2020 08:34:21 +0000
Subject: [PATCH] Merge branch 'voutsinas-issue-1' into 'master'
Changes to the JS code to enable the keyword search textfield
See merge request vermaas/adex-gui!7
(cherry picked from commit 2cfcc52ae0d8681cdaaba46857fed24a1a6fdb9c)
329a0e89 Changes to the JS code to enable the keyword search textfield
---
docker/docker-compose.yml | 36 +++++++++++++++++++++++++++++++
src/routes/query/QueryArchives.js | 11 +++++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 docker/docker-compose.yml
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..50362cb
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,36 @@
+
+version: '3'
+
+networks:
+
+ esap_net:
+
+services:
+ esap_api:
+ image:
+ "esap_api:latest"
+ read_only:
+ false
+ volumes:
+ - /data/shared:/shared
+ networks:
+ - esap_net
+ ports:
+ - "8005:8005"
+
+ my_nginx:
+ image:
+ "my_nginx:latest"
+ read_only:
+ false
+ volumes:
+ - /data/shared:/shared
+ - /data/shared:/etc/nginx/conf.d/
+ - /data/shared/static:/static
+ networks:
+ - esap_net
+ ports:
+ - "80:80"
+ depends_on:
+ - esap_api
+
diff --git a/src/routes/query/QueryArchives.js b/src/routes/query/QueryArchives.js
index 7d30b85..07130a5 100644
--- a/src/routes/query/QueryArchives.js
+++ b/src/routes/query/QueryArchives.js
@@ -101,6 +101,15 @@ export default function QueryArchives(props) {
queryToStore[key]=value
}
+ if (formData.keyword) {
+
+ key = "keyword"
+ value = formData.keyword.trim()
+
+ query = query + "&" + key + "=" + value
+ queryToStore[key]=value
+ }
+
if (formData.target) {
@@ -347,4 +356,4 @@ export default function QueryArchives(props) {
);
-}
\ No newline at end of file
+}
--
GitLab