From 7781d8b09c50d8ba6d7d5a891a1b1018ddb93522 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 22 Jul 2020 08:42:39 +0200
Subject: [PATCH] [IMP] runbot_merge: only show required statuses in the
 dashboard

Apparently a long-running issue but not really a concern before the
new mergebot started sending a lot more statuses: stagings would show
a list of all statuses they received, including optional / irrelevant
statuses.

Get a list of required statuses and only show that on the staging
dropdowns.

Closes #387
---
 runbot_merge/tests/test_basic.py |  6 ++--
 runbot_merge/views/templates.xml | 55 +++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/runbot_merge/tests/test_basic.py b/runbot_merge/tests/test_basic.py
index 331a2687..25f318b4 100644
--- a/runbot_merge/tests/test_basic.py
+++ b/runbot_merge/tests/test_basic.py
@@ -87,10 +87,8 @@ def test_trivial_flow(env, repo, page, users, config):
     p = html.fromstring(page('/runbot_merge'))
     s = p.cssselect('.staging div.dropdown li')
     assert len(s) == 2
-    assert s[0].get('class') == 'bg-success'
-    assert s[0][0].text.strip() == '{}: ci/runbot'.format(repo.name)
-    assert s[1].get('class') == 'bg-danger'
-    assert s[1][0].text.strip() == '{}: ci/lint'.format(repo.name)
+    assert s[1].get('class') == 'bg-success'
+    assert s[1][0].text.strip() == '{}: ci/runbot'.format(repo.name)
 
     assert re.match('^force rebuild', staging_head.message)
 
diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index 6bc65334..9fb8542c 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -115,6 +115,7 @@
         </t>
     </template>
     <template id="stagings" name="mergebot branch stagings">
+        <t t-set="repo_statuses" t-value="branch.project_id.repo_ids.having_branch(branch).status_ids"/>
         <ul class="list-unstyled stagings">
             <t t-foreach="branch.staging_ids.sorted(lambda s: s.staged_at, reverse=True)[:6]" t-as="staging">
                 <t t-set="success" t-value="staging.state == 'success'"/>
@@ -157,16 +158,20 @@
                                         Open Staging
                                     </a>
                                 </li>
-                                <li t-foreach="staging.statuses" t-as="st" t-if="st[3]"
-                                    t-att-class="
-                                        'bg-success' if st[2] == 'success'
-                                   else 'bg-danger' if st[2] in ('error', 'failure')
-                                   else 'bg-info'"
-                                >
-                                    <a t-att-href="st[3]" target="new">
-                                        <t t-esc="st[0]"/>: <t t-esc="st[1]"/>
-                                    </a>
-                                </li>
+
+                                <t t-set="statuses" t-value="{c: (s, t) for h, c, s, t in staging.statuses}"/>
+                                <t t-foreach="repo_statuses._for_staging(staging)" t-as="req">
+                                    <t t-set="st" t-value="statuses.get(req.context) or ('pending', None)"/>
+                                    <li t-att-class="
+                                            'bg-success' if st[0] == 'success'
+                                       else 'bg-danger' if st[0] in ('error', 'failure')
+                                       else 'bg-info'"
+                                    >
+                                        <a t-att-href="st[1]" target="new">
+                                            <t t-esc="req.repo_id.name"/>: <t t-esc="req.context"/>
+                                        </a>
+                                    </li>
+                                </t>
                             </ul>
                         </div>
                     </t>
@@ -175,6 +180,7 @@
         </ul>
     </template>
     <template id="branch_stagings" name="mergebot stagings page">
+        <t t-set="repo_statuses" t-value="branch.project_id.repo_ids.having_branch(branch).status_ids"/>
         <t t-call="website.layout">
             <div id="wrap"><div class="container-fluid">
                 <section class="row">
@@ -231,19 +237,22 @@
                                                 Open Staging
                                             </a>
                                         </li>
-                                        <li t-foreach="staging.statuses"
-                                            t-as="st" t-if="st[3]"
-                                            t-att-class="
-                                        'bg-success' if st[2] == 'success'
-                                   else 'bg-danger' if st[2] in ('error', 'failure')
-                                   else 'bg-info'"
-                                        >
-                                            <a t-att-href="st[3]"
-                                               target="new">
-                                                <t t-esc="st[0]"/>:
-                                                <t t-esc="st[1]"/>
-                                            </a>
-                                        </li>
+
+                                        <t t-set="statuses" t-value="{c: (s, t) for h, c, s, t in staging.statuses}"/>
+                                        <t t-foreach="repo_statuses._for_staging(staging)" t-as="req">
+                                            <t t-set="st" t-value="statuses.get(req.context) or ('pending', None)"/>
+                                            <li t-att-class="
+                                                    'bg-success' if st[0] == 'success'
+                                               else 'bg-danger' if st[0] in ('error', 'failure')
+                                               else 'bg-info'"
+                                            >
+                                                <a t-att-href="st[1]"
+                                                   target="new">
+                                                    <t t-esc="req.repo_id.name"/>:
+                                                    <t t-esc="req.context"/>
+                                                </a>
+                                            </li>
+                                        </t>
                                     </ul>
                                 </div>
                             </th>