## Description Fixes the reversed message delivery status indicators for the API channel. The API inbox was grouped with the web widget inbox in the `isDelivered` computed property, causing both to treat a `sent` status as `delivered`. Since the API channel provides real `sent`/`delivered`/`read` status values from external systems (unlike the web widget which has no separate delivery confirmation), the API inbox needs its own handling. **Before this fix:** - Status `sent` (0) → incorrectly showed delivered checkmarks - Status `delivered` (1) → incorrectly showed "Sending" spinner **After this fix:** - Status `sent` → correctly shows sent indicator (single checkmark) - Status `delivered` → correctly shows delivered indicator (double checkmarks) - Status `read` → unchanged (already worked correctly) The web widget inbox behavior is unchanged — it still treats `sent` as `delivered` since it lacks a separate delivery confirmation mechanism. Fixes #13576 ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? Verified by code review that the computed properties now correctly map API channel message statuses: - `isSent` returns `true` when `status === 'sent'` for API inbox - `isDelivered` returns `true` when `status === 'delivered'` for API inbox - `isRead` unchanged — already checks `status === 'read'` for API inbox - Web widget inbox logic is unchanged ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [x] My changes generate no new warnings *This PR was created with the assistance of Claude Opus 4.6 by Anthropic. Happy to make any adjustments! Reviewed and submitted by a human.* Co-authored-by: Your Name <your-email@example.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
144 lines
3.8 KiB
Vue
144 lines
3.8 KiB
Vue
<script setup>
|
|
import { computed } from 'vue';
|
|
import { messageTimestamp } from 'shared/helpers/timeHelper';
|
|
|
|
import MessageStatus from './MessageStatus.vue';
|
|
import Icon from 'next/icon/Icon.vue';
|
|
import { useInbox } from 'dashboard/composables/useInbox';
|
|
import { useMessageContext } from './provider.js';
|
|
|
|
import { MESSAGE_STATUS, MESSAGE_TYPES } from './constants';
|
|
|
|
const {
|
|
isAFacebookInbox,
|
|
isALineChannel,
|
|
isAPIInbox,
|
|
isASmsInbox,
|
|
isATelegramChannel,
|
|
isATwilioChannel,
|
|
isAWebWidgetInbox,
|
|
isAWhatsAppChannel,
|
|
isAnEmailChannel,
|
|
isAnInstagramChannel,
|
|
isATiktokChannel,
|
|
} = useInbox();
|
|
|
|
const {
|
|
status,
|
|
isPrivate,
|
|
createdAt,
|
|
sourceId,
|
|
messageType,
|
|
contentAttributes,
|
|
} = useMessageContext();
|
|
|
|
const readableTime = computed(() =>
|
|
messageTimestamp(createdAt.value, 'LLL d, h:mm a')
|
|
);
|
|
|
|
const showStatusIndicator = computed(() => {
|
|
if (isPrivate.value) return false;
|
|
// Don't show status for failed messages, we already show error message
|
|
if (status.value === MESSAGE_STATUS.FAILED) return false;
|
|
// Don't show status for deleted messages
|
|
if (contentAttributes.value?.deleted) return false;
|
|
|
|
if (messageType.value === MESSAGE_TYPES.OUTGOING) return true;
|
|
if (messageType.value === MESSAGE_TYPES.TEMPLATE) return true;
|
|
|
|
return false;
|
|
});
|
|
|
|
const isSent = computed(() => {
|
|
if (!showStatusIndicator.value) return false;
|
|
|
|
// Messages will be marked as sent for the Email channel if they have a source ID.
|
|
if (isAnEmailChannel.value) return !!sourceId.value;
|
|
|
|
if (
|
|
isAWhatsAppChannel.value ||
|
|
isATwilioChannel.value ||
|
|
isAFacebookInbox.value ||
|
|
isASmsInbox.value ||
|
|
isATelegramChannel.value ||
|
|
isAnInstagramChannel.value ||
|
|
isATiktokChannel.value
|
|
) {
|
|
return sourceId.value && status.value === MESSAGE_STATUS.SENT;
|
|
}
|
|
|
|
// API inbox messages use real sent/delivered/read status values from the external system.
|
|
if (isAPIInbox.value) return status.value === MESSAGE_STATUS.SENT;
|
|
|
|
// All messages will be mark as sent for the Line channel, as there is no source ID.
|
|
if (isALineChannel.value) return true;
|
|
|
|
return false;
|
|
});
|
|
|
|
const isDelivered = computed(() => {
|
|
if (!showStatusIndicator.value) return false;
|
|
|
|
if (
|
|
isAWhatsAppChannel.value ||
|
|
isATwilioChannel.value ||
|
|
isASmsInbox.value ||
|
|
isAFacebookInbox.value ||
|
|
isAnInstagramChannel.value ||
|
|
isATiktokChannel.value
|
|
) {
|
|
return sourceId.value && status.value === MESSAGE_STATUS.DELIVERED;
|
|
}
|
|
// API inbox messages use real delivered status from the external system.
|
|
if (isAPIInbox.value) return status.value === MESSAGE_STATUS.DELIVERED;
|
|
// All messages marked as delivered for the web widget inbox once they are sent.
|
|
if (isAWebWidgetInbox.value) {
|
|
return status.value === MESSAGE_STATUS.SENT;
|
|
}
|
|
if (isALineChannel.value) {
|
|
return status.value === MESSAGE_STATUS.DELIVERED;
|
|
}
|
|
|
|
return false;
|
|
});
|
|
|
|
const isRead = computed(() => {
|
|
if (!showStatusIndicator.value) return false;
|
|
|
|
if (
|
|
isAWhatsAppChannel.value ||
|
|
isATwilioChannel.value ||
|
|
isAFacebookInbox.value ||
|
|
isAnInstagramChannel.value ||
|
|
isATiktokChannel.value
|
|
) {
|
|
return sourceId.value && status.value === MESSAGE_STATUS.READ;
|
|
}
|
|
|
|
if (isAWebWidgetInbox.value || isAPIInbox.value) {
|
|
return status.value === MESSAGE_STATUS.READ;
|
|
}
|
|
|
|
return false;
|
|
});
|
|
|
|
const statusToShow = computed(() => {
|
|
if (isRead.value) return MESSAGE_STATUS.READ;
|
|
if (isDelivered.value) return MESSAGE_STATUS.DELIVERED;
|
|
if (isSent.value) return MESSAGE_STATUS.SENT;
|
|
|
|
return MESSAGE_STATUS.PROGRESS;
|
|
});
|
|
</script>
|
|
|
|
<template>
|
|
<div class="text-xs flex items-center gap-1.5">
|
|
<div class="inline">
|
|
<time class="inline">{{ readableTime }}</time>
|
|
</div>
|
|
<Icon v-if="isPrivate" icon="i-lucide-lock-keyhole" class="size-3" />
|
|
<MessageStatus v-if="showStatusIndicator" :status="statusToShow" />
|
|
</div>
|
|
</template>
|
|
`
|