Email search improvements

app/admin_model.py

@@ -33,6 +33,7 @@ from app.models import (
     Mailbox,
     DeletedAlias,
     DomainDeletedAlias,
+    PartnerUser,
 )
 from app.newsletter_utils import send_newsletter_to_user, send_newsletter_to_address
 
@@ -747,22 +748,18 @@ class EmailSearchResult:
         if alias:
             output.alias = alias
             output.no_match = False
-            return output
         user = User.get_by(email=email)
         if user:
             output.user = user
             output.no_match = False
-            return output
         mailbox = Mailbox.get_by(email=email)
         if mailbox:
             output.mailbox = mailbox
             output.no_match = False
-            return output
         deleted_alias = DeletedAlias.get_by(email=email)
         if deleted_alias:
             output.deleted_alias = deleted_alias
             output.no_match = False
-            return output
         domain_deleted_alias = DomainDeletedAlias.get_by(email=email)
         if domain_deleted_alias:
             output.domain_deleted_alias = domain_deleted_alias
@@ -792,6 +789,10 @@ class EmailSearchHelpers:
     def alias_count(user: User) -> int:
         return Alias.filter_by(user_id=user.id).count()
 
+    @staticmethod
+    def partner_user(user: User) -> Optional[PartnerUser]:
+        return PartnerUser.get_by(user_id=user.id)
+
 
 class EmailSearchAdmin(BaseView):
     def is_accessible(self):

templates/admin/email_search.html

@@ -2,23 +2,40 @@
 
 {% macro show_user(user) -%}
   <h4>User {{ user.email }} with ID {{ user.id }}.</h4>
+  {% set pu = helper.partner_user(user) %}
   <table class="table">
     <thead>
       <tr>
         <th scope="col">User ID</th>
         <th scope="col">Email</th>
+        <th scope="col">Status</th>
         <th scope="col">Paid</th>
         <th>Subscription</th>
         <th>Created At</th>
+        <th>Updated At</th>
+        <th>Connected with Proton account</th>
       </tr>
     </thead>
     <tbody>
       <tr>
         <td>{{ user.id }}</td>
         <td>{{ user.email }}</td>
-        <td>{{ "yes" if user.is_paid() else No }}</td>
+        {% if user.disabled %}
+
+          <td class="text-danger">Disabled</td>
+        {% else %}
+          <td class="text-success">Enabled</td>
+        {% endif %}
+        <td>{{ "yes" if user.is_paid() else "No" }}</td>
         <td>{{ user.get_active_subscription() }}</td>
         <td>{{ user.created_at }}</td>
+        <td>{{ user.updated_at }}</td>
+        {% if pu %}
+
+          <td>{{ pu.partner_email }}</td>
+        {% else %}
+          <td>No</td>
+        {% endif %}
       </tr>
     </tbody>
   </table>
@@ -44,7 +61,9 @@
           <td>{{ mailbox.id }}</td>
           <td>{{ mailbox.email }}</td>
           <td>{{ "Yes" if mailbox.verified else "No" }}</td>
-          <td>{{ mailbox.created_at }}</td>
+          <td>
+            {{ mailbox.created_at }}
+          </td>
         </tr>
       {% endfor %}
     </tbody>
@@ -58,15 +77,22 @@
   <table class="table">
     <thead>
       <tr>
-        <th>Alias ID</th>
+        <th>
-        <th>Email</th>
+          Alias ID
-        <th>Verified</th>
+        </th>
-        <th>Created At</th>
+        <th>
+          Email
+        </th>
+        <th>
+          Verified
+        </th>
+        <th>
+          Created At
+        </th>
       </tr>
     </thead>
     <tbody>
       {% for alias in aliases %}
-
         <tr>
           <td>{{ alias.id }}</td>
           <td>{{ alias.email }}</td>