-> Better message for cohorts oversize for download but no social account available

Author: s-paquette

static/js/cohorts/cohort-details.js

@@ -55,13 +55,6 @@ require([
 ], function($, jqueryui, base, tippy, bootstrap) {
     A11y.Core();
 
-    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) {
@@ -131,7 +124,7 @@ require([
 
         if(manifest_type == 'file-manifest') {
             base.blockResubmit(function () {
-                enable_buttons();
+                update_download_manifest_buttons();
                 $('#manifest-in-progress').modal('hide');
             }, downloadToken, 'downloadToken');
         }
@@ -194,11 +187,11 @@ require([
                     }
                 },
                 complete: function(xhr, status) {
+                    update_download_manifest_buttons();
                     $('#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();
+                    $('#bq-export-option input').prop('checked', true).trigger("click");
                 }
             });
         }
@@ -220,12 +213,14 @@ require([
             $('#download-csv').attr('disabled', 'disabled');
             $('#download-tsv').attr('disabled', 'disabled');
             $('#download-json').attr('disabled', 'disabled');
+            $('#get-bq-table').attr('disabled', 'disabled');
         }
         else
         {
             $('#download-csv').removeAttr('disabled');
             $('#download-tsv').removeAttr('disabled');
             $('#download-json').removeAttr('disabled');
+            $('#get-bq-table').removeAttr('disabled');
         }
 
         if (num_selected_column == 0) {

static/js/image_search.js

@@ -1737,13 +1737,17 @@ require([
                             $('#file-export-option').prop('title', 'Your cohort exceeds the maximum for download.');
                             $('#file-export-option input').prop('disabled', 'disabled');
                             $('#file-export-option input').prop('checked', false);
+                            $('#file-manifest').hide();
                             if(!user_is_social) {
                                 $('#need-social-account').show();
                             } else {
                                 $('#file-manifest-max-exceeded').show();
                                 $('#bq-export-option input').prop('checked', true).trigger("click");
                             }
                         } else {
+                            $('#file-manifest-max-exceeded').hide();
+                            $('#file-manifest').show();
+
                             var select_box_div = $('#file-part-select-box');
                             var select_box = select_box_div.find('select');
                             if (data.file_parts_count > 1) {