Fix problem with gene panel icons not appearing for genomic tracks

Was related to refactoring of sampleToMutationGenePanelId and sampleToDiscreteGenePanelId to MobXPromisses
cBioPortal · Oct 23, 2019 · 9810e74 · 9810e74
1 parent 451d48a
commit 9810e74
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/pages/patientView/PatientViewPage.tsx b/src/pages/patientView/PatientViewPage.tsx
@@ -429,10 +429,13 @@ export default class PatientViewPage extends React.Component<IPatientViewPagePro
                                     />
 
                                     {
-                                        (patientViewPageStore.mutationData.isComplete && patientViewPageStore.cnaSegments.isComplete
-                                            && patientViewPageStore.sequencedSampleIdsInStudy.isComplete && sampleManager)
-                                        && ( patientViewPageStore.mergedMutationDataFilteredByGene.length > 0 || patientViewPageStore.cnaSegments.result.length > 0)
-                                        && (
+                                        (patientViewPageStore.mutationData.isComplete
+                                         && patientViewPageStore.cnaSegments.isComplete
+                                         && patientViewPageStore.sequencedSampleIdsInStudy.isComplete
+                                         && patientViewPageStore.sampleToMutationGenePanelId.isComplete
+                                         && patientViewPageStore.sampleToDiscreteGenePanelId.isComplete
+                                         && (patientViewPageStore.mergedMutationDataFilteredByGene.length > 0 || patientViewPageStore.cnaSegments.result.length > 0)
+                                         && sampleManager) && (
                                             <div>
                                                 <GenomicOverview
                                                     mergedMutations={patientViewPageStore.mergedMutationDataFilteredByGene}
@@ -443,8 +446,8 @@ export default class PatientViewPage extends React.Component<IPatientViewPagePro
                                                     sampleColors={sampleManager.sampleColors}
                                                     sampleManager={sampleManager}
                                                     containerWidth={WindowStore.size.width-20}
-                                                    sampleIdToMutationGenePanelId={patientViewPageStore.sampleToMutationGenePanelId}
-                                                    sampleIdToCopyNumberGenePanelId={patientViewPageStore.sampleToDiscreteGenePanelId}
+                                                    sampleIdToMutationGenePanelId={patientViewPageStore.sampleToMutationGenePanelId.result}
+                                                    sampleIdToCopyNumberGenePanelId={patientViewPageStore.sampleToDiscreteGenePanelId.result}
                                                 />
                                                 <hr />
                                             </div>
@@ -454,8 +457,12 @@ export default class PatientViewPage extends React.Component<IPatientViewPagePro
                                     <LoadingIndicator isLoading={patientViewPageStore.mutationData.isPending || patientViewPageStore.uncalledMutationData.isPending || patientViewPageStore.oncoKbAnnotatedGenes.isPending || patientViewPageStore.studyIdToStudy.isPending} />
 
                                     {
-                                        (patientViewPageStore.oncoKbAnnotatedGenes.isComplete && patientViewPageStore.mutationData.isComplete && patientViewPageStore.uncalledMutationData.isComplete
-                                         && !!sampleManager && patientViewPageStore.studyIdToStudy.isComplete) && (
+                                        (patientViewPageStore.oncoKbAnnotatedGenes.isComplete
+                                         && patientViewPageStore.mutationData.isComplete
+                                         && patientViewPageStore.uncalledMutationData.isComplete
+                                         && patientViewPageStore.studyIdToStudy.isComplete
+                                         && patientViewPageStore.sampleToMutationGenePanelId.isComplete
+                                         && !!sampleManager) && (
                                             <div data-test="patientview-mutation-table">
                                                 <PatientViewMutationTable
                                                     studyIdToStudy={patientViewPageStore.studyIdToStudy.result}