-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix web display of merge trains #178
Conversation
d800d1d
to
d213a8f
Compare
There were changes on master. Better rebase now than later... |
This is ready for review. @frank-channable or @alex-mckenna can either of you please review? (whoever is free first -- first-come-first-merged) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have no real comments about the code, it all looks pretty clean to me. I do wonder if now that more is displayed it's losing some clarity.
The emoji indicators are cute, but as we have more they become less obvious. The blue diamond for promoted feels odd, but I can't think of a good choice for this. Text only also has problems though, because it becomes a bit more difficult to just scan the page with your eyes... What do you think?
It does feel hard to parse in the case I presented. However in practice we expect to seldom encounter icons other than 🟡 and ❌:
The interface state shown here is a bit of an extreme example illustrating all states: In practice we normally see something like:
Other icons will be more like exceptions:
... or only shown during a brief window:
PS: here are the two queries: journalctl -u hoff -S2022-08-01 | grep "Posted.*Failed to rebase"
journalctl -u hoff -S2022-08-01 | grep "Posted.*Merge rejected:" |
Hmm, okay. That seems reasonable then. Thanks for adding the comment 👍 PS: Good to know, you don't need |
@alex-mckenna Thanks for the review. 🎉 @OpsBotPrime merge 🚢 🚀 |
Pull request approved for merge by @rudymatela, rebasing now. |
Approved-by: rudymatela Auto-deploy: false
Rebased as 00dd4ad, waiting for CI … |
CI job 🟡 started. |
Closes: #162
Closes: #163
This PR fixes the web display of merge trains:
(closes Order PRs in the web interface by approval #162);
(closes Display speculative rebase failures properly on the web interface #163);
WebInterface
to remove repeated code with theclassifiedPullRequests
function;🟡❌✅ 🔷❗
;classifiedPullRequests
;Before merge actions (unchanged)
⬆️ Nothing changes when all PRs are waiting for review.
These PRs were approved in the following order:
Before (repository view)
⬆️ note PR #142 (Squidward) is missing and PRs are not listed in order of approval.
After (repository view)
⬆️ correct order, no duplicates, icons
Before (global view)
⬆️ note PR #142 (Squidward) is missing and PRs are not listed in order of approval. There is one PR that is duplicate!
After (global view)
⬆️ correct order, no duplicates, icons