Enable "Run query" for default query (#2352)

quiltdata · Sep 14, 2022 · 2a7ad47 · 2a7ad47
1 parent b62757f
commit 2a7ad47
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/catalog/app/containers/Bucket/Queries/ElasticSearch.tsx b/catalog/app/containers/Bucket/Queries/ElasticSearch.tsx
@@ -183,10 +183,9 @@ const QUERY_PLACEHOLDER = {
 }
 
 const isButtonDisabled = (
-  queryContent: requests.ElasticSearchQuery,
   resultsData: requests.AsyncData<requests.ElasticSearchResults>,
   error: Error | null,
-): boolean => !!error || !queryContent || !!resultsData.case({ Pending: R.T, _: R.F })
+): boolean => !!error || !!resultsData.case({ Pending: R.T, _: R.F })
 
 interface ElastiSearchProps extends RouteComponentProps<{ bucket: string }> {}
 
@@ -228,7 +227,7 @@ export default function ElastiSearch({
           {queryData.case({
             Init: () => (
               <Form
-                disabled={isButtonDisabled(customQueryBody, resultsData, queryBodyError)}
+                disabled={isButtonDisabled(resultsData, queryBodyError)}
                 onChange={handleQueryBodyChange}
                 onError={handleError}
                 onSubmit={handleSubmit}
@@ -237,11 +236,7 @@ export default function ElastiSearch({
             ),
             Ok: (queryBody: requests.ElasticSearchQuery) => (
               <Form
-                disabled={isButtonDisabled(
-                  customQueryBody || queryBody,
-                  resultsData,
-                  queryBodyError,
-                )}
+                disabled={isButtonDisabled(resultsData, queryBodyError)}
                 onChange={handleQueryBodyChange}
                 onError={handleError}
                 onSubmit={handleSubmit}

diff --git a/catalog/app/containers/Bucket/Queries/QuerySelect.tsx b/catalog/app/containers/Bucket/Queries/QuerySelect.tsx
@@ -54,7 +54,7 @@ export default function QuerySelect<T>({
           classes={{ root: classes.select }}
           disabled={!queries.length}
           onChange={handleChange}
-          value={value ? value.key : 'none'}
+          value={value?.key || 'none'}
         >
           <M.MenuItem disabled value="none">
             <M.ListItemText>Custom</M.ListItemText>

diff --git a/catalog/app/containers/Bucket/Queries/QueryViewer.tsx b/catalog/app/containers/Bucket/Queries/QueryViewer.tsx
@@ -64,9 +64,7 @@ export default function QueryViewer({
   const [error, setError] = React.useState<Error | null>(null)
 
   const handleChange = React.useCallback(
-    (value: object) => {
-      onChange(value as requests.ElasticSearchQuery)
-    },
+    (value: object) => onChange(value as requests.ElasticSearchQuery),
     [onChange],
   )
 
@@ -92,8 +90,6 @@ export default function QueryViewer({
     [t],
   )
 
-  if (!query) return null
-
   return (
     <div className={className}>
       <M.Typography className={classes.header} variant="body1">