Merge pull request #469 from ImagingDataCommons/idc-test-sp

Sprint 15

Author: s-paquette

idc/settings.py

@@ -80,6 +80,7 @@
 GCLOUD_PROJECT_NUMBER          = os.environ.get('GCLOUD_PROJECT_NUMBER', '')
 BIGQUERY_PROJECT_ID            = os.environ.get('BIGQUERY_PROJECT_ID', GCLOUD_PROJECT_ID)
 BIGQUERY_DATA_PROJECT_ID       = os.environ.get('BIGQUERY_DATA_PROJECT_ID', GCLOUD_PROJECT_ID)
+BIGQUERY_USER_MANIFEST_DATASET = os.environ.get('BIGQUERY_USER_MANIFEST_DATASET', 'dev_user_dataset')
 
 # Deployment module
 CRON_MODULE             = os.environ.get('CRON_MODULE')

static/js/cohorts/cohort-details.js

@@ -58,13 +58,20 @@ require([
     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 GCSPath.',
+            'CRDCInstanceUUID, and GCS_URL.',
         theme: 'light',
         placement: 'left',
         arrow: false,
         maxWidth: 400
     });
 
+    var enable_buttons = function() {
+        $('#download-csv').removeAttr('disabled');
+        $('#download-tsv').removeAttr('disabled');
+        $('#download-json').removeAttr('disabled');
+        $('#get-bq-table').removeAttr('disabled');
+    };
+
     var downloadToken = new Date().getTime();
 
     $('#download-csv').on('click', function(e) {
@@ -92,14 +99,16 @@ require([
     update_export_option("file-manifest");
 
     var download_manifest = function(file_type, clicked_button, e) {
+        let manifest_type = $('input[name="manifest-type"]:checked').val();
+
         $('#unallowed-chars-alert').hide();
         $('#name-too-long-alert-modal').hide();
 
         var name = $('#export-manifest-name').val();
         var unallowed = (name.match(base.blacklist) || []);
 
         if (name.length == 0) {
-            $('#download-csv').prop('title','Please input the name.');
+            $('#download-csv').prop('title','Please provide a file name.');
             $('#export-manifest-name')[0].focus();
             e.preventDefault();
             return false;
@@ -123,20 +132,19 @@ require([
             return false;
         }
 
-        $('#export-manifest-form').submit();
-
         $('#download-csv').attr('disabled','disabled');
         $('#download-tsv').attr('disabled','disabled');
         $('#download-json').attr('disabled','disabled');
+        $('#get-bq-table').attr('disabled','disabled');
 
-        $('#download-in-progress').modal('show');
+        $('#manifest-in-progress').modal('show');
 
-        base.blockResubmit(function() {
-            $('#download-csv').removeAttr('disabled');
-            $('#download-tsv').removeAttr('disabled');
-            $('#download-json').removeAttr('disabled');
-            $('#download-in-progress').modal('hide');
-        },downloadToken, 'downloadToken');
+        if(manifest_type == 'file-manifest') {
+            base.blockResubmit(function () {
+                enable_buttons();
+                $('#manifest-in-progress').modal('hide');
+            }, downloadToken, 'downloadToken');
+        }
 
         var checked_fields = [];
         $('.field-checkbox').each(function()
@@ -158,25 +166,52 @@ require([
            }
         });
 
-        var include_header = $('#include-header-checkbox')[0].checked;
-
-        var url = BASE_URL + '/cohorts/download_manifest/' + cohort_id + '/';
-        url += ("?file_type=" + file_type);
-        url += ("&include_header=" + include_header);
-        url += ("&file_name=" + name);
-        url += ("&header_fields=" + JSON.stringify(checked_fields));
-        url += ("&columns=" + JSON.stringify(checked_columns));
-        url += ("&downloadToken=" + downloadToken);
+        $('input[name="file_type"]').val(file_type);
+        $('input[name="header_fields"]').val(JSON.stringify(checked_fields));
+        $('input[name="columns"]').val(JSON.stringify(checked_columns));
+        $('input[name="downloadToken"]').val(downloadToken);
+        $('input[name="include_header"]').val($('#include-header-checkbox').is(':checked') ? 'true': 'false');
 
         var select_box_div = $('#file-part-select-box');
         var select_box = select_box_div.find('select');
-        if (select_box_div.is(":visible"))
-        {
+        if (select_box_div.is(":visible")) {
             var selected_file_part = select_box.children("option:selected").val();
-            url += ("&file_part=" + selected_file_part);
+            $('input[name="file_part"]').val(selected_file_part);
+        } else {
+            $('input[name="file_part"]').val("");
         }
 
-        location.href = url;
+        if(manifest_type == 'file-manifest') {
+            $('#export-manifest-form').submit();
+        } else {
+            $.ajax({
+                url: $('#export-manifest-form').attr('action'),
+                data: $('#export-manifest-form').serialize(),
+                method: 'GET',
+                success: function (data) {
+                    if(data.message) {
+                        base.showJsMessage("info",data.message,true);
+                    }
+                },
+                error: function (xhr) {
+                    var responseJSON = $.parseJSON(xhr.responseText);
+                    // If we received a redirect, honor that
+                    if(responseJSON.redirect) {
+                        base.setReloadMsg(responseJSON.level || "error",responseJSON.message);
+                        window.location = responseJSON.redirect;
+                    } else {
+                        base.showJsMessage(responseJSON.level || "error",responseJSON.message,true);
+                    }
+                },
+                complete: function(xhr, status) {
+                    $('#manifest-in-progress').modal('hide');
+                    enable_buttons();
+                    $('#export-manifest-modal').modal('hide');
+                    $('input[name="manifest-type"][value="file-manifest"]').triggerHandler('click');
+                    $('#export-manifest-form')[0].reset();
+                }
+            });
+        }
     };
 
     $('.column-checkbox').change(function() {
@@ -213,4 +248,9 @@ require([
     };
 
     update_download_manifest_buttons();
+
+    $('#get-bq-table').on('click',function(){
+        download_manifest('',$(this));
+    });
+
 });