From ed657ce69e3b3ce1b881a641b13477f7df0adc9f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Thu, 29 Nov 2018 14:24:22 +0100
Subject: [PATCH] Rework how we present flags on the PR list

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 pagure/lib/model.py                        | 18 ++++++++
 pagure/static/pagure.css                   |  3 +-
 pagure/templates/_render_pullrequests.html | 71 +++++++++++++++---------------
 3 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index 79b7ce63..1e6d9f43 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -2027,6 +2027,24 @@ class PullRequest(BASE):
         """
         return [comment for comment in self.comments if not comment.commit_id]
 
+    @property
+    def flags_stats(self):
+        """ Return some stats about the flags associated with this PR.
+        """
+        flags = self.flags
+        flags.reverse()
+
+        # Only keep the last flag from each service
+        tmp = {}
+        for flag in flags:
+            tmp[flag.username] = flag
+
+        output = collections.defaultdict(list)
+        for flag in tmp.values():
+            output[flag.status].append(flag)
+
+        return output
+
     @property
     def score(self):
         """ Return the review score of the pull-request by checking the
diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 2206f02a..dac79e7d 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -274,7 +274,8 @@ th[data-sort] {
   overflow:auto;
 }
 
-.attachment_list p {
+.attachment_list p,
+.prs_flag_list p {
   margin-bottom: 0;
 }
 
diff --git a/pagure/templates/_render_pullrequests.html b/pagure/templates/_render_pullrequests.html
index 72db33f9..1aa79d91 100644
--- a/pagure/templates/_render_pullrequests.html
+++ b/pagure/templates/_render_pullrequests.html
@@ -46,17 +46,17 @@
                             {% endif %}
                         </span>
                         {% endif %}
-            
+
                         <span title="branch to" class="text-muted ml-3" data-toggle="tooltip">
                             <span class="fa fa-fw fa-random pr-2"></span>
                               {{request.branch}}
                           </span>
-            
+
                         <span title="{{request.user_comments|count}} comments" class="text-muted ml-3" data-toggle="tooltip">
                           <span class="fa fa-fw fa-comment pr-2"></span>
                             {{request.user_comments|count}}
                         </span>
-                        
+
                 </span>
             </div>
                 {% if subtitle %}
@@ -87,7 +87,7 @@
                         </small>
                     {% else %}
                     <small>
-                        <span class="text-success font-weight-bold">Opened</span> 
+                        <span class="text-success font-weight-bold">Opened</span>
                         <span data-toggle="tooltip" title="{{
                         request.date_created | format_datetime
                       }}">{{ request.date_created | humanize}}</span> by <span title="{{
@@ -132,41 +132,40 @@
                       {% endif %}
                 </div>
                 <div>
-                        {% for tag in request.tags %}
-                            <span id="tag-{{ tag.tag }}" title="{{ tag.tag_description }}"
-                                  style="background-color:{{ tag.tag_color}}; font-size:90%"
-                                  class="badge badge-secondary"
-                                  >
-                                {{ tag.tag }}
-                            </span>
-                        {% endfor %}
+                  {% for tag in request.tags %}
+                      <span id="tag-{{ tag.tag }}" title="{{ tag.tag_description }}"
+                            style="background-color:{{ tag.tag_color}}; font-size:90%"
+                            class="badge badge-secondary">
+                          {{ tag.tag }}
+                      </span>
+                  {% endfor %}
                 </div>
 
                 {% if request.flags %}
-                <div style='margin-top: 5px;'>
-                    <!-- <strong><p style='padding-top: 5px;'>Most recent build status:</p></strong> -->
-                    {% for flag in request.flags | batch(1) | first %}
-                        <a href="{{ flag.url }}" class="list-group-item list-group-item-action border-0 pl-0 pr-0">
-                            <span class="font-weight-bold">
-                              {{ flag.username }}
-                            </span>
-                            <div class="float-right">
-                                <span class="badge {{ flag | flag2label }} font-size-09">
-                                {{ flag.status }}
-                                {%- if flag.percent %} ({{ flag.percent }}%) {%- endif %}
-                            </div>
-
-                            <small><div class="clearfix">
-                                <span>{{ flag.comment }}</span>
-                                <div title="{{ flag.date_created }}" class="float-right">
-                                    {{ flag.date_created | humanize }}</div>
-                                </div>
-                            </small>
-                        </a>
-                    {% endfor %}
-                </div>
-                {% else %}
-                    <strong><p style='padding-top: 5px;'>No builds for this request</p></strong>
+                  <div class="d-flex prs_flag_list">
+                    {% set flags_stats = request.flags_stats %}
+                    {% if flags_stats | length == 1 %}
+                      {% for status in flags_stats %}
+                        <p>{{ flags_stats[status][0].username }}:
+                          <span class="badge {{
+                            flags_stats[status][0] | flag2label }} font-size-09">
+                              {{ flags_stats[status][0].status }}
+                          </span>
+                        </p>
+                      {% endfor %}
+                    {% else %}
+                      <p>Flags:
+                      {% for status in flags_stats %}
+                        <span class="badge {{
+                          flags_stats[status][0] | flag2label }} font-size-09"
+                          title="{% for f in flags_stats[status] %}{{
+                          f.username}}{% if not loop.last %}, {% endif %}{% endfor %}">
+                            {{ flags_stats[status] | length }} {{ status }}
+                        </span>
+                      </p>
+                      {% endfor %}
+                    {% endif %}
+                  </div>
                 {% endif %}
 
                 </span>
-- 
2.14.5