From 809d55c5f47d84c6fcc64e28b9be2ec26d06c785 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 16 Dec 2025 11:37:29 +0100
Subject: [PATCH] Contacts listing improvements.

---
 .../src/components/contacts/ContactList.vue   | 134 ++++++++++++++----
 modoboa/contacts/viewsets.py                  |   4 +
 pyproject.toml                                |   2 +-
 3 files changed, 111 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/contacts/ContactList.vue b/frontend/src/components/contacts/ContactList.vue
index 0c42cc60a..391bf0d82 100644
--- a/frontend/src/components/contacts/ContactList.vue
+++ b/frontend/src/components/contacts/ContactList.vue
@@ -1,7 +1,16 @@
 <template>
   <div>
     <v-card class="mt-6">
-      <v-data-table :headers="headers" :items="contacts">
+      <v-data-table-server
+        :headers="headers"
+        :items="contacts"
+        :items-length="totalContacts"
+        :loading="loading"
+        :search="search"
+        item-value="pk"
+        show-expand
+        @update:options="fetchContacts"
+      >
         <template #top>
           <v-toolbar color="white" flat>
             <v-text-field
@@ -66,19 +75,27 @@
             ></v-progress-circular>
           </v-toolbar>
         </template>
-        <template #[`item.display_name`]="{ item }">
-          <template v-if="item.display_name">
-            {{ item.display_name }}
-          </template>
-          <template v-else>
-            {{ item.first_name }} {{ item.last_name }}
-          </template>
-        </template>
-        <template #[`item.emails`]="{ item }">
-          {{ displayEmails(item.emails) }}
-        </template>
-        <template #[`item.phone_numbers`]="{ item }">
-          {{ displayPhoneNumbers(item.phone_numbers) }}
+        <template
+          #[`item.data-table-expand`]="{
+            internalItem,
+            isExpanded,
+            toggleExpand,
+          }"
+        >
+          <v-btn
+            :append-icon="
+              isExpanded(internalItem) ? 'mdi-chevron-up' : 'mdi-chevron-down'
+            "
+            :text="isExpanded(internalItem) ? 'Collapse' : 'More info'"
+            class="text-none"
+            color="medium-emphasis"
+            size="small"
+            variant="text"
+            width="105"
+            border
+            slim
+            @click="toggleExpand(internalItem)"
+          ></v-btn>
         </template>
         <template #[`item.actions`]="{ item }">
           <div class="text-right">
@@ -91,7 +108,53 @@
             </v-menu>
           </div>
         </template>
-      </v-data-table>
+        <template #expanded-row="{ columns, item }">
+          <tr>
+            <td :colspan="columns.length" class="pa-4">
+              <v-card v-if="item.emails.length" class="mb-4">
+                <v-card-title class="bg-surface-light">
+                  <v-icon icon="mdi-email" class="mr-4"></v-icon
+                  >{{ $gettext('Email addresses') }}
+                </v-card-title>
+                <v-card-text class="pt-4">
+                  <v-row v-for="email in item.emails" :key="email" class="mt-2">
+                    <v-col cols="2">
+                      <v-chip size="small" color="info">{{
+                        email.type
+                      }}</v-chip>
+                    </v-col>
+                    <v-col cols="10">
+                      {{ email.address }}
+                    </v-col>
+                  </v-row>
+                </v-card-text>
+              </v-card>
+              <v-card v-if="item.phone_numbers.length" class="mb-4">
+                <v-card-title class="bg-surface-light">
+                  <v-icon icon="mdi-phone" class="mr-4"></v-icon
+                  >{{ $gettext('Phone numbers') }}
+                </v-card-title>
+                <v-card-text class="pt-4">
+                  <v-row
+                    v-for="number in item.phone_numbers"
+                    :key="number"
+                    class="mt-2"
+                  >
+                    <v-col cols="2">
+                      <v-chip size="small" color="info">{{
+                        number.type
+                      }}</v-chip>
+                    </v-col>
+                    <v-col cols="10">
+                      {{ number.number }}
+                    </v-col>
+                  </v-row>
+                </v-card-text>
+              </v-card>
+            </td>
+          </tr>
+        </template>
+      </v-data-table-server>
     </v-card>
     <v-dialog v-model="showForm" persistent max-width="800px">
       <ContactForm
@@ -137,18 +200,20 @@ const { displayNotification } = useBusStore()
 
 const addressBook = ref({})
 const contacts = ref([])
+const totalContacts = ref(0)
 const search = ref('')
 const selectedContact = ref(null)
 const showAddressBookInfo = ref(false)
 const showForm = ref(false)
 const showCategoriesForm = ref(false)
 const preferences = ref({})
+const loading = ref(false)
 
 const headers = [
-  { key: 'display_name', title: $gettext('Display name') },
-  { key: 'emails', title: $gettext('E-mail') },
-  { key: 'phone_numbers', title: $gettext('Phone') },
-  { key: 'actions', title: $gettext('Actions'), align: 'end' },
+  { key: 'first_name', title: $gettext('First name') },
+  { key: 'last_name', title: $gettext('Last name') },
+  { width: 1, key: 'data-table-expand' },
+  { key: 'actions', title: $gettext('Actions'), align: 'end', sortable: false },
 ]
 
 const contactActions = [
@@ -185,10 +250,6 @@ function displayEmails(emails) {
   return emails.map((email) => email.address).join(', ')
 }
 
-function displayPhoneNumbers(phoneNumbers) {
-  return phoneNumbers.map((phoneNumber) => phoneNumber.number).join(', ')
-}
-
 function editContact(contact) {
   selectedContact.value = contact
   showForm.value = true
@@ -224,10 +285,28 @@ async function fetchPreferences() {
   preferences.value = resp.data.params
 }
 
-function fetchContacts() {
-  return contactsApi.getContacts(route.params).then((resp) => {
-    contacts.value = resp.data
-  })
+async function fetchContacts(options) {
+  const params = {
+    page: options?.page || 1,
+    page_size: options?.itemsPerPage || 10,
+    ...route.params,
+  }
+  if (options?.sortBy) {
+    params.ordering = options.sortBy
+      .map((item) => (item.order !== 'asc' ? `-${item.key}` : item.key))
+      .join(',')
+  }
+  if (search.value !== '') {
+    params.search = search.value
+  }
+  loading.value = true
+  try {
+    const resp = await contactsApi.getContacts(params)
+    contacts.value = resp.data.results
+    totalContacts.value = resp.data.count
+  } finally {
+    loading.value = false
+  }
 }
 
 function syncToAddressBook() {
@@ -268,7 +347,6 @@ function startAutomaticSync() {
 
 await fetchAddressBook()
 await fetchPreferences()
-await fetchContacts()
 
 watch(preferences, (value) => {
   if (value) {
diff --git a/modoboa/contacts/viewsets.py b/modoboa/contacts/viewsets.py
index a283b2b84..0f0668568 100644
--- a/modoboa/contacts/viewsets.py
+++ b/modoboa/contacts/viewsets.py
@@ -6,6 +6,8 @@ from rest_framework.decorators import action
 from rest_framework import filters, response, viewsets
 from rest_framework.permissions import IsAuthenticated
 
+from modoboa.lib import pagination
+
 from . import models
 from . import serializers
 from . import tasks
@@ -72,10 +74,12 @@ class ContactViewSet(viewsets.ModelViewSet):
     """Contact ViewSet."""
 
     filter_backends = [
+        filters.OrderingFilter,
         filters.SearchFilter,
         django_filters.rest_framework.DjangoFilterBackend,
     ]
     filterset_class = ContactFilter
+    pagination_class = pagination.CustomPageNumberPagination
     permission_classes = [IsAuthenticated]
     search_fields = ("^first_name", "^last_name", "^emails__address")
     serializer_class = serializers.ContactSerializer
diff --git a/pyproject.toml b/pyproject.toml
index 9448af3d7..c874e2437 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,7 +59,7 @@ dependencies = [
 	"ovh",
 	"oath",
         "packaging",
-	"redis>=4.2.0rc1",
+	"redis>=7.1.0",
 	"rrdtool-bindings>=0.2.0",
 	"qrcode",
 	"aiosmtplib",