From f40b6758ded0fbad2bf85ccde13d89594da907b2 Mon Sep 17 00:00:00 2001
From: grimhilt <grimhilt@users.noreply.github.com>
Date: Sun, 16 Jul 2023 15:54:57 +0200
Subject: [PATCH] add members in message modal

---
 .../components/modals/MessageViewModal.vue    | 34 +++++++++++++++++--
 front/src/views/room/RoomView.vue             |  7 +++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/front/src/components/modals/MessageViewModal.vue b/front/src/components/modals/MessageViewModal.vue
index 1db010b..9fcbb5f 100644
--- a/front/src/components/modals/MessageViewModal.vue
+++ b/front/src/components/modals/MessageViewModal.vue
@@ -1,17 +1,42 @@
 <script setup lang="ts">
-import { Message } from "@/store/models/model";
-import { ref, watch, defineProps, PropType } from "vue";
+import { Address, Message, Room } from "@/store/models/model";
+import { ref, Ref, watch, defineProps, PropType } from "vue";
 import Content from "../structure/message/Content.vue";
 import Modal from "./Modal.vue";
+import MemberList from "@/views/room/MemberList.vue";
+import { removeDuplicates } from "@/utils/array";
 
-const props = defineProps({ messageId: { type: Number, require: true }, message: Object as PropType<Message> });
+const props = defineProps({
+    messageId: { type: Number, require: true },
+    message: Object as PropType<Message>,
+    room: Object as PropType<Room>,
+});
 
 const messageId = ref(-1);
+const fromA = ref<Address[]>([]);
+const toA = ref<Address[]>([]);
+const ccA = ref<Address[]>([]);
+
+const getAddr = (ids: string | undefined, addrs: Address[] | undefined, res: Ref<Address[]>) => {
+    res.value = [];
+    if (!ids || !addrs) return;
+    let idsClean = removeDuplicates(ids.split(","));
+    idsClean.forEach((id) => {
+        let addr = addrs.find((member) => member.id === parseInt(id));
+        if (addr) {
+            res.value.push(addr);
+        }
+    });
+};
+
 watch(
     () => props.messageId,
     (newMessageId: number | undefined) => {
         if (!newMessageId) return;
         messageId.value = newMessageId;
+        getAddr(props.message?.fromA, props.room?.members, fromA);
+        getAddr(props.message?.toA, props.room?.members, toA);
+        getAddr(props.message?.ccA, props.room?.members, ccA);
     },
 );
 </script>
@@ -20,6 +45,9 @@ watch(
     <div class="main">
         <Modal v-if="messageId != -1" @close-modal="() => $emit('close')">
             <template v-slot:body>
+                <MemberList type="from" :members="fromA" />
+                <MemberList type="to" :members="toA" />
+                <MemberList v-if="ccA.length > 0" type="cc" :members="ccA" />
                 <div>{{ props.message?.subject ?? "No Object" }}</div>
                 <Content type="large" :content="props.message?.content" class="content" />
             </template>
diff --git a/front/src/views/room/RoomView.vue b/front/src/views/room/RoomView.vue
index 40f4584..2ddb81e 100644
--- a/front/src/views/room/RoomView.vue
+++ b/front/src/views/room/RoomView.vue
@@ -72,7 +72,12 @@ provide("room", room);
             />
         </div>
         <Composer v-if="shouldDisplayComposer() || true" />
-        <MessageViewModal :message="message" :messageId="messageIdView" @close="() => openMessageView(-1)" />
+        <MessageViewModal
+            :room="room"
+            :message="message"
+            :messageId="messageIdView"
+            @close="() => openMessageView(-1)"
+        />
         <!-- todo -->
         <!-- <ConfirmationModal /> -->
     </div>