UI: If MR is applied, don't do the canApply check and display "RESOLVED"

This commit is contained in:
fr33domlover 2022-09-27 18:11:13 +00:00
parent ceee428450
commit 84b70aa7b3
2 changed files with 23 additions and 17 deletions

View file

@ -317,8 +317,11 @@ getClothR loomHash clothHash = do
let patchIDs = NE.map entityKey patches
diffs = NE.map (patchContent . entityVal) $ NE.reverse patches
(repoID, _, _, maybeBranch) = targetRepo
errorOrCanApply <- runExceptT $ canApplyPatches repoID maybeBranch diffs
return (bundleID, patchIDs, errorOrCanApply)
maybeErrorOrCanApply <-
case ticketStatus ticket of
TSClosed -> pure Nothing
_ -> Just <$> runExceptT (canApplyPatches repoID maybeBranch diffs)
return (bundleID, patchIDs, maybeErrorOrCanApply)
hashMessageKey <- handlerToWidget getEncodeKeyHashid
let desc :: Widget
desc = toWidget $ markupHTML $ ticketDescription ticket

View file

@ -54,7 +54,7 @@ $with (_repoID, repoHash, name, maybeBranch) <- targetRepo
<a href=@{RepoBranchSourceR repoHash branch []}>
#{branch}
$maybe (bundleID, patchIDs, errorOrCanApply) <- mbundle'
$maybe (bundleID, patchIDs, maybeErrorOrCanApply) <- mbundle'
<div>
Bundle
<a href=@{BundleR loomHash clothHash (hashBundle bundleID)}>
@ -66,7 +66,8 @@ $maybe (bundleID, patchIDs, errorOrCanApply) <- mbundle'
<a href=@{PatchR loomHash clothHash (hashBundle bundleID) (hashPatch patchID)}>
#{keyHashidText $ hashPatch patchID}
<div>
Status:
Status: #
$maybe errorOrCanApply <- maybeErrorOrCanApply
$case errorOrCanApply
$of Left e
<span .apply-error>
@ -80,6 +81,8 @@ $maybe (bundleID, patchIDs, errorOrCanApply) <- mbundle'
<span .apply-yes>
[Can apply!]
^{applyButton "Apply"}
$nothing
RESOLVED
<div>
<span>