<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[9898] sites/trunk: Trac: Attempt to include PR Review status in the PR status on trac.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9898">9898</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9898","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-05-22 05:12:41 +0000 (Fri, 22 May 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Trac: Attempt to include PR Review status in the PR status on trac.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5052">#5052</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgtracprfunctionsphp">sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletracwptracjs">sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgtracprfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php 2020-05-22 04:27:29 UTC (rev 9897)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php 2020-05-22 05:12:41 UTC (rev 9898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +43,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_reviews = api_request(
+ '/repos/' . $repo . '/pulls/' . intval( $pr ) . '/reviews',
+ null,
+ [ 'Accept: application/vnd.github.antiope-preview+json' ]
+ );
+ $reviews = [];
+ foreach ( $_reviews as $r ) {
+ if (
+ in_array( $r->state, [ 'CHANGES_REQUESTED', 'APPROVED' ] ) &&
+ ! in_array( $r->user->login, $reviews[ $r->state ] ?? [], true )
+ ) {
+ $reviews[ $r->state ][] = $r->user->login;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return (object) [
</span><span class="cx" style="display: block; padding: 0 10px"> 'repo' => $data->base->repo->full_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => $data->number,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'closed_at' => $data->closed_at,
</span><span class="cx" style="display: block; padding: 0 10px"> 'mergeable_state' => $data->mergeable_state,
</span><span class="cx" style="display: block; padding: 0 10px"> 'check_runs' => $check_runs,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'reviews' => $reviews,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'body' => $data->body,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user' => (object) [
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $data->user->html_url,
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlstyletracwptracjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2020-05-22 04:27:29 UTC (rev 9897)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2020-05-22 05:12:41 UTC (rev 9898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1697,41 +1697,94 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Logic to determine what the PRs status is
</span><span class="cx" style="display: block; padding: 0 10px"> function prStatus( data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Closed?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var stack = [],
+ emojiState = '';
+
+ // Closed? Skip everything else.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( data.closed_at ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '✅ Closed';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Merge State then
+ switch ( data.mergeable_state ) {
+ case 'draft':
+ stack.push( 'Draft' );
+ break;
+ case 'blocked':
+ // All Good, Changes Requested, or unit tests failing.
+ // Why 'blocked' is returned for some PRs is not obvious.
+ if (
+ data.reviews.CHANGES_REQUESTED ||
+ (
+ data.check_runs &&
+ 'failed' == Object.values( data.check_runs ).reduce( function( result, element ) {
+ return 'failed' == element ? element : result;
+ } )
+ )
+ ) {
+ // Let the unit tests / reviews section take care of it.
+ break;
+ } // else fall through.
+ case 'clean':
+ emojiState = '✅';
+ stack.push( 'All checks pass' );
+ break;
+ case 'dirty':
+ emojiState = '❌';
+ stack.push( 'Merge conflicts' );
+ break;
+ case 'unstable':
+ emojiState = '❌';
+ stack.push( 'Failing tests' );
+ break;
+ case 'unknown':
+ stack.push( 'Unknown' );
+ break;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Unit Tests?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( data.check_runs ) {
</span><span class="cx" style="display: block; padding: 0 10px"> for ( var provider in data.check_runs ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch( data.check_runs[ provider ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch ( data.check_runs[ provider ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'in_progress':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return provider + ' running';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ stack.push( provider + ' running' );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'failed':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '❌ ' + provider + ' failed';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ emojiState = '❌';
+ stack.push( provider );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'success':
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '❌ ' + provider + ' ' + data.check_runs[ provider ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ stack.push( provider + ' ' + data.check_runs[ provider ] );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Merge State then
- switch ( data.mergeable_state ) {
- case 'draft':
- return 'Draft';
- case 'blocked': // This seems to be returned for our App with PRs but not others..
- case 'clean':
- return '✅ All checks pass';
- case 'dirty':
- return '❌ Merge conflicts';
- case 'unstable': // Not seen, Unit Tests above should catch it.
- return '❌ Failing tests';
- case 'unknown':
- return 'Unknown';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Changes requested?
+ if ( data.reviews ) {
+ if ( data.reviews.APPROVED ) {
+ emojiState = '✅';
+ stack.push(
+ $('<span>Approved</span>').prop(
+ 'title',
+ 'Changes approved by: ' + data.reviews.APPROVED.join(', ')
+ )[0].outerHTML
+ );
+ }
+ if ( data.reviews.CHANGES_REQUESTED ) {
+ emojiState = '❌';
+ stack.push(
+ $('<span>Changes Requested</span>').prop(
+ 'title',
+ 'Changes requested by: ' + data.reviews.CHANGES_REQUESTED.join(', ')
+ )[0].outerHTML
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return emojiState + ' ' + stack.join( ', ' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function renderPR( container, data ) {
</span></span></pre>
</div>
</div>
</body>
</html>