zuul
/
zuul
Code Issues Proposed changes

Fix re-enqueue buildset in web ui 

The re-enqueue buildset functionality in the web ui needs to be
updated to account for the bundle refactor.

Change-Id: I9b01d47051e805a56a6b90476736f9cd5babcbc8
This commit is contained in:
James E. Blair 2024-02-11 08:19:18 -08:00
parent 0c118ffa39
commit 24e1cbc26d
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/src/containers/build/Buildset.jsx
View File

@ -51,8 +51,13 @@ function getRefs(buildset) {
return 'refs' in buildset ? buildset.refs : [buildset] return 'refs' in buildset ? buildset.refs : [buildset]
} }
function getRef(buildset) {
return 'refs' in buildset ? buildset.refs[0] : buildset
}
function Buildset({ buildset, timezone, tenant, user, preferences }) { function Buildset({ buildset, timezone, tenant, user, preferences }) {
const [isGanttChartModalOpen, setIsGanttChartModalOpen] = useState(false) const [isGanttChartModalOpen, setIsGanttChartModalOpen] = useState(false)
const ref = getRef(buildset)
function renderBuildTimes() { function renderBuildTimes() {
const firstStartBuild = buildset.builds.reduce((prev, cur) => const firstStartBuild = buildset.builds.reduce((prev, cur) =>
@ -181,9 +186,9 @@ function Buildset({ buildset, timezone, tenant, user, preferences }) {
function enqueueConfirm() { function enqueueConfirm() {
setShowEnqueueModal(false) setShowEnqueueModal(false)
if (buildset.change === null) { if (ref.change === null) {
enqueue_ref(tenant.apiPrefix, buildset.project, buildset.pipeline, enqueue_ref(tenant.apiPrefix, ref.project, buildset.pipeline,
buildset.ref, buildset.oldrev, buildset.newrev) ref.ref, ref.oldrev, ref.newrev)
.then(() => { .then(() => {
dispatch(addNotification( dispatch(addNotification(
{ {
@ -197,12 +202,12 @@ function Buildset({ buildset, timezone, tenant, user, preferences }) {
dispatch(addApiError(error)) dispatch(addApiError(error))
}) })
} else { } else {
const changeId = buildset.change + ',' + buildset.patchset const changeId = ref.change + ',' + ref.patchset
enqueue(tenant.apiPrefix, buildset.project, buildset.pipeline, changeId) enqueue(tenant.apiPrefix, ref.project, ref.pipeline, changeId)
.then(() => { .then(() => {
dispatch(addNotification( dispatch(addNotification(
{ {
text: 'Change queued successfully.', text: 'Change enqueued successfully.',
type: 'success', type: 'success',
status: '', status: '',
url: '', url: '',
@ -215,10 +220,10 @@ function Buildset({ buildset, timezone, tenant, user, preferences }) {
} }
function renderEnqueueModal() { function renderEnqueueModal() {
let changeId = buildset.change ? buildset.change + ',' + buildset.patchset : buildset.newrev let changeId = ref.change ? ref.change + ',' + ref.patchset : ref.newrev
let changeInfo = changeId let changeInfo = changeId
? <>for change <strong>{changeId}</strong></> ? <>for change <strong>{changeId}</strong></>
: <>for ref <strong>{buildset.ref}</strong></> : <>for ref <strong>{ref.ref}</strong></>
const title = 'You are about to re-enqueue a change' const title = 'You are about to re-enqueue a change'
return ( return (
<Modal <Modal
@ -231,7 +236,7 @@ function Buildset({ buildset, timezone, tenant, user, preferences }) {
<Button key="deq_confirm" variant="primary" onClick={enqueueConfirm}>Confirm</Button>, <Button key="deq_confirm" variant="primary" onClick={enqueueConfirm}>Confirm</Button>,
<Button key="deq_cancel" variant="link" onClick={() => { setShowEnqueueModal(false) }}>Cancel</Button>, <Button key="deq_cancel" variant="link" onClick={() => { setShowEnqueueModal(false) }}>Cancel</Button>,
]}> ]}>
<p>Please confirm that you want to re-enqueue <strong>all jobs</strong> {changeInfo} on project <strong>{buildset.project}</strong> on pipeline <strong>{buildset.pipeline}</strong>.</p> <p>Please confirm that you want to re-enqueue <strong>all jobs</strong> {changeInfo} on project <strong>{ref.project}</strong> on pipeline <strong>{buildset.pipeline}</strong>.</p>
</Modal> </Modal>
) )
} }