Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ui/job-view/details/summary/LogUrls.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import LogItem from './LogItem';
export default function LogUrls(props) {
const { logUrls, logViewerUrl, logViewerFullUrl } = props;
const logUrlsUseful = logUrls.filter(
(logUrl) => logUrl.name !== 'perfherder-data-resource-usage.json',
(logUrl) => !logUrl.name.includes('perfherder-data'),
);

return (
Expand Down
26 changes: 22 additions & 4 deletions ui/job-view/details/summary/SummaryPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,30 @@ class SummaryPanel extends React.PureComponent {
classificationMap,
} = this.props;

const logs = jobLogUrls.filter(
(log) => !log.name.includes('perfherder-data'),
);
const artifacts = jobLogUrls.filter((artifact) =>
artifact.name.includes('perfherder-data'),
);
const logStatus = [
{
title: 'Log parsing status',
value: !jobLogUrls.length
value: !logs.length
? 'No logs'
: jobLogUrls.map((log) => log.parse_status).join(', '),
: logs.map((log) => log.parse_status).join(', '),
},
];
const artifactStatus = [
{
title: 'Artifact parsing status',
value: !artifacts.length ? 'No artifacts' : null,
subfields: artifacts.length
? artifacts.map((artifact) => ({
name: artifact.name,
value: artifact.parse_status,
}))
: null,
},
];

Expand All @@ -50,7 +68,7 @@ class SummaryPanel extends React.PureComponent {
jobDetails={jobDetails}
logViewerUrl={logViewerUrl}
logViewerFullUrl={logViewerFullUrl}
jobLogUrls={jobLogUrls}
jobLogUrls={logs}
user={user}
/>
<div id="summary-panel-content">
Expand Down Expand Up @@ -80,7 +98,7 @@ class SummaryPanel extends React.PureComponent {
<StatusPanel selectedJobFull={selectedJobFull} />
<JobInfo
job={selectedJobFull}
extraFields={logStatus}
extraFields={[...logStatus, ...artifactStatus]}
currentRepo={currentRepo}
/>
</ul>
Expand Down
50 changes: 37 additions & 13 deletions ui/shared/JobInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,35 @@ const getTimeFields = function getTimeFields(job) {
};

export default class JobInfo extends React.PureComponent {
renderFieldValue(field) {
if (field.url) {
return (
<a
title={field.value}
href={field.url}
target="_blank"
rel="noopener noreferrer"
>
{field.value}
</a>
);
}

if (field.subfields) {
return (
<ul className="list-unstyled ml-1">
{field.subfields.map((sf) => (
<li key={sf.name}>
{sf.name}: <span>{sf.value}</span>
</li>
))}
</ul>
);
}

return <span>{field.value}</span>;
}

render() {
const { job, extraFields, showJobFilters, currentRepo } = this.props;
const {
Expand Down Expand Up @@ -107,20 +136,9 @@ export default class JobInfo extends React.PureComponent {
<Clipboard description="job Name" text={jobTypeName} />
</li>
{[...timeFields, ...extraFields].map((field) => (
<li className="small" key={`${field.title}${field.value}`}>
<li className="small" key={`${field.title}${field.value ?? ''}`}>
<strong>{field.title}: </strong>
{field.url ? (
<a
title={field.value}
href={field.url}
target="_blank"
rel="noopener noreferrer"
>
{field.value}
</a>
) : (
<span>{field.value}</span>
)}
{this.renderFieldValue(field)}
{field.clipboard && (
<Clipboard
description={field.clipboard.description}
Expand Down Expand Up @@ -153,6 +171,12 @@ JobInfo.propTypes = {
description: PropTypes.string.isRequired,
text: PropTypes.string,
}),
subfields: PropTypes.arrayOf(
PropTypes.exact({
name: PropTypes.string.isRequired,
value: PropTypes.string.isRequired,
}),
),
}),
),
showJobFilters: PropTypes.bool,
Expand Down
4 changes: 3 additions & 1 deletion ui/shared/tabs/failureSummary/FailureSummaryTab.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ class FailureSummaryTab extends React.Component {
suggestions,
errors,
} = this.state;
const logs = jobLogUrls;
const logs = jobLogUrls.filter(
(jlu) => !jlu.name.includes('perfherder-data'),
);
const jobLogsAllParsed =
logs.length > 0 && logs.every((jlu) => jlu.parse_status !== 'pending');

Expand Down