Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Improve rollup UX #160

Open
kennytm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve rollup UX #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
310fe2b
Display the PR title in a rollup PR.
kennytm Mar 30, 2018
0cfbe1c
Display an operation instruction before creating a rollup.
kennytm Mar 30, 2018
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
37 changes: 34 additions & 3 deletions homu/html/queue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,39 @@
#search { width: 150px; }
.hide { display: none; }
th { cursor: pointer; }
#actual-rollup { background: #c7e2ff; border: #00acf7 3px double; border-radius: 5px; width: 75%; padding: 0 1em; }
</style>
</head>
<body>
<h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_label}}</a>{% else %}{{repo_label}}{% endif %} {% if treeclosed %} [TREE CLOSED below priority {{treeclosed}}] {% endif %}</h2>

<p>
<button type="button" id="rollup">Create a rollup</button>
<button type="button" id="expand-rollup">Create a rollup</button>
<button type="button" id="synch">Synchronize</button>
</p>

<div id="actual-rollup" class="hide">
<p>This will create a new pull request consisting of <span id="checkbox-count">0</span> PRs.</p>
<p>A rollup is useful for shortening the queue, but jumping the queue is unfair to older PRs who have waited too long.</p>
<p>When creating a real rollup, try to be fair to the PRs not rolled up. You may pick one of these strategies:</p>
<ul>
<li>
<p>Always include the first <span class="approved">approved</span> PR in the rollup.
Then give the new pull request the highest priority (p=100);</p>
<p><i>or</i></p>
</li>
<li>
<p>After creating the rollup, give it a fairly high priority (p=10), then assign
even higher priorties (p=20, ...) to every PRs older than the oldest rolled up PR.</p>
</li>
</ul>
<p>
<button type="button" id="rollup">Rollup</button>
—
<button type="button" id="cancel-rollup">Cancel</button>
</p>
</div>

<p>
{{ total }} total, {{ approved }} approved, {{ rolled_up }} rolled up, {{ failed }} failed
/
Expand Down Expand Up @@ -91,9 +114,17 @@ <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_
<script src="//cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js"></script>

<script>
document.getElementById('rollup').onclick = function(ev) {
if (!confirm('This will create a new pull request. Proceed?')) return;
document.getElementById('expand-rollup').onclick = function() {
var checkboxCount = document.querySelectorAll('#queue tbody input[type=checkbox]:checked').length;
document.getElementById('checkbox-count').innerHTML = checkboxCount;
document.getElementById('actual-rollup').className = '';
};

document.getElementById('cancel-rollup').onclick = function() {
document.getElementById('actual-rollup').className = 'hide';
};

document.getElementById('rollup').onclick = function(ev) {
var nums = [];
var els = document.querySelectorAll('#queue tbody input[type=checkbox]:checked');
for (var i=0;i<els.length;i++) {
Expand Down
15 changes: 9 additions & 6 deletions homu/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,18 @@ def rollup(user_gh, state, repo_label, repo_cfg, repo):
if e.code != 409:
raise

failures.append(state.num)
failures.append(state)
else:
successes.append(state.num)
successes.append(state)

title = 'Rollup of {} pull requests'.format(len(successes))
body = '- Successful merges: {}\n- Failed merges: {}'.format(
', '.join('#{}'.format(x) for x in successes),
', '.join('#{}'.format(x) for x in failures),
)

body = 'Successful merges:\n\n'
for x in successes:
body += ' - #{} ({})\n'.format(x.num, x.title)
body += '\nFailed merges:\n\n'
for x in failures:
body += ' - #{} ({})\n'.format(x.num, x.title)

try:
rollup = repo_cfg.get('branch', {}).get('rollup', 'rollup')
Expand Down