From f00a44fb075f3038e7fdda6be04a94928515e6b2 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Fri, 3 Nov 2023 17:36:44 -0500
Subject: [PATCH] Message: Allow to list messages with no sender - refs
 BT#21015

---
 assets/vue/views/message/MessageList.vue              | 11 +++++++++--
 assets/vue/views/message/MessageShow.vue              |  9 +++++++--
 .../DataProvider/Extension/MessageExtension.php       |  6 +++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/assets/vue/views/message/MessageList.vue b/assets/vue/views/message/MessageList.vue
index 1fcbce1aed..40fb362dc1 100644
--- a/assets/vue/views/message/MessageList.vue
+++ b/assets/vue/views/message/MessageList.vue
@@ -104,11 +104,18 @@
         <Column selection-mode="multiple" />
         <Column :header="t('From')">
           <template #body="slotProps">
-            <div class="flex items-center gap-2">
+            <div
+              v-if="slotProps.data.sender"
+              class="flex items-center gap-2"
+            >
               <BaseUserAvatar :image-url="slotProps.data.sender.illustrationUrl" />
 
               {{ slotProps.data.sender.username }}
             </div>
+            <div
+              v-else
+              v-t="'No sender'"
+            />
           </template>
         </Column>
         <Column :header="t('Title')">
@@ -414,4 +421,4 @@ function showDlgConfirmDeleteMultiple() {
 onMounted(() => {
   showInbox()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/assets/vue/views/message/MessageShow.vue b/assets/vue/views/message/MessageShow.vue
index 513dc100ba..32658f94ba 100644
--- a/assets/vue/views/message/MessageShow.vue
+++ b/assets/vue/views/message/MessageShow.vue
@@ -52,7 +52,7 @@
       </div>
 
       <BaseAutocomplete
-        v-if="item.sender['@id'] !== user['@id']"
+        v-if="item.sender && item.sender['@id'] !== user['@id']"
         id="search-tags"
         v-model="foundTag"
         :label="t('Tags')"
@@ -66,10 +66,15 @@
       {{ t("From") }}
 
       <BaseChip
+        v-if="item.sender"
         :value="item.sender"
         image-field="illustrationUrl"
         label-field="username"
       />
+      <span
+        v-else
+        v-t="'No sender'"
+      />
     </div>
 
     <div>
@@ -299,4 +304,4 @@ async function onItemSelect({ value }) {
     })
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/CoreBundle/DataProvider/Extension/MessageExtension.php b/src/CoreBundle/DataProvider/Extension/MessageExtension.php
index 294ba82f13..0636d25943 100644
--- a/src/CoreBundle/DataProvider/Extension/MessageExtension.php
+++ b/src/CoreBundle/DataProvider/Extension/MessageExtension.php
@@ -94,12 +94,12 @@ final class MessageExtension implements QueryCollectionExtensionInterface //, Qu
 
         $qb->andWhere(
             "
-            ($alias.sender = :current AND $alias.status <> :deleted) OR 
-                ($alias.sender <> :current AND r.receiver = :current AND (
+            ($alias.sender = :current AND $alias.status <> :deleted) OR
+                (r.receiver = :current AND (
                     ($alias.msgType = :inbox) OR
                     ($alias.msgType = :invitation) OR
                     ($alias.msgType = :conversation)
-                ) 
+                )
             )
         "
         );