Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhancement/files and links #4995

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Enhancement/files and links #4995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf777e
Enhancement: Files & Links tab on patient view
Nelliney Sep 11, 2024
d598a77
add view option for Files & Links tab
Nelliney Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/pages/studyView/resources/FilesAndLinks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Else, If, Then } from 'react-if';
import { WindowWidthBox } from '../../../shared/components/WindowWidthBox/WindowWidthBox';
import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
import {
getResourceViewUrlWithPathname,
getSampleViewUrlWithPathname,
getPatientViewUrlWithPathname,
} from 'shared/api/urls';
Expand Down Expand Up @@ -86,6 +87,7 @@ function buildItemsAndResources(resourceData: {
typeOfResource: resource?.resourceDefinition?.displayName,
description: resource?.resourceDefinition?.description,
url: resource?.url,
resourceId: resource?.resourceId,
}))
)
.value();
Expand Down Expand Up @@ -259,18 +261,41 @@ export class FilesAndLinks extends React.Component<IFilesLinksTable, {}> {
'Type Of Resource'
),
render: (data: { [id: string]: string }) => {
const path = `patient/openResource_${data.resourceId}`;
return (
<div>
<a href={data.url} target="_blank">
<a
href={getResourceViewUrlWithPathname(
data.studyId,
path,
data.patientId
)}
>
{data.typeOfResource}
</a>
</div>
);
},
},

{
...this.getDefaultColumnConfig('resourceUrl', ''),
render: (data: { [id: string]: string }) => {
return (
<div>
<a
href={data.url}
style={{ fontSize: 10 }}
target={'_blank'}
>
<i
className={`fa fa-external-link fa-sm`}
style={{
marginRight: 5,
color: 'black',
fontSize: 10,
}}
/>
{data.typeOfResource}
Open in new window
</a>
</div>
);
Expand All @@ -287,7 +312,7 @@ export class FilesAndLinks extends React.Component<IFilesLinksTable, {}> {
{
...this.getDefaultColumnConfig(
'resourcesPerPatient',
'Number of Resource Per Patient',
'Resources per Patient',
true
),
render: (data: { [id: string]: number }) => {
Expand Down
9 changes: 9 additions & 0 deletions src/shared/api/urls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,15 @@ export function getSampleViewUrlWithPathname(
return buildCBioPortalPageUrl(pathname, { sampleId, studyId }, hash);
}

export function getResourceViewUrlWithPathname(
studyId: string,
pathname: string,
patientId: string
) {
let caseId: string = `${patientId}`;
return buildCBioPortalPageUrl(pathname, { studyId, caseId });
}

export function getPatientViewUrl(
studyId: string,
caseId: string,
Expand Down
24 changes: 16 additions & 8 deletions src/shared/components/resources/ResourceTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,22 @@ export default class ResourceTab extends React.Component<

return (
<div>
<FeatureTitle
title={
this.currentResourceDatum.resourceDefinition.displayName
}
isLoading={false}
className="pull-left"
style={{ marginBottom: 10 }}
/>
<div style={{ display: 'flex', alignItems: 'flex-end' }}>
<FeatureTitle
title={
this.currentResourceDatum.resourceDefinition
.displayName
}
isLoading={false}
className="pull-left"
style={{ marginBottom: 10 }}
/>
<p style={{ marginLeft: 10 }}>
{this.currentResourceDatum.sampleId
? this.currentResourceDatum.sampleId
: this.currentResourceDatum.patientId}
</p>
</div>
<div
style={{
width: '100%',
Expand Down
5 changes: 4 additions & 1 deletion src/shared/components/resources/ResourceTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface IResourceTableProps {
resources: ResourceData[];
isTabOpen: (resourceId: string) => boolean;
openResource: (resource: ResourceData) => void;
sampleId?: React.ReactNode;
}

function icon(resource: ResourceData) {
Expand Down Expand Up @@ -45,7 +46,7 @@ function icon(resource: ResourceData) {
}

const ResourceTable = observer(
({ resources, isTabOpen, openResource }: IResourceTableProps) => {
({ resources, isTabOpen, openResource, sampleId }: IResourceTableProps) => {
const resourceTable = useLocalObservable(() => ({
get data() {
return _.sortBy(resources, r => r.resourceDefinition.priority);
Expand All @@ -56,6 +57,7 @@ const ResourceTable = observer(
<table className="simple-table table table-striped table-border-top">
<thead>
<tr>
{sampleId && <th>Sample ID</th>}
<th>Resource</th>
<th></th>
<th>Description</th>
Expand All @@ -64,6 +66,7 @@ const ResourceTable = observer(
<tbody>
{resourceTable.data.map(resource => (
<tr>
{sampleId && <td>{sampleId}</td>}
<td>
<a onClick={() => openResource(resource)}>
{icon(resource)}
Expand Down
15 changes: 9 additions & 6 deletions src/shared/components/resources/SampleResourcesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,21 @@ export default class SampleResourcesTable extends React.Component<
return (
<>
{this.data.map((datum, index) => {
const sampleId = (
<p className="blackHeader" style={{ margin: 0 }}>
{datum.sample.sampleId}{' '}
{this.props.sampleManager.getComponentForSample(
datum.sample.sampleId
)}
</p>
);
return (
<>
<h5 className="blackHeader">
Sample {datum.sample.sampleId}{' '}
{this.props.sampleManager.getComponentForSample(
datum.sample.sampleId
)}
</h5>
<ResourceTable
resources={datum.resources}
isTabOpen={this.props.isTabOpen}
openResource={this.props.openResource}
sampleId={sampleId}
/>
{index < this.data.length - 1 && (
<hr style={{ marginTop: 20 }}></hr>
Expand Down
Loading