Merge pull request #4 from Nelliney/hide-empty-tab

cBioPortal · Aug 21, 2024 · 593846a · 593846a
2 parents e41c49e + 41a48e4
commit 593846a
Show file tree

Hide file tree

Showing 8 changed files with 493 additions and 42 deletions.
diff --git a/src/pages/patientView/PatientViewPage.tsx b/src/pages/patientView/PatientViewPage.tsx
@@ -277,6 +277,11 @@ export class PatientViewPageInner extends React.Component<
 
     @computed
     get shouldShowResources(): boolean {
+        const tabId: string = this.urlWrapper.activeTabId;
+        if (tabId === 'filesAndLinks') {
+            return true;
+        }
+
         if (this.pageStore.resourceIdToResourceData.isComplete) {
             return _.some(
                 this.pageStore.resourceIdToResourceData.result,

diff --git a/src/pages/patientView/resources/ResourcesTab.tsx b/src/pages/patientView/resources/ResourcesTab.tsx
@@ -118,6 +118,40 @@ export default class ResourcesTab extends React.Component<
         },
     });
 
+    readonly showNoResource = MakeMobxView({
+        await: () => [this.props.store.resourceIdToResourceData],
+        render: () => {
+            const shouldShowNoResource = () => {
+                if (this.props.store.resourceIdToResourceData.isComplete) {
+                    return !_.some(
+                        this.props.store.resourceIdToResourceData.result,
+                        data => data.length > 0
+                    );
+                }
+                return true;
+            };
+
+            if (shouldShowNoResource()) {
+                return (
+                    <div className="resourcesSection">
+                        <h4 className="blackHeader">
+                            Resources for {this.props.store.patientId}
+                        </h4>
+                        <ResourceTable
+                            resources={
+                                this.props.store.studyResourceData.result!
+                            }
+                            isTabOpen={this.props.store.isResourceTabOpen}
+                            openResource={this.props.openResource}
+                        />
+                    </div>
+                );
+            } else {
+                return null;
+            }
+        },
+    });
+
     render() {
         return (
             <div className="resourcesTab">
@@ -136,6 +170,7 @@ export default class ResourcesTab extends React.Component<
                     {this.patientResources.component}
                     {this.sampleResources.component}
                     {this.studyResources.component}
+                    {this.showNoResource.component}
                 </div>
             </div>
         );

diff --git a/src/pages/studyView/StudyViewPage.tsx b/src/pages/studyView/StudyViewPage.tsx
@@ -378,11 +378,8 @@ export default class StudyViewPage extends React.Component<
     }
 
     @computed get shouldShowResources() {
-        if (this.store.resourceIdToResourceData.isComplete) {
-            return _.some(
-                this.store.resourceIdToResourceData.result,
-                data => data.length > 0
-            );
+        if (this.store.resourceDefinitions.isComplete) {
+            return this.store.resourceDefinitions.result.length > 0;
         } else {
             return false;
         }

diff --git a/src/pages/studyView/StudyViewPageStore.ts b/src/pages/studyView/StudyViewPageStore.ts
@@ -5784,6 +5784,44 @@ export class StudyViewPageStore
         },
     });
 
+    readonly sampleResourceData = remoteData<{
+        [sampleId: string]: ResourceData[];
+    }>({
+        await: () => [this.resourceDefinitions, this.samples],
+        invoke: () => {
+            const sampleResourceDefinitions = this.resourceDefinitions.result!.filter(
+                d => d.resourceType === 'SAMPLE'
+            );
+            if (!sampleResourceDefinitions.length) {
+                return Promise.resolve({});
+            }
+
+            const res = _(this.samples.result!)
+                .map(sample =>
+                    sampleResourceDefinitions.map(resource =>
+                        internalClient.getAllResourceDataOfSampleInStudyUsingGET(
+                            {
+                                sampleId: sample.sampleId,
+                                studyId: sample.studyId,
+                                resourceId: resource.resourceId,
+                                projection: 'DETAILED',
+                            }
+                        )
+                    )
+                )
+                .flatten()
+                .value();
+
+            return Promise.all(res).then(resData =>
+                _(resData)
+                    .flatMap()
+                    .groupBy('sampleId')
+                    .mapValues(data => data)
+                    .value()
+            );
+        },
+    });
+
     readonly resourceIdToResourceData = remoteData<{
         [resourceId: string]: ResourceData[];
     }>({