fix issue with incorrect data being passed causing crashes with some …

…data type options
cBioPortal · Jan 5, 2024 · 1f3b315 · 1f3b315
1 parent 6c05ee8
commit 1f3b315
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/src/pages/resultsView/ResultsViewPage.tsx b/src/pages/resultsView/ResultsViewPage.tsx
@@ -316,6 +316,10 @@ export default class ResultsViewPage extends React.Component<
                                 driverAnnotationSettings={
                                     store.driverAnnotationSettings
                                 }
+                                studyIdToStudy={store.studyIdToStudy.result}
+                                structuralVariants={
+                                    store.structuralVariants.result
+                                }
                                 hugoGeneSymbols={store.hugoGeneSymbols}
                                 selectedGenericAssayEntitiesGroupByMolecularProfileId={
                                     store.selectedGenericAssayEntitiesGroupByMolecularProfileId

diff --git a/src/pages/resultsView/plots/PlotsFeature.tsx b/src/pages/resultsView/plots/PlotsFeature.tsx
@@ -1916,7 +1916,6 @@ export default class PlotsTab extends React.Component<IPlotsTabProps, {}> {
         await: () => [this.props.genes],
         invoke: () => {
             return Promise.resolve(
-                // this.props.genes.result!.filter(g => g.hugoGeneSymbol === 'KRAS').map(gene => ({
                 this.props.genes.result!.map(gene => ({
                     value: gene.entrezGeneId,
                     label: gene.hugoGeneSymbol,

diff --git a/src/pages/studyView/StudyViewPage.tsx b/src/pages/studyView/StudyViewPage.tsx
@@ -736,7 +736,8 @@ export default class StudyViewPage extends React.Component<
                                                     .queriedPhysicalStudyIds
                                             }
                                             molecularProfilesWithData={
-                                                this.store.molecularProfiles
+                                                this.store
+                                                    .molecularProfilesInStudies
                                             }
                                             molecularProfilesInStudies={
                                                 this.store
@@ -795,8 +796,7 @@ export default class StudyViewPage extends React.Component<
                                                     .driverAnnotationSettings
                                             }
                                             studyIdToStudy={
-                                                this.store.everyStudyIdToStudy
-                                                    .result
+                                                this.store.studyIdToStudy.result
                                             }
                                             structuralVariants={
                                                 this.store.structuralVariants

diff --git a/src/pages/studyView/StudyViewPageStore.ts b/src/pages/studyView/StudyViewPageStore.ts
@@ -5325,6 +5325,17 @@ export class StudyViewPageStore
         default: [],
     });
 
+    readonly studyIdToStudy = remoteData(
+        {
+            await: () => [this.queriedPhysicalStudies],
+            invoke: () =>
+                Promise.resolve(
+                    _.keyBy(this.queriedPhysicalStudies.result, x => x.studyId)
+                ),
+        },
+        {}
+    );
+
     readonly queriedSampleIdentifiers = remoteData<SampleIdentifier[]>({
         await: () => [
             this.filteredPhysicalStudies,
@@ -11222,7 +11233,7 @@ export class StudyViewPageStore
 
     readonly structuralVariants = remoteData<StructuralVariant[]>({
         await: () => [
-            this.allGenes,
+            this.plotsSelectedGenes,
             this.samples,
             this.studyToStructuralVariantMolecularProfile,
             this.entrezGeneIdToGeneAll,
@@ -11232,7 +11243,7 @@ export class StudyViewPageStore
                 _.isEmpty(
                     this.studyToStructuralVariantMolecularProfile.result
                 ) ||
-                _.isEmpty(this.allGenes.result)
+                _.isEmpty(this.plotsSelectedGenes.result)
             ) {
                 return [];
             }
@@ -11262,18 +11273,18 @@ export class StudyViewPageStore
                 // Set all SVs that are queried at the gene level.
                 // The gene1::gene2 orientation does not come into play here.
                 const entrezGeneIds = _.map(
-                    this.allGenes.result,
+                    this.plotsSelectedGenes.result,
                     (gene: Gene) => gene.entrezGeneId
                 );
-                // Set all SVs that are queried at the gene1::gene2 orientation level.
-                const structuralVariantQueries = [].map(sv =>
-                    createStructuralVariantQuery(sv, this.allGenes.result!)
-                );
+                // // Set all SVs that are queried at the gene1::gene2 orientation level.
+                // const structuralVariantQueries = this.structVarQueries.map(sv =>
+                //     createStructuralVariantQuery(sv, this.plotsSelectedGenes.result!)
+                // );
 
                 return await internalClient.fetchStructuralVariantsUsingPOST({
                     structuralVariantFilter: {
                         entrezGeneIds,
-                        structuralVariantQueries,
+                        structuralVariantQueries: [],
                         sampleMolecularIdentifiers,
                         molecularProfileIds: [],
                     },