Fix query forms

django-daiquiri · Jul 29, 2024 · 00de29e · 00de29e
1 parent 48366a9
commit 00de29e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 17 deletions.
diff --git a/daiquiri/query/assets/js/query/components/forms/Form.js b/daiquiri/query/assets/js/query/components/forms/Form.js
@@ -124,7 +124,7 @@ const Form = ({ formKey, loadJob }) => {
 
         <div className="d-flex mt-2">
           <button type="button" className="btn btn-primary me-auto" onClick={() => handleSubmit()}>
-            {form.submit}
+            {form.submit || gettext('Submit')}
           </button>
           <button type="button" className="btn btn-outline-secondary" onClick={() => handleClear()}>
             {gettext('Clear input window')}

diff --git a/daiquiri/query/assets/js/query/components/forms/FormSql.js b/daiquiri/query/assets/js/query/components/forms/FormSql.js
@@ -199,7 +199,7 @@ const FormSql = ({ formKey, loadJob, query }) => {
 
         <div className="d-flex mt-2">
           <button type="button" className="btn btn-primary me-auto" onClick={() => handleSubmit()}>
-            {gettext('Submit new SQL Query')}
+            {form.submit || gettext('Submit new SQL query')}
           </button>
           <button type="button" className="btn btn-outline-secondary" onClick={() => handleClear()}>
             {gettext('Clear input window')}

diff --git a/daiquiri/query/assets/js/query/components/forms/FormUpload.js b/daiquiri/query/assets/js/query/components/forms/FormUpload.js
@@ -63,7 +63,7 @@ const FormUpload = ({ formKey, loadJob }) => {
 
         <div className="mt-2">
           <button type="button" className="btn btn-primary me-auto" onClick={() => handleUpload()}>
-            {gettext('Upload table')}
+            {form.submit || gettext('Upload')}
           </button>
         </div>
       </div>

diff --git a/daiquiri/query/serializers.py b/daiquiri/query/serializers.py
@@ -26,8 +26,8 @@ class FormDetailSerializer(serializers.Serializer):
     key = serializers.CharField()
     label = serializers.CharField()
     template = serializers.SerializerMethodField(required=False)
-    fields = serializers.SerializerMethodField(required=False, method_name='get_adapter_fields')
-    submit = serializers.CharField(default=_('Submit'))
+    fields = serializers.SerializerMethodField(method_name='get_adapter_fields')
+    submit = serializers.CharField(default=None)
 
     def get_template(self, obj):
         try:
@@ -36,7 +36,8 @@ def get_template(self, obj):
             return None
 
     def get_adapter_fields(self, obj):
-        return get_query_form_adapter(obj).get_fields()
+        adapter = get_query_form_adapter(obj)
+        return adapter.get_fields() if adapter else None
 
 
 class DropdownSerializer(serializers.Serializer):

diff --git a/daiquiri/query/settings.py b/daiquiri/query/settings.py
@@ -44,17 +44,14 @@
     {
         'key': 'sql',
         'label': 'SQL query',
-        'service': 'query/js/forms/sql.js',
-        'template': 'query/query_form_sql.html'
+        'template': 'query/new/query_form_sql.html'
     },
     {
         'key': 'upload',
         'label': 'Upload VOTable',
-        'service': 'query/js/forms/upload.js',
-        'template': 'query/query_form_upload.html'
+        'template': 'query/new/query_form_upload.html'
     }
 ]
-
 QUERY_PLOTS = [
     {
         'key': 'scatter_plot',

diff --git a/daiquiri/query/utils.py b/daiquiri/query/utils.py
@@ -354,7 +354,9 @@ def get_query_form(form_key):
 
 
 def get_query_form_adapter(form):
-    try:
-        return import_class(form['adapter'])()
-    except (AttributeError, KeyError):
-        raise RuntimeError('Query form adapter for query form "{key}"" not found.'.format(**form))
+    adapter_class = form.get('adapter')
+    if adapter_class:
+        try:
+            return import_class(form['adapter'])()
+        except AttributeError:
+            raise RuntimeError(f'Query form adapter "{adapter_class}"" could not be imported.')
diff --git a/daiquiri/query/viewsets.py b/daiquiri/query/viewsets.py
@@ -55,8 +55,6 @@
     fetch_user_schema_metadata,
     get_download_config,
     get_format_config,
-    get_query_form,
-    get_query_form_adapter,
     get_quota,
     get_user_upload_directory,
     handle_upload_param,