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.

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

updated io tree response to add link type information #2033

Merged
merged 5 commits into from
Oct 12, 2018

Conversation

waychal
Copy link
Contributor

@waychal waychal commented Oct 8, 2018

No description provided.

@coveralls
Copy link

coveralls commented Oct 8, 2018

Coverage Status

Coverage increased (+2.7%) to 50.681% when pulling ab3fc17 on waychal:iotree into a17fcce on aiidateam:release_v0.12.3.

@@ -596,6 +597,7 @@ def get_node_shape(ntype):
"displaytype": display_type,
"group": "inputs",
"description": description,
"linklabel": linklabel,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the linklabel should be attached to the nodes, but to the edges

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This information is used in materials cloud when user mouse hover on node. So it needs to be passed in node.

@@ -604,20 +606,21 @@ def get_node_shape(ntype):
"to": 0,
"arrows": "to",
"color": {"inherit": 'from'},
"linktype": linktype,
"label": linktype,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The linklabel should be moved here from nodes, and this should remain to be called linktype

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'label' is the name used by JS library to display value on edge. This endpoint is specifically written for materials cloud and passes the data in format used in MC. Otherwise we can reprocess the data completely in frontend again before passing it to the visualization library.

@@ -634,6 +637,7 @@ def get_node_shape(ntype):
"displaytype": display_type,
"group": "outputs",
"description": description,
"linklabel": linklabel,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above

@@ -642,7 +646,7 @@ def get_node_shape(ntype):
"to": nodeCount,
"arrows": "to",
"color": {"inherit": 'to'},
"linktype": linktype
"label": linktype
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above

@giovannipizzi
Copy link
Member

@waychal you can merge this when tests finish to run.

@waychal waychal merged commit 6f2d385 into aiidateam:release_v0.12.3 Oct 12, 2018
@ltalirz ltalirz added this to PRs to be cherry-picked in Port from 0.12.3 into develop Mar 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Port from 0.12.3 into develop
  
PRs to be cherry-picked
Development

Successfully merging this pull request may close these issues.

None yet

3 participants