Merge branch 'master' into version_4.32.1

Clinical-Genomics · Apr 16, 2021 · d3d79fa · d3d79fa
2 parents 9bda326 + dae7284
commit d3d79fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ About changelog [here](https://keepachangelog.com/en/1.0.0/)
 ## [4.32.1]
 ### Fixed
 - iSort lint check only
+- Institute cases page crashing when a case has track:Null
 ### Added
 ### Changed
 

diff --git a/scout/adapter/mongo/case.py b/scout/adapter/mongo/case.py
@@ -779,7 +779,7 @@ def update_case(self, case_obj, keep_date=False):
                     "smn_tsv": case_obj.get("smn_tsv"),
                     "status": case_obj.get("status"),
                     "sv_rank_model_version": case_obj.get("sv_rank_model_version"),
-                    "track": case_obj.get("track"),
+                    "track": case_obj.get("track", "rare"),
                     "updated_at": updated_at,
                     "variants_stats": case_obj.get("variants_stats"),
                     "vcf_files": case_obj.get("vcf_files"),

diff --git a/scout/server/blueprints/institutes/controllers.py b/scout/server/blueprints/institutes/controllers.py
@@ -20,7 +20,8 @@
 
 from .forms import CaseFilterForm
 
-TRACKS = {"rare": "Rare Disease", "cancer": "Cancer"}
+# Do not assume all cases have a valid track set
+TRACKS = {None: "Rare Disease", "rare": "Rare Disease", "cancer": "Cancer"}
 
 
 def institute(store, institute_id):