Merge pull request #4922 from thehyve/fix_ga_profile_switch

Fix swapping generic assay profiles in comparison view
cBioPortal · Jul 1, 2024 · b14bcf0 · b14bcf0
2 parents fa4a480 + 25fc31c
commit b14bcf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 130 deletions.
diff --git a/src/pages/groupComparison/GenericAssayEnrichments.tsx b/src/pages/groupComparison/GenericAssayEnrichments.tsx
diff --git a/src/shared/lib/comparison/ComparisonStore.ts b/src/shared/lib/comparison/ComparisonStore.ts
@@ -1699,14 +1699,14 @@ export default abstract class ComparisonStore extends AnalysisStore
     readonly gaEnrichmentGroupsByAssayType = remoteData({
         await: () => [
             this
-                .selectedGenericAssayEnrichmentProfileMapGroupedByGenericAssayType,
+                .selectedAllGenericAssayEnrichmentProfileMapGroupedByGenericAssayType,
             this.enrichmentAnalysisGroups,
         ],
         invoke: () => {
             return Promise.resolve(
                 _.mapValues(
                     this
-                        .selectedGenericAssayEnrichmentProfileMapGroupedByGenericAssayType
+                        .selectedAllGenericAssayEnrichmentProfileMapGroupedByGenericAssayType
                         .result!,
                     selectedGenericAssayEnrichmentProfileMap => {
                         let studyIds = Object.keys(
@@ -1850,7 +1850,7 @@ export default abstract class ComparisonStore extends AnalysisStore
         await: () => [
             this.gaEnrichmentGroupsByAssayType,
             this
-                .selectedGenericAssayEnrichmentProfileMapGroupedByGenericAssayType,
+                .selectedAllGenericAssayEnrichmentProfileMapGroupedByGenericAssayType,
         ],
         invoke: () => {
             return Promise.resolve(
@@ -1866,7 +1866,7 @@ export default abstract class ComparisonStore extends AnalysisStore
                                     sample => ({
                                         caseId: sample.sampleId,
                                         molecularProfileId: this
-                                            .selectedGenericAssayEnrichmentProfileMapGroupedByGenericAssayType
+                                            .selectedAllGenericAssayEnrichmentProfileMapGroupedByGenericAssayType
                                             .result![genericAssayType][
                                             sample.studyId
                                         ].molecularProfileId,
@@ -1973,7 +1973,7 @@ export default abstract class ComparisonStore extends AnalysisStore
                             await: () => [],
                             getSelectedProfileMap: () =>
                                 this
-                                    .selectedGenericAssayEnrichmentProfileMapGroupedByGenericAssayType
+                                    .selectedAllGenericAssayEnrichmentProfileMapGroupedByGenericAssayType
                                     .result![genericAssayType], // returns an empty array if the selected study doesn't have any generic assay profiles
                             fetchData: () => {
                                 if (