From c1e25ff1c47eea29efbcee3d4000621ac8197503 Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Thu, 1 Jan 2026 12:11:21 +0100
Subject: [PATCH 01/11] feat: add appeal mail on delete

---
 components/Admin/AdminDeleteModal.vue         | 159 ++++++++++++++++++
 .../AdminUpdateDataservicePage.vue            |  41 ++---
 .../Datasets/AdminUpdateDatasetPage.vue       |  41 ++---
 components/Discussions/DeleteCommentModal.vue | 146 +++++++++++++---
 components/Discussions/DeleteThreadModal.vue  | 155 +++++++++++++----
 components/Reuses/AdminUpdateReusePage.vue    |  43 ++---
 components/User/DeleteUserModal.vue           | 153 +++++++++++++----
 composables/useDeleteMailto.ts                |  55 ++++++
 .../organizations/[oid]/profile/index.vue     |  52 +++---
 pages/admin/site/moderation.vue               |  76 +++++++--
 utils/owner.ts                                |  40 +++++
 11 files changed, 740 insertions(+), 221 deletions(-)
 create mode 100644 components/Admin/AdminDeleteModal.vue
 create mode 100644 composables/useDeleteMailto.ts
 create mode 100644 utils/owner.ts

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
new file mode 100644
index 00000000..d1aee4c6
--- /dev/null
+++ b/components/Admin/AdminDeleteModal.vue
@@ -0,0 +1,159 @@
+<template>
+  <ModalWithButton
+    v-model="isOpen"
+    :title
+    size="lg"
+  >
+    <template #button="{ attrs, listeners }">
+      <slot
+        name="button"
+        :attrs="attrs"
+        :listeners="listeners"
+      />
+    </template>
+
+    <template v-if="!deleted">
+      <slot />
+
+      <div
+        v-if="isMeAdmin() && recipientEmail"
+        class="mt-6 pt-4 border-t border-default-grey"
+      >
+        <RadioButtons
+          v-model="mailOption"
+          :label="$t('Notification par email')"
+          :options="mailOptions"
+        />
+      </div>
+    </template>
+
+    <template v-else>
+      <div class="flex flex-col items-center gap-4 py-6">
+        <div class="flex items-center gap-2 text-success-dark">
+          <RiCheckLine class="size-6" />
+          <span class="font-bold">{{ $t('Suppression effectuée') }}</span>
+        </div>
+        <p class="text-center text-mention-grey">
+          {{ $t("Vous pouvez maintenant envoyer un mail personnalisé au propriétaire.") }}
+        </p>
+        <a
+          :href="mailtoLink"
+          class="fr-btn fr-btn--secondary"
+          target="_blank"
+        >
+          {{ $t('Envoyer le mail personnalisé') }}
+        </a>
+      </div>
+    </template>
+
+    <template #footer="{ close: closeModal }">
+      <div class="w-full flex justify-end gap-4">
+        <BrandedButton
+          v-if="!deleted"
+          color="secondary"
+          :disabled="loading"
+          @click="closeModal"
+        >
+          {{ $t('Annuler') }}
+        </BrandedButton>
+        <BrandedButton
+          v-if="!deleted"
+          color="danger"
+          :loading
+          :disabled="isMeAdmin() && !!recipientEmail && !mailOption"
+          @click="() => handleDelete(closeModal)"
+        >
+          {{ deleteButtonLabel }}
+        </BrandedButton>
+        <BrandedButton
+          v-else
+          @click="handleClose(closeModal)"
+        >
+          {{ $t('Fermer') }}
+        </BrandedButton>
+      </div>
+    </template>
+  </ModalWithButton>
+</template>
+
+<script setup lang="ts">
+import { BrandedButton } from '@datagouv/components-next'
+import { RiCheckLine } from '@remixicon/vue'
+import { isMeAdmin } from '~/utils/auth'
+import { useDeleteMailto } from '~/composables/useDeleteMailto'
+import RadioButtons from '~/components/RadioButtons.vue'
+
+type MailOption = 'auto' | 'custom'
+type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
+
+const props = withDefaults(defineProps<{
+  title: string
+  deleteUrl: string
+  deleteButtonLabel?: string
+  recipientEmail?: string | null
+  objectType: ObjectType
+  objectTitle?: string
+}>(), {
+  recipientEmail: null,
+})
+
+const emit = defineEmits<{
+  deleted: []
+}>()
+
+const { t } = useTranslation()
+const { $api } = useNuxtApp()
+const { generateMailtoLink } = useDeleteMailto()
+
+const isOpen = ref(false)
+const loading = ref(false)
+const deleted = ref(false)
+const mailOption = ref<MailOption | null>(null)
+
+const mailOptions = computed(() => [
+  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
+  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
+])
+
+const mailtoLink = computed(() => {
+  if (!props.recipientEmail) return ''
+  return generateMailtoLink(props.recipientEmail, props.objectType, props.objectTitle)
+})
+
+const deleteButtonLabel = computed(() => props.deleteButtonLabel || t('Supprimer'))
+
+watch(isOpen, (newVal) => {
+  if (!newVal) {
+    deleted.value = false
+    mailOption.value = null
+  }
+})
+
+async function handleDelete(closeModal: () => void) {
+  loading.value = true
+  try {
+    let url = props.deleteUrl
+    if (isMeAdmin() && mailOption.value === 'auto') {
+      url += url.includes('?') ? '&send_legal_notice=true' : '?send_legal_notice=true'
+    }
+
+    await $api(url, { method: 'DELETE' })
+
+    if (isMeAdmin() && mailOption.value === 'custom' && props.recipientEmail) {
+      deleted.value = true
+    }
+    else {
+      closeModal()
+    }
+
+    emit('deleted')
+  }
+  finally {
+    loading.value = false
+  }
+}
+
+function handleClose(closeModal: () => void) {
+  closeModal()
+}
+</script>
diff --git a/components/Dataservices/AdminUpdateDataservicePage.vue b/components/Dataservices/AdminUpdateDataservicePage.vue
index 0038872e..8865bdb8 100644
--- a/components/Dataservices/AdminUpdateDataservicePage.vue
+++ b/components/Dataservices/AdminUpdateDataservicePage.vue
@@ -101,9 +101,14 @@
         >
           {{ $t("Attention, cette action ne peut pas être annulée.") }}
           <template #button>
-            <ModalWithButton
+            <AdminDeleteModal
               :title="$t('Êtes-vous sûr de vouloir supprimer cette API ?')"
-              size="lg"
+              :delete-url="`/api/1/dataservices/${route.params.id}`"
+              :delete-button-label="$t(`Supprimer l'API`)"
+              :recipient-email="getOwnerEmail(dataservice)"
+              object-type="dataservice"
+              :object-title="dataservice.title"
+              @deleted="onDataserviceDeleted"
             >
               <template #button="{ attrs, listeners }">
                 <BrandedButton
@@ -119,18 +124,7 @@
               <p class="fr-text--bold">
                 {{ $t("Cette action est irréversible.") }}
               </p>
-              <template #footer>
-                <div class="flex-1 flex justify-end">
-                  <BrandedButton
-                    color="danger"
-                    :loading="isLoading"
-                    @click="deleteDataservice"
-                  >
-                    {{ $t("Supprimer l'API") }}
-                  </BrandedButton>
-                </div>
-              </template>
-            </ModalWithButton>
+            </AdminDeleteModal>
           </template>
         </BannerAction>
       </div>
@@ -143,7 +137,9 @@ import { BannerAction, BrandedButton, LoadingBlock, TranslationT, toast } from '
 import type { Dataservice } from '@datagouv/components-next'
 import { RiArchiveLine, RiArrowGoBackLine, RiDeleteBin6Line } from '@remixicon/vue'
 import DescribeDataservice from '~/components/Dataservices/DescribeDataservice.vue'
+import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import type { DataserviceForm } from '~/types/types'
+import { getOwnerEmail } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { $api } = useNuxtApp()
@@ -251,19 +247,10 @@ async function restoreDataservice() {
   }
 }
 
-async function deleteDataservice() {
-  start()
-  try {
-    await $api(`/api/1/dataservices/${route.params.id}`, {
-      method: 'DELETE',
-    })
-    refresh()
-    toast.success(t('API supprimée !'))
-    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
-  }
-  finally {
-    finish()
-  }
+function onDataserviceDeleted() {
+  refresh()
+  toast.success(t('API supprimée !'))
+  window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
 }
 
 async function feature() {
diff --git a/components/Datasets/AdminUpdateDatasetPage.vue b/components/Datasets/AdminUpdateDatasetPage.vue
index e764ff20..77562182 100644
--- a/components/Datasets/AdminUpdateDatasetPage.vue
+++ b/components/Datasets/AdminUpdateDatasetPage.vue
@@ -95,9 +95,14 @@
           {{ $t("Attention, cette action ne peut pas être annulée.") }}
 
           <template #button>
-            <ModalWithButton
+            <AdminDeleteModal
               :title="$t('Êtes-vous sûr de vouloir supprimer ce jeu de données ?')"
-              size="lg"
+              :delete-url="`/api/1/datasets/${route.params.id}`"
+              :delete-button-label="$t('Supprimer le jeu de données')"
+              :recipient-email="getOwnerEmail(dataset)"
+              object-type="dataset"
+              :object-title="dataset.title"
+              @deleted="onDatasetDeleted"
             >
               <template #button="{ attrs, listeners }">
                 <BrandedButton
@@ -112,18 +117,7 @@
               <p class="fr-text--bold">
                 {{ $t("Cette action est irréversible.") }}
               </p>
-              <template #footer>
-                <div class="flex-1 flex justify-end">
-                  <BrandedButton
-                    color="danger"
-                    :loading="isLoading"
-                    @click="deleteDataset"
-                  >
-                    {{ $t("Supprimer le jeu de données") }}
-                  </BrandedButton>
-                </div>
-              </template>
-            </ModalWithButton>
+            </AdminDeleteModal>
           </template>
         </BannerAction>
       </div>
@@ -136,7 +130,9 @@ import { BannerAction, BrandedButton, LoadingBlock, TranslationT, toast } from '
 import type { DatasetV2WithFullObject } from '@datagouv/components-next'
 import { RiArchiveLine, RiArrowGoBackLine, RiDeleteBin6Line } from '@remixicon/vue'
 import DescribeDataset from '~/components/Datasets/DescribeDataset.vue'
+import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import type { DatasetForm } from '~/types/types'
+import { getOwnerEmail } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { $api } = useNuxtApp()
@@ -191,19 +187,10 @@ async function save() {
   }
 }
 
-async function deleteDataset() {
-  start()
-  try {
-    await $api(`/api/1/datasets/${route.params.id}`, {
-      method: 'DELETE',
-    })
-    refresh()
-    toast.success(t('Jeu de données supprimé !'))
-    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
-  }
-  finally {
-    finish()
-  }
+function onDatasetDeleted() {
+  refresh()
+  toast.success(t('Jeu de données supprimé !'))
+  window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
 }
 
 async function switchDatasetPrivate() {
diff --git a/components/Discussions/DeleteCommentModal.vue b/components/Discussions/DeleteCommentModal.vue
index 605f6944..f5f511ea 100644
--- a/components/Discussions/DeleteCommentModal.vue
+++ b/components/Discussions/DeleteCommentModal.vue
@@ -1,9 +1,8 @@
 <template>
   <ModalWithButton
-    :title="t('Êtes-vous sûrs de vouloir supprimer ce message ?')"
+    v-model="isOpen"
+    :title="t('Êtes-vous sûrs de vouloir supprimer ce message ?')"
     size="lg"
-    form
-    @submit.prevent="deleteMessage"
   >
     <template #button="{ attrs, listeners }">
       <BrandedButton
@@ -19,33 +18,74 @@
     </template>
 
     <template #default>
-      <CommentBlock
-        :thread
-        :comment
-        :subject
-      />
-      <div class="mt-4 font-bold">
-        {{ $t('Cette action est irréversible.') }}
-      </div>
+      <template v-if="!deleted">
+        <CommentBlock
+          :thread
+          :comment
+          :subject
+        />
+        <div class="mt-4 font-bold">
+          {{ $t('Cette action est irréversible.') }}
+        </div>
+
+        <div
+          v-if="showMailOptions"
+          class="mt-6 pt-4 border-t border-default-grey"
+        >
+          <RadioButtons
+            v-model="mailOption"
+            :label="$t('Notification par email')"
+            :options="mailOptions"
+          />
+        </div>
+      </template>
+
+      <template v-else>
+        <div class="flex flex-col items-center gap-4 py-6">
+          <div class="flex items-center gap-2 text-success-dark">
+            <RiCheckLine class="size-6" />
+            <span class="font-bold">{{ $t('Suppression effectuée') }}</span>
+          </div>
+          <p class="text-center text-mention-grey">
+            {{ $t("Vous pouvez maintenant envoyer un mail personnalisé à l'auteur.") }}
+          </p>
+          <a
+            :href="mailtoLink"
+            class="fr-btn fr-btn--secondary"
+            target="_blank"
+          >
+            {{ $t('Envoyer le mail personnalisé') }}
+          </a>
+        </div>
+      </template>
     </template>
 
     <template #footer="{ close }">
       <div class="w-full flex justify-end space-x-4">
+        <template v-if="!deleted">
+          <BrandedButton
+            color="secondary"
+            size="xs"
+            :loading
+            @click="close"
+          >
+            {{ t("Annuler") }}
+          </BrandedButton>
+          <BrandedButton
+            color="danger"
+            size="xs"
+            :loading
+            :disabled="!!showMailOptions && !mailOption"
+            @click="() => deleteMessage(close)"
+          >
+            {{ t("Supprimer le commentaire") }}
+          </BrandedButton>
+        </template>
         <BrandedButton
-          color="secondary"
-          size="xs"
-          :loading
-          @click="close"
+          v-else
+          @click="handleClose(close)"
         >
-          {{ t("Annuler") }}
-        </BrandedButton>
-        <BrandedButton
-          type="submit"
-          color="danger"
-          size="xs"
-          :loading
-        >
-          {{ t("Supprimer le commentaire") }}
+          {{ $t('Fermer') }}
         </BrandedButton>
       </div>
     </template>
@@ -53,10 +93,15 @@
 </template>
 
 <script setup lang="ts">
-import { RiDeleteBin6Line } from '@remixicon/vue'
+import { RiCheckLine, RiDeleteBin6Line } from '@remixicon/vue'
 import { BrandedButton } from '@datagouv/components-next'
 import CommentBlock from './CommentBlock.vue'
+import RadioButtons from '~/components/RadioButtons.vue'
 import type { Comment, DiscussionSubjectTypes, Thread } from '~/types/discussions'
+import { isMeAdmin } from '~/utils/auth'
+import { useDeleteMailto } from '~/composables/useDeleteMailto'
+
+type MailOption = 'auto' | 'custom'
 
 const props = defineProps<{
   subject: DiscussionSubjectTypes
@@ -70,19 +115,64 @@ const emit = defineEmits<{
 
 const { t } = useTranslation()
 const { $api } = useNuxtApp()
+const { generateMailtoLink } = useDeleteMailto()
 
+const isOpen = ref(false)
 const loading = ref(false)
+const deleted = ref(false)
+const mailOption = ref<MailOption | null>(null)
+
+const authorEmail = computed(() => {
+  const user = props.comment.posted_by
+  return user && 'email' in user ? (user as { email?: string }).email : null
+})
 
-const deleteMessage = async (_: SubmitEvent, close: () => void) => {
+const showMailOptions = computed(() => {
+  return isMeAdmin() && authorEmail.value
+})
+
+const mailOptions = computed(() => [
+  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
+  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
+])
+
+const mailtoLink = computed(() => {
+  if (!authorEmail.value) return ''
+  return generateMailtoLink(authorEmail.value, 'comment')
+})
+
+watch(isOpen, (newVal) => {
+  if (!newVal) {
+    deleted.value = false
+    mailOption.value = null
+  }
+})
+
+const deleteMessage = async (close: () => void) => {
   loading.value = true
 
   try {
-    await $api(`/api/1/discussions/${props.thread.id}/comments/${props.index}/`, { method: 'DELETE' })
-    close()
+    let url = `/api/1/discussions/${props.thread.id}/comments/${props.index}/`
+    if (isMeAdmin() && mailOption.value === 'auto') {
+      url += '?send_legal_notice=true'
+    }
+
+    await $api(url, { method: 'DELETE' })
+
+    if (isMeAdmin() && mailOption.value === 'custom' && authorEmail.value) {
+      deleted.value = true
+    }
+    else {
+      close()
+    }
     emit('deleted')
   }
   finally {
     loading.value = false
   }
 }
+
+function handleClose(close: () => void) {
+  close()
+}
 </script>
diff --git a/components/Discussions/DeleteThreadModal.vue b/components/Discussions/DeleteThreadModal.vue
index cc2808f5..004d99ba 100644
--- a/components/Discussions/DeleteThreadModal.vue
+++ b/components/Discussions/DeleteThreadModal.vue
@@ -1,9 +1,8 @@
 <template>
   <ModalWithButton
-    :title="t('Êtes-vous sûr de vouloir supprimer cette discussion ?')"
+    v-model="isOpen"
+    :title="t('Êtes-vous sûr de vouloir supprimer cette discussion ?')"
     size="lg"
-    form
-    @submit.prevent="deleteThread"
   >
     <template #button="{ attrs, listeners }">
       <BrandedButton
@@ -19,37 +18,78 @@
     </template>
 
     <template #default>
-      <ThreadHeader
-        :subject
-        :thread
-      />
-      <ReadMore
-        class="prose whitespace-pre-line max-w-none text-sm"
-      >
-        {{ thread.discussion[0].content }}
-      </ReadMore>
-      <div class="mt-4 font-bold">
-        {{ $t('Cette action est irréversible. Tous les commentaires de cette discussion seront aussi supprimés.') }}
-      </div>
+      <template v-if="!deleted">
+        <ThreadHeader
+          :subject
+          :thread
+        />
+        <ReadMore
+          class="prose whitespace-pre-line max-w-none text-sm"
+        >
+          {{ thread.discussion[0].content }}
+        </ReadMore>
+        <div class="mt-4 font-bold">
+          {{ $t('Cette action est irréversible. Tous les commentaires de cette discussion seront aussi supprimés.') }}
+        </div>
+
+        <div
+          v-if="showMailOptions"
+          class="mt-6 pt-4 border-t border-default-grey"
+        >
+          <RadioButtons
+            v-model="mailOption"
+            :label="$t('Notification par email')"
+            :options="mailOptions"
+          />
+        </div>
+      </template>
+
+      <template v-else>
+        <div class="flex flex-col items-center gap-4 py-6">
+          <div class="flex items-center gap-2 text-success-dark">
+            <RiCheckLine class="size-6" />
+            <span class="font-bold">{{ $t('Suppression effectuée') }}</span>
+          </div>
+          <p class="text-center text-mention-grey">
+            {{ $t("Vous pouvez maintenant envoyer un mail personnalisé à l'auteur.") }}
+          </p>
+          <a
+            :href="mailtoLink"
+            class="fr-btn fr-btn--secondary"
+            target="_blank"
+          >
+            {{ $t('Envoyer le mail personnalisé') }}
+          </a>
+        </div>
+      </template>
     </template>
 
     <template #footer="{ close }">
       <div class="w-full flex justify-end space-x-4">
+        <template v-if="!deleted">
+          <BrandedButton
+            color="secondary"
+            size="xs"
+            :loading
+            @click="close"
+          >
+            {{ t("Annuler") }}
+          </BrandedButton>
+          <BrandedButton
+            color="danger"
+            size="xs"
+            :loading
+            :disabled="!!showMailOptions && !mailOption"
+            @click="() => deleteThread(close)"
+          >
+            {{ t("Supprimer la discussion et les commentaires") }}
+          </BrandedButton>
+        </template>
         <BrandedButton
-          color="secondary"
-          size="xs"
-          :loading
-          @click="close"
+          v-else
+          @click="handleClose(close)"
         >
-          {{ t("Annuler") }}
-        </BrandedButton>
-        <BrandedButton
-          type="submit"
-          color="danger"
-          size="xs"
-          :loading
-        >
-          {{ t("Supprimer la discussion et les commentaires") }}
+          {{ $t('Fermer') }}
         </BrandedButton>
       </div>
     </template>
@@ -57,10 +97,15 @@
 </template>
 
 <script setup lang="ts">
-import { RiDeleteBin6Line } from '@remixicon/vue'
+import { RiCheckLine, RiDeleteBin6Line } from '@remixicon/vue'
 import { BrandedButton, ReadMore } from '@datagouv/components-next'
 import ThreadHeader from './ThreadHeader.vue'
+import RadioButtons from '~/components/RadioButtons.vue'
 import type { DiscussionSubjectTypes, Thread } from '~/types/discussions'
+import { isMeAdmin } from '~/utils/auth'
+import { useDeleteMailto } from '~/composables/useDeleteMailto'
+
+type MailOption = 'auto' | 'custom'
 
 const props = defineProps<{
   subject: DiscussionSubjectTypes
@@ -72,19 +117,65 @@ const emit = defineEmits<{
 
 const { t } = useTranslation()
 const { $api } = useNuxtApp()
+const { generateMailtoLink } = useDeleteMailto()
 
+const isOpen = ref(false)
 const loading = ref(false)
+const deleted = ref(false)
+const mailOption = ref<MailOption | null>(null)
 
-const deleteThread = async (_: SubmitEvent, close: () => void) => {
+const authorEmail = computed(() => {
+  const firstComment = props.thread.discussion[0]
+  const user = firstComment?.posted_by
+  return user && 'email' in user ? (user as { email?: string }).email : null
+})
+
+const showMailOptions = computed(() => {
+  return isMeAdmin() && authorEmail.value
+})
+
+const mailOptions = computed(() => [
+  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
+  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
+])
+
+const mailtoLink = computed(() => {
+  if (!authorEmail.value) return ''
+  return generateMailtoLink(authorEmail.value, 'discussion', props.thread.title)
+})
+
+watch(isOpen, (newVal) => {
+  if (!newVal) {
+    deleted.value = false
+    mailOption.value = null
+  }
+})
+
+const deleteThread = async (close: () => void) => {
   loading.value = true
 
   try {
-    await $api(`/api/1/discussions/${props.thread.id}/`, { method: 'DELETE' })
-    close()
+    let url = `/api/1/discussions/${props.thread.id}/`
+    if (isMeAdmin() && mailOption.value === 'auto') {
+      url += '?send_legal_notice=true'
+    }
+
+    await $api(url, { method: 'DELETE' })
+
+    if (isMeAdmin() && mailOption.value === 'custom' && authorEmail.value) {
+      deleted.value = true
+    }
+    else {
+      close()
+    }
     emit('deleted')
   }
   finally {
     loading.value = false
   }
 }
+
+function handleClose(close: () => void) {
+  close()
+}
 </script>
diff --git a/components/Reuses/AdminUpdateReusePage.vue b/components/Reuses/AdminUpdateReusePage.vue
index ae771aeb..d13bd3fa 100644
--- a/components/Reuses/AdminUpdateReusePage.vue
+++ b/components/Reuses/AdminUpdateReusePage.vue
@@ -102,9 +102,14 @@
         >
           {{ $t("Attention, cette action ne peut pas être annulée.") }}
           <template #button>
-            <ModalWithButton
-              :title="$t('Êtes-vous sûr de vouloir supprimer cette réutilisation?')"
-              size="lg"
+            <AdminDeleteModal
+              :title="$t('Êtes-vous sûr de vouloir supprimer cette réutilisation ?')"
+              :delete-url="`/api/1/reuses/${route.params.id}`"
+              :delete-button-label="$t('Supprimer cette réutilisation')"
+              :recipient-email="getOwnerEmail(reuse)"
+              object-type="reuse"
+              :object-title="reuse.title"
+              @deleted="onReuseDeleted"
             >
               <template #button="{ attrs, listeners }">
                 <BrandedButton
@@ -120,18 +125,7 @@
               <p class="fr-text--bold">
                 {{ $t("Cette action ne peut pas être annulée.") }}
               </p>
-              <template #footer>
-                <div class="flex-1 flex justify-end">
-                  <BrandedButton
-                    color="danger"
-                    :loading="isLoading"
-                    @click="deleteReuse"
-                  >
-                    {{ $t("Supprimer cette réutilisation") }}
-                  </BrandedButton>
-                </div>
-              </template>
-            </ModalWithButton>
+            </AdminDeleteModal>
           </template>
         </BannerAction>
       </div>
@@ -144,7 +138,9 @@ import { BannerAction, BrandedButton, LoadingBlock, TranslationT, toast } from '
 import type { Reuse, ReuseTopic, ReuseType } from '@datagouv/components-next'
 import { RiArchiveLine, RiArrowGoBackLine, RiDeleteBin6Line } from '@remixicon/vue'
 import DescribeReuse from '~/components/Reuses/DescribeReuse.vue'
+import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import type { ReuseForm } from '~/types/types'
+import { getOwnerEmail } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { $api, $fileApi } = useNuxtApp()
@@ -193,19 +189,10 @@ async function save() {
   }
 }
 
-async function deleteReuse() {
-  start()
-  try {
-    await $api(`/api/1/reuses/${route.params.id}`, {
-      method: 'DELETE',
-    })
-    refresh()
-    toast.success(t('Réutilisation supprimée !'))
-    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
-  }
-  finally {
-    finish()
-  }
+function onReuseDeleted() {
+  refresh()
+  toast.success(t('Réutilisation supprimée !'))
+  window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
 }
 
 async function archiveReuse() {
diff --git a/components/User/DeleteUserModal.vue b/components/User/DeleteUserModal.vue
index 7606f0af..268b9d17 100644
--- a/components/User/DeleteUserModal.vue
+++ b/components/User/DeleteUserModal.vue
@@ -1,5 +1,6 @@
 <template>
   <ModalWithButton
+    v-model="isOpen"
     :title="$t('Êtes-vous sûrs de vouloir supprimer ce compte utilisateur ?')"
     size="lg"
   >
@@ -15,72 +16,151 @@
       </BrandedButton>
     </template>
     <template #default>
-      <p class="fr-text--bold">
-        {{ $t("Cette action est irréversible.") }}
-      </p>
-      <p>{{ $t("Tous les contenus publiés en votre nom resteront en ligne, aux mêmes URL, mais sous forme anonyme, c’est-à-dire sans être rattachés à un producteur de données.") }}</p>
-      <p>{{ $t("Si vous souhaitez aussi supprimer les contenus publiées que vous avez publiés, commencez par supprimer les contenus avant de supprimer votre compte.") }}</p>
-    </template>
-    <template #footer>
-      <div class="w-full flex justify-end space-x-4">
+      <template v-if="!deleted">
+        <p class="fr-text--bold">
+          {{ $t("Cette action est irréversible.") }}
+        </p>
+        <p>{{ $t("Tous les contenus publiés en votre nom resteront en ligne, aux mêmes URL, mais sous forme anonyme, c'est-à-dire sans être rattachés à un producteur de données.") }}</p>
+        <p>{{ $t("Si vous souhaitez aussi supprimer les contenus publiées que vous avez publiés, commencez par supprimer les contenus avant de supprimer votre compte.") }}</p>
+
         <div
-          v-if="isMeAdmin()"
+          v-if="showMailOptions"
+          class="mt-6 pt-4 border-t border-default-grey"
         >
-          <BrandedButton
-            color="warning"
-            :disabled="loading"
-            @click="() => deleteUser({ spam: true })"
-          >
-            {{ $t("Supprimer comme spam (pas d'envoi de mail et suppression des discussions)") }}
-          </BrandedButton>
+          <RadioButtons
+            v-model="mailOption"
+            :label="$t('Notification par email')"
+            :options="mailOptions"
+          />
         </div>
-        <div>
-          <BrandedButton
-            color="danger"
-            :disabled="loading"
-            @click="() => deleteUser({ spam: false })"
+      </template>
+
+      <template v-else>
+        <div class="flex flex-col items-center gap-4 py-6">
+          <div class="flex items-center gap-2 text-success-dark">
+            <RiCheckLine class="size-6" />
+            <span class="font-bold">{{ $t('Suppression effectuée') }}</span>
+          </div>
+          <p class="text-center text-mention-grey">
+            {{ $t("Vous pouvez maintenant envoyer un mail personnalisé à l'utilisateur.") }}
+          </p>
+          <a
+            :href="mailtoLink"
+            class="fr-btn fr-btn--secondary"
+            target="_blank"
           >
-            <span v-if="user.id === me.id">
-              {{ $t("Supprimer votre compte") }}
-            </span>
-            <span v-else>
-              {{ $t("Supprimer ce compte") }}
-            </span>
-          </BrandedButton>
+            {{ $t('Envoyer le mail personnalisé') }}
+          </a>
         </div>
+      </template>
+    </template>
+    <template #footer>
+      <div class="w-full flex justify-end space-x-4">
+        <template v-if="!deleted">
+          <div v-if="isMeAdmin() && user.id !== me.id">
+            <BrandedButton
+              color="warning"
+              :disabled="loading || (!!showMailOptions && !mailOption)"
+              @click="() => deleteUser({ spam: true })"
+            >
+              {{ $t("Supprimer comme spam (pas d'envoi de mail et suppression des discussions)") }}
+            </BrandedButton>
+          </div>
+          <div>
+            <BrandedButton
+              color="danger"
+              :disabled="loading || (!!showMailOptions && !mailOption)"
+              @click="() => deleteUser({ spam: false })"
+            >
+              <span v-if="user.id === me.id">
+                {{ $t("Supprimer votre compte") }}
+              </span>
+              <span v-else>
+                {{ $t("Supprimer ce compte") }}
+              </span>
+            </BrandedButton>
+          </div>
+        </template>
+        <BrandedButton
+          v-else
+          @click="handleClose"
+        >
+          {{ $t('Fermer') }}
+        </BrandedButton>
       </div>
     </template>
   </ModalWithButton>
 </template>
 
 <script setup lang="ts">
-import { RiDeleteBin6Line } from '@remixicon/vue'
+import { RiCheckLine, RiDeleteBin6Line } from '@remixicon/vue'
 import { BrandedButton, type User, toast } from '@datagouv/components-next'
-import { useLogout } from '~/utils/auth'
+import { isMeAdmin, useLogout } from '~/utils/auth'
+import { useDeleteMailto } from '~/composables/useDeleteMailto'
+import RadioButtons from '~/components/RadioButtons.vue'
+
+type MailOption = 'auto' | 'custom'
 
 const props = defineProps<{
-  user: User
+  user: User & { email?: string }
 }>()
 
 const me = useMe()
 const { $api } = useNuxtApp()
 const config = useRuntimeConfig()
 const { t } = useTranslation()
+const { generateMailtoLink } = useDeleteMailto()
 
+const isOpen = ref(false)
 const loading = ref(false)
+const deleted = ref(false)
+const mailOption = ref<MailOption | null>(null)
+
+const showMailOptions = computed(() => {
+  return isMeAdmin() && props.user.id !== me.value.id && props.user.email
+})
+
+const mailOptions = computed(() => [
+  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
+  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
+])
+
+const mailtoLink = computed(() => {
+  if (!props.user.email) return ''
+  return generateMailtoLink(props.user.email, 'user', props.user.first_name + ' ' + props.user.last_name)
+})
 
 const logout = useLogout()
 
+watch(isOpen, (newVal) => {
+  if (!newVal) {
+    deleted.value = false
+    mailOption.value = null
+  }
+})
+
 async function deleteUser({ spam = false }) {
   loading.value = true
   try {
     let deleteUserUrl = props.user.id === me.value.id ? '/api/1/me/' : `/api/1/users/${props.user.id}/`
+
+    const params = new URLSearchParams()
     if (props.user.id !== me.value.id && spam) {
-      deleteUserUrl += '?no_mail=true&delete_comments=true'
+      params.set('no_mail', 'true')
+      params.set('delete_comments', 'true')
+    }
+    if (isMeAdmin() && mailOption.value === 'auto' && !spam) {
+      params.set('send_legal_notice', 'true')
+    }
+
+    if (params.toString()) {
+      deleteUserUrl += '?' + params.toString()
     }
+
     await $api(deleteUserUrl, {
       method: 'DELETE',
     })
+
     if (props.user.id === me.value.id) {
       toast.success(t('Votre compte a bien été supprimé. Vous êtes maintenant déconnecté.'))
       if (config.public.enableCdataSecurityViews) {
@@ -90,6 +170,9 @@ async function deleteUser({ spam = false }) {
         await navigateTo(`${config.public.apiBase}/logout`, { external: true })
       }
     }
+    else if (isMeAdmin() && mailOption.value === 'custom' && props.user.email) {
+      deleted.value = true
+    }
     else {
       toast.success(t('Utilisateur supprimé !'))
       await navigateTo(`/admin/site/users`, { replace: true })
@@ -99,4 +182,10 @@ async function deleteUser({ spam = false }) {
     loading.value = false
   }
 }
+
+async function handleClose() {
+  isOpen.value = false
+  toast.success(t('Utilisateur supprimé !'))
+  await navigateTo(`/admin/site/users`, { replace: true })
+}
 </script>
diff --git a/composables/useDeleteMailto.ts b/composables/useDeleteMailto.ts
new file mode 100644
index 00000000..7ca00cdc
--- /dev/null
+++ b/composables/useDeleteMailto.ts
@@ -0,0 +1,55 @@
+type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
+
+export function useDeleteMailto() {
+  const { t } = useTranslation()
+  const config = useRuntimeConfig()
+
+  const getObjectTypeLabel = (type: ObjectType): string => {
+    const labels: Record<ObjectType, string> = {
+      dataset: t('jeu de données'),
+      reuse: t('réutilisation'),
+      dataservice: t('API'),
+      organization: t('organisation'),
+      user: t('compte'),
+      discussion: t('discussion'),
+      comment: t('commentaire'),
+    }
+    return labels[type]
+  }
+
+  const generateMailtoLink = (
+    recipientEmail: string,
+    objectType: ObjectType,
+    objectTitle?: string,
+  ): string => {
+    const siteName = config.public.title || 'data.gouv.fr'
+    const typeLabel = getObjectTypeLabel(objectType)
+
+    const subject = t('Suppression de votre {type} sur {site}', {
+      type: typeLabel,
+      site: siteName,
+    })
+
+    const body = t(`Bonjour,
+
+Votre {type}{title} a été supprimé(e) de {site}.
+
+Nos conditions d'utilisation précisent au point 5.1.2 que la plateforme n'est pas « destinée à diffuser des contenus publicitaires, des promotions d'intérêts privés, des contenus contraires à l'ordre public, des contenus illicites, du spam et toute contribution violant le cadre légal applicable. L'Éditeur se réserve le droit, sans préavis, de supprimer ou rendre inaccessible tout contenu publié sur la Plateforme n'ayant aucun lien avec son Objet. L'Éditeur n'effectue pas de contrôle "a priori" sur les publications. Dès que l'Éditeur a connaissance de contenus contraires aux présentes conditions d'utilisation, il agit rapidement pour les supprimer ou les rendre inaccessibles ».
+
+Vous pouvez contester cette décision dans un délai de deux mois à compter de sa notification en formant un recours administratif (recours gracieux ou hiérarchique). Vous pouvez également saisir le tribunal administratif via l'application « Télérecours citoyens » (https://www.telerecours.fr).
+
+Cordialement,
+L'équipe {site}`, {
+      type: typeLabel,
+      title: objectTitle ? ` « ${objectTitle} »` : '',
+      site: siteName,
+    })
+
+    return `mailto:${encodeURIComponent(recipientEmail)}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`
+  }
+
+  return {
+    generateMailtoLink,
+    getObjectTypeLabel,
+  }
+}
diff --git a/pages/admin/organizations/[oid]/profile/index.vue b/pages/admin/organizations/[oid]/profile/index.vue
index 7292eb48..e416450d 100644
--- a/pages/admin/organizations/[oid]/profile/index.vue
+++ b/pages/admin/organizations/[oid]/profile/index.vue
@@ -43,13 +43,18 @@
           v-if="!organization.deleted"
           class="mt-12"
           type="danger"
-          :title="$t('Supprimer l’organisation')"
+          :title="$t(`Supprimer l'organisation`)"
         >
           {{ t("Attention, cette action ne peut pas être annulée.") }}
           <template #button>
-            <ModalWithButton
+            <AdminDeleteModal
               :title="t('Êtes-vous sûrs de vouloir supprimer cette organisation ?')"
-              size="lg"
+              :delete-url="`/api/1/organizations/${organization.id}/`"
+              :delete-button-label="t(`Supprimer l'organisation`)"
+              :recipient-email="getOrganizationAdminEmails(organization)"
+              object-type="organization"
+              :object-title="organization.name"
+              @deleted="onOrganizationDeleted"
             >
               <template #button="{ attrs, listeners }">
                 <BrandedButton
@@ -65,21 +70,10 @@
                 <p class="fr-text--bold">
                   {{ t("Cette action est irréversible.") }}
                 </p>
-                <p>{{ t("Tous les contenus publiés par cette organisation resteront en ligne, aux mêmes URL, mais sous forme anonyme, c’est-à-dire sans être rattachés à un producteur de données.") }}</p>
+                <p>{{ t("Tous les contenus publiés par cette organisation resteront en ligne, aux mêmes URL, mais sous forme anonyme, c'est-à-dire sans être rattachés à un producteur de données.") }}</p>
                 <p>{{ t("Si vous souhaitez aussi supprimer les contenus publiées que vous avez publiés, commencez par supprimer les contenus avant de supprimer votre compte.") }}</p>
               </template>
-              <template #footer>
-                <div class="flex justify-end">
-                  <BrandedButton
-                    color="danger"
-                    :loading="isLoading"
-                    @click="deleteCurrentOrganization"
-                  >
-                    {{ t("Supprimer l'organisation") }}
-                  </BrandedButton>
-                </div>
-              </template>
-            </ModalWithButton>
+            </AdminDeleteModal>
           </template>
         </BannerAction>
       </template>
@@ -92,7 +86,9 @@ import { RiArrowGoBackLine, RiDeleteBin6Line } from '@remixicon/vue'
 import { AnimatedLoader, BannerAction, BrandedButton, toast } from '@datagouv/components-next'
 import type { Organization, Badge } from '@datagouv/components-next'
 import DescribeOrganizationFrom from '~/components/Organization/New/Step2DescribeOrganization.vue'
+import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import { updateOrganization, updateOrganizationBadges, uploadLogo } from '~/api/organizations'
+import { getOrganizationAdminEmails } from '~/utils/owner'
 
 const props = defineProps<{
   organization: Organization
@@ -102,7 +98,6 @@ const emit = defineEmits<{
 }>()
 
 const { t } = useTranslation()
-const { $api } = useNuxtApp()
 const { start, finish, isLoading } = useLoadingIndicator()
 
 const form = ref<InstanceType<typeof DescribeOrganizationFrom> | null>(null)
@@ -113,20 +108,15 @@ watchEffect(() => {
   organizationForm.value = props.organization
 })
 
-async function deleteCurrentOrganization() {
-  if (props.organization) {
-    start()
-    await $api(`api/1/organizations/${props.organization.id}/`, { method: 'DELETE' })
-    finish()
-    if (isMeAdmin()) {
-      emit('refresh')
-      window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
-    }
-    else {
-      reloadNuxtApp({
-        path: '/admin/me/profile',
-      })
-    }
+function onOrganizationDeleted() {
+  if (isMeAdmin()) {
+    emit('refresh')
+    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
+  }
+  else {
+    reloadNuxtApp({
+      path: '/admin/me/profile',
+    })
   }
 }
 
diff --git a/pages/admin/site/moderation.vue b/pages/admin/site/moderation.vue
index 40b876f9..aced03e7 100644
--- a/pages/admin/site/moderation.vue
+++ b/pages/admin/site/moderation.vue
@@ -202,18 +202,33 @@
                   >
                     —
                   </div>
-                  <BrandedButton
+                  <AdminDeleteModal
                     v-if="report.subject && getDeleteUrl(report.subject)"
-                    size="xs"
-                    color="tertiary"
-                    type="button"
-                    :icon="RiDeleteBinLine"
-                    icon-only
-                    keep-margins-even-without-borders
-                    :disabled="isSubjectDeleted(subjects[report.id].value)"
-                    :title="$t('Supprimer l\'objet')"
-                    @click="deleteSubject(report, report.subject)"
-                  />
+                    :title="$t('Êtes-vous sûr de vouloir supprimer cet objet ?')"
+                    :delete-url="getDeleteUrl(report.subject)!"
+                    :delete-button-label="$t('Supprimer')"
+                    :recipient-email="getSubjectOwnerEmail(subjects[report.id]?.value)"
+                    :object-type="getObjectType(report.subject.class)"
+                    :object-title="getSubjectTitle(subjects[report.id]?.value)"
+                    @deleted="() => fetchFullSubject(report, report.subject!)"
+                  >
+                    <template #button="{ attrs, listeners }">
+                      <BrandedButton
+                        size="xs"
+                        color="tertiary"
+                        :icon="RiDeleteBinLine"
+                        icon-only
+                        keep-margins-even-without-borders
+                        :disabled="isSubjectDeleted(subjects[report.id].value)"
+                        :title="$t('Supprimer l\'objet')"
+                        v-bind="attrs"
+                        v-on="listeners"
+                      />
+                    </template>
+                    <p class="fr-text--bold">
+                      {{ $t("Cette action est irréversible.") }}
+                    </p>
+                  </AdminDeleteModal>
                 </div>
               </td>
             </tr>
@@ -249,10 +264,12 @@ import AdminBreadcrumb from '~/components/Breadcrumbs/AdminBreadcrumb.vue'
 import BreadcrumbItem from '~/components/Breadcrumbs/BreadcrumbItem.vue'
 import AdminTable from '~/components/AdminTable/Table/AdminTable.vue'
 import AdminTableTh from '~/components/AdminTable/Table/AdminTableTh.vue'
+import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import type { Thread } from '~/types/discussions'
 import DatasetBadge from '~/components/AdminBadge/DatasetBadge.vue'
 import DataserviceBadge from '~/components/AdminBadge/DataserviceBadge.vue'
 import ReuseBadge from '~/components/AdminBadge/ReuseBadge.vue'
+import { getOwnerEmail, getOrganizationAdminEmails } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { formatDate } = useFormatDate()
@@ -373,11 +390,38 @@ const isSubjectDeleted = (subject: RecordSubjectFullObject['value']) => {
   return false
 }
 
-const deleteSubject = async (report: Report, subject: ReportSubject) => {
-  const url = getDeleteUrl(subject)
-  if (!url) return
+type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
 
-  await $api(url, { method: 'DELETE' })
-  await fetchFullSubject(report, subject)
+const getObjectType = (subjectClass: string): ObjectType => {
+  return {
+    Dataset: 'dataset' as ObjectType,
+    Dataservice: 'dataservice' as ObjectType,
+    Reuse: 'reuse' as ObjectType,
+    Organization: 'organization' as ObjectType,
+    Discussion: 'discussion' as ObjectType,
+  }[subjectClass] || 'dataset'
+}
+
+const getSubjectOwnerEmail = (subject: RecordSubjectFullObject['value']): string | null => {
+  if (!subject) return null
+
+  if ('organization' in subject && subject.organization) {
+    return getOrganizationAdminEmails(subject.organization as Organization)
+  }
+  if ('owner' in subject && subject.owner) {
+    return getOwnerEmail({ owner: subject.owner as { email?: string | null } })
+  }
+  if ('members' in subject) {
+    return getOrganizationAdminEmails(subject as Organization)
+  }
+
+  return null
+}
+
+const getSubjectTitle = (subject: RecordSubjectFullObject['value']): string | undefined => {
+  if (!subject) return undefined
+  if ('title' in subject) return subject.title
+  if ('name' in subject) return subject.name
+  return undefined
 }
 </script>
diff --git a/utils/owner.ts b/utils/owner.ts
new file mode 100644
index 00000000..3bd04347
--- /dev/null
+++ b/utils/owner.ts
@@ -0,0 +1,40 @@
+import type { Organization, User } from '@datagouv/components-next'
+
+type OwnedObject = {
+  owner?: { email?: string | null } | null
+  organization?: { members?: Array<{ user: { email?: string | null }, role: string }> } | null
+}
+
+export function getOwnerEmail(obj: OwnedObject | Record<string, unknown> | null | undefined): string | null {
+  if (!obj) return null
+
+  if ('owner' in obj && obj.owner && typeof obj.owner === 'object' && 'email' in obj.owner) {
+    return (obj.owner as { email?: string | null }).email || null
+  }
+
+  if ('organization' in obj && obj.organization && typeof obj.organization === 'object' && 'members' in obj.organization) {
+    const org = obj.organization as { members?: Array<{ user: { email?: string | null }, role: string }> }
+    const adminMember = org.members?.find(m => m.role === 'admin')
+    if (adminMember?.user?.email) {
+      return adminMember.user.email
+    }
+  }
+
+  return null
+}
+
+export function getOrganizationAdminEmails(org: Organization | null | undefined): string | null {
+  if (!org?.members) return null
+
+  const adminMember = org.members.find(m => m.role === 'admin')
+  if (adminMember?.user && 'email' in adminMember.user) {
+    return (adminMember.user as User & { email?: string }).email || null
+  }
+
+  return null
+}
+
+export function getUserEmail(user: User | null | undefined): string | null {
+  if (!user) return null
+  return 'email' in user ? (user as User & { email?: string }).email || null : null
+}

From 35b1874264cdde4e6338a36da98a7d17f6e52130 Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Thu, 1 Jan 2026 12:46:02 +0100
Subject: [PATCH 02/11] add test

---
 tests/admin/delete-with-legal-mail.spec.ts | 93 ++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 tests/admin/delete-with-legal-mail.spec.ts

diff --git a/tests/admin/delete-with-legal-mail.spec.ts b/tests/admin/delete-with-legal-mail.spec.ts
new file mode 100644
index 00000000..10051a62
--- /dev/null
+++ b/tests/admin/delete-with-legal-mail.spec.ts
@@ -0,0 +1,93 @@
+import { test, expect } from '@playwright/test'
+import * as path from 'path'
+import { clickOutside } from '../helpers'
+
+const __dirname = import.meta.dirname
+
+test.describe('Delete modal for reuse', () => {
+  // Note: Mail options (auto mail / custom mail) only appear when:
+  // 1. User is sysadmin (isMeAdmin() returns true)
+  // 2. Recipient email is available (owner.email or org admin emails)
+  //
+  // In the test environment, the API does not expose owner email in the response
+  // (UserReference type doesn't include email). Therefore, mail options won't appear.
+  // To test the full mail flow with options, the backend would need to include
+  // email for admin requests, or we'd need to fetch owner data separately.
+
+  test('opens delete modal and confirms deletion', async ({ page }) => {
+    const uniqueId = Date.now()
+
+    // Create a reuse
+    await page.goto('/')
+    await page.getByRole('button', { name: 'Publier sur data.gouv.fr' }).click()
+    await page.getByRole('link', { name: 'Une réutilisation' }).click()
+    await page.waitForURL('**/admin/reuses/new**')
+
+    // Select producer
+    await page.getByTestId('producer-select').click()
+    await page.getByRole('option', { name: 'Admin User' }).click()
+
+    // Fill the form
+    await page.getByRole('textbox', { name: 'Nom de la réutilisation' }).fill(`Test suppression ${uniqueId}`)
+    await page.getByRole('textbox', { name: 'Lien' }).fill(`https://example.com/test-delete-${uniqueId}`)
+
+    // Select type
+    await page.getByTestId('searchable-select-type').click()
+    await page.getByRole('option', { name: 'Application' }).click()
+    await clickOutside(page)
+
+    // Select thématique
+    await page.getByTestId('searchable-select-thmatique').click()
+    await page.getByRole('option', { name: 'Culture et loisirs' }).click()
+    await clickOutside(page)
+
+    // Fill description
+    await page.getByTestId('markdown-editor').click()
+    await page.getByTestId('markdown-editor').fill('Une description de ma réutilisation qui utilise des données ouvertes. Cette réutilisation permet de visualiser et d\'analyser des données publiques de manière innovante et accessible à tous les citoyens.')
+    await page.getByTestId('markdown-editor').press('Tab')
+
+    // Upload image
+    const fileChooserPromise = page.waitForEvent('filechooser')
+    await page.getByRole('button', { name: 'Parcourir' }).click()
+    const fileChooser = await fileChooserPromise
+    await fileChooser.setFiles(path.join(__dirname, '../../public/nuxt_images/onboarding/logo-ign.png'))
+    await clickOutside(page)
+    await page.waitForTimeout(500)
+
+    // Go to step 2
+    await page.getByRole('button', { name: 'Suivant' }).click()
+    await expect(page.getByText('Étape 2 sur 3')).toBeVisible()
+
+    // Go to step 3
+    await page.getByRole('button', { name: 'Suivant' }).click()
+    await expect(page.getByText('Étape 3 sur 3')).toBeVisible()
+
+    // Publish the reuse
+    await page.getByRole('button', { name: 'Publier la réutilisation' }).click()
+    await expect(page.getByRole('heading', { level: 1 })).toContainText(`Test suppression ${uniqueId}`)
+
+    // Go to edit page
+    await page.getByRole('link', { name: 'Modifier' }).click()
+    await expect(page.getByRole('button', { name: 'Supprimer' })).toBeVisible()
+
+    // Open delete modal
+    await page.getByRole('button', { name: 'Supprimer' }).click()
+    await expect(page.getByRole('dialog')).toBeVisible()
+
+    // Verify modal content
+    const dialog = page.getByRole('dialog')
+    await expect(dialog.getByRole('heading', { name: 'Êtes-vous sûr de vouloir supprimer cette réutilisation ?' })).toBeVisible()
+    await expect(dialog.getByText('Cette action ne peut pas être annulée.', { exact: true })).toBeVisible()
+
+    // Delete button should be enabled (no mail options when email is not available)
+    const deleteButton = dialog.getByRole('button', { name: 'Supprimer cette réutilisation' })
+    await expect(deleteButton).toBeEnabled()
+
+    // Confirm deletion
+    await deleteButton.click()
+
+    // Modal should close and reuse should be marked as deleted
+    await expect(page.getByRole('dialog')).not.toBeVisible()
+    await expect(page.getByText('Restaurer la réutilisation')).toBeVisible()
+  })
+})

From 50c67781de1298a881fa9078624eeb77ead35db4 Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Thu, 1 Jan 2026 12:57:59 +0100
Subject: [PATCH 03/11] fix always showing the modal for sysadmins

---
 components/Admin/AdminDeleteModal.vue      | 19 +++++++++------
 tests/admin/delete-with-legal-mail.spec.ts | 28 ++++++++++------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
index d1aee4c6..be1a7631 100644
--- a/components/Admin/AdminDeleteModal.vue
+++ b/components/Admin/AdminDeleteModal.vue
@@ -16,7 +16,7 @@
       <slot />
 
       <div
-        v-if="isMeAdmin() && recipientEmail"
+        v-if="isMeAdmin()"
         class="mt-6 pt-4 border-t border-default-grey"
       >
         <RadioButtons
@@ -27,7 +27,7 @@
       </div>
     </template>
 
-    <template v-else>
+    <template v-else-if="mailOption === 'custom' && recipientEmail">
       <div class="flex flex-col items-center gap-4 py-6">
         <div class="flex items-center gap-2 text-success-dark">
           <RiCheckLine class="size-6" />
@@ -60,7 +60,7 @@
           v-if="!deleted"
           color="danger"
           :loading
-          :disabled="isMeAdmin() && !!recipientEmail && !mailOption"
+          :disabled="isMeAdmin() && !mailOption"
           @click="() => handleDelete(closeModal)"
         >
           {{ deleteButtonLabel }}
@@ -110,10 +110,15 @@ const loading = ref(false)
 const deleted = ref(false)
 const mailOption = ref<MailOption | null>(null)
 
-const mailOptions = computed(() => [
-  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
-  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
-])
+const mailOptions = computed(() => {
+  const options = [
+    { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
+  ]
+  if (props.recipientEmail) {
+    options.push({ value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') })
+  }
+  return options
+})
 
 const mailtoLink = computed(() => {
   if (!props.recipientEmail) return ''
diff --git a/tests/admin/delete-with-legal-mail.spec.ts b/tests/admin/delete-with-legal-mail.spec.ts
index 10051a62..5b765c6f 100644
--- a/tests/admin/delete-with-legal-mail.spec.ts
+++ b/tests/admin/delete-with-legal-mail.spec.ts
@@ -4,17 +4,8 @@ import { clickOutside } from '../helpers'
 
 const __dirname = import.meta.dirname
 
-test.describe('Delete modal for reuse', () => {
-  // Note: Mail options (auto mail / custom mail) only appear when:
-  // 1. User is sysadmin (isMeAdmin() returns true)
-  // 2. Recipient email is available (owner.email or org admin emails)
-  //
-  // In the test environment, the API does not expose owner email in the response
-  // (UserReference type doesn't include email). Therefore, mail options won't appear.
-  // To test the full mail flow with options, the backend would need to include
-  // email for admin requests, or we'd need to fetch owner data separately.
-
-  test('opens delete modal and confirms deletion', async ({ page }) => {
+test.describe('Delete modal with legal mail option', () => {
+  test('shows mail option for admin and sends legal notice on delete', async ({ page }) => {
     const uniqueId = Date.now()
 
     // Create a reuse
@@ -74,13 +65,20 @@ test.describe('Delete modal for reuse', () => {
     await page.getByRole('button', { name: 'Supprimer' }).click()
     await expect(page.getByRole('dialog')).toBeVisible()
 
-    // Verify modal content
     const dialog = page.getByRole('dialog')
-    await expect(dialog.getByRole('heading', { name: 'Êtes-vous sûr de vouloir supprimer cette réutilisation ?' })).toBeVisible()
-    await expect(dialog.getByText('Cette action ne peut pas être annulée.', { exact: true })).toBeVisible()
 
-    // Delete button should be enabled (no mail options when email is not available)
+    // Verify mail options are shown for admin
+    await expect(dialog.getByText('Notification par email')).toBeVisible()
+    await expect(dialog.getByText('Envoyer un mail automatique (voies de recours)')).toBeVisible()
+
+    // Delete button should be disabled until an option is selected
     const deleteButton = dialog.getByRole('button', { name: 'Supprimer cette réutilisation' })
+    await expect(deleteButton).toBeDisabled()
+
+    // Select automatic mail option
+    await dialog.getByText('Envoyer un mail automatique (voies de recours)').click()
+
+    // Now delete button should be enabled
     await expect(deleteButton).toBeEnabled()
 
     // Confirm deletion

From 72ce2814a5c0450a0af234c9357926fad72f19c3 Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Thu, 1 Jan 2026 13:37:46 +0100
Subject: [PATCH 04/11] Fix existing tests

---
 components/Admin/AdminDeleteModal.vue | 20 +++++++-------------
 tests/dataservices/creation.spec.ts   |  1 +
 tests/reuses/creation.spec.ts         |  1 +
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
index be1a7631..5c18e604 100644
--- a/components/Admin/AdminDeleteModal.vue
+++ b/components/Admin/AdminDeleteModal.vue
@@ -27,7 +27,7 @@
       </div>
     </template>
 
-    <template v-else-if="mailOption === 'custom' && recipientEmail">
+    <template v-else-if="mailOption === 'custom'">
       <div class="flex flex-col items-center gap-4 py-6">
         <div class="flex items-center gap-2 text-success-dark">
           <RiCheckLine class="size-6" />
@@ -110,19 +110,13 @@ const loading = ref(false)
 const deleted = ref(false)
 const mailOption = ref<MailOption | null>(null)
 
-const mailOptions = computed(() => {
-  const options = [
-    { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
-  ]
-  if (props.recipientEmail) {
-    options.push({ value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') })
-  }
-  return options
-})
+const mailOptions = computed(() => [
+  { value: 'auto' as const, label: t('Envoyer un mail automatique (voies de recours)') },
+  { value: 'custom' as const, label: t('Envoyer un mail personnalisé') },
+])
 
 const mailtoLink = computed(() => {
-  if (!props.recipientEmail) return ''
-  return generateMailtoLink(props.recipientEmail, props.objectType, props.objectTitle)
+  return generateMailtoLink(props.recipientEmail || '', props.objectType, props.objectTitle)
 })
 
 const deleteButtonLabel = computed(() => props.deleteButtonLabel || t('Supprimer'))
@@ -144,7 +138,7 @@ async function handleDelete(closeModal: () => void) {
 
     await $api(url, { method: 'DELETE' })
 
-    if (isMeAdmin() && mailOption.value === 'custom' && props.recipientEmail) {
+    if (isMeAdmin() && mailOption.value === 'custom') {
       deleted.value = true
     }
     else {
diff --git a/tests/dataservices/creation.spec.ts b/tests/dataservices/creation.spec.ts
index c87bed27..44c71a18 100644
--- a/tests/dataservices/creation.spec.ts
+++ b/tests/dataservices/creation.spec.ts
@@ -38,5 +38,6 @@ test('can create a dataservice', async ({ page }) => {
   // Cleanup: delete the created dataservice
   await page.getByRole('link', { name: 'Modifier' }).click()
   await page.getByRole('button', { name: 'Supprimer' }).click()
+  await page.getByText('Envoyer un mail automatique (voies de recours)').click()
   await page.getByRole('button', { name: 'Supprimer l\'API' }).click()
 })
diff --git a/tests/reuses/creation.spec.ts b/tests/reuses/creation.spec.ts
index 3ad39acc..6903def6 100644
--- a/tests/reuses/creation.spec.ts
+++ b/tests/reuses/creation.spec.ts
@@ -54,5 +54,6 @@ test('can create a reuse', async ({ page }) => {
   // Cleanup: delete the created reuse
   await page.getByRole('link', { name: 'Modifier' }).click()
   await page.getByRole('button', { name: 'Supprimer' }).click()
+  await page.getByText('Envoyer un mail automatique (voies de recours)').click()
   await page.getByRole('button', { name: 'Supprimer cette réutilisation' }).click()
 })

From 4aac6f3a6ab42476b5fe7a214455e62f475a3e74 Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Mon, 5 Jan 2026 13:25:00 +0100
Subject: [PATCH 05/11] Fix not showing mailto modal because of refresh and
 fetch all members

---
 components/Admin/AdminDeleteModal.vue         | 27 +++++----
 .../AdminUpdateDataservicePage.vue            |  3 +-
 .../Datasets/AdminUpdateDatasetPage.vue       |  3 +-
 components/Discussions/DeleteCommentModal.vue |  2 +-
 components/Discussions/DeleteThreadModal.vue  |  2 +-
 components/Reuses/AdminUpdateReusePage.vue    |  3 +-
 components/User/DeleteUserModal.vue           |  2 +-
 composables/useDeleteMailto.ts                |  5 +-
 .../organizations/[oid]/profile/index.vue     |  3 +-
 pages/admin/site/moderation.vue               | 19 +-----
 utils/owner.ts                                | 58 ++++++++++++-------
 11 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
index 5c18e604..511a2352 100644
--- a/components/Admin/AdminDeleteModal.vue
+++ b/components/Admin/AdminDeleteModal.vue
@@ -16,7 +16,7 @@
       <slot />
 
       <div
-        v-if="isMeAdmin()"
+        v-if="isAdmin"
         class="mt-6 pt-4 border-t border-default-grey"
       >
         <RadioButtons
@@ -60,7 +60,7 @@
           v-if="!deleted"
           color="danger"
           :loading
-          :disabled="isMeAdmin() && !mailOption"
+          :disabled="isAdmin && !mailOption"
           @click="() => handleDelete(closeModal)"
         >
           {{ deleteButtonLabel }}
@@ -81,6 +81,7 @@ import { BrandedButton } from '@datagouv/components-next'
 import { RiCheckLine } from '@remixicon/vue'
 import { isMeAdmin } from '~/utils/auth'
 import { useDeleteMailto } from '~/composables/useDeleteMailto'
+import { getOwnerEmails, type OwnedObject } from '~/utils/owner'
 import RadioButtons from '~/components/RadioButtons.vue'
 
 type MailOption = 'auto' | 'custom'
@@ -90,11 +91,11 @@ const props = withDefaults(defineProps<{
   title: string
   deleteUrl: string
   deleteButtonLabel?: string
-  recipientEmail?: string | null
+  ownedObject?: OwnedObject | null
   objectType: ObjectType
   objectTitle?: string
 }>(), {
-  recipientEmail: null,
+  ownedObject: null,
 })
 
 const emit = defineEmits<{
@@ -105,10 +106,12 @@ const { t } = useTranslation()
 const { $api } = useNuxtApp()
 const { generateMailtoLink } = useDeleteMailto()
 
+const isAdmin = isMeAdmin()
 const isOpen = ref(false)
 const loading = ref(false)
 const deleted = ref(false)
 const mailOption = ref<MailOption | null>(null)
+const recipientEmails = ref<string[]>([])
 
 const mailOptions = computed(() => [
   { value: 'auto' as const, label: t('Envoyer un mail automatique (voies de recours)') },
@@ -116,15 +119,19 @@ const mailOptions = computed(() => [
 ])
 
 const mailtoLink = computed(() => {
-  return generateMailtoLink(props.recipientEmail || '', props.objectType, props.objectTitle)
+  return generateMailtoLink(recipientEmails.value, props.objectType, props.objectTitle)
 })
 
 const deleteButtonLabel = computed(() => props.deleteButtonLabel || t('Supprimer'))
 
-watch(isOpen, (newVal) => {
+watch(isOpen, async (newVal) => {
+  if (newVal && isAdmin && props.ownedObject) {
+    recipientEmails.value = await getOwnerEmails($api, props.ownedObject)
+  }
   if (!newVal) {
     deleted.value = false
     mailOption.value = null
+    recipientEmails.value = []
   }
 })
 
@@ -132,20 +139,19 @@ async function handleDelete(closeModal: () => void) {
   loading.value = true
   try {
     let url = props.deleteUrl
-    if (isMeAdmin() && mailOption.value === 'auto') {
+    if (isAdmin && mailOption.value === 'auto') {
       url += url.includes('?') ? '&send_legal_notice=true' : '?send_legal_notice=true'
     }
 
     await $api(url, { method: 'DELETE' })
 
-    if (isMeAdmin() && mailOption.value === 'custom') {
+    if (isAdmin && mailOption.value === 'custom') {
       deleted.value = true
     }
     else {
       closeModal()
+      emit('deleted')
     }
-
-    emit('deleted')
   }
   finally {
     loading.value = false
@@ -154,5 +160,6 @@ async function handleDelete(closeModal: () => void) {
 
 function handleClose(closeModal: () => void) {
   closeModal()
+  emit('deleted')
 }
 </script>
diff --git a/components/Dataservices/AdminUpdateDataservicePage.vue b/components/Dataservices/AdminUpdateDataservicePage.vue
index 8865bdb8..8f438246 100644
--- a/components/Dataservices/AdminUpdateDataservicePage.vue
+++ b/components/Dataservices/AdminUpdateDataservicePage.vue
@@ -105,7 +105,7 @@
               :title="$t('Êtes-vous sûr de vouloir supprimer cette API ?')"
               :delete-url="`/api/1/dataservices/${route.params.id}`"
               :delete-button-label="$t(`Supprimer l'API`)"
-              :recipient-email="getOwnerEmail(dataservice)"
+              :owned-object="dataservice"
               object-type="dataservice"
               :object-title="dataservice.title"
               @deleted="onDataserviceDeleted"
@@ -139,7 +139,6 @@ import { RiArchiveLine, RiArrowGoBackLine, RiDeleteBin6Line } from '@remixicon/v
 import DescribeDataservice from '~/components/Dataservices/DescribeDataservice.vue'
 import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import type { DataserviceForm } from '~/types/types'
-import { getOwnerEmail } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { $api } = useNuxtApp()
diff --git a/components/Datasets/AdminUpdateDatasetPage.vue b/components/Datasets/AdminUpdateDatasetPage.vue
index 77562182..28148779 100644
--- a/components/Datasets/AdminUpdateDatasetPage.vue
+++ b/components/Datasets/AdminUpdateDatasetPage.vue
@@ -99,7 +99,7 @@
               :title="$t('Êtes-vous sûr de vouloir supprimer ce jeu de données ?')"
               :delete-url="`/api/1/datasets/${route.params.id}`"
               :delete-button-label="$t('Supprimer le jeu de données')"
-              :recipient-email="getOwnerEmail(dataset)"
+              :owned-object="dataset"
               object-type="dataset"
               :object-title="dataset.title"
               @deleted="onDatasetDeleted"
@@ -132,7 +132,6 @@ import { RiArchiveLine, RiArrowGoBackLine, RiDeleteBin6Line } from '@remixicon/v
 import DescribeDataset from '~/components/Datasets/DescribeDataset.vue'
 import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import type { DatasetForm } from '~/types/types'
-import { getOwnerEmail } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { $api } = useNuxtApp()
diff --git a/components/Discussions/DeleteCommentModal.vue b/components/Discussions/DeleteCommentModal.vue
index f5f511ea..909b2bde 100644
--- a/components/Discussions/DeleteCommentModal.vue
+++ b/components/Discussions/DeleteCommentModal.vue
@@ -138,7 +138,7 @@ const mailOptions = computed(() => [
 
 const mailtoLink = computed(() => {
   if (!authorEmail.value) return ''
-  return generateMailtoLink(authorEmail.value, 'comment')
+  return generateMailtoLink([authorEmail.value], 'comment')
 })
 
 watch(isOpen, (newVal) => {
diff --git a/components/Discussions/DeleteThreadModal.vue b/components/Discussions/DeleteThreadModal.vue
index 004d99ba..80135281 100644
--- a/components/Discussions/DeleteThreadModal.vue
+++ b/components/Discussions/DeleteThreadModal.vue
@@ -141,7 +141,7 @@ const mailOptions = computed(() => [
 
 const mailtoLink = computed(() => {
   if (!authorEmail.value) return ''
-  return generateMailtoLink(authorEmail.value, 'discussion', props.thread.title)
+  return generateMailtoLink([authorEmail.value], 'discussion', props.thread.title)
 })
 
 watch(isOpen, (newVal) => {
diff --git a/components/Reuses/AdminUpdateReusePage.vue b/components/Reuses/AdminUpdateReusePage.vue
index d13bd3fa..07d09e89 100644
--- a/components/Reuses/AdminUpdateReusePage.vue
+++ b/components/Reuses/AdminUpdateReusePage.vue
@@ -106,7 +106,7 @@
               :title="$t('Êtes-vous sûr de vouloir supprimer cette réutilisation ?')"
               :delete-url="`/api/1/reuses/${route.params.id}`"
               :delete-button-label="$t('Supprimer cette réutilisation')"
-              :recipient-email="getOwnerEmail(reuse)"
+              :owned-object="reuse"
               object-type="reuse"
               :object-title="reuse.title"
               @deleted="onReuseDeleted"
@@ -140,7 +140,6 @@ import { RiArchiveLine, RiArrowGoBackLine, RiDeleteBin6Line } from '@remixicon/v
 import DescribeReuse from '~/components/Reuses/DescribeReuse.vue'
 import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import type { ReuseForm } from '~/types/types'
-import { getOwnerEmail } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { $api, $fileApi } = useNuxtApp()
diff --git a/components/User/DeleteUserModal.vue b/components/User/DeleteUserModal.vue
index 268b9d17..f0192a76 100644
--- a/components/User/DeleteUserModal.vue
+++ b/components/User/DeleteUserModal.vue
@@ -127,7 +127,7 @@ const mailOptions = computed(() => [
 
 const mailtoLink = computed(() => {
   if (!props.user.email) return ''
-  return generateMailtoLink(props.user.email, 'user', props.user.first_name + ' ' + props.user.last_name)
+  return generateMailtoLink([props.user.email], 'user', props.user.first_name + ' ' + props.user.last_name)
 })
 
 const logout = useLogout()
diff --git a/composables/useDeleteMailto.ts b/composables/useDeleteMailto.ts
index 7ca00cdc..183625d2 100644
--- a/composables/useDeleteMailto.ts
+++ b/composables/useDeleteMailto.ts
@@ -18,7 +18,7 @@ export function useDeleteMailto() {
   }
 
   const generateMailtoLink = (
-    recipientEmail: string,
+    recipientEmails: string[],
     objectType: ObjectType,
     objectTitle?: string,
   ): string => {
@@ -45,7 +45,8 @@ L'équipe {site}`, {
       site: siteName,
     })
 
-    return `mailto:${encodeURIComponent(recipientEmail)}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`
+    const recipients = recipientEmails.join(',')
+    return `mailto:${encodeURIComponent(recipients)}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`
   }
 
   return {
diff --git a/pages/admin/organizations/[oid]/profile/index.vue b/pages/admin/organizations/[oid]/profile/index.vue
index e416450d..a493aa75 100644
--- a/pages/admin/organizations/[oid]/profile/index.vue
+++ b/pages/admin/organizations/[oid]/profile/index.vue
@@ -51,7 +51,7 @@
               :title="t('Êtes-vous sûrs de vouloir supprimer cette organisation ?')"
               :delete-url="`/api/1/organizations/${organization.id}/`"
               :delete-button-label="t(`Supprimer l'organisation`)"
-              :recipient-email="getOrganizationAdminEmails(organization)"
+              :owned-object="organization"
               object-type="organization"
               :object-title="organization.name"
               @deleted="onOrganizationDeleted"
@@ -88,7 +88,6 @@ import type { Organization, Badge } from '@datagouv/components-next'
 import DescribeOrganizationFrom from '~/components/Organization/New/Step2DescribeOrganization.vue'
 import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import { updateOrganization, updateOrganizationBadges, uploadLogo } from '~/api/organizations'
-import { getOrganizationAdminEmails } from '~/utils/owner'
 
 const props = defineProps<{
   organization: Organization
diff --git a/pages/admin/site/moderation.vue b/pages/admin/site/moderation.vue
index aced03e7..f5fa361b 100644
--- a/pages/admin/site/moderation.vue
+++ b/pages/admin/site/moderation.vue
@@ -207,7 +207,7 @@
                     :title="$t('Êtes-vous sûr de vouloir supprimer cet objet ?')"
                     :delete-url="getDeleteUrl(report.subject)!"
                     :delete-button-label="$t('Supprimer')"
-                    :recipient-email="getSubjectOwnerEmail(subjects[report.id]?.value)"
+                    :owned-object="subjects[report.id]?.value"
                     :object-type="getObjectType(report.subject.class)"
                     :object-title="getSubjectTitle(subjects[report.id]?.value)"
                     @deleted="() => fetchFullSubject(report, report.subject!)"
@@ -269,7 +269,6 @@ import type { Thread } from '~/types/discussions'
 import DatasetBadge from '~/components/AdminBadge/DatasetBadge.vue'
 import DataserviceBadge from '~/components/AdminBadge/DataserviceBadge.vue'
 import ReuseBadge from '~/components/AdminBadge/ReuseBadge.vue'
-import { getOwnerEmail, getOrganizationAdminEmails } from '~/utils/owner'
 
 const { t } = useTranslation()
 const { formatDate } = useFormatDate()
@@ -402,22 +401,6 @@ const getObjectType = (subjectClass: string): ObjectType => {
   }[subjectClass] || 'dataset'
 }
 
-const getSubjectOwnerEmail = (subject: RecordSubjectFullObject['value']): string | null => {
-  if (!subject) return null
-
-  if ('organization' in subject && subject.organization) {
-    return getOrganizationAdminEmails(subject.organization as Organization)
-  }
-  if ('owner' in subject && subject.owner) {
-    return getOwnerEmail({ owner: subject.owner as { email?: string | null } })
-  }
-  if ('members' in subject) {
-    return getOrganizationAdminEmails(subject as Organization)
-  }
-
-  return null
-}
-
 const getSubjectTitle = (subject: RecordSubjectFullObject['value']): string | undefined => {
   if (!subject) return undefined
   if ('title' in subject) return subject.title
diff --git a/utils/owner.ts b/utils/owner.ts
index 3bd04347..fae90945 100644
--- a/utils/owner.ts
+++ b/utils/owner.ts
@@ -1,37 +1,51 @@
-import type { Organization, User } from '@datagouv/components-next'
+import { throwOnNever, type Dataservice, type DatasetV2, type DatasetV2WithFullObject, type Organization, type Reuse, type User } from '@datagouv/components-next'
+import type { $Fetch } from 'nitropack'
+import type { Thread } from '~/types/discussions'
 
-type OwnedObject = {
-  owner?: { email?: string | null } | null
-  organization?: { members?: Array<{ user: { email?: string | null }, role: string }> } | null
+export type OwnedObject = DatasetV2 | DatasetV2WithFullObject | Reuse | Dataservice | Organization | User | Thread
+
+type OrganizationWithMembers = Organization & {
+  members: Array<{ user: User & { email?: string }, role: string }>
 }
 
-export function getOwnerEmail(obj: OwnedObject | Record<string, unknown> | null | undefined): string | null {
-  if (!obj) return null
+export async function getOwnerEmails($api: $Fetch, obj: OwnedObject): Promise<string[]> {
+  // User (has email directly)
+  if ('first_name' in obj && 'last_name' in obj) {
+    return obj.email ? [obj.email] : []
+  }
+
+  // Organization (has members)
+  if ('members' in obj) {
+    return await getOrganizationAdminEmails($api, obj.id)
+  }
 
-  if ('owner' in obj && obj.owner && typeof obj.owner === 'object' && 'email' in obj.owner) {
-    return (obj.owner as { email?: string | null }).email || null
+  // Thread (no owner to notify)
+  if ('discussion' in obj) {
+    return []
   }
 
-  if ('organization' in obj && obj.organization && typeof obj.organization === 'object' && 'members' in obj.organization) {
-    const org = obj.organization as { members?: Array<{ user: { email?: string | null }, role: string }> }
-    const adminMember = org.members?.find(m => m.role === 'admin')
-    if (adminMember?.user?.email) {
-      return adminMember.user.email
+  // Owned objects (Dataset, Reuse, Dataservice)
+  if ('owner' in obj && 'organization' in obj) {
+    if (obj.owner) {
+      const user = await $api<User & { email?: string }>(`/api/1/users/${obj.owner.id}/`)
+      return user.email ? [user.email] : []
     }
+    if (obj.organization) {
+      return await getOrganizationAdminEmails($api, obj.organization.id)
+    }
+    return []
   }
 
-  return null
+  return throwOnNever(obj, `Unknown object type in getOwnerEmails`)
 }
 
-export function getOrganizationAdminEmails(org: Organization | null | undefined): string | null {
-  if (!org?.members) return null
-
-  const adminMember = org.members.find(m => m.role === 'admin')
-  if (adminMember?.user && 'email' in adminMember.user) {
-    return (adminMember.user as User & { email?: string }).email || null
-  }
+export async function getOrganizationAdminEmails($api: $Fetch, orgId: string): Promise<string[]> {
+  const org = await $api<OrganizationWithMembers>(`/api/1/organizations/${orgId}/`)
+  if (!org?.members) return []
 
-  return null
+  return org.members
+    .filter((m): m is typeof m & { user: { email: string } } => m.role === 'admin' && !!m.user?.email)
+    .map(m => m.user.email)
 }
 
 export function getUserEmail(user: User | null | undefined): string | null {

From 46ca00a9de4b3f871ff1691bb12a184fa81f318a Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Mon, 5 Jan 2026 13:58:54 +0100
Subject: [PATCH 06/11] improve tests and merge logic between multiple modals

---
 components/Admin/AdminDeleteModal.vue         |  10 +-
 components/Discussions/DeleteCommentModal.vue | 164 ++---------------
 components/Discussions/DeleteThreadModal.vue  | 174 +++---------------
 components/User/DeleteUserModal.vue           |   9 +-
 tests/admin/delete-with-legal-mail.spec.ts    | 173 ++++++++---------
 utils/owner.ts                                |  17 +-
 6 files changed, 151 insertions(+), 396 deletions(-)

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
index 511a2352..7a391d3a 100644
--- a/components/Admin/AdminDeleteModal.vue
+++ b/components/Admin/AdminDeleteModal.vue
@@ -16,7 +16,7 @@
       <slot />
 
       <div
-        v-if="isAdmin"
+        v-if="showMailOptions"
         class="mt-6 pt-4 border-t border-default-grey"
       >
         <RadioButtons
@@ -60,7 +60,7 @@
           v-if="!deleted"
           color="danger"
           :loading
-          :disabled="isAdmin && !mailOption"
+          :disabled="showMailOptions && !mailOption"
           @click="() => handleDelete(closeModal)"
         >
           {{ deleteButtonLabel }}
@@ -113,6 +113,8 @@ const deleted = ref(false)
 const mailOption = ref<MailOption | null>(null)
 const recipientEmails = ref<string[]>([])
 
+const showMailOptions = computed(() => isAdmin && recipientEmails.value.length > 0)
+
 const mailOptions = computed(() => [
   { value: 'auto' as const, label: t('Envoyer un mail automatique (voies de recours)') },
   { value: 'custom' as const, label: t('Envoyer un mail personnalisé') },
@@ -139,13 +141,13 @@ async function handleDelete(closeModal: () => void) {
   loading.value = true
   try {
     let url = props.deleteUrl
-    if (isAdmin && mailOption.value === 'auto') {
+    if (showMailOptions.value && mailOption.value === 'auto') {
       url += url.includes('?') ? '&send_legal_notice=true' : '?send_legal_notice=true'
     }
 
     await $api(url, { method: 'DELETE' })
 
-    if (isAdmin && mailOption.value === 'custom') {
+    if (showMailOptions.value && mailOption.value === 'custom') {
       deleted.value = true
     }
     else {
diff --git a/components/Discussions/DeleteCommentModal.vue b/components/Discussions/DeleteCommentModal.vue
index 909b2bde..4e0c4bda 100644
--- a/components/Discussions/DeleteCommentModal.vue
+++ b/components/Discussions/DeleteCommentModal.vue
@@ -1,8 +1,11 @@
 <template>
-  <ModalWithButton
-    v-model="isOpen"
+  <AdminDeleteModal
     :title="t('Êtes-vous sûrs de vouloir supprimer ce message ?')"
-    size="lg"
+    :delete-url="`/api/1/discussions/${thread.id}/comments/${index}/`"
+    :delete-button-label="t('Supprimer le commentaire')"
+    :owned-object="comment"
+    object-type="comment"
+    @deleted="emit('deleted')"
   >
     <template #button="{ attrs, listeners }">
       <BrandedButton
@@ -12,167 +15,38 @@
         icon-only
         :title="$t('Supprimer')"
         v-bind="attrs"
-        :loading
         v-on="listeners"
       />
     </template>
 
-    <template #default>
-      <template v-if="!deleted">
-        <CommentBlock
-          :thread
-          :comment
-          :subject
-        />
-        <div class="mt-4 font-bold">
-          {{ $t('Cette action est irréversible.') }}
-        </div>
-
-        <div
-          v-if="showMailOptions"
-          class="mt-6 pt-4 border-t border-default-grey"
-        >
-          <RadioButtons
-            v-model="mailOption"
-            :label="$t('Notification par email')"
-            :options="mailOptions"
-          />
-        </div>
-      </template>
-
-      <template v-else>
-        <div class="flex flex-col items-center gap-4 py-6">
-          <div class="flex items-center gap-2 text-success-dark">
-            <RiCheckLine class="size-6" />
-            <span class="font-bold">{{ $t('Suppression effectuée') }}</span>
-          </div>
-          <p class="text-center text-mention-grey">
-            {{ $t("Vous pouvez maintenant envoyer un mail personnalisé à l'auteur.") }}
-          </p>
-          <a
-            :href="mailtoLink"
-            class="fr-btn fr-btn--secondary"
-            target="_blank"
-          >
-            {{ $t('Envoyer le mail personnalisé') }}
-          </a>
-        </div>
-      </template>
-    </template>
-
-    <template #footer="{ close }">
-      <div class="w-full flex justify-end space-x-4">
-        <template v-if="!deleted">
-          <BrandedButton
-            color="secondary"
-            size="xs"
-            :loading
-            @click="close"
-          >
-            {{ t("Annuler") }}
-          </BrandedButton>
-          <BrandedButton
-            color="danger"
-            size="xs"
-            :loading
-            :disabled="!!showMailOptions && !mailOption"
-            @click="() => deleteMessage(close)"
-          >
-            {{ t("Supprimer le commentaire") }}
-          </BrandedButton>
-        </template>
-        <BrandedButton
-          v-else
-          @click="handleClose(close)"
-        >
-          {{ $t('Fermer') }}
-        </BrandedButton>
-      </div>
-    </template>
-  </ModalWithButton>
+    <CommentBlock
+      :thread
+      :comment
+      :subject
+    />
+    <div class="mt-4 font-bold">
+      {{ $t('Cette action est irréversible.') }}
+    </div>
+  </AdminDeleteModal>
 </template>
 
 <script setup lang="ts">
-import { RiCheckLine, RiDeleteBin6Line } from '@remixicon/vue'
+import { RiDeleteBin6Line } from '@remixicon/vue'
 import { BrandedButton } from '@datagouv/components-next'
+import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import CommentBlock from './CommentBlock.vue'
-import RadioButtons from '~/components/RadioButtons.vue'
 import type { Comment, DiscussionSubjectTypes, Thread } from '~/types/discussions'
-import { isMeAdmin } from '~/utils/auth'
-import { useDeleteMailto } from '~/composables/useDeleteMailto'
 
-type MailOption = 'auto' | 'custom'
-
-const props = defineProps<{
+defineProps<{
   subject: DiscussionSubjectTypes
   thread: Thread
   comment: Comment
   index: number
 }>()
+
 const emit = defineEmits<{
   deleted: []
 }>()
 
 const { t } = useTranslation()
-const { $api } = useNuxtApp()
-const { generateMailtoLink } = useDeleteMailto()
-
-const isOpen = ref(false)
-const loading = ref(false)
-const deleted = ref(false)
-const mailOption = ref<MailOption | null>(null)
-
-const authorEmail = computed(() => {
-  const user = props.comment.posted_by
-  return user && 'email' in user ? (user as { email?: string }).email : null
-})
-
-const showMailOptions = computed(() => {
-  return isMeAdmin() && authorEmail.value
-})
-
-const mailOptions = computed(() => [
-  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
-  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
-])
-
-const mailtoLink = computed(() => {
-  if (!authorEmail.value) return ''
-  return generateMailtoLink([authorEmail.value], 'comment')
-})
-
-watch(isOpen, (newVal) => {
-  if (!newVal) {
-    deleted.value = false
-    mailOption.value = null
-  }
-})
-
-const deleteMessage = async (close: () => void) => {
-  loading.value = true
-
-  try {
-    let url = `/api/1/discussions/${props.thread.id}/comments/${props.index}/`
-    if (isMeAdmin() && mailOption.value === 'auto') {
-      url += '?send_legal_notice=true'
-    }
-
-    await $api(url, { method: 'DELETE' })
-
-    if (isMeAdmin() && mailOption.value === 'custom' && authorEmail.value) {
-      deleted.value = true
-    }
-    else {
-      close()
-    }
-    emit('deleted')
-  }
-  finally {
-    loading.value = false
-  }
-}
-
-function handleClose(close: () => void) {
-  close()
-}
 </script>
diff --git a/components/Discussions/DeleteThreadModal.vue b/components/Discussions/DeleteThreadModal.vue
index 80135281..0f3378bc 100644
--- a/components/Discussions/DeleteThreadModal.vue
+++ b/components/Discussions/DeleteThreadModal.vue
@@ -1,8 +1,12 @@
 <template>
-  <ModalWithButton
-    v-model="isOpen"
+  <AdminDeleteModal
     :title="t('Êtes-vous sûr de vouloir supprimer cette discussion ?')"
-    size="lg"
+    :delete-url="`/api/1/discussions/${thread.id}/`"
+    :delete-button-label="t('Supprimer la discussion et les commentaires')"
+    :owned-object="thread"
+    object-type="discussion"
+    :object-title="thread.title"
+    @deleted="emit('deleted')"
   >
     <template #button="{ attrs, listeners }">
       <BrandedButton
@@ -12,170 +16,40 @@
         icon-only
         :title="$t('Supprimer')"
         v-bind="attrs"
-        :loading
         v-on="listeners"
       />
     </template>
 
-    <template #default>
-      <template v-if="!deleted">
-        <ThreadHeader
-          :subject
-          :thread
-        />
-        <ReadMore
-          class="prose whitespace-pre-line max-w-none text-sm"
-        >
-          {{ thread.discussion[0].content }}
-        </ReadMore>
-        <div class="mt-4 font-bold">
-          {{ $t('Cette action est irréversible. Tous les commentaires de cette discussion seront aussi supprimés.') }}
-        </div>
-
-        <div
-          v-if="showMailOptions"
-          class="mt-6 pt-4 border-t border-default-grey"
-        >
-          <RadioButtons
-            v-model="mailOption"
-            :label="$t('Notification par email')"
-            :options="mailOptions"
-          />
-        </div>
-      </template>
-
-      <template v-else>
-        <div class="flex flex-col items-center gap-4 py-6">
-          <div class="flex items-center gap-2 text-success-dark">
-            <RiCheckLine class="size-6" />
-            <span class="font-bold">{{ $t('Suppression effectuée') }}</span>
-          </div>
-          <p class="text-center text-mention-grey">
-            {{ $t("Vous pouvez maintenant envoyer un mail personnalisé à l'auteur.") }}
-          </p>
-          <a
-            :href="mailtoLink"
-            class="fr-btn fr-btn--secondary"
-            target="_blank"
-          >
-            {{ $t('Envoyer le mail personnalisé') }}
-          </a>
-        </div>
-      </template>
-    </template>
-
-    <template #footer="{ close }">
-      <div class="w-full flex justify-end space-x-4">
-        <template v-if="!deleted">
-          <BrandedButton
-            color="secondary"
-            size="xs"
-            :loading
-            @click="close"
-          >
-            {{ t("Annuler") }}
-          </BrandedButton>
-          <BrandedButton
-            color="danger"
-            size="xs"
-            :loading
-            :disabled="!!showMailOptions && !mailOption"
-            @click="() => deleteThread(close)"
-          >
-            {{ t("Supprimer la discussion et les commentaires") }}
-          </BrandedButton>
-        </template>
-        <BrandedButton
-          v-else
-          @click="handleClose(close)"
-        >
-          {{ $t('Fermer') }}
-        </BrandedButton>
-      </div>
-    </template>
-  </ModalWithButton>
+    <ThreadHeader
+      :subject
+      :thread
+    />
+    <ReadMore
+      class="prose whitespace-pre-line max-w-none text-sm"
+    >
+      {{ thread.discussion[0].content }}
+    </ReadMore>
+    <div class="mt-4 font-bold">
+      {{ $t('Cette action est irréversible. Tous les commentaires de cette discussion seront aussi supprimés.') }}
+    </div>
+  </AdminDeleteModal>
 </template>
 
 <script setup lang="ts">
-import { RiCheckLine, RiDeleteBin6Line } from '@remixicon/vue'
+import { RiDeleteBin6Line } from '@remixicon/vue'
 import { BrandedButton, ReadMore } from '@datagouv/components-next'
+import AdminDeleteModal from '~/components/Admin/AdminDeleteModal.vue'
 import ThreadHeader from './ThreadHeader.vue'
-import RadioButtons from '~/components/RadioButtons.vue'
 import type { DiscussionSubjectTypes, Thread } from '~/types/discussions'
-import { isMeAdmin } from '~/utils/auth'
-import { useDeleteMailto } from '~/composables/useDeleteMailto'
 
-type MailOption = 'auto' | 'custom'
-
-const props = defineProps<{
+defineProps<{
   subject: DiscussionSubjectTypes
   thread: Thread
 }>()
+
 const emit = defineEmits<{
   deleted: []
 }>()
 
 const { t } = useTranslation()
-const { $api } = useNuxtApp()
-const { generateMailtoLink } = useDeleteMailto()
-
-const isOpen = ref(false)
-const loading = ref(false)
-const deleted = ref(false)
-const mailOption = ref<MailOption | null>(null)
-
-const authorEmail = computed(() => {
-  const firstComment = props.thread.discussion[0]
-  const user = firstComment?.posted_by
-  return user && 'email' in user ? (user as { email?: string }).email : null
-})
-
-const showMailOptions = computed(() => {
-  return isMeAdmin() && authorEmail.value
-})
-
-const mailOptions = computed(() => [
-  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
-  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
-])
-
-const mailtoLink = computed(() => {
-  if (!authorEmail.value) return ''
-  return generateMailtoLink([authorEmail.value], 'discussion', props.thread.title)
-})
-
-watch(isOpen, (newVal) => {
-  if (!newVal) {
-    deleted.value = false
-    mailOption.value = null
-  }
-})
-
-const deleteThread = async (close: () => void) => {
-  loading.value = true
-
-  try {
-    let url = `/api/1/discussions/${props.thread.id}/`
-    if (isMeAdmin() && mailOption.value === 'auto') {
-      url += '?send_legal_notice=true'
-    }
-
-    await $api(url, { method: 'DELETE' })
-
-    if (isMeAdmin() && mailOption.value === 'custom' && authorEmail.value) {
-      deleted.value = true
-    }
-    else {
-      close()
-    }
-    emit('deleted')
-  }
-  finally {
-    loading.value = false
-  }
-}
-
-function handleClose(close: () => void) {
-  close()
-}
 </script>
diff --git a/components/User/DeleteUserModal.vue b/components/User/DeleteUserModal.vue
index f0192a76..a54b547e 100644
--- a/components/User/DeleteUserModal.vue
+++ b/components/User/DeleteUserModal.vue
@@ -57,7 +57,7 @@
     <template #footer>
       <div class="w-full flex justify-end space-x-4">
         <template v-if="!deleted">
-          <div v-if="isMeAdmin() && user.id !== me.id">
+          <div v-if="isAdmin && user.id !== me.id">
             <BrandedButton
               color="warning"
               :disabled="loading || (!!showMailOptions && !mailOption)"
@@ -111,13 +111,14 @@ const config = useRuntimeConfig()
 const { t } = useTranslation()
 const { generateMailtoLink } = useDeleteMailto()
 
+const isAdmin = isMeAdmin()
 const isOpen = ref(false)
 const loading = ref(false)
 const deleted = ref(false)
 const mailOption = ref<MailOption | null>(null)
 
 const showMailOptions = computed(() => {
-  return isMeAdmin() && props.user.id !== me.value.id && props.user.email
+  return isAdmin && props.user.id !== me.value.id && props.user.email
 })
 
 const mailOptions = computed(() => [
@@ -149,7 +150,7 @@ async function deleteUser({ spam = false }) {
       params.set('no_mail', 'true')
       params.set('delete_comments', 'true')
     }
-    if (isMeAdmin() && mailOption.value === 'auto' && !spam) {
+    if (isAdmin && mailOption.value === 'auto' && !spam) {
       params.set('send_legal_notice', 'true')
     }
 
@@ -170,7 +171,7 @@ async function deleteUser({ spam = false }) {
         await navigateTo(`${config.public.apiBase}/logout`, { external: true })
       }
     }
-    else if (isMeAdmin() && mailOption.value === 'custom' && props.user.email) {
+    else if (isAdmin && mailOption.value === 'custom' && props.user.email) {
       deleted.value = true
     }
     else {
diff --git a/tests/admin/delete-with-legal-mail.spec.ts b/tests/admin/delete-with-legal-mail.spec.ts
index 5b765c6f..fc449501 100644
--- a/tests/admin/delete-with-legal-mail.spec.ts
+++ b/tests/admin/delete-with-legal-mail.spec.ts
@@ -1,91 +1,94 @@
 import { test, expect } from '@playwright/test'
-import * as path from 'path'
-import { clickOutside } from '../helpers'
 
-const __dirname = import.meta.dirname
+const API_BASE = process.env.NUXT_PUBLIC_API_BASE || 'http://dev.local:7000'
 
 test.describe('Delete modal with legal mail option', () => {
-  test('shows mail option for admin and sends legal notice on delete', async ({ page }) => {
-    const uniqueId = Date.now()
-
-    // Create a reuse
-    await page.goto('/')
-    await page.getByRole('button', { name: 'Publier sur data.gouv.fr' }).click()
-    await page.getByRole('link', { name: 'Une réutilisation' }).click()
-    await page.waitForURL('**/admin/reuses/new**')
-
-    // Select producer
-    await page.getByTestId('producer-select').click()
-    await page.getByRole('option', { name: 'Admin User' }).click()
-
-    // Fill the form
-    await page.getByRole('textbox', { name: 'Nom de la réutilisation' }).fill(`Test suppression ${uniqueId}`)
-    await page.getByRole('textbox', { name: 'Lien' }).fill(`https://example.com/test-delete-${uniqueId}`)
-
-    // Select type
-    await page.getByTestId('searchable-select-type').click()
-    await page.getByRole('option', { name: 'Application' }).click()
-    await clickOutside(page)
-
-    // Select thématique
-    await page.getByTestId('searchable-select-thmatique').click()
-    await page.getByRole('option', { name: 'Culture et loisirs' }).click()
-    await clickOutside(page)
-
-    // Fill description
-    await page.getByTestId('markdown-editor').click()
-    await page.getByTestId('markdown-editor').fill('Une description de ma réutilisation qui utilise des données ouvertes. Cette réutilisation permet de visualiser et d\'analyser des données publiques de manière innovante et accessible à tous les citoyens.')
-    await page.getByTestId('markdown-editor').press('Tab')
-
-    // Upload image
-    const fileChooserPromise = page.waitForEvent('filechooser')
-    await page.getByRole('button', { name: 'Parcourir' }).click()
-    const fileChooser = await fileChooserPromise
-    await fileChooser.setFiles(path.join(__dirname, '../../public/nuxt_images/onboarding/logo-ign.png'))
-    await clickOutside(page)
-    await page.waitForTimeout(500)
-
-    // Go to step 2
-    await page.getByRole('button', { name: 'Suivant' }).click()
-    await expect(page.getByText('Étape 2 sur 3')).toBeVisible()
-
-    // Go to step 3
-    await page.getByRole('button', { name: 'Suivant' }).click()
-    await expect(page.getByText('Étape 3 sur 3')).toBeVisible()
-
-    // Publish the reuse
-    await page.getByRole('button', { name: 'Publier la réutilisation' }).click()
-    await expect(page.getByRole('heading', { level: 1 })).toContainText(`Test suppression ${uniqueId}`)
-
-    // Go to edit page
-    await page.getByRole('link', { name: 'Modifier' }).click()
-    await expect(page.getByRole('button', { name: 'Supprimer' })).toBeVisible()
-
-    // Open delete modal
-    await page.getByRole('button', { name: 'Supprimer' }).click()
-    await expect(page.getByRole('dialog')).toBeVisible()
-
-    const dialog = page.getByRole('dialog')
-
-    // Verify mail options are shown for admin
-    await expect(dialog.getByText('Notification par email')).toBeVisible()
-    await expect(dialog.getByText('Envoyer un mail automatique (voies de recours)')).toBeVisible()
-
-    // Delete button should be disabled until an option is selected
-    const deleteButton = dialog.getByRole('button', { name: 'Supprimer cette réutilisation' })
-    await expect(deleteButton).toBeDisabled()
-
-    // Select automatic mail option
-    await dialog.getByText('Envoyer un mail automatique (voies de recours)').click()
-
-    // Now delete button should be enabled
-    await expect(deleteButton).toBeEnabled()
-
-    // Confirm deletion
-    await deleteButton.click()
-
-    // Modal should close and reuse should be marked as deleted
-    await expect(page.getByRole('dialog')).not.toBeVisible()
-    await expect(page.getByText('Restaurer la réutilisation')).toBeVisible()
+  test.describe('Dataset deletion', () => {
+    test('shows mail options and sends automatic legal notice', async ({ page }) => {
+      const uniqueId = Date.now()
+
+      // Create dataset via API
+      const response = await page.request.post(`${API_BASE}/api/1/datasets/`, {
+        data: {
+          title: `Test delete auto mail ${uniqueId}`,
+          description: 'Description pour test de suppression',
+          frequency: 'unknown',
+        },
+      })
+      const dataset = await response.json()
+
+      // Go to admin page
+      await page.goto(`/admin/datasets/${dataset.id}/`)
+      await expect(page.getByRole('button', { name: 'Supprimer' })).toBeVisible()
+
+      // Open delete modal
+      await page.getByRole('button', { name: 'Supprimer' }).click()
+      await expect(page.getByRole('dialog')).toBeVisible()
+
+      const dialog = page.getByRole('dialog')
+
+      // Verify mail options are shown for admin
+      await expect(dialog.getByText('Notification par email')).toBeVisible()
+      await expect(dialog.getByText('Envoyer un mail automatique (voies de recours)')).toBeVisible()
+      await expect(dialog.getByText('Envoyer un mail personnalisé')).toBeVisible()
+
+      // Delete button should be disabled until an option is selected
+      const deleteButton = dialog.getByRole('button', { name: 'Supprimer le jeu de données' })
+      await expect(deleteButton).toBeDisabled()
+
+      // Select automatic mail option
+      await dialog.getByText('Envoyer un mail automatique (voies de recours)').click()
+      await expect(deleteButton).toBeEnabled()
+
+      // Confirm deletion
+      await deleteButton.click()
+
+      // Modal should close and dataset should be marked as deleted
+      await expect(page.getByRole('dialog')).not.toBeVisible()
+      await expect(page.getByText('Restaurer ce jeu de données')).toBeVisible()
+    })
+
+    test('shows mailto link when custom mail option is selected', async ({ page }) => {
+      const uniqueId = Date.now()
+
+      // Create dataset via API
+      const response = await page.request.post(`${API_BASE}/api/1/datasets/`, {
+        data: {
+          title: `Test delete custom mail ${uniqueId}`,
+          description: 'Description pour test de suppression',
+          frequency: 'unknown',
+        },
+      })
+      const dataset = await response.json()
+
+      // Go to admin page
+      await page.goto(`/admin/datasets/${dataset.id}/`)
+      await expect(page.getByRole('button', { name: 'Supprimer' })).toBeVisible()
+
+      // Open delete modal
+      await page.getByRole('button', { name: 'Supprimer' }).click()
+      await expect(page.getByRole('dialog')).toBeVisible()
+
+      const dialog = page.getByRole('dialog')
+
+      // Select custom mail option
+      await dialog.getByText('Envoyer un mail personnalisé').click()
+
+      // Confirm deletion
+      await dialog.getByRole('button', { name: 'Supprimer le jeu de données' }).click()
+
+      // Modal should stay open with mailto link
+      await expect(dialog.getByText('Suppression effectuée')).toBeVisible()
+      await expect(dialog.getByText('Vous pouvez maintenant envoyer un mail personnalisé au propriétaire.')).toBeVisible()
+      await expect(dialog.getByRole('link', { name: 'Envoyer le mail personnalisé' })).toBeVisible()
+
+      // Verify mailto link format
+      const mailtoLink = dialog.getByRole('link', { name: 'Envoyer le mail personnalisé' })
+      await expect(mailtoLink).toHaveAttribute('href', /^mailto:/)
+
+      // Close the modal (use the footer button, not the X button)
+      await dialog.getByRole('button', { name: 'Fermer', exact: true }).last().click()
+      await expect(page.getByRole('dialog')).not.toBeVisible()
+    })
   })
 })
diff --git a/utils/owner.ts b/utils/owner.ts
index fae90945..4ced2d79 100644
--- a/utils/owner.ts
+++ b/utils/owner.ts
@@ -1,11 +1,11 @@
 import { throwOnNever, type Dataservice, type DatasetV2, type DatasetV2WithFullObject, type Organization, type Reuse, type User } from '@datagouv/components-next'
 import type { $Fetch } from 'nitropack'
-import type { Thread } from '~/types/discussions'
+import type { Comment, Thread } from '~/types/discussions'
 
-export type OwnedObject = DatasetV2 | DatasetV2WithFullObject | Reuse | Dataservice | Organization | User | Thread
+export type OwnedObject = DatasetV2 | DatasetV2WithFullObject | Reuse | Dataservice | Organization | User | Thread | Comment
 
 type OrganizationWithMembers = Organization & {
-  members: Array<{ user: User & { email?: string }, role: string }>
+  members: Array<{ user: User, role: string }>
 }
 
 export async function getOwnerEmails($api: $Fetch, obj: OwnedObject): Promise<string[]> {
@@ -19,15 +19,16 @@ export async function getOwnerEmails($api: $Fetch, obj: OwnedObject): Promise<st
     return await getOrganizationAdminEmails($api, obj.id)
   }
 
-  // Thread (no owner to notify)
-  if ('discussion' in obj) {
-    return []
+  // Thread or Comment (author is posted_by)
+  if ('discussion' in obj || 'posted_by' in obj) {
+    const author = 'discussion' in obj ? obj.discussion[0]?.posted_by : obj.posted_by
+    return author?.email ? [author.email] : []
   }
 
   // Owned objects (Dataset, Reuse, Dataservice)
   if ('owner' in obj && 'organization' in obj) {
     if (obj.owner) {
-      const user = await $api<User & { email?: string }>(`/api/1/users/${obj.owner.id}/`)
+      const user = await $api<User>(`/api/1/users/${obj.owner.id}/`)
       return user.email ? [user.email] : []
     }
     if (obj.organization) {
@@ -50,5 +51,5 @@ export async function getOrganizationAdminEmails($api: $Fetch, orgId: string): P
 
 export function getUserEmail(user: User | null | undefined): string | null {
   if (!user) return null
-  return 'email' in user ? (user as User & { email?: string }).email || null : null
+  return user.email || null
 }

From f60f750a55f1d4239f24a5e48b06a9f17c1cf1db Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Mon, 5 Jan 2026 14:13:19 +0100
Subject: [PATCH 07/11] More simplication and remove duplicate/dead code

---
 components/Admin/AdminDeleteModal.vue | 11 ++---------
 components/User/DeleteUserModal.vue   | 10 ++--------
 composables/useDeleteMailto.ts        |  9 +++++++--
 pages/admin/site/moderation.vue       |  3 +--
 types/delete.ts                       |  2 ++
 utils/owner.ts                        |  5 -----
 6 files changed, 14 insertions(+), 26 deletions(-)
 create mode 100644 types/delete.ts

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
index 7a391d3a..1fe0a1cd 100644
--- a/components/Admin/AdminDeleteModal.vue
+++ b/components/Admin/AdminDeleteModal.vue
@@ -83,9 +83,7 @@ import { isMeAdmin } from '~/utils/auth'
 import { useDeleteMailto } from '~/composables/useDeleteMailto'
 import { getOwnerEmails, type OwnedObject } from '~/utils/owner'
 import RadioButtons from '~/components/RadioButtons.vue'
-
-type MailOption = 'auto' | 'custom'
-type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
+import type { ObjectType, MailOption } from '~/types/delete'
 
 const props = withDefaults(defineProps<{
   title: string
@@ -104,7 +102,7 @@ const emit = defineEmits<{
 
 const { t } = useTranslation()
 const { $api } = useNuxtApp()
-const { generateMailtoLink } = useDeleteMailto()
+const { generateMailtoLink, mailOptions } = useDeleteMailto()
 
 const isAdmin = isMeAdmin()
 const isOpen = ref(false)
@@ -115,11 +113,6 @@ const recipientEmails = ref<string[]>([])
 
 const showMailOptions = computed(() => isAdmin && recipientEmails.value.length > 0)
 
-const mailOptions = computed(() => [
-  { value: 'auto' as const, label: t('Envoyer un mail automatique (voies de recours)') },
-  { value: 'custom' as const, label: t('Envoyer un mail personnalisé') },
-])
-
 const mailtoLink = computed(() => {
   return generateMailtoLink(recipientEmails.value, props.objectType, props.objectTitle)
 })
diff --git a/components/User/DeleteUserModal.vue b/components/User/DeleteUserModal.vue
index a54b547e..44d9c2fd 100644
--- a/components/User/DeleteUserModal.vue
+++ b/components/User/DeleteUserModal.vue
@@ -98,8 +98,7 @@ import { BrandedButton, type User, toast } from '@datagouv/components-next'
 import { isMeAdmin, useLogout } from '~/utils/auth'
 import { useDeleteMailto } from '~/composables/useDeleteMailto'
 import RadioButtons from '~/components/RadioButtons.vue'
-
-type MailOption = 'auto' | 'custom'
+import type { MailOption } from '~/types/delete'
 
 const props = defineProps<{
   user: User & { email?: string }
@@ -109,7 +108,7 @@ const me = useMe()
 const { $api } = useNuxtApp()
 const config = useRuntimeConfig()
 const { t } = useTranslation()
-const { generateMailtoLink } = useDeleteMailto()
+const { generateMailtoLink, mailOptions } = useDeleteMailto()
 
 const isAdmin = isMeAdmin()
 const isOpen = ref(false)
@@ -121,11 +120,6 @@ const showMailOptions = computed(() => {
   return isAdmin && props.user.id !== me.value.id && props.user.email
 })
 
-const mailOptions = computed(() => [
-  { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
-  { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
-])
-
 const mailtoLink = computed(() => {
   if (!props.user.email) return ''
   return generateMailtoLink([props.user.email], 'user', props.user.first_name + ' ' + props.user.last_name)
diff --git a/composables/useDeleteMailto.ts b/composables/useDeleteMailto.ts
index 183625d2..00f0bda5 100644
--- a/composables/useDeleteMailto.ts
+++ b/composables/useDeleteMailto.ts
@@ -1,4 +1,4 @@
-type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
+import type { ObjectType, MailOption } from '~/types/delete'
 
 export function useDeleteMailto() {
   const { t } = useTranslation()
@@ -17,6 +17,11 @@ export function useDeleteMailto() {
     return labels[type]
   }
 
+  const mailOptions = computed(() => [
+    { value: 'auto' as MailOption, label: t('Envoyer un mail automatique (voies de recours)') },
+    { value: 'custom' as MailOption, label: t('Envoyer un mail personnalisé') },
+  ])
+
   const generateMailtoLink = (
     recipientEmails: string[],
     objectType: ObjectType,
@@ -51,6 +56,6 @@ L'équipe {site}`, {
 
   return {
     generateMailtoLink,
-    getObjectTypeLabel,
+    mailOptions,
   }
 }
diff --git a/pages/admin/site/moderation.vue b/pages/admin/site/moderation.vue
index f5fa361b..85367b49 100644
--- a/pages/admin/site/moderation.vue
+++ b/pages/admin/site/moderation.vue
@@ -260,6 +260,7 @@ import { AvatarWithName, LoadingBlock, Pagination, useFormatDate, BrandedButton
 import { computed, ref } from 'vue'
 import { RiCheckLine, RiDeleteBinLine, RiEyeOffLine } from '@remixicon/vue'
 import type { PaginatedArray } from '~/types/types'
+import type { ObjectType } from '~/types/delete'
 import AdminBreadcrumb from '~/components/Breadcrumbs/AdminBreadcrumb.vue'
 import BreadcrumbItem from '~/components/Breadcrumbs/BreadcrumbItem.vue'
 import AdminTable from '~/components/AdminTable/Table/AdminTable.vue'
@@ -389,8 +390,6 @@ const isSubjectDeleted = (subject: RecordSubjectFullObject['value']) => {
   return false
 }
 
-type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
-
 const getObjectType = (subjectClass: string): ObjectType => {
   return {
     Dataset: 'dataset' as ObjectType,
diff --git a/types/delete.ts b/types/delete.ts
new file mode 100644
index 00000000..afa6274c
--- /dev/null
+++ b/types/delete.ts
@@ -0,0 +1,2 @@
+export type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
+export type MailOption = 'auto' | 'custom'
diff --git a/utils/owner.ts b/utils/owner.ts
index 4ced2d79..19932429 100644
--- a/utils/owner.ts
+++ b/utils/owner.ts
@@ -48,8 +48,3 @@ export async function getOrganizationAdminEmails($api: $Fetch, orgId: string): P
     .filter((m): m is typeof m & { user: { email: string } } => m.role === 'admin' && !!m.user?.email)
     .map(m => m.user.email)
 }
-
-export function getUserEmail(user: User | null | undefined): string | null {
-  if (!user) return null
-  return user.email || null
-}

From e6aa293cf558716fdd9c2a9d30e6735518696814 Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Mon, 5 Jan 2026 14:15:01 +0100
Subject: [PATCH 08/11] Rename OwnedObject to DeletableObject

---
 components/Admin/AdminDeleteModal.vue | 4 ++--
 utils/owner.ts                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
index 1fe0a1cd..a754d10b 100644
--- a/components/Admin/AdminDeleteModal.vue
+++ b/components/Admin/AdminDeleteModal.vue
@@ -81,7 +81,7 @@ import { BrandedButton } from '@datagouv/components-next'
 import { RiCheckLine } from '@remixicon/vue'
 import { isMeAdmin } from '~/utils/auth'
 import { useDeleteMailto } from '~/composables/useDeleteMailto'
-import { getOwnerEmails, type OwnedObject } from '~/utils/owner'
+import { getOwnerEmails, type DeletableObject } from '~/utils/owner'
 import RadioButtons from '~/components/RadioButtons.vue'
 import type { ObjectType, MailOption } from '~/types/delete'
 
@@ -89,7 +89,7 @@ const props = withDefaults(defineProps<{
   title: string
   deleteUrl: string
   deleteButtonLabel?: string
-  ownedObject?: OwnedObject | null
+  ownedObject?: DeletableObject | null
   objectType: ObjectType
   objectTitle?: string
 }>(), {
diff --git a/utils/owner.ts b/utils/owner.ts
index 19932429..3db21d40 100644
--- a/utils/owner.ts
+++ b/utils/owner.ts
@@ -2,13 +2,13 @@ import { throwOnNever, type Dataservice, type DatasetV2, type DatasetV2WithFullO
 import type { $Fetch } from 'nitropack'
 import type { Comment, Thread } from '~/types/discussions'
 
-export type OwnedObject = DatasetV2 | DatasetV2WithFullObject | Reuse | Dataservice | Organization | User | Thread | Comment
+export type DeletableObject = DatasetV2 | DatasetV2WithFullObject | Reuse | Dataservice | Organization | User | Thread | Comment
 
 type OrganizationWithMembers = Organization & {
   members: Array<{ user: User, role: string }>
 }
 
-export async function getOwnerEmails($api: $Fetch, obj: OwnedObject): Promise<string[]> {
+export async function getOwnerEmails($api: $Fetch, obj: DeletableObject): Promise<string[]> {
   // User (has email directly)
   if ('first_name' in obj && 'last_name' in obj) {
     return obj.email ? [obj.email] : []

From 9bb670a2733138710bc24e5e72cfb495a0c3207f Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Mon, 5 Jan 2026 14:20:32 +0100
Subject: [PATCH 09/11] Small tweaks

---
 components/Admin/AdminDeleteModal.vue            | 16 +++++++---------
 .../Dataservices/AdminUpdateDataservicePage.vue  |  2 +-
 components/Datasets/AdminUpdateDatasetPage.vue   |  2 +-
 components/Discussions/DeleteCommentModal.vue    |  2 +-
 components/Discussions/DeleteThreadModal.vue     |  2 +-
 components/Reuses/AdminUpdateReusePage.vue       |  2 +-
 .../admin/organizations/[oid]/profile/index.vue  |  2 +-
 pages/admin/site/moderation.vue                  |  2 +-
 types/delete.ts                                  |  4 ++++
 utils/owner.ts                                   |  6 ++----
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/components/Admin/AdminDeleteModal.vue b/components/Admin/AdminDeleteModal.vue
index a754d10b..26192b1e 100644
--- a/components/Admin/AdminDeleteModal.vue
+++ b/components/Admin/AdminDeleteModal.vue
@@ -81,20 +81,18 @@ import { BrandedButton } from '@datagouv/components-next'
 import { RiCheckLine } from '@remixicon/vue'
 import { isMeAdmin } from '~/utils/auth'
 import { useDeleteMailto } from '~/composables/useDeleteMailto'
-import { getOwnerEmails, type DeletableObject } from '~/utils/owner'
+import { getOwnerEmails } from '~/utils/owner'
 import RadioButtons from '~/components/RadioButtons.vue'
-import type { ObjectType, MailOption } from '~/types/delete'
+import type { ObjectType, MailOption, DeletableObject } from '~/types/delete'
 
-const props = withDefaults(defineProps<{
+const props = defineProps<{
   title: string
   deleteUrl: string
   deleteButtonLabel?: string
-  ownedObject?: DeletableObject | null
+  deletableObject: DeletableObject
   objectType: ObjectType
   objectTitle?: string
-}>(), {
-  ownedObject: null,
-})
+}>()
 
 const emit = defineEmits<{
   deleted: []
@@ -120,8 +118,8 @@ const mailtoLink = computed(() => {
 const deleteButtonLabel = computed(() => props.deleteButtonLabel || t('Supprimer'))
 
 watch(isOpen, async (newVal) => {
-  if (newVal && isAdmin && props.ownedObject) {
-    recipientEmails.value = await getOwnerEmails($api, props.ownedObject)
+  if (newVal && isAdmin) {
+    recipientEmails.value = await getOwnerEmails($api, props.deletableObject)
   }
   if (!newVal) {
     deleted.value = false
diff --git a/components/Dataservices/AdminUpdateDataservicePage.vue b/components/Dataservices/AdminUpdateDataservicePage.vue
index 8f438246..80731636 100644
--- a/components/Dataservices/AdminUpdateDataservicePage.vue
+++ b/components/Dataservices/AdminUpdateDataservicePage.vue
@@ -105,7 +105,7 @@
               :title="$t('Êtes-vous sûr de vouloir supprimer cette API ?')"
               :delete-url="`/api/1/dataservices/${route.params.id}`"
               :delete-button-label="$t(`Supprimer l'API`)"
-              :owned-object="dataservice"
+              :deletable-object="dataservice"
               object-type="dataservice"
               :object-title="dataservice.title"
               @deleted="onDataserviceDeleted"
diff --git a/components/Datasets/AdminUpdateDatasetPage.vue b/components/Datasets/AdminUpdateDatasetPage.vue
index d5f8a1c7..7e24cad8 100644
--- a/components/Datasets/AdminUpdateDatasetPage.vue
+++ b/components/Datasets/AdminUpdateDatasetPage.vue
@@ -99,7 +99,7 @@
               :title="$t('Êtes-vous sûr de vouloir supprimer ce jeu de données ?')"
               :delete-url="`/api/1/datasets/${route.params.id}`"
               :delete-button-label="$t('Supprimer le jeu de données')"
-              :owned-object="dataset"
+              :deletable-object="dataset"
               object-type="dataset"
               :object-title="dataset.title"
               @deleted="onDatasetDeleted"
diff --git a/components/Discussions/DeleteCommentModal.vue b/components/Discussions/DeleteCommentModal.vue
index 4e0c4bda..6086f201 100644
--- a/components/Discussions/DeleteCommentModal.vue
+++ b/components/Discussions/DeleteCommentModal.vue
@@ -3,7 +3,7 @@
     :title="t('Êtes-vous sûrs de vouloir supprimer ce message ?')"
     :delete-url="`/api/1/discussions/${thread.id}/comments/${index}/`"
     :delete-button-label="t('Supprimer le commentaire')"
-    :owned-object="comment"
+    :deletable-object="comment"
     object-type="comment"
     @deleted="emit('deleted')"
   >
diff --git a/components/Discussions/DeleteThreadModal.vue b/components/Discussions/DeleteThreadModal.vue
index 0f3378bc..f1167aa7 100644
--- a/components/Discussions/DeleteThreadModal.vue
+++ b/components/Discussions/DeleteThreadModal.vue
@@ -3,7 +3,7 @@
     :title="t('Êtes-vous sûr de vouloir supprimer cette discussion ?')"
     :delete-url="`/api/1/discussions/${thread.id}/`"
     :delete-button-label="t('Supprimer la discussion et les commentaires')"
-    :owned-object="thread"
+    :deletable-object="thread"
     object-type="discussion"
     :object-title="thread.title"
     @deleted="emit('deleted')"
diff --git a/components/Reuses/AdminUpdateReusePage.vue b/components/Reuses/AdminUpdateReusePage.vue
index 07d09e89..2ebd3790 100644
--- a/components/Reuses/AdminUpdateReusePage.vue
+++ b/components/Reuses/AdminUpdateReusePage.vue
@@ -106,7 +106,7 @@
               :title="$t('Êtes-vous sûr de vouloir supprimer cette réutilisation ?')"
               :delete-url="`/api/1/reuses/${route.params.id}`"
               :delete-button-label="$t('Supprimer cette réutilisation')"
-              :owned-object="reuse"
+              :deletable-object="reuse"
               object-type="reuse"
               :object-title="reuse.title"
               @deleted="onReuseDeleted"
diff --git a/pages/admin/organizations/[oid]/profile/index.vue b/pages/admin/organizations/[oid]/profile/index.vue
index a493aa75..347da04b 100644
--- a/pages/admin/organizations/[oid]/profile/index.vue
+++ b/pages/admin/organizations/[oid]/profile/index.vue
@@ -51,7 +51,7 @@
               :title="t('Êtes-vous sûrs de vouloir supprimer cette organisation ?')"
               :delete-url="`/api/1/organizations/${organization.id}/`"
               :delete-button-label="t(`Supprimer l'organisation`)"
-              :owned-object="organization"
+              :deletable-object="organization"
               object-type="organization"
               :object-title="organization.name"
               @deleted="onOrganizationDeleted"
diff --git a/pages/admin/site/moderation.vue b/pages/admin/site/moderation.vue
index 85367b49..039779b0 100644
--- a/pages/admin/site/moderation.vue
+++ b/pages/admin/site/moderation.vue
@@ -207,7 +207,7 @@
                     :title="$t('Êtes-vous sûr de vouloir supprimer cet objet ?')"
                     :delete-url="getDeleteUrl(report.subject)!"
                     :delete-button-label="$t('Supprimer')"
-                    :owned-object="subjects[report.id]?.value"
+                    :deletable-object="subjects[report.id].value!"
                     :object-type="getObjectType(report.subject.class)"
                     :object-title="getSubjectTitle(subjects[report.id]?.value)"
                     @deleted="() => fetchFullSubject(report, report.subject!)"
diff --git a/types/delete.ts b/types/delete.ts
index afa6274c..816ec8a9 100644
--- a/types/delete.ts
+++ b/types/delete.ts
@@ -1,2 +1,6 @@
+import type { Dataservice, DatasetV2, DatasetV2WithFullObject, Organization, Reuse, User } from '@datagouv/components-next'
+import type { Comment, Thread } from '~/types/discussions'
+
 export type ObjectType = 'dataset' | 'reuse' | 'dataservice' | 'organization' | 'user' | 'discussion' | 'comment'
 export type MailOption = 'auto' | 'custom'
+export type DeletableObject = DatasetV2 | DatasetV2WithFullObject | Reuse | Dataservice | Organization | User | Thread | Comment
diff --git a/utils/owner.ts b/utils/owner.ts
index 3db21d40..8d15ec53 100644
--- a/utils/owner.ts
+++ b/utils/owner.ts
@@ -1,8 +1,6 @@
-import { throwOnNever, type Dataservice, type DatasetV2, type DatasetV2WithFullObject, type Organization, type Reuse, type User } from '@datagouv/components-next'
+import { throwOnNever, type Organization, type User } from '@datagouv/components-next'
 import type { $Fetch } from 'nitropack'
-import type { Comment, Thread } from '~/types/discussions'
-
-export type DeletableObject = DatasetV2 | DatasetV2WithFullObject | Reuse | Dataservice | Organization | User | Thread | Comment
+import type { DeletableObject } from '~/types/delete'
 
 type OrganizationWithMembers = Organization & {
   members: Array<{ user: User, role: string }>

From 9011fd93144d30efe483e496f7c4313799965a3b Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Mon, 5 Jan 2026 15:59:31 +0100
Subject: [PATCH 10/11] Add tests on discussion creation and deletion with
 normal user

---
 .github/workflows/e2e.yml                     |   1 +
 playwright.config.ts                          |  12 +-
 tests/admin/delete-modal.normal-user.spec.ts  |  43 ++++++
 tests/auth-normal-user.setup.ts               |  17 +++
 .../discussions.normal-user.spec.ts           | 134 ++++++++++++++++++
 5 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 tests/admin/delete-modal.normal-user.spec.ts
 create mode 100644 tests/auth-normal-user.setup.ts
 create mode 100644 tests/discussions/discussions.normal-user.spec.ts

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index b532c2dd..f00ba40c 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -113,6 +113,7 @@ jobs:
           uv run udata import-fixtures
 
           uv run udata user create --first-name "Admin" --last-name "User" --email "admin@example.com" --password "@1337Password42" --admin
+          uv run udata user create --first-name "Normal" --last-name "User" --email "normal@example.com" --password "@1337Password42"
 
           uv run inv i18nc
 
diff --git a/playwright.config.ts b/playwright.config.ts
index a16e5ec1..24d77c5b 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -38,16 +38,26 @@ export default defineConfig({
 
   /* Configure projects for major browsers */
   projects: [
-    { name: 'setup', testMatch: /.*\.setup\.ts/ },
+    { name: 'setup', testMatch: /auth\.setup\.ts/ },
+    { name: 'setup-normal-user', testMatch: /auth-normal-user\.setup\.ts/ },
 
     {
       name: 'chromium',
+      testIgnore: /.*\.normal-user\.spec\.ts/,
       use: { ...devices['Desktop Chrome'], storageState: 'playwright/.auth/user.json' },
       dependencies: ['setup'],
     },
 
+    {
+      name: 'chromium-normal-user',
+      testMatch: /.*\.normal-user\.spec\.ts/,
+      use: { ...devices['Desktop Chrome'], storageState: 'playwright/.auth/normal-user.json' },
+      dependencies: ['setup-normal-user'],
+    },
+
     {
       name: 'firefox',
+      testIgnore: /.*\.normal-user\.spec\.ts/,
       use: { ...devices['Desktop Firefox'], storageState: 'playwright/.auth/user.json' },
       dependencies: ['setup'],
     },
diff --git a/tests/admin/delete-modal.normal-user.spec.ts b/tests/admin/delete-modal.normal-user.spec.ts
new file mode 100644
index 00000000..929d6d48
--- /dev/null
+++ b/tests/admin/delete-modal.normal-user.spec.ts
@@ -0,0 +1,43 @@
+import { test, expect } from '@playwright/test'
+
+const API_BASE = process.env.NUXT_PUBLIC_API_BASE || 'http://dev.local:7000'
+
+test.describe('Delete modal as normal user', () => {
+  test('does not show mail options for non-admin user', async ({ page }) => {
+    const uniqueId = Date.now()
+
+    // Create dataset via API (authenticated as normal user via setup)
+    const response = await page.request.post(`${API_BASE}/api/1/datasets/`, {
+      data: {
+        title: `Test delete normal user ${uniqueId}`,
+        description: 'Description pour test de suppression',
+        frequency: 'unknown',
+      },
+    })
+    const dataset = await response.json()
+
+    // Go to admin page for the dataset
+    await page.goto(`/admin/datasets/${dataset.id}/`)
+    await expect(page.getByRole('button', { name: 'Supprimer' })).toBeVisible()
+
+    // Open delete modal
+    await page.getByRole('button', { name: 'Supprimer' }).click()
+    await expect(page.getByRole('dialog')).toBeVisible()
+
+    const dialog = page.getByRole('dialog')
+
+    // Verify mail options are NOT shown for non-admin users
+    await expect(dialog.getByText('Notification par email')).not.toBeVisible()
+
+    // Delete button should be enabled directly (no option to select)
+    const deleteButton = dialog.getByRole('button', { name: 'Supprimer le jeu de données' })
+    await expect(deleteButton).toBeEnabled()
+
+    // Confirm deletion
+    await deleteButton.click()
+
+    // Modal should close and dataset should be marked as deleted
+    await expect(page.getByRole('dialog')).not.toBeVisible()
+    await expect(page.getByText('Restaurer ce jeu de données')).toBeVisible()
+  })
+})
diff --git a/tests/auth-normal-user.setup.ts b/tests/auth-normal-user.setup.ts
new file mode 100644
index 00000000..878f9961
--- /dev/null
+++ b/tests/auth-normal-user.setup.ts
@@ -0,0 +1,17 @@
+import { test as setup } from '@playwright/test'
+import path from 'path'
+
+const authFile = path.join(import.meta.dirname, '../playwright/.auth/normal-user.json')
+
+setup('authenticate as normal user', async ({ page, baseURL }) => {
+  const loginURL = baseURL || 'http://localhost:3000'
+
+  await page.goto(`${loginURL}/login/?next=%2F`)
+  await page.waitForLoadState('networkidle')
+  await page.getByLabel('Adresse email').fill('normal@example.com')
+  await page.getByLabel('Mot de passe').fill('@1337Password42')
+  await page.getByRole('button', { name: 'Se connecter' }).first().click()
+  await page.waitForURL(`${loginURL}/`)
+
+  await page.context().storageState({ path: authFile })
+})
diff --git a/tests/discussions/discussions.normal-user.spec.ts b/tests/discussions/discussions.normal-user.spec.ts
new file mode 100644
index 00000000..3810bbcc
--- /dev/null
+++ b/tests/discussions/discussions.normal-user.spec.ts
@@ -0,0 +1,134 @@
+import { test, expect } from '@playwright/test'
+
+const API_BASE = process.env.NUXT_PUBLIC_API_BASE || 'http://dev.local:7000'
+
+test.describe('Discussions as normal user', () => {
+  test('can create a discussion and delete it', async ({ page }) => {
+    const uniqueId = Date.now()
+
+    // Create a dataset via API
+    const response = await page.request.post(`${API_BASE}/api/1/datasets/`, {
+      data: {
+        title: `Test discussions dataset ${uniqueId}`,
+        description: 'Dataset pour tester les discussions',
+        frequency: 'unknown',
+      },
+    })
+    const dataset = await response.json()
+
+    await page.goto(`/datasets/${dataset.id}/`)
+
+    // Navigate to discussions tab
+    await page.getByRole('link', { name: 'Discussions' }).click()
+    await expect(page).toHaveURL(/\/discussions$/)
+
+    // Start a new discussion
+    await page.getByRole('button', { name: 'Démarrer une nouvelle discussion' }).click()
+
+    // Select identity (Normal User)
+    await page.getByTestId('producer-select').click()
+    await page.getByRole('option', { name: 'Normal User' }).click()
+
+    // Fill the discussion form
+    await page.getByRole('textbox', { name: /Titre/ }).click()
+    await page.getByRole('textbox', { name: /Titre/ }).fill('Ma discussion de test')
+    await page.getByRole('textbox', { name: /Votre message/ }).click()
+    await page.getByRole('textbox', { name: /Votre message/ }).fill('Ceci est le contenu de ma discussion de test.')
+
+    // Submit the discussion
+    await page.getByRole('button', { name: 'Envoyer' }).click()
+
+    // Verify discussion was created
+    await expect(page.getByText('Ma discussion de test', { exact: true })).toBeVisible()
+    await expect(page.getByText('Ceci est le contenu de ma discussion de test.')).toBeVisible()
+
+    // Delete the discussion
+    const deleteButton = page.getByRole('button', { name: 'Supprimer' }).first()
+    await deleteButton.click()
+
+    // Confirm deletion in modal
+    await expect(page.getByRole('dialog')).toBeVisible()
+    const dialog = page.getByRole('dialog')
+
+    // Verify mail options are NOT shown for non-admin users
+    await expect(dialog.getByText('Notification par email')).not.toBeVisible()
+
+    await dialog.getByRole('button', { name: 'Supprimer la discussion et les commentaires' }).click()
+
+    // Verify discussion was deleted
+    await expect(page.getByRole('dialog')).not.toBeVisible()
+    await expect(page.getByText('Ma discussion de test', { exact: true })).not.toBeVisible()
+
+    // Cleanup: delete the dataset
+    await page.request.delete(`${API_BASE}/api/1/datasets/${dataset.id}/`)
+  })
+
+  test('can add a comment to a discussion and delete only the comment', async ({ page }) => {
+    const uniqueId = Date.now()
+
+    // Create a dataset via API
+    const datasetResponse = await page.request.post(`${API_BASE}/api/1/datasets/`, {
+      data: {
+        title: `Test comments dataset ${uniqueId}`,
+        description: 'Dataset pour tester les commentaires',
+        frequency: 'unknown',
+      },
+    })
+    const dataset = await datasetResponse.json()
+
+    // Create a discussion via API
+    const discussionResponse = await page.request.post(`${API_BASE}/api/1/discussions/`, {
+      data: {
+        subject: {
+          class: 'Dataset',
+          id: dataset.id,
+        },
+        title: 'Discussion pour tester les commentaires',
+        comment: 'Premier message de la discussion.',
+      },
+    })
+    const discussion = await discussionResponse.json()
+
+    await page.goto(`/datasets/${dataset.id}/discussions`)
+
+    // Open the discussion and click reply
+    await page.getByText('Discussion pour tester les commentaires').click()
+    await page.getByRole('button', { name: 'Répondre' }).first().click()
+
+    // Select identity (Normal User)
+    await page.getByTestId('producer-select').click()
+    await page.getByRole('option', { name: 'Normal User' }).click()
+
+    // Add a comment/reply
+    await page.getByRole('textbox', { name: /Votre message/ }).click()
+    await page.getByRole('textbox', { name: /Votre message/ }).fill('Mon commentaire ajouté à la discussion.')
+    await page.getByRole('button', { name: 'Répondre', exact: true }).click()
+
+    // Verify comment was added
+    await expect(page.getByText('Mon commentaire ajouté à la discussion.')).toBeVisible()
+
+    // Find and click delete button for the comment (not the discussion)
+    // The comment delete button should be the second one (first is for the discussion)
+    const commentDeleteButton = page.getByRole('button', { name: 'Supprimer' }).nth(1)
+    await commentDeleteButton.click()
+
+    // Confirm deletion in modal
+    await expect(page.getByRole('dialog')).toBeVisible()
+    const dialog = page.getByRole('dialog')
+
+    // Verify mail options are NOT shown for non-admin users
+    await expect(dialog.getByText('Notification par email')).not.toBeVisible()
+
+    await dialog.getByRole('button', { name: 'Supprimer le commentaire' }).click()
+
+    // Verify comment was deleted but discussion still exists
+    await expect(page.getByRole('dialog')).not.toBeVisible()
+    await expect(page.getByText('Mon commentaire ajouté à la discussion.')).not.toBeVisible()
+    await expect(page.getByText('Discussion pour tester les commentaires')).toBeVisible()
+    await expect(page.getByText('Premier message de la discussion.')).toBeVisible()
+
+    // Cleanup
+    await page.request.delete(`${API_BASE}/api/1/discussions/${discussion.id}/`)
+    await page.request.delete(`${API_BASE}/api/1/datasets/${dataset.id}/`)
+  })
+})

From fc94020d7eb3aa60314ce7bd1299c642f70767ab Mon Sep 17 00:00:00 2001
From: Thibaud Dauce <git@hadibut.fr>
Date: Mon, 5 Jan 2026 16:49:43 +0100
Subject: [PATCH 11/11] Fix missing env variable to call the API directly

---
 .github/workflows/e2e.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index f00ba40c..a1668284 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -142,6 +142,7 @@ jobs:
       - name: Run E2E tests
         env:
           BASE_URL: http://localhost:3000
+          NUXT_PUBLIC_API_BASE: http://localhost:7000
           CI: true
         run: pnpm run test:e2e