diff --git a/web/src/Misc.jsx b/web/src/Misc.jsx index fafd318e3d..1da9d109ca 100644 --- a/web/src/Misc.jsx +++ b/web/src/Misc.jsx @@ -92,6 +92,14 @@ function buildExternalTableLink(ref) { return null } +function describeRef(ref) { + if (ref.change) { + return `Change ${ref.change}` + } else { + return `Ref ${ref.ref}` + } +} + function renderRefInfo(ref) { const refinfo = ref.branch ? ( <> @@ -172,4 +180,4 @@ function setDarkMode(darkMode) { } } -export { IconProperty, removeHash, ExternalLink, buildExternalLink, buildExternalTableLink, renderRefInfo, ConditionalWrapper, resolveDarkMode, setDarkMode } +export { IconProperty, removeHash, ExternalLink, buildExternalLink, buildExternalTableLink, describeRef, renderRefInfo, ConditionalWrapper, resolveDarkMode, setDarkMode } diff --git a/web/src/containers/charts/GanttChart.jsx b/web/src/containers/charts/GanttChart.jsx index 5c92f7b29d..45819f84de 100644 --- a/web/src/containers/charts/GanttChart.jsx +++ b/web/src/containers/charts/GanttChart.jsx @@ -24,6 +24,7 @@ import 'moment-duration-format' import { Chart, ChartBar, ChartAxis, ChartLegend, ChartTooltip } from '@patternfly/react-charts' import { buildResultLegendData, buildsBarStyle } from './Misc' +import { describeRef } from '../../Misc' function BuildsetGanttChart(props) { @@ -40,15 +41,17 @@ function BuildsetGanttChart(props) { const origin = moment_tz.utc(sortedByStartTime[builds.length - 1].start_time).tz(timezone) const longestJobName = builds.reduce((a, build) => (a.length < build.job_name.length ? build.job_name : a), '') + const jobNames = builds.map((d) => d.job_name) const data = sortedByStartTime.map((build) => { return { - x: build.job_name, + x: build.uuid, y0: build.start_time ? (moment_tz.utc(build.start_time).tz(timezone) - origin) / 1000 : 0, y: build.end_time ? (moment_tz.utc(build.end_time).tz(timezone) - origin) / 1000 : 0, result: build.result, started: moment_tz.utc(build.start_time).tz(timezone).format('YYYY-MM-DD HH:mm:ss'), ended: moment_tz.utc(build.end_time).tz(timezone).format('YYYY-MM-DD HH:mm:ss'), + ref: build.ref, } }) @@ -88,7 +91,10 @@ function BuildsetGanttChart(props) { legendData={legendData} legendComponent={} > - + jobNames[index])} + /> } - labels={({ datum }) => `${datum.result}\nStarted ${datum.started}\nEnded ${datum.ended}`} + labels={({ datum }) => `${datum.result}\nStarted ${datum.started}\nEnded ${datum.ended}\n${describeRef(datum.ref)}`} />