Merge "web: link to index.html if index_links is set"
This commit is contained in:
commit
3288d16adc
|
@ -235,7 +235,8 @@ const receiveBuildManifest = (buildId, manifest) => {
|
||||||
return {
|
return {
|
||||||
type: BUILD_MANIFEST_SUCCESS,
|
type: BUILD_MANIFEST_SUCCESS,
|
||||||
buildId: buildId,
|
buildId: buildId,
|
||||||
manifest: {tree: manifest.tree, index: index},
|
manifest: {tree: manifest.tree, index: index,
|
||||||
|
index_links: manifest.index_links},
|
||||||
receivedAt: Date.now()
|
receivedAt: Date.now()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,11 @@ class Manifest extends React.Component {
|
||||||
render() {
|
render() {
|
||||||
const { tenant, build } = this.props
|
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(
|
const nodes = build.manifest.tree.map(
|
||||||
n => renderTree(
|
n => renderTree(
|
||||||
tenant, build, '/', n,
|
tenant, build, '/', n,
|
||||||
|
@ -40,13 +45,13 @@ class Manifest extends React.Component {
|
||||||
to={tenant.linkPrefix + '/build/' + build.uuid + '/log' + path + name}>
|
to={tenant.linkPrefix + '/build/' + build.uuid + '/log' + path + name}>
|
||||||
{obj.name}
|
{obj.name}
|
||||||
</Link>
|
</Link>
|
||||||
(<a href={log_url + path + name}>raw</a>
|
(<a href={log_url + path + name + raw_suffix(obj)}>raw</a>
|
||||||
<span className="fa fa-external-link"/>)
|
<span className="fa fa-external-link"/>)
|
||||||
</span>),
|
</span>),
|
||||||
(log_url, path, name, obj) => (
|
(log_url, path, name, obj) => (
|
||||||
<span>
|
<span>
|
||||||
{obj.name}
|
{obj.name}
|
||||||
(<a href={log_url + path + name}>raw</a>
|
(<a href={log_url + path + name + raw_suffix(obj)}>raw</a>
|
||||||
<span className="fa fa-external-link"/>)
|
<span className="fa fa-external-link"/>)
|
||||||
</span>
|
</span>
|
||||||
)))
|
)))
|
||||||
|
|
|
@ -84,9 +84,15 @@ class Summary extends React.Component {
|
||||||
}
|
}
|
||||||
if (column === 'log_url') {
|
if (column === 'log_url') {
|
||||||
label = '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') {
|
if (column === 'ref_url') {
|
||||||
label = 'ref url'
|
label = 'ref url'
|
||||||
|
value = <a href={value}>{value}</a>
|
||||||
}
|
}
|
||||||
if (column === 'event_id') {
|
if (column === 'event_id') {
|
||||||
label = 'event id'
|
label = 'event id'
|
||||||
|
|
Loading…
Reference in New Issue