Merge pull request #471 from ImagingDataCommons/user/mt/multi-part-manifest

s-paquette · web-flow · commit e1b0ec5b51fe · 2020-12-04T11:07:14.000-08:00
Add limit to 10 files for manifest download
diff --git a/static/css/style.css b/static/css/style.css
diff --git a/static/js/image_search.js b/static/js/image_search.js
@@ -1756,13 +1756,27 @@ require([
                         if (data.file_parts_count > 1)
                         {
                             select_box_div.show();
-                            for (let i = 0; i < data.file_parts_count; ++i)
+                            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();
+                            }
                         }
                         else
                         {
diff --git a/templates/cohorts/export-manifest-modal.html b/templates/cohorts/export-manifest-modal.html
@@ -133,6 +133,9 @@ <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>

Original file line number	Diff line number	Diff line change
`@@ -1756,13 +1756,27 @@ require([`
`1756`	`1756`	`if (data.file_parts_count > 1)`
`1757`	`1757`	`{`
`1758`	`1758`	`select_box_div.show();`
`1759`		`- for (let i = 0; i < data.file_parts_count; ++i)`
	`1759`	`+ for (let i = 0; i < data.display_file_parts_count; ++i)`
`1760`	`1760`	`{`
`1761`	`1761`	`select_box.append($('<option/>', {`
`1762`	`1762`	`value: i,`
`1763`	`1763`	`text : "File Part " + (i + 1)`
`1764`	`1764`	`}));`
`1765`	`1765`	`}`
	`1766`	`+`
	`1767`	`+ var file_limit_message = $('#file-part-limit-reached-message');`
	`1768`	`+ if (data.display_file_parts_count < data.file_parts_count)`
	`1769`	`+ {`
	`1770`	`+ file_limit_message.show();`
	`1771`	`+ file_limit_message.html(`
	`1772`	`+ '<span>* This cohort\'s manifest has reached the limit of ' +`
	`1773`	`+ data.display_file_parts_count + ' file parts.' +`
	`1774`	`+ ' Please use the BigQuery option to access all ' + data.file_parts_count + ' parts.</span>');`
	`1775`	`+ }`
	`1776`	`+ else`
	`1777`	`+ {`
	`1778`	`+ file_limit_message.hide();`
	`1779`	`+ }`
`1766`	`1780`	`}`
`1767`	`1781`	`else`
`1768`	`1782`	`{`