Merge pull request #3588 from kalletlak/fix-7814

Support study view without any molecuar profiles
cBioPortal · Jan 20, 2021 · 3734d4a · 3734d4a
2 parents bb51a33 + 1b9c380
commit 3734d4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/pages/studyView/StudyViewPageStore.ts b/src/pages/studyView/StudyViewPageStore.ts
@@ -4135,6 +4135,9 @@ export class StudyViewPageStore {
     readonly filteredGenePanelData = remoteData({
         await: () => [this.molecularProfiles, this.samples],
         invoke: async () => {
+            if (_.isEmpty(this.molecularProfiles.result)) {
+                return [];
+            }
             const studyMolecularProfilesSet = _.groupBy(
                 this.molecularProfiles.result,
                 molecularProfile => molecularProfile.studyId
@@ -4686,6 +4689,11 @@ export class StudyViewPageStore {
     @computed
     get chartMetaSet(): { [id: string]: ChartMeta } {
         let _chartMetaSet = _.fromPairs(this._customCharts.toJSON());
+        if (_.isEmpty(this.molecularProfiles.result)) {
+            delete _chartMetaSet[
+                SpecialChartsUniqueKeyEnum.GENOMIC_PROFILES_SAMPLE_COUNT
+            ];
+        }
         _chartMetaSet = _.merge(
             _chartMetaSet,
             _.fromPairs(this._geneSpecificCharts.toJSON()),

diff --git a/src/pages/studyView/addChartButton/AddChartButton.tsx b/src/pages/studyView/addChartButton/AddChartButton.tsx
@@ -602,7 +602,10 @@ class AddChartTabs extends React.Component<IAddChartTabsProps, {}> {
                         key={1}
                         id={ChartMetaDataTypeEnum.GENOMIC}
                         linkText={TabNamesEnum.GENOMIC}
-                        hide={this.props.disableGenomicTab}
+                        hide={
+                            this.props.disableGenomicTab ||
+                            this.genomicChartOptions.length === 0
+                        }
                         className="addGenomicChartTab"
                     >
                         <AddChartByType