Skip to content

Commit 892cb45

Browse files
Merge pull request #39 from 4dn-dcic/metaworkflowrun-example
Metaworkflowrun Example
2 parents c277cc4 + d59344a commit 892cb45

File tree

7 files changed

+9631
-36
lines changed

7 files changed

+9631
-36
lines changed

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
## Changelog
2+
3+
- [View releases on Github](https://github.com/4dn-dcic/react-workflow-viz/releases)
4+
- [View releases on NPM](https://www.npmjs.com/package/@hms-dbmi-bgm/react-workflow-viz?activeTab=versions)
5+
- [View releases on Unpkg](https://unpkg.com/browse/@hms-dbmi-bgm/react-workflow-viz/)
6+
7+
#### 2023-05-16 (v0.1.8)
8+
- Add new metaworkflow run example to demo page
9+
10+
#### 2022-04-22 (v0.1.6, v0.1.7)
11+
- Stop tracking `dist` and `es` directories/hide in `.gitignore`
12+
- Package version updates for `webpack`, `babel` deps, `d3`, and `underscore`
13+
- Slight improvement to `parsing-functions.js`
14+
- Updates to `package-lock`
15+
16+
#### 2022-02-22 (v0.1.5)
17+
- Update `react` and `react-dom` dependencies from `^16.14.0` to `>=16.14.0`
18+
19+
#### 2021-09-13 (v0.1.3, v0.1.4)
20+
- Added couple of new demo files for development.
21+
22+
#### 2020-03-13 (v0.1.3, v0.1.4)
23+
- Improvements in path plotting - do not diverge into separate paths unless necessary.
24+
- Demo updates.
25+
- Minor patch: move http-server to devDependencies.
26+
27+
#### 2020-01-21 (v0.1.2)
28+
- Important glitch fixes, including typo and intersection counting.
29+
- PROTOTYPE / NOT ENABLED: Reuse horizontal edge segments (to reduce # of lines; noise) if:
30+
- Segment is on same Y coordinate as previous segment (or source node, if first segment) _and_ has common source node. This prevents a path from a single node from prematuraly splitting into many separate paths.
31+
- Segment is leading to a common target node. This allows paths to converge if beneficial.
32+
- This could be better tested; perhaps reused segments should be treated differently in regard to intersections (at least excluded).
33+
34+
#### 2019-10-06 (v0.1.1)
35+
- Improved ordering of terminal reference file input nodes.
36+
- Now compares distance of closest step that is being input into; those which go into further steps get pushed to bottom.
37+
- For edges spanning more than one column gap, longer edges now get drawn/'traced' before shorter edges (experimental-ish).
38+
- Including comments in ESM build output.

README.md

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ React component for visualizing CWL-like workflows (and similar data).
44
This is in alpha/beta phase.
55

66

7-
Is being used by HMS-DBMI in the [4DN Data Portal](https://data.4dnucleome.org/experiment-set-replicates/4DNESMU2MA2G/#graph-section) to show provenance of analytical pipeline runs.
8-
Also being used in the CGAP (final name TDB) project for similar purposes.
7+
This package is being used by HMS-DBMI in the [4DN Data Portal](https://data.4dnucleome.org/experiment-set-replicates/4DNESMU2MA2G/#graph-section) to show provenance of analytical pipeline runs.
8+
Also being used in [CGAP](https://cgap.hms.harvard.edu) for similar purposes.
9+
10+
Check out a live demo at [unpkg.com/@hms-dbmi-bgm/react-workflow-viz/index.html](https://unpkg.com/@hms-dbmi-bgm/react-workflow-viz/index.html). _Note: This link points to the index.html file in the distributable NPM package (and in this repo)._
11+
12+
[![Gif of CWL Workflow Viz](https://i.gyazo.com/0c5e73105b1f284c16a9cca03ec866ed.gif)](https://unpkg.com/@hms-dbmi-bgm/react-workflow-viz/index.html)
913

10-
Checkout the current demo at [unpkg.com/@hms-dbmi-bgm/react-workflow-viz/index.html](https://unpkg.com/@hms-dbmi-bgm/react-workflow-viz/index.html), which points to the index.html file in the distributable NPM package (and in this repo).
1114

1215
## Build demo
1316

@@ -20,35 +23,14 @@ npm run build
2023
When it completes, load `file:///path-to-your-checkout/react-workflow-viz/index.html`.
2124
New testdata won't show with `npm run build` unless is already present in unpkg/npm. For local development, do the following
2225

26+
2327
### For Development
2428

2529
For local development (watches file, serves on localhost:8100), run `npm run dev`.
2630

2731

2832
## Changelog
29-
_Side Note -_ Is there a way to auto-generate a `CHANGELOG.md` file out of releases' content?
30-
31-
#### 2021-09-13 (v0.1.3, v0.1.4)
32-
- Added couple of new demo files for development.
33-
34-
#### 2020-03-13 (v0.1.3, v0.1.4)
35-
- Improvements in path plotting - do not diverge into separate paths unless necessary.
36-
- Demo updates.
37-
- Minor patch: move http-server to devDependencies.
38-
39-
#### 2020-01-21 (v0.1.2)
40-
- Important glitch fixes, including typo and intersection counting.
41-
- PROTOTYPE / NOT ENABLED: Reuse horizontal edge segments (to reduce # of lines; noise) if:
42-
- Segment is on same Y coordinate as previous segment (or source node, if first segment) _and_ has common source node. This prevents a path from a single node from prematuraly splitting into many separate paths.
43-
- Segment is leading to a common target node. This allows paths to converge if beneficial.
44-
- This could be better tested; perhaps reused segments should be treated differently in regard to intersections (at least excluded).
45-
46-
#### 2019-10-06 (v0.1.1)
47-
48-
- Improved ordering of terminal reference file input nodes.
49-
- Now compares distance of closest step that is being input into; those which go into further steps get pushed to bottom.
50-
- For edges spanning more than one column gap, longer edges now get drawn/'traced' before shorter edges (experimental-ish).
51-
- Including comments in ESM build output.
33+
Changelog has been moved to `CHANGELOG.md` file in root directory. Please check there for updates.
5234

5335

5436
## Things to do

demo/demo.js

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ class DemoApp extends Component {
7373
"description" : null,
7474
"href" : url.resolve(BASE_HREF, "for-development-hi-c-workflowrunawsem.json"),
7575
"opts" : workflowOpts
76+
},
77+
{
78+
"name" : "MetaWorkflowRun - WGS SNV Germline Trio Example",
79+
"description": null,
80+
"href" : url.resolve(BASE_HREF, "meta-workflow-run-WGS-SNV-Germline-Trio.json"),
81+
"opts" : workflowOpts
7682
}
7783
]
7884
};
@@ -92,7 +98,8 @@ class DemoApp extends Component {
9298
parseBasicIO: false
9399
},
94100
loadedSteps: {},
95-
rowSpacingType: "compact"
101+
rowSpacingType: "compact",
102+
loadingSteps: false,
96103
};
97104
}
98105

@@ -138,16 +145,20 @@ class DemoApp extends Component {
138145
const existingSteps = currDemoInfo.steps || loadedSteps[name];
139146

140147
if (!Array.isArray(existingSteps)) {
141-
this.setState({ loadingSteps: true }, ()=>{
142-
window.fetch(url.resolve(window.location.href, href)).then((resp)=>{
143-
return resp.json();
144-
}).then((resp)=>{
148+
this.setState({ loadingSteps: true }, () => {
149+
window.fetch(url.resolve(window.location.href, href))
150+
.then((resp) => resp.json())
151+
.then((resp) => {
145152
this.setState(function({ loadedSteps: prevSteps }){
146153
return {
147154
loadedSteps: { ...prevSteps, [name] : resp },
148155
loadingSteps: false
149156
};
150157
});
158+
})
159+
.catch((err) => {
160+
console.error("Something went wrong while loading data!", err);
161+
this.setState({ loadingSteps: false });
151162
});
152163
});
153164
}
@@ -223,6 +234,9 @@ function ParsingOptsCheckboxes(props){
223234
return (
224235
<div className="parsing-options-container options-container">
225236
<h5>Parsing Options</h5>
237+
<p className="tip-text">
238+
Note: updating the viz for some parsing options (such as showing parameters) may take a few seconds to complete for larger test datasets.
239+
</p>
226240
<label>
227241
<input type="checkbox" name="showReferenceFiles"
228242
checked={dataOpts['showReferenceFiles'] || showReferenceFiles}

0 commit comments

Comments
 (0)