Merge pull request #416 from ImagingDataCommons/sprint-13-sp

-> Fix for empty derived counts

Author: s-paquette

shell/database-setup.sh

@@ -78,7 +78,6 @@ else
     mysql -u$MYSQL_ROOT_USER -h $MYSQL_DB_HOST -p$MYSQL_ROOT_PASSWORD -D$DATABASE_NAME < ${HOMEROOT}/scripts/${METADATA_SQL_FILE}
 fi
 
-
 echo "Adding Django site IDs..."
 python3 ${HOMEROOT}/scripts/add_site_ids.py
 

static/js/image_search.js

@@ -1464,7 +1464,10 @@ require([
                             if ('attributes' in data.derived_set[facetSet]){
 
                                 dicofdic = {'unfilt': data.derived_set[facetSet].attributes, 'filt': ''}
-                                if (isFiltered){
+                                if (isFiltered && data.filtered_counts.hasOwnProperty('derived_set')
+                                    && data.filtered_counts.derived_set.hasOwnProperty(facetSet)
+                                    && data.filtered_counts.derived_set[facetSet].hasOwnProperty('attributes')
+                                ) {
                                     dicofdic['filt'] = data.filtered_counts.derived_set[facetSet].attributes;
                                 }
                                 else{