Merge pull request #1536 from ImagingDataCommons/release-50-sp

#1525 bugfixes

Author: s-paquette

idc/models.py

@@ -13,14 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+import uuid
+from datetime import timedelta
 
 from django.db import models
 from django.contrib.auth.models import User
-
+import uuid
+import datetime
+import base64
 import logging
 
 logger = logging.getLogger(__name__)
 
+def cart_keygen():
+    return '{}'.format(base64.b64encode(uuid.uuid4().bytes).replace("=",""))
+
+CART_EXPIRATION = datetime.timedelta(days=90)
 
 class AppInfo(models.Model):
     id = models.AutoField(primary_key=True, null=False, blank=False)
@@ -29,9 +37,7 @@ class AppInfo(models.Model):
     app_date = models.DateField(auto_now_add=True, null=False, blank=False)
     active = models.BooleanField(default=True, null=False, blank=False)
 
-
 class User_Data(models.Model):
     id = models.AutoField(primary_key=True, null=False, blank=False)
     user = models.ForeignKey(User, null=False, blank=True, on_delete=models.CASCADE)
     history = models.CharField(max_length=2000, blank=False, null=False, default='')
-

idc/views.py

@@ -59,6 +59,10 @@
 
 BQ_ATTEMPT_MAX = 10
 WEBAPP_LOGIN_LOG_NAME = settings.WEBAPP_LOGIN_LOG_NAME
+SERIES_COLLEX_ID_TYPE = {
+    "collection": "collection_id",
+    "analysis_result": "analysis_results_id"
+}
 
 
 # The site's homepage
@@ -617,12 +621,13 @@ def cart_data(request):
 def get_series(request, collection_id=None, patient_id=None, study_uid=None):
     status = 200
     response = {"result": []}
+    req = request.GET if request.method == 'GET' else request.POST
     try:
         fields = ["collection_id", "PatientID", "StudyInstanceUID", "Modality", "crdc_series_uuid", "SeriesInstanceUID", "aws_bucket", "instance_size"]
         result = {}
         if not collection_id:
             # This is a request for filters and/or a cart
-            body_unicode = request.body.decode('utf-8')
+            body_unicode = req.body.decode('utf-8')
             body = json.loads(body_unicode)
             partitions = body.get("partitions", {})
             filtergrp_list = body.get("filtergrp_list", {})
@@ -656,8 +661,9 @@ def get_series(request, collection_id=None, patient_id=None, study_uid=None):
                 active=True, source_type=DataSource.SOLR,
                 aggregate_level="SeriesInstanceUID"
             ).first()
+            id_type = SERIES_COLLEX_ID_TYPE[req.get("type","collection")]
             filters = {
-                "collection_id": [collection_id]
+                id_type: [collection_id]
             }
             if patient_id:
                 filters['PatientID'] = [patient_id]

static/js/downloader.js

@@ -954,7 +954,8 @@ require([
             } else {
                 let study_uri = (study_id !== undefined && study_id !== null) ? `${study_id}/` : "";
                 let patient_uri = (patient_id !== undefined && patient_id !== null) ? `${patient_id}/` : "";
-                response = await fetch(`${BASE_URL}${SERIES_IDS_URL}${collection_id}/${patient_uri}${study_uri}`);
+                let type = (download_type === "analysis_result") ? `?type=analysis_result` : "";
+                response = await fetch(`${BASE_URL}${SERIES_IDS_URL}${collection_id}/${patient_uri}${study_uri}${type}`);
             }
             if (!response.ok) {
                 console.error(`[ERROR] Failed to retrieve series IDs: ${response.status}`);

static/js/tooltips.js

@@ -275,6 +275,9 @@ require([
 
     const manifest_tooltip = {
         dynamicTip: function(ref){
+            if($(ref).hasClass('idc-index')) {
+                return `View instructions for downloading this ${$(ref).attr("data-download-type-display")} using the idc-index tool.`;
+            }
             let table_type = $(ref).parents('table').attr('data-table-type');
             if(table_type === 'series') {
                 return 'Download a manifest file for this series to use with a download tool.'
@@ -304,7 +307,7 @@ require([
                 return disabled_messages[$(ref).attr('data-disabled-type')];
             }
             let download_type = $(ref).attr('data-download-type');
-            return `Download all of the files in this ${download_type}.`;
+            return `Download all of the files in this ${download_type.replace("_"," ")}.`;
         },
         content: 'Download all files.', // placeholder text
         theme: 'dark',
@@ -354,7 +357,7 @@ require([
     tippy.delegate('.cases-table', copy_tip);
 
     tippy.delegate('#body', {
-        content: 'Get the citation list for this cohort.',
+        content: 'View citation(s) in Vancouver Elsevier format.',
         theme: 'dark',
         placement: 'left',
         arrow: false,
@@ -403,6 +406,7 @@ require([
 
     tippy.delegate('#body', disabled_download_tooltip);
     tippy.delegate('#body', download_tooltip);
+    tippy.delegate("#collection_details", manifest_tooltip);
 
     tippy.delegate('#body', {
         content: function(reference) {

templates/collections/collection_details.html

@@ -30,15 +30,16 @@ <h3>{{ collection_type }} <i class="fa fa-solid fa-ellipsis-v collection-spacer"
             {% with size_warning=total_size_with_ar|size_check %}
                 <li class="collex-list-item">
                     <a class="dropdown-item download-instances{% if size_warning %} download-size-warning{% elif total_size_with_ar > 3 %} is-disabled{% else %} download-all-instances{% endif %}"
-                       href="#" data-download-type="collection" data-collection="{{ collection_id }}"{% if total_size_with_ar > 3 %}data-disabled-type="download-size-disabled"{% endif %}
+                       href="#" data-download-type="{{ collection_type.lower|replace_whitespace:"_" }}" data-collection="{{ collection_id }}"{% if total_size_with_ar > 3 %}data-disabled-type="download-size-disabled"{% endif %}
                        {% if size_warning %}data-toggle="modal" data-target="#download-warning"{% endif %}
                     >
                     Direct <i class="fa fa-solid fa-download"></i></a></li>
                   <li class="collex-list-item">
                       <a
-                          class="dropdown-item"
+                          class="dropdown-item idc-index export-button"
                           role="button"
                           data-toggle="modal"
+                          data-download-type-display="{{ collection_type.lower }}"
                           data-bs-toggle="modal"
                           data-bs-target="#export-collex-manifest-modal"
                           data-target="#export-collex-manifest-modal">idc-index <i class="fa fa-solid fa-list"></i>