From aac987f2bbea3164e60a94bb2460c3a2e2f0ac31 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Fri, 27 Sep 2024 14:13:43 +0200
Subject: [PATCH] [FIX] runbot_merge: dashboard display nits

- fix staging reasons containing escaped quotes (would render as
  `&#32;` to the end user)
- remove extra spacing around PR title @title/popovers
- simplify a few view conditionals through judicious use of `t-elif`
  and nesting
- make `staging_end` non-computed as it's not computed anymore, just
  set if and when the staging gets disabled
  (146564a90a7c4ee6bc111380886e2e1ec1dabe7b)
---
 runbot_merge/models/pull_requests.py |  2 +-
 runbot_merge/views/templates.xml     | 42 +++++++++++++---------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py
index d04e2a72..810eb673 100644
--- a/runbot_merge/models/pull_requests.py
+++ b/runbot_merge/models/pull_requests.py
@@ -2048,7 +2048,7 @@ class Stagings(models.Model):
     active = fields.Boolean(default=True)
 
     staged_at = fields.Datetime(default=fields.Datetime.now, index=True)
-    staging_end = fields.Datetime(store=True, compute='_compute_state')
+    staging_end = fields.Datetime(store=True)
     staging_duration = fields.Float(compute='_compute_duration')
     timeout_limit = fields.Datetime(store=True, compute='_compute_timeout_limit')
     reason = fields.Text("Reason for final state (if any)")
diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index 2dff930f..2ac80f83 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -5,21 +5,18 @@
     </function>
 
     <template id="link-pr" name="create a link to `pr`">
+        <t t-set="title"
+           t-value="pr.message.split('\n', 1)[0] if pr.repository.group_id &lt;= env.user.groups_id else ''"/>
         <t t-set="title">
-            <t t-if="pr.repository.group_id &lt;= env.user.groups_id">
-                <t t-out="pr.message.split('\n', 1)[0]"/>
-            </t>
-        </t>
-        <t t-set="title">
-          <t t-if="title.strip() and pr.blocked" >
-            <t t-out="title.strip()"/>: <t t-out="pr.blocked"/>
+          <t t-if="title and pr.blocked" >
+            <t t-out="title"/>: <t t-out="pr.blocked"/>
           </t>
           <t t-else="">
-            <t t-out="pr.blocked or title.strip()"/>
+            <t t-out="pr.blocked or title"/>
           </t>
         </t>
         <a t-attf-href="https://github.com/{{ pr.repository.name }}/pull/{{ pr.number }}"
-           t-att-title="title"
+           t-att-title="title.strip()"
            t-att-target="target or None"
            t-att-class="classes or None"
         ><t t-esc="pr.display_name"/></a>
@@ -177,14 +174,15 @@
                     <t t-if="staging_index >= 4">d-none d-lg-block</t>
                 </t>
                 <t t-set="title">
-                    <t t-if="staging.state == 'ff_failed'">fast forward failed (<t t-esc="staging.reason"/>)</t>
-                    <t t-if="staging.state == 'pending'">last status</t>
+                    <t t-if="staging.state == 'success'"/>
+                    <t t-else="">
+                        <t t-if="staging.state == 'pending'">last status</t
+                        ><t t-elif="staging.state == 'ff_failed'">fast forward failed (<t t-out="(staging.reason or '').replace('\'', '')"/>)</t
+                        ><t t-else="" t-out="(staging.reason or '').replace('\'', '')"
+                        /> at <t t-out="(staging.staging_end or staging.write_date).replace(microsecond=0)"/>Z
+                    </t>
                 </t>
-                <!-- separate concatenation to avoid having line-break in title as some browsers trigger it -->
-                <!-- write-date may have microsecond precision, strip that information -->
-                <!-- use write-date under assumption that a staging is last modified when it ends -->
-                <t t-set="title"><t t-esc="title.strip() or staging.reason"/> at <t t-esc="staging.write_date.replace(microsecond=0)"/>Z</t>
-                <li t-attf-class="staging {{stateclass.strip()}} {{decorationclass.strip()}}" t-att-title="title">
+                <li t-attf-class="staging {{stateclass.strip()}} {{decorationclass.strip()}}" t-att-title="title.strip() or None">
                     <ul class="list-unstyled">
                         <li t-foreach="staging.batch_ids" t-as="batch" class="batch">
                             <t t-esc="batch.prs[:1].label"/>
@@ -241,14 +239,14 @@
                             </t>
                         </t>
                         <t t-set="title">
-                            <t t-if="staging.state == 'canceled'">Cancelled:
-                                <t t-esc="staging.reason"/>
+                            <t t-if="staging.state == 'ff_failed'">
+                                Fast Forward Failed
                             </t>
-                            <t t-if="staging.state == 'ff_failed'">Fast
-                                Forward Failed
+                            <t t-elif="staging.state == 'canceled'">
+                                Cancelled<t t-if="staging.reason">: <t t-out="staging.reason.replace('\'', '')"/></t>
                             </t>
-                            <t t-if="staging.state not in ('canceled', 'ff_failed')">
-                                <t t-esc="staging.reason"/>
+                            <t t-else="">
+                                <t t-out="(staging.reason or '').replace('\'', '')"/>
                             </t>
                         </t>
                         <tr t-att-class="stateclass"