Merge branch 'master' of https://github.com/ImagingDataCommons/IDC-WebApp into idc-test-sp

Author: s-paquette

static/js/cohorts/cohort-details.js

@@ -55,16 +55,6 @@ require([
 ], function($, jqueryui, base, tippy, bootstrap) {
     A11y.Core();
 
-    tippy('.manifest-size-warning',{
-        content: 'Your cohort is too large to be downloaded in its entirety, and will be truncated at 65,000 records ' +
-        'ordered by PatientID, CollectionID, StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID, SourceDOI, ' +
-            'CRDCInstanceUUID, and GCS_URL.',
-        theme: 'light',
-        placement: 'left',
-        arrow: false,
-        maxWidth: 400
-    });
-
     var enable_buttons = function() {
         $('#download-csv').removeAttr('disabled');
         $('#download-tsv').removeAttr('disabled');

static/js/image_search.js

@@ -1745,43 +1745,27 @@ require([
                 success: function (data) {
                     var isFiltered = Boolean($('#search_def p').length>0);
                     if (is_cohort) {
-                        if(data.total > 65000) {
-                            $('.manifest-size-warning').show();
+                        if (data.file_parts_count > data.display_file_parts_count) {
+                            $('#file-export-option').prop('title', 'Your cohort exceeds the maximum for download.');
+                            $('#file-manifest-max-exceeded').show();
+                            $('#file-export-option input').prop('disabled', 'disabled');
+                            $('#file-export-option input').prop('checked', false);
+                            $('#bq-export-option input').prop('checked', true).trigger("click");
                         } else {
-                            $('.manifest-size-warning').hide();
-                        }
-
-                        var select_box_div = $('#file-part-select-box');
-                        var select_box = select_box_div.find('select');
-                        if (data.file_parts_count > 1)
-                        {
-                            select_box_div.show();
-                            for (let i = 0; i < data.display_file_parts_count; ++i)
-                            {
-                                select_box.append($('<option/>', {
-                                    value: i,
-                                    text : "File Part " + (i + 1)
-                                }));
-                            }
-
-                            var file_limit_message = $('#file-part-limit-reached-message');
-                            if (data.display_file_parts_count < data.file_parts_count)
-                            {
-                                file_limit_message.show();
-                                file_limit_message.html(
-                                    '<span>* This cohort\'s manifest has reached the limit of ' +
-                                    data.display_file_parts_count + ' file parts.' +
-                                    ' Please use the BigQuery option to access all ' + data.file_parts_count + ' parts.</span>');
-                            }
-                            else
-                            {
-                                file_limit_message.hide();
+                            var select_box_div = $('#file-part-select-box');
+                            var select_box = select_box_div.find('select');
+                            if (data.file_parts_count > 1) {
+                                select_box_div.show();
+                                for (let i = 0; i < data.display_file_parts_count; ++i) {
+                                    select_box.append($('<option/>', {
+                                        value: i,
+                                        text : "File Part " + (i + 1)
+                                    }));
+                                }
+                            } else {
+                                select_box_div.hide();
                             }
                         }
-                        else
-                        {
-                            select_box_div.hide();
-                        }
                     } else {
                         if (isFiltered && data.total > 0){
                             $('#save-cohort-btn').prop('disabled','');

templates/cohorts/cohort_details.html

@@ -42,7 +42,6 @@ <h3 class="pull-left" role="heading" aria-level="1">Cohort Name: {{ cohort.name
             </div>
             <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
                 <div class="cohort-manifest pull-right">
-                    <div class="manifest-size-warning"><i class="fa fa-warning"></i></div>
                  <button id="export-manifest" class="btn btn-special pull-right" data-toggle="modal"
                         data-target="#export-manifest-modal"> Export Cohort Manifest
                  </button>

templates/cohorts/export-manifest-modal.html

@@ -18,6 +18,10 @@ <h4 class="modal-title" id="exportManifestModal">Export Cohort Manifest</h4>
                         <button type="button" class="close" data-hide="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
                         At least one column needs to be selected to export manifest file.
                     </div>
+                    <div id="file-manifest-max-exceeded" class="alert alert-warning alert-dismissable" style="display: none;">
+                        <button type="button" class="close" data-hide="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                        Your manifest is too large to be downloaded. Please use our BigQuery export option. (This requires a Google Account login.)
+                    </div>
                 </div>
             </div>
 
@@ -116,8 +120,8 @@ <h4 class="modal-title" id="exportManifestModal">Export Cohort Manifest</h4>
 
                         <!-- Export Option -->
                         <div class="export-option">
-                            <span class="value"><input type="radio" name="manifest-type" value="file-manifest" checked> Files</span>
-                            <span style="margin-left:10px" class="value" {% if not is_social %}title="Export to BigQuery is only available with a Google Account."{% endif %}>
+                            <span id="file-export-option" title="" class="value"><input type="radio" name="manifest-type" value="file-manifest" checked> Files</span>
+                            <span id="bq-export-option" style="margin-left:10px" class="value" {% if not is_social %}title="Export to BigQuery is only available with a Google Account."{% endif %}>
                                 <input type="radio" name="manifest-type" value="bq-manifest" {% if not is_social %}disabled{% endif %}> BigQuery</span>
                         </div>
                         <br>
@@ -133,9 +137,6 @@ <h4 class="modal-title" id="exportManifestModal">Export Cohort Manifest</h4>
                                 <select class="form-control">
                                 </select>
                                 <br>
-                                <div id="file-part-limit-reached-message">
-                                </div>
-                                <br>
                             </div>
 
                             <span><input id="include-header-checkbox" type="checkbox" checked> Include header fields (CSV and TSV only)</span>