fix: Publish SEND_MESSAGE_FAILED event (#704)

Sravan S · web-flow · commit d8eff44f9027 · 2023-08-11T12:17:47.000+09:00
Implementation for Failure state on `sendbirdSelectors.getSendUserMessage` was missing Bonus - fix typo in `SEND_MESSAGEGE_FAILURE ` Fixes: https://sendbird.atlassian.net/browse/CLNP-542
diff --git a/src/lib/pubSub/topics.ts b/src/lib/pubSub/topics.ts
@@ -4,6 +4,7 @@ export const PUBSUB_TOPICS = {
   // Group Channel
   USER_UPDATED: 'USER_UPDATED',
   SEND_MESSAGE_START: 'SEND_MESSAGE_START',
+  SEND_MESSAGE_FAILED: 'SEND_MESSAGE_FAILED',
   SEND_USER_MESSAGE: 'SEND_USER_MESSAGE',
   SEND_FILE_MESSAGE: 'SEND_FILE_MESSAGE',
   UPDATE_USER_MESSAGE: 'UPDATE_USER_MESSAGE',
diff --git a/src/lib/selectors.ts b/src/lib/selectors.ts
@@ -465,7 +465,13 @@ export const getSendUserMessage = (state: SendBirdState) => (
     const handler = new UikitMessageHandler();
     const pubSub = getPubSub(state);
     channel.sendUserMessage(params)
-      .onFailed((error, message) => handler.triggerFailed(error, message))
+      .onFailed((error, message) => {
+        pubSub.publish(
+          topics.SEND_MESSAGE_FAILED,
+          { error, message, channel },
+        );
+        handler.triggerFailed(error, message);
+      })
       .onPending((message) => {
         pubSub.publish(
           topics.SEND_MESSAGE_START,
@@ -499,7 +505,13 @@ export const getSendFileMessage = (state: SendBirdState) => (
     const handler = new UikitMessageHandler();
     const pubSub = getPubSub(state);
     channel.sendFileMessage(params)
-      .onFailed((error, message) => handler.triggerFailed(error, message))
+      .onFailed((error, message) => {
+        pubSub.publish(
+          topics.SEND_MESSAGE_FAILED,
+          { error, message, channel },
+        );
+        handler.triggerFailed(error, message);
+      })
       .onPending((message) => {
         pubSub.publish(
           topics.SEND_MESSAGE_START,
diff --git a/src/modules/Channel/context/dux/actionTypes.js b/src/modules/Channel/context/dux/actionTypes.js
@@ -10,7 +10,7 @@ export const FETCH_NEXT_MESSAGES_FAILURE = 'FETCH_NEXT_MESSAGES_FAILURE';
 
 export const SEND_MESSAGEGE_START = 'SEND_MESSAGEGE_START';
 export const SEND_MESSAGEGE_SUCESS = 'SEND_MESSAGEGE_SUCESS';
-export const SEND_MESSAGEGE_FAILURE = 'SEND_MESSAGEGE_FAILURE';
+export const SEND_MESSAGE_FAILURE = 'SEND_MESSAGE_FAILURE';
 
 export const RESEND_MESSAGEGE_START = 'RESEND_MESSAGEGE_START';
 
diff --git a/src/modules/Channel/context/dux/reducers.js b/src/modules/Channel/context/dux/reducers.js
@@ -173,7 +173,7 @@ export default function reducer(state, action) {
           ],
       };
     }
-    case actionTypes.SEND_MESSAGEGE_FAILURE: {
+    case actionTypes.SEND_MESSAGE_FAILURE: {
       // eslint-disable-next-line no-param-reassign
       action.payload.failed = true;
       return {
diff --git a/src/modules/Channel/context/hooks/useResendMessageCallback.js b/src/modules/Channel/context/hooks/useResendMessageCallback.js
@@ -39,7 +39,7 @@ function useResendMessageCallback({
             // eslint-disable-next-line no-param-reassign
             failedMessage.sendingStatus = 'failed';
             messagesDispatcher({
-              type: messageActionTypes.SEND_MESSAGEGE_FAILURE,
+              type: messageActionTypes.SEND_MESSAGE_FAILURE,
               payload: failedMessage,
             });
           });
@@ -72,7 +72,7 @@ function useResendMessageCallback({
             // eslint-disable-next-line no-param-reassign
             failedMessage.sendingStatus = 'failed';
             messagesDispatcher({
-              type: messageActionTypes.SEND_MESSAGEGE_FAILURE,
+              type: messageActionTypes.SEND_MESSAGE_FAILURE,
               payload: failedMessage,
             });
           });
diff --git a/src/modules/Channel/context/hooks/useSendFileMessageCallback.js b/src/modules/Channel/context/hooks/useSendFileMessageCallback.js
@@ -97,7 +97,7 @@ export default function useSendFileMessageCallback({
                   // eslint-disable-next-line no-param-reassign
                   failedMessage.file = compressedFile;
                   messagesDispatcher({
-                    type: messageActionTypes.SEND_MESSAGEGE_FAILURE,
+                    type: messageActionTypes.SEND_MESSAGE_FAILURE,
                     payload: failedMessage,
                   });
                 })
@@ -147,7 +147,7 @@ export default function useSendFileMessageCallback({
           // eslint-disable-next-line no-param-reassign
           message.file = file;
           messagesDispatcher({
-            type: messageActionTypes.SEND_MESSAGEGE_FAILURE,
+            type: messageActionTypes.SEND_MESSAGE_FAILURE,
             payload: message,
           });
         })
diff --git a/src/modules/Channel/context/hooks/useSendMessageCallback.js b/src/modules/Channel/context/hooks/useSendMessageCallback.js
@@ -69,7 +69,7 @@ export default function useSendMessageCallback({
         .onFailed((err, msg) => {
           logger.warning('Channel: Sending message failed!', { message: msg, error: err });
           messagesDispatcher({
-            type: messageActionTypes.SEND_MESSAGEGE_FAILURE,
+            type: messageActionTypes.SEND_MESSAGE_FAILURE,
             payload: msg,
           });
         })
diff --git a/src/modules/Channel/context/hooks/useSendVoiceMessageCallback.ts b/src/modules/Channel/context/hooks/useSendVoiceMessageCallback.ts
@@ -74,7 +74,7 @@ export const useSendVoiceMessageCallback = ({
       .onFailed((err, failedMessage) => {
         logger.error('Channel: Sending voice message failed!', { failedMessage, err });
         messagesDispatcher({
-          type: messageActionTypes.SEND_MESSAGEGE_FAILURE,
+          type: messageActionTypes.SEND_MESSAGE_FAILURE,
           payload: failedMessage,
         });
       })
diff --git a/src/modules/Channel/context/utils.js b/src/modules/Channel/context/utils.js
@@ -81,6 +81,15 @@ export const pubSubHandler = ({
       });
     }
   }));
+  subscriber.set(topics.SEND_MESSAGE_FAILED, pubSub.subscribe(topics.SEND_MESSAGE_FAILED, (msg) => {
+    const { channel, message } = msg;
+    if (channelUrl === channel?.url) {
+      dispatcher({
+        type: channelActions.SEND_MESSAGE_FAILURE,
+        payload: message,
+      });
+    }
+  }));
   subscriber.set(topics.SEND_FILE_MESSAGE, pubSub.subscribe(topics.SEND_FILE_MESSAGE, (msg) => {
     const { channel, message } = msg;
     scrollIntoLast(0, scrollRef);
diff --git a/src/modules/Thread/context/hooks/useHandlePubsubEvents.ts b/src/modules/Thread/context/hooks/useHandlePubsubEvents.ts
@@ -44,6 +44,17 @@ export default function useHandlePubsubEvents({
         }
         scrollIntoLast?.();
       }));
+      subscriber.set(topics.SEND_MESSAGE_FAILED, pubSub.subscribe(topics.SEND_MESSAGE_FAILED, (props) => {
+        const { channel, message } = props;
+        if (currentChannel?.url === channel?.url
+          && message?.parentMessageId === parentMessage?.messageId
+        ) {
+          threadDispatcher({
+            type: ThreadContextActionTypes.SEND_MESSAGE_FAILURE,
+            payload: { message },
+          });
+        }
+      }));
       subscriber.set(topics.SEND_FILE_MESSAGE, pubSub.subscribe(topics.SEND_FILE_MESSAGE, (props) => {
         const { channel, message } = props;
         if (currentChannel?.url === channel?.url) {

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ export default function reducer(state, action) {`
`173`	`173`	`],`
`174`	`174`	`};`
`175`	`175`	`}`
`176`		`- case actionTypes.SEND_MESSAGEGE_FAILURE: {`
	`176`	`+ case actionTypes.SEND_MESSAGE_FAILURE: {`
`177`	`177`	`// eslint-disable-next-line no-param-reassign`
`178`	`178`	`action.payload.failed = true;`
`179`	`179`	`return {`