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

Change the order and put "Matched Samples" above ARM #2944

Merged
merged 1 commit into from
Dec 23, 2019
Merged

Change the order and put "Matched Samples" above ARM #2944

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions src/pages/patientView/trialMatch/TrialMatchTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,18 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
</div>
))}
</div>
<If condition={armMatch.armDescription !== ''}>
<div style={{ marginTop: 7, marginBottom: 3, width: '75%' }}>
<div style={{ marginTop: 5 }}>
<span>Matched Samples: {this.getSampleIdIcons(armMatch.sampleIds)}</span>
</div>
<If condition={armMatch.armDescription !== ''}>
<div style={{ width: '75%' }}>
<span>Arm: {armMatch.armDescription}</span>
</div>
</If>
<div>
<span>Matched Samples: {this.getSampleIdIcons(armMatch.sampleIds)}</span>
</div>
<If condition={armMatch.drugs.length > 0}>
<div>
<span>
<img src={require("../../../globalStyles/images/drug.png")} style={{ width: 18, marginTop: -5 }} alt="drug icon"/>
<img src={require("../../../globalStyles/images/drug.png")} style={{ width: 18, marginTop: -5, marginRight: 5 }} alt="drug icon"/>
<b>{armMatch.drugs.map((drugCombination: string[]) => drugCombination.join(' + ')).join(', ')}</b></span>
</div>
</If>
Expand Down Expand Up @@ -169,7 +169,7 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
{clinicalGroupMatch.trialOncotreePrimaryDiagnosis.positive.join(', ')}
{clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative.length > 0 &&
<span>
<b> except in </b>
<b> except </b>
<If condition={clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative.length < 4}>
<Then>
<span>{clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative.join(', ').replace(/,(?!.*,)/gmi, ' and')}</span>
Expand Down Expand Up @@ -202,7 +202,9 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
<React.Fragment>
{matches.MUTATION.map((genomicGroupMatch: IGenomicGroupMatch) => (
<div>
<span style={{'marginRight': 5}}><b>{genomicGroupMatch.patientGenomic!.trueHugoSymbol}</b> {genomicGroupMatch.patientGenomic!.trueProteinChange}</span>
<span style={{'marginRight': 5}}>
<b>{genomicGroupMatch.patientGenomic!.trueHugoSymbol} </b>{genomicGroupMatch.patientGenomic!.trueProteinChange}
</span>
<DefaultTooltip
placement='bottomLeft'
trigger={['hover', 'focus']}
Expand All @@ -214,7 +216,7 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
</div>
))}
{matches.MSI.length > 0 &&
<div>Tumor is MSI-H</div>
<div>Tumor is <b>MSI-H</b></div>
}
{matches.CNA.map((genomicGroupMatch: IGenomicGroupMatch) => (
<div>
Expand Down Expand Up @@ -254,7 +256,7 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
</div>
}
{ notMatches.MSI.length > 0 &&
<div>Tumor is not MSI-H</div>
<div>Tumor is <b>not MSI-H</b></div>
}
{ notMatches.WILDTYPE.length > 0 &&
<div>
Expand Down