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

Author: s-paquette

shell/vagrant-set-env.sh

@@ -4,4 +4,6 @@ echo 'export SECURE_LOCAL_PATH=../parentDir/secure_files/idc/' | tee -a /home/va
 echo 'export DJANGO_SETTINGS_MODULE=idc.settings' | tee -a /home/vagrant/.bash_profile
 source /home/vagrant/.bash_profile
 chmod +x /home/vagrant/www/shell/python-su.sh
-sudo ln -s /home/vagrant/www /vagrant
+if [[ ! -d /vagrant ]]; then
+  sudo ln -s /home/vagrant/www /vagrant
+fi

static/js/cohorts/export-manifest.js

@@ -107,9 +107,10 @@ require([
 
     var update_export_modal_for_cart = function(partitions, filtergrp_list, mxstudies=0, mxseries=0){
         is_cohort = false;
+        let export_modal = $('#export-manifest-modal');
         let export_form = $('#export-manifest-form');
         var name_base='';
-        $('.modal-title').text("Export Cart Manifest");
+        export_modal.find('.modal-title').text("Export Cart Manifest");
         export_form.append('<input type="hidden" name="from_cart">')
         export_form.find('input[name="from_cart"]').val("True");
         if(filtergrp_list !== null && filtergrp_list !== undefined && filtergrp_list.length > 0) {
@@ -157,7 +158,7 @@ require([
 
         $('.filter-tab.manifest-file').show();
         $('.filter-tab.manifest-bq').show();
-        $('.modal-title').text('Export Manifest');
+        export_modal.find('.modal-title').text('Export Manifest');
     }
 
     const update_export_modal_for_mini = function(button){
@@ -235,15 +236,16 @@ require([
     });
 
     $('#export-manifest-modal').on('hidden.bs.modal', function() {
-      $('.manifest-file').show();
-      $('.manifest-bq').show();
+      let export_modal = $('#export-manifest-modal');
+      export_modal.find('.manifest-file').show();
+      export_modal.find('.manifest-bq').show();
       $('#download-idc-index').show();
-      $('.header-fields-container').show();
-      $('.idc-index-loc-type').show();
-      $('.download-manifest-text').show();
+      export_modal.find('.header-fields-container').show();
+      export_modal.find('.idc-index-loc-type').show();
+      export_modal.find('.download-manifest-text').show();
       $('#s5cmd-header-fields').find('input[value="cohort_name"]').parent().show();
       $('#s5cmd-header-fields').find('input[value="user_email"]').parent().show();
-      $('.modal-title').text('Export Manifest');
+      export_modal.find('.modal-title').text('Export Manifest');
       $('#manifest-source').text('manifest');
     });
 

static/js/tables.js

@@ -2081,12 +2081,12 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
             idsArr.push(ids);
 
             if (rowsAdded) {
-                $(this).find('.fa-caret-right').addClass('is-hidden');
-                $(this).find('.fa-caret-down').removeClass('is-hidden');
+                $(this).find('.expansion-toggle .fa-caret-right').addClass('is-hidden');
+                $(this).find('.expansion-toggle .fa-caret-down').removeClass('is-hidden');
                 $(this).find('.viewbx').addClass('open');
             } else{
-               $(this).find('.fa-caret-right').removeClass('is-hidden');
-                $(this).find('.fa-caret-down').addClass('is-hidden');
+               $(this).find('.expansion-toggle .fa-caret-right').removeClass('is-hidden');
+                $(this).find('.expansion-toggle .fa-caret-down').addClass('is-hidden');
                 $(this).find('.viewbx').removeClass('open');
             }
         });
@@ -2193,15 +2193,15 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
                  toggle_elem = toggle_elem[0];
                  $(toggle_elem).hasClass('open') ? $(toggle_elem).removeClass('open') : $(toggle_elem).addClass('open');
              }
-             if ($(row).find('.fa-caret-down.is-hidden').length>0){
+             if ($(row).find('.expansion-toggle .fa-caret-down.is-hidden').length>0){
                  var rowsAdded = true;
-                 $(row).find('.fa-caret-right').addClass('is-hidden');
-                 $(row).find('.fa-caret-down').removeClass('is-hidden');
+                 $(row).find('.expansion-toggle .fa-caret-right').addClass('is-hidden');
+                 $(row).find('.expansion-toggle .fa-caret-down').removeClass('is-hidden');
 
              } else {
                  var rowsAdded = false;
-                 $(row).find('.fa-caret-right').removeClass('is-hidden');
-                 $(row).find('.fa-caret-down').addClass('is-hidden');
+                 $(row).find('.expansion-toggle .fa-caret-right').removeClass('is-hidden');
+                 $(row).find('.expansion-toggle .fa-caret-down').addClass('is-hidden');
              }
              changeViewStates(tabletype, [ids], rowsAdded);
          }