mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-01 11:37:58 +00:00
This PR has fixes for the following issues - Inconsistent spacing between meta and text in text bubble - Activity bubble overflows for longer text (for now I have truncated it, I'll work with @absurdiya on a better solution) - Ugly lookinh gradient for expand button on email bubble - Email bubble overflow issues and text rendering issues - Alignment for error message - Minute-wise grouping not working - Link color should not be blue - Use `gray-3` for bubble background instead of `gray-4`
135 lines
4.1 KiB
Vue
135 lines
4.1 KiB
Vue
<script setup>
|
|
import { defineProps, computed } from 'vue';
|
|
import Message from './Message.vue';
|
|
import { MESSAGE_TYPES } from './constants.js';
|
|
import { useCamelCase } from 'dashboard/composables/useTransformKeys';
|
|
|
|
/**
|
|
* Props definition for the component
|
|
* @typedef {Object} Props
|
|
* @property {Array} readMessages - Array of read messages
|
|
* @property {Array} unReadMessages - Array of unread messages
|
|
* @property {Number} currentUserId - ID of the current user
|
|
* @property {Boolean} isAnEmailChannel - Whether this is an email channel
|
|
* @property {Object} inboxSupportsReplyTo - Inbox reply support configuration
|
|
* @property {Array} messages - Array of all messages [These are not in camelcase]
|
|
*/
|
|
const props = defineProps({
|
|
readMessages: {
|
|
type: Array,
|
|
default: () => [],
|
|
},
|
|
unReadMessages: {
|
|
type: Array,
|
|
default: () => [],
|
|
},
|
|
currentUserId: {
|
|
type: Number,
|
|
required: true,
|
|
},
|
|
isAnEmailChannel: {
|
|
type: Boolean,
|
|
default: false,
|
|
},
|
|
inboxSupportsReplyTo: {
|
|
type: Object,
|
|
default: () => ({ incoming: false, outgoing: false }),
|
|
},
|
|
messages: {
|
|
type: Array,
|
|
default: () => [],
|
|
},
|
|
});
|
|
|
|
const unread = computed(() => {
|
|
return useCamelCase(props.unReadMessages, { deep: true });
|
|
});
|
|
|
|
const read = computed(() => {
|
|
return useCamelCase(props.readMessages, { deep: true });
|
|
});
|
|
|
|
/**
|
|
* Determines if a message should be grouped with the next message
|
|
* @param {Number} index - Index of the current message
|
|
* @param {Array} searchList - Array of messages to check
|
|
* @returns {Boolean} - Whether the message should be grouped with next
|
|
*/
|
|
const shouldGroupWithNext = (index, searchList) => {
|
|
if (index === searchList.length - 1) return false;
|
|
|
|
const current = searchList[index];
|
|
const next = searchList[index + 1];
|
|
|
|
if (next.status === 'failed') return false;
|
|
|
|
const nextSenderId = next.senderId ?? next.sender?.id;
|
|
const currentSenderId = current.senderId ?? current.sender?.id;
|
|
const hasSameSender = nextSenderId === currentSenderId;
|
|
|
|
const nextMessageType = next.messageType;
|
|
const currentMessageType = current.messageType;
|
|
|
|
const areBothTemplates =
|
|
nextMessageType === MESSAGE_TYPES.TEMPLATE &&
|
|
currentMessageType === MESSAGE_TYPES.TEMPLATE;
|
|
|
|
if (!hasSameSender || !areBothTemplates) return false;
|
|
|
|
// Check if messages are in the same minute by rounding down to nearest minute
|
|
return Math.floor(next.createdAt / 60) === Math.floor(current.createdAt / 60);
|
|
};
|
|
|
|
/**
|
|
* Gets the message that was replied to
|
|
* @param {Object} parentMessage - The message containing the reply reference
|
|
* @returns {Object|null} - The message being replied to, or null if not found
|
|
*/
|
|
const getInReplyToMessage = parentMessage => {
|
|
if (!parentMessage) return null;
|
|
|
|
const inReplyToMessageId =
|
|
parentMessage.contentAttributes?.inReplyTo ??
|
|
parentMessage.content_attributes?.in_reply_to;
|
|
|
|
if (!inReplyToMessageId) return null;
|
|
|
|
// Find in-reply-to message in the messages prop
|
|
const replyMessage = props.messages?.find(
|
|
message => message.id === inReplyToMessageId
|
|
);
|
|
|
|
return replyMessage ? useCamelCase(replyMessage) : null;
|
|
};
|
|
</script>
|
|
|
|
<template>
|
|
<ul class="px-4 bg-n-background">
|
|
<slot name="beforeAll" />
|
|
<template v-for="(message, index) in read" :key="message.id">
|
|
<Message
|
|
v-bind="message"
|
|
:is-email-inbox="isAnEmailChannel"
|
|
:in-reply-to="getInReplyToMessage(message)"
|
|
:group-with-next="shouldGroupWithNext(index, read)"
|
|
:inbox-supports-reply-to="inboxSupportsReplyTo"
|
|
:current-user-id="currentUserId"
|
|
data-clarity-mask="True"
|
|
/>
|
|
</template>
|
|
<slot name="beforeUnread" />
|
|
<template v-for="(message, index) in unread" :key="message.id">
|
|
<Message
|
|
v-bind="message"
|
|
:in-reply-to="getInReplyToMessage(message)"
|
|
:group-with-next="shouldGroupWithNext(index, unread)"
|
|
:inbox-supports-reply-to="inboxSupportsReplyTo"
|
|
:current-user-id="currentUserId"
|
|
:is-email-inbox="isAnEmailChannel"
|
|
data-clarity-mask="True"
|
|
/>
|
|
</template>
|
|
<slot name="after" />
|
|
</ul>
|
|
</template>
|