Skip to content

Commit

Permalink
Merge pull request #364 from bento-platform/fixes/excluded
Browse files Browse the repository at this point in the history
"negated" -> "excluded" for phenotypic features
  • Loading branch information
gsfk authored Feb 8, 2024
2 parents 5f82cf9 + 1c78cbd commit 21f42ca
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/components/explorer/IndividualPhenotypicFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const PHENOTYPIC_FEATURES_COLUMNS = [
{
title: "Feature",
key: "feature",
render: ({ header, type, negated }) => ({
render: ({ header, type, excluded }) => ({
children: header ? (
<h4 style={{ marginBottom: 0 }} className="phenotypic-features--phenopacket-header">
Phenopacket:{" "}
Expand All @@ -20,7 +20,7 @@ const PHENOTYPIC_FEATURES_COLUMNS = [
</h4>
) : <>
<OntologyTerm term={type} />{" "}
{negated ? (
{excluded ? (
<span style={{ color: "#CC3333" }}>
(<span style={{ fontWeight: "bold" }}>Excluded:</span>{" "}
Found to be absent{" "}
Expand Down Expand Up @@ -73,7 +73,7 @@ const IndividualPhenotypicFeatures = ({ individual }) => {
}] : []), // If there is just 1 phenopacket, don't include a header row
...(p.phenotypic_features ?? []).map((pf) => ({
...pf,
key: `${p.id}:${pf.type.id}:${pf.negated}`,
key: `${p.id}:${pf.type.id}:${pf.excluded}`,
})),
]);
}, [individual]);
Expand Down
1 change: 1 addition & 0 deletions src/propTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ export const diseasePropTypesShape = PropTypes.shape({
// Prop types object shape for a single phenopacket phenotypic feature object.
export const phenotypicFeaturePropTypesShape = PropTypes.shape({
type: ontologyShape.isRequired,
excluded: PropTypes.bool,
created: PropTypes.string, // ISO datetime string
updated: PropTypes.string, // ISO datetime string
});
Expand Down

0 comments on commit 21f42ca

Please sign in to comment.