[#230] Button to flatten

Mostly test fixes to allow for this.

cove/static/dataexplore/css/style.css

@@ -73,3 +73,7 @@ show-open-if-noscript {
 a:hover {
  cursor:pointer;
 }
+
+.left-space {
+    margin-left:10px
+}

cove/templates/explore.html

@@ -26,7 +26,7 @@ <h4 class="panel-title">
   <div class="panel-body">
     {% if conversion == 'flatten' %}
 
-      <ul>
+      <ul class="list-unstyled left-space">
         <li>
           <a href="{{original_file.url}}">{% blocktrans with file_format=JSON status=original %}{{file_format}} ({{status}}){% endblocktrans %}</a> {{original_file.size|filesizeformat }}
         </li>
@@ -48,7 +48,7 @@ <h4 class="panel-title">
 
     {% elif conversion == 'unflatten' %}
 
-      <ul>
+      <ul class="list-unstyled left-space">
         <li>
           <a href="{{original_file.url}}">
             {% if file_type == 'xlsx' %}
@@ -65,9 +65,13 @@ <h4 class="panel-title">
       </ul>
 
     {% else %}
-      <ul>
+      <ul class="list-unstyled left-space">
         <li>
-          <a href="{{original_file.url}}">{% blocktrans with file_format=JSON status=original %}{{file_format}} ({{status}}){% endblocktrans %}</a> {{original_file.size|filesizeformat }}
+          <span class="pull-left"><a href="{{original_file.url}}">{% blocktrans with file_format=JSON status=original %}{{file_format}} ({{status}}){% endblocktrans %}</a> {{original_file.size|filesizeformat }}
+          </span>
+          {% if conversion == 'flattenable' %}
+             <form method="post"> <button name="flatten" value="true" type="submit" class="btn btn-default btn-xs left-space"> Convert to Spreadsheet </button> {% csrf_token %} </form>
+          {% endif %}
         </li>
       </ul>
     {% endif %}

cove/tests.py

@@ -81,6 +81,10 @@ def test_explore_page(client, current_app):
     data.current_app = current_app
     resp = client.get(data.get_absolute_url())
     assert resp.status_code == 200
+    assert resp.context['conversion'] == 'flattenable'
+
+    resp = client.post(data.get_absolute_url(), {'flatten': 'true'})
+    assert resp.status_code == 200
     assert resp.context['conversion'] == 'flatten'
     assert 'converted_file_size' in resp.context
     if current_app == 'cove-360':
@@ -124,6 +128,6 @@ def test_explore_unconvertable_json(client):
     data = SuppliedData.objects.create()
     with open(os.path.join('cove', 'fixtures', 'unconvertable_json.json')) as fp:
         data.original_file.save('unconvertable_json.json', UploadedFile(fp))
-    resp = client.get(data.get_absolute_url())
+    resp = client.post(data.get_absolute_url(), {'flatten': 'true'})
     assert resp.status_code == 200
     assert b'could not be converted' in resp.content

cove/views.py

@@ -318,7 +318,11 @@ def convert_json(request, data):
     )
     try:
         if not os.path.exists(converted_path + '.xlsx'):
-            flattentool.flatten(data.original_file.file.name, **flatten_kwargs)
+            if request.POST.get('flatten'):
+                flattentool.flatten(data.original_file.file.name, **flatten_kwargs)
+            else:
+                return {'conversion': 'flattenable'}
+
         context['converted_file_size'] = os.path.getsize(converted_path + '.xlsx')
         if request.cove_config['convert_titles']:
             flatten_kwargs.update(dict(

fts/tests.py

@@ -1,6 +1,7 @@
 import pytest
 import requests
 from selenium import webdriver
+from selenium.common.exceptions import NoSuchElementException
 import time
 import os
 
@@ -191,7 +192,8 @@ def test_URL_input(server_url, browser, httpserver, source_filename, prefix, exp
     browser.find_element_by_css_selector("#fetchURL > div.form-group > button.btn.btn-primary").click()
     check_url_input_result_page(server_url, browser, httpserver, source_filename, prefix, expected_text, conversion_successful)
     #refresh page to now check if tests still work after caching some data
-    browser.refresh()
+    browser.get(browser.current_url)
+
     check_url_input_result_page(server_url, browser, httpserver, source_filename, prefix, expected_text, conversion_successful)
 
     browser.get(server_url + prefix + '?source_url=' + source_url)
@@ -200,6 +202,11 @@ def test_URL_input(server_url, browser, httpserver, source_filename, prefix, exp
 
 def check_url_input_result_page(server_url, browser, httpserver, source_filename, prefix, expected_text, conversion_successful):
     # We should still be in the correct app
+    if source_filename.endswith('.json'):
+        try:
+            browser.find_element_by_name("flatten").click()
+        except NoSuchElementException:
+            pass
     body_text = browser.find_element_by_tag_name('body').text
     if isinstance(expected_text, str):
         expected_text = [expected_text]