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.

Sign up for GitHub

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

Jump to bottom

webdash: add all task fields #458

Merged
merged 2 commits into from
Jan 30, 2018
Merged

webdash: add all task fields #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f89a7cc
webdash: add all missing task fields
Jan 24, 2018
53dfe10
cmd: include examples that use nearly all task fields
Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config/bundle.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 31 additions & 8 deletions examples/bundle.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions examples/full-hello.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "Full Hello world",
"description": "Demonstrates the most basic echo task with all the extras.",
"tags": {
"tag-ONE": "TWO",
"tag-THREE": "FOUR"
},
"outputs": [{
"url": "/Users/buchanae/src/github.com/ohsu-comp-bio/funnel/_scratch/full-output/",
"path": "/outputs",
"type": "DIRECTORY"
}],
"volumes": ["/vol1", "/vol2"],
"executors": [
{
"image": "alpine",
"command": ["sh", "-c", "echo foo > /outputs/foo; echo bar > /outputs/bar"],
"env": {
"ONE": "TWO",
"THREE": "FOUR"
}
}
]
}
52 changes: 52 additions & 0 deletions webdash/task.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,31 @@ <h5 style="text-align: center">Not Found</h5>
<td>End Time</td>
<td>{{ task.logs[0].end_time | date:"medium" }}</td>
</tr>
<tr ng-show="task.volumes">
<td>Volumes</td>
<td>{{ task.volumes.join(', ') }}</td>
</tr>
</table>

<div ng-show="task.tags">
<h6>Tags</h6>
<table class="task-desc-table">
<tr ng-repeat="(k, v) in task.tags">
<td>{{ k }}</td>
<td>{{ v }}</td>
</tr>
</table>
</div>

<div ng-show="task.logs[0].metadata">
<h6>Metadata</h6>
<table class="task-desc-table">
<tr ng-repeat="(k, v) in task.logs[0].metadata">
<td>{{ k }}</td>
<td>{{ v }}</td>
</tr>
</table>
</div>

<div ng-show="task.inputs">
<h6>Inputs</h6>
Expand Down Expand Up @@ -116,6 +140,16 @@ <h6>Executors</h6>
<td>Image</td>
<td>{{ cmd.image }}</td>
</tr>
<tr ng-show="cmd.workdir">
<td>Workdir</td>
<td>{{ cmd.workdir }}</td>
</tr>
<tbody ng-show="cmd.env">
<tr ng-repeat="(k, v) in cmd.env">
<td>{{ k }}</td>
<td>{{ v }}</td>
</tr>
</tbody>

<tr ng-show="logs.exit_code != undefined">
<td>Exit Code</td>
Expand All @@ -138,6 +172,24 @@ <h6>Executors</h6>
<td><pre class="logs-pre"><code>{{ logs.stderr }}</code></pre></td>
</tr>
</table>

<div ng-show="task.logs[0].outputs">
<h6>Output File Log</h6>
<table class="data-table" ng-repeat="output in task.logs[0].outputs track by $index">
<tr>
<td>URL</td>
<td>{{ output.url }}</td>
</tr>
<tr>
<td>Path</td>
<td>{{ output.path }}</td>
</tr>
<tr>
<td>Size (bytes)</td>
<td>{{ output.size_bytes }}</td>
</tr>
</table>
</div>

<div ng-show="syslogs.length" class="syslogs-section">
<h6>System Logs</h6>
Expand Down
Loading