zuul
/
zuul
Code Issues Proposed changes

Merge "web: link to index.html if index_links is set"

This commit is contained in:
Zuul 2020-02-19 09:54:12 +00:00 committed by Gerrit Code Review
parent 1914417dd4 f330fc67fd
commit 3288d16adc
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/actions/build.js
View File

@ -235,7 +235,8 @@ const receiveBuildManifest = (buildId, manifest) => {
return {
type: BUILD_MANIFEST_SUCCESS,
buildId: buildId,
manifest: {tree: manifest.tree, index: index},
manifest: {tree: manifest.tree, index: index,
index_links: manifest.index_links},
receivedAt: Date.now()
}
}

9
web/src/containers/build/Manifest.jsx
View File

@ -31,6 +31,11 @@ class Manifest extends React.Component {
render() {
const { tenant, build } = this.props
const raw_suffix = (obj) => {
return (obj.mimetype === 'application/directory' &&
build.manifest.index_links) ? 'index.html' : ''
}
const nodes = build.manifest.tree.map(
n => renderTree(
tenant, build, '/', n,
@ -40,13 +45,13 @@ class Manifest extends React.Component {
to={tenant.linkPrefix + '/build/' + build.uuid + '/log' + path + name}>
{obj.name}
</Link>
&nbsp;&nbsp;(<a href={log_url + path + name}>raw</a>
&nbsp;&nbsp;(<a href={log_url + path + name + raw_suffix(obj)}>raw</a>
&nbsp;<span className="fa fa-external-link"/>)
</span>),
(log_url, path, name, obj) => (
<span>
{obj.name}
&nbsp;&nbsp;(<a href={log_url + path + name}>raw</a>
&nbsp;&nbsp;(<a href={log_url + path + name + raw_suffix(obj)}>raw</a>
&nbsp;<span className="fa fa-external-link"/>)
</span>
)))

6
web/src/containers/build/Summary.jsx
View File

@ -84,9 +84,15 @@ class Summary extends React.Component {
}
if (column === 'log_url') {
label = 'log url'
if (build.manifest && build.manifest.index_links) {
value = <a href={value + 'index.html'}>{value}</a>
} else {
value = <a href={value}>{value}</a>
}
}
if (column === 'ref_url') {
label = 'ref url'
value = <a href={value}>{value}</a>
}
if (column === 'event_id') {
label = 'event id'