Merge branch 'main' of github.com:hainatravel/global-sales

src/channel/bubbleMsgUtils.js

@@ -325,7 +325,7 @@ const whatsappMsgMapped = {
   'wai.message.received': {
     getMsg: (result) => {
       const data1 = pick(result, ['conversationid', 'opi_sn', 'coli_sn', 'coli_id']);
-      return isEmpty(result?.waiMessage) ? null : { ...result.waiMessage, ...data1, messageorigin: result.messageorigin, msg_source: 'wai', ...objectMapper(result.waiMessage, { direction: 'msg_direction' }) };
+      return isEmpty(result?.waiMessage) ? null : { ...result.waiMessage, ...data1, messageorigin: result.messageorigin, msg_source: 'wai', ...objectMapper(result.waiMessage, { direction: {key: 'msg_direction'} }) };
     },
     contentToRender: (contentObj) => {
       return parseRenderMessageItem(contentObj);
@@ -336,7 +336,7 @@ const whatsappMsgMapped = {
     getMsg: (result) => {
       return isEmpty(result?.waiMessage)
         ? null
-        : { ...result.waiMessage, conversationid: result.conversationid, messageorigin: result.messageorigin, msg_source: 'wai', ...objectMapper(result.waiMessage, { direction: 'msg_direction' }) }
+        : { ...result.waiMessage, conversationid: result.conversationid, messageorigin: result.messageorigin, msg_source: 'wai', ...objectMapper(result.waiMessage, { direction: {key: 'msg_direction'} }) }
     },
     contentToRender: (contentObj) => {
       if (contentObj?.status === 'failed') {
@@ -594,6 +594,10 @@ export const whatsappMsgTypeMapped = {
     data: (msg) => ({ id: msg.wamid, text: `[暂不支持此消息类型](${msg.wamid})`, dateString: `${dayjs(msg.sendTime).format('MM-DD HH:mm')} [ WhatsApp未提供消息内容 ] 可能是客人删除消息/会话, \n可询问客人截图/详细内容 或 忽略 📌` }),
     renderForReply: (msg) => ({ id: msg?.wamid || msg.id, text: `[Message type unsupported](${msg.wamid})` }),
   },
+  unresolvable: {
+    type: 'text',
+    data: (msg) => ({ id: msg.wamid, text: `[无法解析](${msg.wamid})`, }),
+  },
   reaction: {
     type: 'text',
     data: (msg) => ({ id: msg.wamid, text: msg.reaction?.emoji || '' }),
@@ -745,7 +749,7 @@ export const parseRenderMessageList = (messages) => {
       // }
     }
     const msgContent = typeof msgtext === 'string' ? JSON.parse(msgContentString) : (msgtext || {});
-    const msgType = isEmpty(msgContent) ? msg.msgtype : (Object.keys(whatsappMsgTypeMapped).includes(msgContent.type) ? msgContent.type : 'unsupported')
+    const msgType = isEmpty(msgContent) ? msg.msgtype : (Object.keys(whatsappMsgTypeMapped).includes(msgContent.type) ? msgContent.type : 'unresolvable')
     msgContent.template = msg.msgtype === 'template' ? { ...msgContent.template, ...template } : {};
     // const parseMethod = msgContent.bizType === 'whatsapp' ? cloneDeep(whatsappMsgTypeMapped) : {};
     let waCode, waError = '';

src/views/Conversations/Online/Components/BubbleIM.jsx

@@ -119,7 +119,7 @@ const BubbleIM = ({ handlePreview, handleContactClick, setNewChatModalVisible, s
         ? {
             // styles: { backgroundColor: '#ccd4ae' },
             notchStyle: { fill: outboundStyle[message.msg_source.toLowerCase()].color },
-            title: <><ChannelLogo channel={message.msg_source} />{message.wabaName ? ` ${message.wabaName} - ${message.title}` : ` ${message.title || message.from}`}</>,
+            title: <><ChannelLogo channel={message.msg_source} />{message.wabaName ? ` ${message.wabaName} - ${message.title || ''}` : ` ${message.title || message.from}`}</>,
           }
         : {
           // title: <>&nbsp;<ChannelLogo channel={message.msg_source} />&nbsp;{message.title}</>,