-
Notifications
You must be signed in to change notification settings - Fork 11
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
⚙️ Fixes dependency tree-view #186
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 27 additions & 12 deletions
39
app/components/Workflow/DependencyTree/DependencyTreeD3.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,40 @@ | ||
import React from 'react'; | ||
import Tree from 'react-d3-tree'; | ||
import WorkflowUtil from '../../../utils/workflow'; | ||
import CodeNode from '../DependencyGraph/CustomNodes/Code/CodeNode'; | ||
import AssetUtil from '../../../utils/asset'; | ||
import styles from './DependencyTree.css'; | ||
|
||
const renderCodeNode = node => ( | ||
<CodeNode | ||
renderType="svg" | ||
node={{ name: node.nodeDatum.name, assetType: node.nodeDatum.attributes.assetType }} | ||
/> | ||
); | ||
|
||
const dependencyGraphD3 = props => { | ||
const dependencyGraphD3 = (props) => { | ||
const { assets } = props; | ||
|
||
const data = WorkflowUtil.getAllDependenciesAsTree(assets); | ||
const data = WorkflowUtil.getAllDependenciesAsTree(AssetUtil.filterIncludedFileAssets(assets)); | ||
let tree = null; | ||
if (data) { | ||
tree = <Tree data={data} renderCustomNodeElement={renderCodeNode} />; | ||
tree = ( | ||
<Tree | ||
data={data} | ||
initialDepth={2} | ||
depthFactor={750} | ||
separation={{ | ||
siblings: 0.4, | ||
nonSiblings: 0.8, | ||
}} | ||
dimensions={{ height: window.innerHeight / 2, width: (2 * window.innerWidth) / 3 }} | ||
pathFunc={'step'} | ||
zoom={0.4} | ||
scaleExtent={{ max: 2, min: 0.1 }} | ||
translate={{ x: 10, y: window.innerHeight / 3 }} | ||
rootNodeClassName={styles.node__root} | ||
branchNodeClassName={styles.node__branch} | ||
leafNodeClassName={styles.node__leaf} | ||
/> | ||
); | ||
} | ||
return <div className={styles.container}>{tree}</div>; | ||
return ( | ||
<div style={{ width: '100%', height: '75vh', fontSize: '2.1em', fontFamily: 'monospace' }}> | ||
{tree} | ||
</div> | ||
); | ||
}; | ||
|
||
export default dependencyGraphD3; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We would love to have this available to try out. We had created 2 versions of the tree and graph components - one for D3 and one for ECharts. Because this uses react-d3-tree, could you please move these changes to the file: https://github.com/StatTag/StatWrap/blob/master/app/components/Workflow/DependencyTree/DependencyTreeD3.js?