diff --git a/src/pages/patientView/PatientViewPage.tsx b/src/pages/patientView/PatientViewPage.tsx index 6eac869b2b8..575385709b4 100644 --- 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 index 86ee1678e00..f34b3beeea8 100644 --- 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 ( +