From 45891bed363e832117521c90ba0d4f388eb4dc77 Mon Sep 17 00:00:00 2001
From: Son Nguyen Kim <nguyenkims@users.noreply.github.com>
Date: Tue, 13 Jul 2021 19:27:45 +0200
Subject: [PATCH] Do not return contact alias activity on the contact manager
 page

---
 .../dashboard/alias_contact_manager.html      | 64 ++++++++++---------
 app/dashboard/views/alias_contact_manager.py  | 20 ++++++
 2 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/app/dashboard/templates/dashboard/alias_contact_manager.html b/app/dashboard/templates/dashboard/alias_contact_manager.html
index 9b2edb99..ece20e29 100644
--- a/app/dashboard/templates/dashboard/alias_contact_manager.html
+++ b/app/dashboard/templates/dashboard/alias_contact_manager.html
@@ -92,39 +92,43 @@
             </span>
           </div>
 
-
           <div class="mb-2 text-muted small-text">
-            {% if contact_info.latest_email_log != None %}
-              {% set email_log = contact_info.latest_email_log %}
-
-              {% if email_log.is_reply %}
-                <i class="fa fa-reply mr-2" data-toggle="tooltip" title="Email reply/sent from alias"></i>
-                {{ email_log.created_at | dt }}
-              {% elif email_log.bounced %}
-                <span class="text-danger">
-                  <i class="fa fa-warning mr-2" data-toggle="tooltip"
-                     title="Email bounced and cannot be forwarded to your mailbox"></i>
-                  {{ email_log.created_at | dt }}
-                </span>
-              {% elif email_log.blocked %}
-                <i class="fa fa-ban mr-2 text-danger" data-toggle="tooltip" title="Email blocked"></i>
-                {{ email_log.created_at | dt }}
-              {% else %}
-                <i class="fa fa-paper-plane  mr-2" data-toggle="tooltip" title="Email sent to alias"></i>
-                {{ email_log.created_at | dt }}
-              {% endif %}
-              <br>
-              Contact created {{ contact.created_at | dt }}
-            {% else %}
-              No Activity. Contact created {{ contact.created_at | dt }}
-            {% endif %}
-
-            <div>
-              <span class="alias-activity">{{ contact_info.nb_forward }}</span> forwards,
-              <span class="alias-activity">{{ contact_info.nb_reply }}</span> replies
-            </div>
+          Contact created {{ contact.created_at | dt }}
           </div>
 
+
+{#          <div class="mb-2 text-muted small-text">#}
+{#            {% if contact_info.latest_email_log != None %}#}
+{#              {% set email_log = contact_info.latest_email_log %}#}
+{##}
+{#              {% if email_log.is_reply %}#}
+{#                <i class="fa fa-reply mr-2" data-toggle="tooltip" title="Email reply/sent from alias"></i>#}
+{#                {{ email_log.created_at | dt }}#}
+{#              {% elif email_log.bounced %}#}
+{#                <span class="text-danger">#}
+{#                  <i class="fa fa-warning mr-2" data-toggle="tooltip"#}
+{#                     title="Email bounced and cannot be forwarded to your mailbox"></i>#}
+{#                  {{ email_log.created_at | dt }}#}
+{#                </span>#}
+{#              {% elif email_log.blocked %}#}
+{#                <i class="fa fa-ban mr-2 text-danger" data-toggle="tooltip" title="Email blocked"></i>#}
+{#                {{ email_log.created_at | dt }}#}
+{#              {% else %}#}
+{#                <i class="fa fa-paper-plane  mr-2" data-toggle="tooltip" title="Email sent to alias"></i>#}
+{#                {{ email_log.created_at | dt }}#}
+{#              {% endif %}#}
+{#              <br>#}
+{#              Contact created {{ contact.created_at | dt }}#}
+{#            {% else %}#}
+{#              No Activity. Contact created {{ contact.created_at | dt }}#}
+{#            {% endif %}#}
+{##}
+{#            <div>#}
+{#              <span class="alias-activity">{{ contact_info.nb_forward }}</span> forwards,#}
+{#              <span class="alias-activity">{{ contact_info.nb_reply }}</span> replies#}
+{#            </div>#}
+{#          </div>#}
+
           <a href="{{ url_for('dashboard.contact_detail_route', contact_id=contact.id) }}">Edit ➡</a>
 
           <form method="post">
diff --git a/app/dashboard/views/alias_contact_manager.py b/app/dashboard/views/alias_contact_manager.py
index 13a0effa..e586cb22 100644
--- a/app/dashboard/views/alias_contact_manager.py
+++ b/app/dashboard/views/alias_contact_manager.py
@@ -61,6 +61,26 @@ class ContactInfo(object):
 
 
 def get_contact_infos(alias: Alias, page=0, contact_id=None) -> [ContactInfo]:
+    q = db.session.query(
+        Contact,
+    )
+
+    if contact_id:
+        q = q.filter(Contact.id == contact_id)
+
+    q = q.order_by(Contact.id.desc()).limit(PAGE_LIMIT).offset(page * PAGE_LIMIT)
+
+    ret = []
+    for contact in q:
+        contact_info = ContactInfo(
+            contact=contact, nb_forward=0, nb_reply=0, latest_email_log=None
+        )
+        ret.append(contact_info)
+
+    return ret
+
+
+def get_contact_infos2(alias: Alias, page=0, contact_id=None) -> [ContactInfo]:
     """if contact_id is set, only return the contact info for this contact"""
     sub = (
         db.session.query(