Make mapped csvs downloadable for processor from the UI

digitalmethodsinitiative · Aug 28, 2024 · 2ab9e86 · 2ab9e86
1 parent 8652ba2
commit 2ab9e86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/webtool/static/css/dataset-page.css b/webtool/static/css/dataset-page.css
@@ -326,6 +326,7 @@ article.result > section:first-child {
 }
 
 .child-wrapper .button-wrap.processor-result-indicator a {
+    display: inline-block;
     color: inherit;
 }
 
@@ -340,6 +341,7 @@ article.result > section:first-child {
 }
 
 .child-wrapper .button-wrap .byline {
+    cursor: default;
     font-size: 0.8em;
 }
 

diff --git a/webtool/templates/components/result-child.html b/webtool/templates/components/result-child.html
@@ -10,25 +10,23 @@
 
     <div class="button-object">
 
-    {% if item.is_finished() and not is_filtered %}<a href="{{ url_for('get_result', query_file=item.result_file) }}">{% endif %}
         <span class="headline">
-            {% if item.is_finished() and not is_filtered %}<a href="{{ url_for('get_result', query_file=item.result_file) }}">{% endif %}
             {% if item.is_finished() and is_filtered and "copied_to" in item.parameters %}<a href="{{ url_for('show_result', key=item.parameters.copied_to) }}">{% endif %}
             {% if is_filtered %}
             <i class="fa fa-filter" aria-hidden="true"></i> <span class="sr-only">Filter</span>
             {% elif item.is_finished() and item.num_rows > 0 %}
-            <i class="fa fa-download" aria-hidden="true"></i> <span class="sr-only">Download</span> {{ processors[item.type].extension if item.type in processors else "" }}, {{ item.get_results_path()|filesize_short }}
+                {% if item.get_own_processor().map_item and item.get_extension() != "csv" %}<a href="{{ url_for('get_mapped_result', key=item.key) }}"><i class="fa fa-download" aria-hidden="true"></i> <span class="sr-only">Download</span> csv</a>
+                {% endif %}
+                <a href="{{ url_for('get_result', query_file=item.result_file) }}"><i class="fa fa-download" aria-hidden="true"></i> <span class="sr-only">Download</span> {{ processors[item.type].extension if item.type in processors else "" }}, {{ item.get_results_path()|filesize_short }}</a>
             {% elif item.is_finished() %}
             <i class="fa fa-skull" aria-hidden="true"></i>
             {% elif "queued" in item.status|lower %}
             <i class="fa fa-hourglass-half" aria-hidden="true"></i>
             {% else %}
             <i class="fa fa-spin fa-sync-alt" aria-hidden="true"></i>
             {% endif %}
-            {% if item.is_finished() and ("copied_to" in item.parameters or not is_filtered) %}</a>{% endif %}
         </span>
         <span class="byline">
-            {% if item.is_finished() and not is_filtered %}<a href="{{ url_for('get_result', query_file=item.result_file) }}">{% endif %}
             {% if item.is_finished() and is_filtered and "copied_to" in item.parameters %}<a href="{{ url_for('show_result', key=item.parameters.copied_to) }}">{% endif %}
             {% if item.is_finished() and item.num_rows >= 0 %}
                 {% if is_filtered and "copied_to" in item.parameters %}
@@ -52,7 +50,6 @@
         </span>
         <span class="queue-notice"></span>
 
-    {% if item.is_finished() and not is_filtered %}</a>{% endif %}
     </div>
     </div>