[ci] Add deploy batch link for merged PRs (#15325)

## Change Description

Updates our PR pages with a "deploy batch" record for already-merged
PRs. Example from a recent merged PR:

<img width="960" height="339" alt="image"
src="https://github.com/user-attachments/assets/5c73b31a-57e2-4e9e-a8e7-1ac67be36c8b"
/>


## Security Assessment

- This change potentially impacts the Hail Batch instance as deployed by
Broad Institute in GCP

### Impact Rating

- This change has a low security impact

### Impact Description

Readonly change to a UI element to make historical deployment tracking
easier

### Appsec Review

- [ ] Required: The impact has been assessed and approved by appsec

Author: cjllanwarne

ci/ci/ci.py

@@ -248,6 +248,7 @@ async def _populate_historical_pr_context(
             'number': gh_pr['number'],
             'labels': [label['name'] for label in gh_pr.get('labels', [])],
             'merged': gh_pr['merged'],
+            'merge_commit_sha': gh_pr.get('merge_commit_sha') if gh_pr['merged'] else None,
         }
     except gidgethub.HTTPException as e:
         if e.status_code == 404:
@@ -293,6 +294,27 @@ async def get_pr(request: web.Request, userdata: UserData) -> web.Response:
         await _populate_batch_context(page_context, batches[0])
     page_context['history'] = [await b.last_known_status() for b in batches]
 
+    deploy_batches = []
+    pr_data = page_context.get('pr')
+    if (
+        not page_context['active_pr']
+        and isinstance(pr_data, dict)
+        and pr_data.get('merged')
+        and pr_data.get('merge_commit_sha')
+    ):
+        merge_commit_sha = pr_data['merge_commit_sha']
+        deploy_batches = sorted(
+            [
+                b
+                async for b in batch_client.list_batches(
+                    f'deploy=1 target_branch={wb.branch.short_str()} sha={merge_commit_sha} user:ci'
+                )
+            ],
+            key=lambda b: b.id,
+            reverse=True,
+        )
+    page_context['deploy_batches'] = [await b.last_known_status() for b in deploy_batches]
+
     return await render_template('ci', request, userdata, 'pr.html', page_context)
 
 

ci/ci/templates/pr.html

@@ -4,6 +4,42 @@
 {% block head %}
     <script defer src="{{ base_path }}/common_static/focus_on_keyup.js"></script>
 {% endblock %}
+
+{% macro batch_state_icon(state) %}
+{% if state == 'success' %}
+<span class="material-symbols-outlined" style="color: green; vertical-align: middle; font-size: 1.3rem; font-variation-settings: 'FILL' 1, 'wght' 700;">check_circle</span>
+{% elif state in ('failure', 'error') %}
+<span class="material-symbols-outlined" style="color: red; vertical-align: middle; font-size: 1.3rem; font-variation-settings: 'FILL' 1, 'wght' 700;">cancel</span>
+{% elif state == 'cancelled' %}
+<span class="material-symbols-outlined" style="color: grey; vertical-align: middle; font-size: 1.3rem; font-variation-settings: 'FILL' 1, 'wght' 700;">block</span>
+{% endif %}
+{% endmacro %}
+
+{% macro batch_history_table(batches) %}
+<table class="data-table">
+  <thead>
+    <tr>
+      <th>id</th>
+      <th>state</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for batch in batches %}
+    <tr>
+      <td class="numeric-cell">
+        <a rel="noopener" href="{{ batch_base_url }}/batches/{{ batch['id'] }}">{{ batch['id'] }}</a>
+      </td>
+      <td>
+        {% if 'state' in batch and batch['state'] %}
+        {{ batch_state_icon(batch['state']) }} {{ batch['state'] }}
+        {% endif %}
+      </td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endmacro %}
+
 {% block content %}
     <h1>{{ pr.title }} <a rel="noopener" href="https://github.com/{{ repo }}/pull/{{ pr.number }}"><span class="gh-number">#{{ pr.number }}</span></a></h1>
     <div class="attributes">
@@ -93,6 +129,7 @@ <h2>Merge Queue</h2>
     </div>
     {% endif %}
 
+    {% if active_pr %}
     <h2>Current Build</h2>
     {% if batch is defined %}
     <div class="attributes">
@@ -131,7 +168,6 @@ <h3>Jobs</h3>
       {{ exception }}
     </pre>
     {% else %}
-    {% if active_pr %}
       {% if pr_authorized %}
       <p>Build queued - waiting for a build slot. <a href="{{ ci_base_url }}">View CI dashboard</a>.</p>
       {% else %}
@@ -142,35 +178,21 @@ <h3>Jobs</h3>
         <button type="submit">Authorize now</button>
       </form>
       {% endif %}
+    {% endif %}
+    {% endif %}
+
+    {% if not active_pr and pr.merged %}
+    <h2>Deploy Batch History</h2>
+    {% if deploy_batches %}
+    {{ batch_history_table(deploy_batches) }}
     {% else %}
-    <p>No builds found.</p>
+    <p>No deploy batch found.</p>
     {% endif %}
     {% endif %}
 
-    <h2>Build History</h2>
+    <h2>Build Batch History</h2>
     {% if history %}
-    <table class="data-table">
-      <thead>
-        <tr>
-          <th>id</th>
-          <th>state</th>
-        </tr>
-      </thead>
-      <tbody>
-        {% for batch in history %}
-        <tr>
-          <td class="numeric-cell">
-            <a rel="noopener" href="{{ batch_base_url }}/batches/{{ batch['id'] }}">{{ batch['id'] }}</a>
-          </td>
-          <td>
-            {% if 'state' in batch and batch['state'] %}
-            {{ batch['state'] }}
-            {% endif %}
-          </td>
-        </tr>
-        {% endfor %}
-      </tbody>
-    </table>
+    {{ batch_history_table(history) }}
     {% else %}
     No builds.
     {% endif %}