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

SCRUM-4538 fix genetic modifier entity #1378

Merged
merged 2 commits into from
Dec 10, 2024
Merged

SCRUM-4538 fix genetic modifier entity #1378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eae62b2
SCRUM-4538 fix genetic modifier entity
cmpich Dec 10, 2024
4e1d3bc
SCRUM-4538 fix exp condition
cmpich Dec 10, 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
20 changes: 15 additions & 5 deletions src/components/dataTable/AnnotatedEntitiesPopupCuration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import StrainBackground from './StrainBackground';
function renderLink(entity) {
const identifier = getIdentifier(entity.diseaseAnnotationSubject);
const url = getResourceUrl({
identifier,
type: entity.diseaseAnnotationSubject.type,
identifier,
type: entity.diseaseAnnotationSubject.type,
subtype: entity.diseaseAnnotationSubject.subtype
})

Expand Down Expand Up @@ -90,15 +90,25 @@ function AnnotatedEntitiesPopupCuration({ children, entities, mainRowCurie, pubM
{
entities.map(entity => {
const provider = buildProviderWithUrl(entity);
var diseaseGeneticModifiers = entity.diseaseGeneticModifierAlleles;
if(entity.diseaseGeneticModifierGenes != null){
diseaseGeneticModifiers = entity.diseaseGeneticModifierGenes;
}
if(entity.diseaseGeneticModifierAgms != null){
diseaseGeneticModifiers = entity.diseaseGeneticModifierAgms;
}
var expCondition = entity.conditionRelations;
if(entity.conditionModifiers != null){
expCondition = entity.conditionModifiers;
}
return (
<tr key={entity.id}>
{columnNameSet.has("Name") && <td>{renderLink(entity)}</td>}
{columnNameSet.has("Type") && <td><TypeCellCuration subject={entity.diseaseAnnotationSubject}/></td>}
{columnNameSet.has("Association") && <td><AssociationCellCuration association={entity.fullRelationString}/></td>}
{columnNameSet.has("Additional Implicated Genes") && <td><AssertedGenes assertedGenes={entity.assertedGenes} mainRowCurie={mainRowCurie}/></td>}
{(columnNameSet.has("Experimental Condition") && entity.conditionRelations) && <td><ExperimentalConditionCellCuration conditions={entity.conditionRelations}/></td>}
{(columnNameSet.has("Experimental Condition") && entity.conditionModifiers) && <td><ExperimentalConditionCellCuration conditions={entity.conditionModifiers}/></td>}
{columnNameSet.has("Genetic Modifiers") && <td><GeneticModifiersCellCuration relation={entity.diseaseGeneticModifierRelation} modifiers={entity.diseaseGeneticModifierGenes}/></td>}
{columnNameSet.has("Experimental Condition") && <td><ExperimentalConditionCellCuration conditions={expCondition}/></td>}
{columnNameSet.has("Genetic Modifiers") && <td><GeneticModifiersCellCuration relation={entity.diseaseGeneticModifierRelation} modifiers={diseaseGeneticModifiers}/></td>}
{columnNameSet.has("Strain Background") && <td><StrainBackground strainBackground={entity.sgdStrainBackground}/></td>}
{columnNameSet.has("Genetic Sex") && <td><GeneticSex geneticSex={entity.geneticSex}/></td>}
{columnNameSet.has("Notes") && <td><RelatedNotes className={style.relatedNotes} relatedNotes={entity.relatedNotes}/></td>}
Expand Down