Skip to content

Commit

Permalink
feat: add With data conversions
Browse files Browse the repository at this point in the history 
BREAKING CHANGE: the With data is returned from the API with a different data structure; the front
end code has been updated to reflect this
  • Loading branch information
@erichartline
erichartline committed Oct 19, 2018
1 parent 66bf142 commit ceb2ce1
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 66 deletions.
29 changes: 14 additions & 15 deletions src/features/Ontology/Table/DisplayTable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,21 +103,20 @@ export class DisplayTable extends Component<Props> {

<TableCell>
{item.with !== null &&
item.with.map((item: Object) =>
item.connectedXrefs.map((xref: Object, i: string) => (
<Fragment key={i}>
<span>
<a
className={classes.link}
href={withLinkGenerator(xref.id, xref.db)}
target="_blank">
{xref.db}:{xref.id}
</a>
</span>
<br />
</Fragment>
)),
)}
item.with.map((item: Object, i: string) => (
<Fragment key={i}>
<span>
<a
className={classes.link}
href={withLinkGenerator(item.id, item.db)}
target="_blank">
{!item.name && `${item.db}:${item.id}`}
{item.name && `${item.name}`}
</a>
</span>
<br />
</Fragment>
))}
</TableCell>
<TableCell>
<a
Expand Down
96 changes: 45 additions & 51 deletions src/features/Summary/Panels/GoaPanel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,23 +146,21 @@ const GoaPanel = (props: Props) => {
<span>
{item.goterm}
{item.with !== null &&
item.with.map((item: Object) =>
withDataFilter(item.connectedXrefs).map(
(xref: Object, i: string) => (
<Fragment key={i}>
<span>
{" "}
<em>with</em>{" "}
<a
className={classes.link}
href={withLinkGenerator(xref.id, xref.db)}
target="_blank">
{!xref.name && `${xref.db}:${xref.id}`}
{xref.name && `${xref.name}`}
</a>
</span>
</Fragment>
),
withDataFilter(item.with).map(
(xref: Object, i: string) => (
<Fragment key={i}>
<span>
{" "}
<em>with</em>{" "}
<a
className={classes.link}
href={withLinkGenerator(xref.id, xref.db)}
target="_blank">
{!xref.name && `${xref.db}:${xref.id}`}
{xref.name && `${xref.name}`}
</a>
</span>
</Fragment>
),
)}
{item.extensions !== null &&
Expand Down Expand Up @@ -205,23 +203,21 @@ const GoaPanel = (props: Props) => {
<span>
{item.goterm}
{item.with !== null &&
item.with.map((item: Object) =>
withDataFilter(item.connectedXrefs).map(
(xref: Object, i: string) => (
<Fragment key={i}>
<span>
{" "}
<em>with</em>{" "}
<a
className={classes.link}
href={withLinkGenerator(xref.id, xref.db)}
target="_blank">
{!xref.name && `${xref.db}:${xref.id}`}
{xref.name && `${xref.name}`}
</a>
</span>
</Fragment>
),
withDataFilter(item.with).map(
(xref: Object, i: string) => (
<Fragment key={i}>
<span>
{" "}
<em>with</em>{" "}
<a
className={classes.link}
href={withLinkGenerator(xref.id, xref.db)}
target="_blank">
{!xref.name && `${xref.db}:${xref.id}`}
{xref.name && `${xref.name}`}
</a>
</span>
</Fragment>
),
)}
{item.extensions !== null &&
Expand Down Expand Up @@ -264,23 +260,21 @@ const GoaPanel = (props: Props) => {
<span>
{item.goterm}
{item.with !== null &&
item.with.map((item: Object) =>
withDataFilter(item.connectedXrefs).map(
(xref: Object, i: string) => (
<Fragment key={i}>
<span>
{" "}
<em>with</em>{" "}
<a
className={classes.link}
href={withLinkGenerator(xref.id, xref.db)}
target="_blank">
{!xref.name && `${xref.db}:${xref.id}`}
{xref.name && `${xref.name}`}
</a>
</span>
</Fragment>
),
withDataFilter(item.with).map(
(xref: Object, i: string) => (
<Fragment key={i}>
<span>
{" "}
<em>with</em>{" "}
<a
className={classes.link}
href={withLinkGenerator(xref.id, xref.db)}
target="_blank">
{!xref.name && `${xref.db}:${xref.id}`}
{xref.name && `${xref.name}`}
</a>
</span>
</Fragment>
),
)}
{item.extensions !== null &&
Expand Down

0 comments on commit ceb2ce1

Please sign in to comment.