Merge pull request #860 from griffithlab/most-recent-org-fix

Handle case when user is in multiple organizations but has not yet performed any actions
griffithlab · Aug 1, 2023 · 23fe63a · 23fe63a
2 parents f1013c0 + de910e8
commit 23fe63a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/src/app/forms2/types/org-submit-button/org-submit-button.type.html b/client/src/app/forms2/types/org-submit-button/org-submit-button.type.html
@@ -40,7 +40,7 @@
         <span>for</span>
         <ng-container *ngrxLet="mostRecentOrg$ as mrOrg">
           <nz-avatar
-            [nzSrc]="mrOrg!.profileImagePath"
+            [nzSrc]="mrOrg ? mrOrg.profileImagePath : organizations[0].profileImagePath"
             [nzSize]="16"
             [nzShape]="'square'">
           </nz-avatar>

diff --git a/server/app/models/mane_select_transcript.rb b/server/app/models/mane_select_transcript.rb
@@ -9,7 +9,7 @@ def mane_select_transcript
     Rails.cache.fetch(cache_key(variant), expires_in: 24.hours) do
       if variant.allele_registry_id
         transcripts = get_allele_registry_transcripts(variant)
-        select = transcripts.find{ |t| t.key?('MANE') && t['MANE']['maneStatus'] == 'MANE Select' }
+        select = transcripts&.find{ |t| t.key?('MANE') && t['MANE']['maneStatus'] == 'MANE Select' }
         if select
           select.dig('MANE', 'nucleotide', 'Ensembl', 'hgvs')
         end