Stop modifying the query response for showing as JSON

puppetboard/templates/query.html

@@ -130,24 +130,26 @@ <h2 id="results_header">Result</h2>
 {% endblock content %}
 
 {% block onload_script %}
-{% macro extra_options(caller) %}
-'columns': [
-    {% for column in columns %}
-    {
-        "title": "{{ quote_columns_data(column) }}",
-{% if column in ['node', 'certname'] %}
-        "render": function (data, type, full, meta) {
-            return `<a href='{{ url_for("node", node_name="") }}${data}'>${data}</a>`
+{% if not form.rawjson.data %}
+    {% macro extra_options(caller) %}
+    'columns': [
+        {% for column in columns %}
+        {
+            "title": "{{ quote_columns_data(column) }}",
+    {% if column in ['node', 'certname'] %}
+            "render": function (data, type, full, meta) {
+                return `<a href='{{ url_for("node", node_name="") }}${data}'>${data}</a>`
+            },
+    {% endif %}
         },
+        {% endfor %}
+    ],
+    'serverSide': false,
+    {% endmacro %}
+
+    {% if not result %}
+        {% set result = [] %}
+    {% endif %}
+    {{ macros.datatable_init(table_html_id="query_table", ajax_url=None, data=result|tojson, default_length=config.NORMAL_TABLE_COUNT, length_selector=config.TABLE_COUNT_SELECTOR, extra_options=extra_options) }}
 {% endif %}
-    },
-    {% endfor %}
-],
-'serverSide': false,
-{% endmacro %}
-
-{% if not result %}
-    {% set result = [] %}
-{% endif %}
-{{ macros.datatable_init(table_html_id="query_table", ajax_url=None, data=result|tojson, default_length=config.NORMAL_TABLE_COUNT, length_selector=config.TABLE_COUNT_SELECTOR, extra_options=extra_options) }}
 {% endblock onload_script %}

puppetboard/views/query.py

@@ -61,21 +61,32 @@ def query(env):
             zero_results = (len(result) == 0)
             result = result if not zero_results else None
 
-            output = []
-            if not zero_results:
-                columns = result[0].keys()
-                for items in result:
-                    output.append(list(items.values()))
+            if form.rawjson.data:
+                # for JSON view pass the response from PuppetDB as-is
+                return render_template('query.html',
+                                       form=form,
+                                       zero_results=zero_results,
+                                       result=result,
+                                       columns=None,
+                                       envs=envs,
+                                       current_env=env)
             else:
-                columns = []
-
-            return render_template('query.html',
-                                   form=form,
-                                   zero_results=zero_results,
-                                   result=output,
-                                   columns=columns,
-                                   envs=envs,
-                                   current_env=env)
+                # for table view separate the columns and the rows
+                rows = []
+                if not zero_results:
+                    columns = result[0].keys()
+                    for items in result:
+                        rows.append(list(items.values()))
+                else:
+                    columns = []
+
+                return render_template('query.html',
+                                       form=form,
+                                       zero_results=zero_results,
+                                       result=rows,
+                                       columns=columns,
+                                       envs=envs,
+                                       current_env=env)
 
         except HTTPError as e:
             error_text = e.response.text

test/views/test_query.py

@@ -18,23 +18,23 @@ def test_query_view(client, mocker,
     assert len(vals) == 0
 
 
-def test_query__some_response(client, mocker,
-                              mock_puppetdb_environments,
-                              mock_puppetdb_default_nodes):
+def test_query__some_response__table(client, mocker,
+                                     mock_puppetdb_environments,
+                                     mock_puppetdb_default_nodes):
     app.app.config['WTF_CSRF_ENABLED'] = False
 
-    query_data = [
-        {'certname': 'foobar'},
+    result = [
+        {'certname': 'foobar', 'catalog_environment': 'qa'},
     ]
-    mocker.patch.object(app.puppetdb, '_query', return_value=query_data)
+    mocker.patch.object(app.puppetdb, '_query', return_value=result)
 
-    data = {
+    query_data = {
         'query': 'nodes[certname] { certname = "foobar" }',
         'endpoints': 'pql',
     }
     rv = client.post(
         '/query',
-        data=data,
+        data=query_data,
         content_type='application/x-www-form-urlencoded',
     )
 
@@ -48,7 +48,49 @@ def test_query__some_response(client, mocker,
 
     vals = soup.find_all('p', {"id": "number_of_results"})
     assert len(vals) == 1
-    assert str(len(query_data)) in vals[0].string
+    assert 'Number of results: 1' in vals[0].string
+
+    vals = soup.find_all('table', {"id": "query_table"})
+    assert len(vals) == 1
+    # we can't test more here as the content of this table is generated with JavaScript...
+
+
+def test_query__some_response__json(client, mocker,
+                                    mock_puppetdb_environments,
+                                    mock_puppetdb_default_nodes):
+    app.app.config['WTF_CSRF_ENABLED'] = False
+
+    result = [
+        {'certname': 'foobar', 'catalog_environment': 'qa'},
+    ]
+    mocker.patch.object(app.puppetdb, '_query', return_value=result)
+
+    query_data = {
+        'query': 'nodes[certname] { certname = "foobar" }',
+        'endpoints': 'pql',
+        'rawjson': 'y',
+    }
+    rv = client.post(
+        '/query',
+        data=query_data,
+        content_type='application/x-www-form-urlencoded',
+    )
+
+    assert rv.status_code == 200
+
+    soup = BeautifulSoup(rv.data, 'html.parser')
+    assert soup.title.contents[0] == 'Puppetboard'
+
+    vals = soup.find_all('h2', {"id": "results_header"})
+    assert len(vals) == 1
+
+    vals = soup.find_all('p', {"id": "number_of_results"})
+    assert len(vals) == 1
+    assert 'Number of results: 1' in vals[0].string
+
+    vals = soup.find_all('pre', {"id": "result"})
+    assert len(vals) == 1
+    # we can't test more here as the content of this tag is generated with JavaScript...
 
 
 def test_query__empty_response(client, mocker,