feat(scanr-agg): allow empty query

dataesr · Dec 18, 2023 · 2ab106b · 2ab106b
1 parent 3e08b14
commit 2ab106b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/client/src/pages/home.jsx b/client/src/pages/home.jsx
@@ -262,7 +262,7 @@ export default function Home() {
       <Row gutters>
         <Col>
           <Button
-            onClick={() => (formQueries.length === 0 ? setFormIsError(true) : (setFormIsError(false), refetch()))}
+            onClick={() => ((formQueries.length === 0) && (formDatasource !== 'scanr-agg') ? setFormIsError(true) : (setFormIsError(false), refetch()))}
           >
             Generate graph
           </Button>

diff --git a/server/src/routes/scanr-agg/make-query.js b/server/src/routes/scanr-agg/make-query.js
@@ -9,7 +9,8 @@ export const makeQuery = (queries, condition, startyear, endyear, size = DEFAULT
       filter: [
         { range: { year: { gte: startyear, lte: endyear } } },
       ],
-      must: {
+      ...(queries.length > 0
+      && { must: {
         query_string: {
           fields: [
             'title.*^3',
@@ -23,7 +24,7 @@ export const makeQuery = (queries, condition, startyear, endyear, size = DEFAULT
             .join(` ${condition} `),
           phrase_slop: 0,
         },
-      },
+      } }),
     },
   },
   aggs: {