improve conditionality

cBioPortal · Aug 21, 2024 · 20a161a · 20a161a
1 parent 7c8c802
commit 20a161a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/pages/studyView/StudyViewPage.tsx b/src/pages/studyView/StudyViewPage.tsx
@@ -847,7 +847,7 @@ export default class StudyViewPage extends React.Component<
                                             structuralVariants={
                                                 this.store.structuralVariants
                                             }
-                                            hugoGeneSymbols={
+                                            allHugoGeneSymbols={
                                                 this.store.allHugoGeneSymbols
                                             }
                                             selectedGenericAssayEntitiesGroupByMolecularProfileId={

diff --git a/src/shared/components/plots/PlotsTab.tsx b/src/shared/components/plots/PlotsTab.tsx
@@ -328,7 +328,8 @@ export interface IPlotsTabProps {
     driverAnnotationSettings: DriverAnnotationSettings;
     studyIdToStudy?: MobxPromiseUnionTypeWithDefault<_.Dictionary<CancerStudy>>;
     structuralVariants?: MobxPromiseUnionType<StructuralVariant[]>;
-    hugoGeneSymbols: string[] | MobxPromiseUnionTypeWithDefault<string[]>;
+    hugoGeneSymbols?: string[];
+    allHugoGeneSymbols?: MobxPromiseUnionTypeWithDefault<string[]>;
     selectedGenericAssayEntitiesGroupByMolecularProfileId: {
         [molecularProfileId: string]: string[];
     };
@@ -3673,15 +3674,16 @@ export default class PlotsTab extends React.Component<IPlotsTabProps, {}> {
         }
         let genericAssayOptionsCount: number = 0;
         let filteredGenericAssayOptionsCount: number = 0;
+        const hugoGeneSymbols: string[] = this.props.hugoGeneSymbols
+            ? this.props.hugoGeneSymbols
+            : this.props.allHugoGeneSymbols!.result;
         if (vertical && this.vertGenericAssayOptions.result) {
             genericAssayOptions =
                 this.makeGenericAssayGroupOptions(
                     this.vertGenericAssayOptions.result,
                     selectedEntities,
                     this._vertGenericAssaySearchText,
-                    Array.isArray(this.props.hugoGeneSymbols)
-                        ? this.props.hugoGeneSymbols
-                        : this.props.hugoGeneSymbols.result,
+                    hugoGeneSymbols,
                     this.horzSelection.selectedGeneOption?.label,
                     GENERIC_ASSAY_CONFIG.genericAssayConfigByType[
                         axisSelection.dataType!
@@ -3709,9 +3711,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps, {}> {
                     this.horzGenericAssayOptions.result,
                     selectedEntities,
                     this._horzGenericAssaySearchText,
-                    Array.isArray(this.props.hugoGeneSymbols)
-                        ? this.props.hugoGeneSymbols
-                        : this.props.hugoGeneSymbols.result,
+                    hugoGeneSymbols,
                     this.vertSelection.selectedGeneOption?.label,
                     GENERIC_ASSAY_CONFIG.genericAssayConfigByType[
                         axisSelection.dataType!
@@ -3754,7 +3754,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps, {}> {
                 options = options.filter(stringCompare).slice(0, 10);
                 const genes = await fetchGenes(options.map(o => o.label));
                 const coverageInformationPromise = getCoverageInformation(
-                    this.props.genePanelDataForAllProfiles?.result || [],
+                    this.props.genePanelDataForAllProfiles!.result!,
                     this.props.sampleKeyToSample.result!,
                     this.props.patients.result!,
                     genes