Skip to content

Commit

Permalink
CW-system-crash-react Fixed ReactWithEmoji usage. Added try/catch for…
Browse files Browse the repository at this point in the history 
… apis
  • Loading branch information
@MeyerPV
MeyerPV committed Jun 26, 2024
1 parent 326b870 commit 7b9f153
Show file tree
Hide file tree
Showing 3 changed files with 214 additions and 193 deletions.
49 changes: 26 additions & 23 deletions src/shared/components/Chat/ChatMessage/ChatMessage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,27 +409,6 @@ const ChatMessage = ({
return null;
}

const emojiButton = useCallback(
() => (
<ReactWithEmoji
emojiButtonClassName={styles.emojiButton}
discussionId={discussionMessage.discussionId}
discussionMessageId={discussionMessage.id}
className={
isNotCurrentUserMessage
? styles.reactWithEmoji
: styles.reactWithEmojiSelf
}
isNotCurrentUserMessage={isNotCurrentUserMessage}
/>
),
[
discussionMessage.discussionId,
discussionMessage.id,
isNotCurrentUserMessage,
],
);

return (
<ChatMessageContext.Provider value={chatMessageContextValue}>
<li
Expand All @@ -442,7 +421,19 @@ const ChatMessage = ({
[styles.systemMessageContainer]: isSystemMessage,
})}
>
{!isSystemMessage && !isNotCurrentUserMessage && emojiButton}
{!isSystemMessage && !isNotCurrentUserMessage && (
<ReactWithEmoji
emojiButtonClassName={styles.emojiButton}
discussionId={discussionMessage.discussionId}
discussionMessageId={discussionMessage.id}
className={
isNotCurrentUserMessage
? styles.reactWithEmoji
: styles.reactWithEmojiSelf
}
isNotCurrentUserMessage={isNotCurrentUserMessage}
/>
)}
{isNotCurrentUserMessage &&
(isUserDiscussionMessage || isBotMessage) && (
<div className={styles.iconWrapper} onClick={handleUserClick}>
Expand Down Expand Up @@ -584,7 +575,19 @@ const ChatMessage = ({
</div>
</>
)}
{!isSystemMessage && isNotCurrentUserMessage && emojiButton}
{!isSystemMessage && isNotCurrentUserMessage && (
<ReactWithEmoji
emojiButtonClassName={styles.emojiButton}
discussionId={discussionMessage.discussionId}
discussionMessageId={discussionMessage.id}
className={
isNotCurrentUserMessage
? styles.reactWithEmoji
: styles.reactWithEmojiSelf
}
isNotCurrentUserMessage={isNotCurrentUserMessage}
/>
)}
</div>
</li>
</ChatMessageContext.Provider>
Expand Down
266 changes: 137 additions & 129 deletions src/shared/hooks/useCases/useDiscussionMessagesById.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,75 +238,79 @@ export const useDiscussionMessagesById = ({
setIsBatchLoading(true);
}

DiscussionMessageService.subscribeToDiscussionMessagesByDiscussionId(
discussionId,
lastVisible && lastVisible[discussionId],
async (
addedDiscussionMessages,
modifiedDiscussionMessages,
removedDiscussionMessages,
lastVisibleDocument,
) => {
const updatedDiscussionMessages = [
...addedDiscussionMessages,
...modifiedDiscussionMessages,
];
setLastVisible((prevVisible) => ({
...prevVisible,
[discussionId]: lastVisibleDocument,
}));

const hasLastVisibleDocument = !!lastVisibleDocument?.data();

const discussionsWithText = await Promise.all(
updatedDiscussionMessages.map(async (discussionMessage) => {
const isUserDiscussionMessage =
checkIsUserDiscussionMessage(discussionMessage);
const isSystemMessage =
checkIsSystemDiscussionMessage(discussionMessage);

const parsedText = await getTextFromTextEditorString({
userId,
ownerId: isUserDiscussionMessage
? discussionMessage.ownerId
: null,
textEditorString: discussionMessage.text,
users,
commonId: discussionMessage.commonId,
systemMessage: isSystemMessage ? discussionMessage : undefined,
getCommonPagePath,
getCommonPageAboutTabPath,
directParent,
onUserClick,
onFeedItemClick,
onInternalLinkClick,
});

return {
...discussionMessage,
parsedText,
};
}),
);
if (
discussionsWithText.length < MESSAGES_NUMBER_IN_BATCH &&
!hasLastVisibleDocument
) {
setIsEndOfList((prevIsEndOfList) => ({
...prevIsEndOfList,
[discussionId]: true,
try {
DiscussionMessageService.subscribeToDiscussionMessagesByDiscussionId(
discussionId,
lastVisible && lastVisible[discussionId],
async (
addedDiscussionMessages,
modifiedDiscussionMessages,
removedDiscussionMessages,
lastVisibleDocument,
) => {
const updatedDiscussionMessages = [
...addedDiscussionMessages,
...modifiedDiscussionMessages,
];
setLastVisible((prevVisible) => ({
...prevVisible,
[discussionId]: lastVisibleDocument,
}));
}
dispatch(
cacheActions.updateDiscussionMessagesStateByDiscussionId({
discussionId,
removedDiscussionMessages,
updatedDiscussionMessages: discussionsWithText,
}),
);
setIsBatchLoading(false);
},
);

const hasLastVisibleDocument = !!lastVisibleDocument?.data();

const discussionsWithText = await Promise.all(
updatedDiscussionMessages.map(async (discussionMessage) => {
const isUserDiscussionMessage =
checkIsUserDiscussionMessage(discussionMessage);
const isSystemMessage =
checkIsSystemDiscussionMessage(discussionMessage);

const parsedText = await getTextFromTextEditorString({
userId,
ownerId: isUserDiscussionMessage
? discussionMessage.ownerId
: null,
textEditorString: discussionMessage.text,
users,
commonId: discussionMessage.commonId,
systemMessage: isSystemMessage ? discussionMessage : undefined,
getCommonPagePath,
getCommonPageAboutTabPath,
directParent,
onUserClick,
onFeedItemClick,
onInternalLinkClick,
});

return {
...discussionMessage,
parsedText,
};
}),
);
if (
discussionsWithText.length < MESSAGES_NUMBER_IN_BATCH &&
!hasLastVisibleDocument
) {
setIsEndOfList((prevIsEndOfList) => ({
...prevIsEndOfList,
[discussionId]: true,
}));
}
dispatch(
cacheActions.updateDiscussionMessagesStateByDiscussionId({
discussionId,
removedDiscussionMessages,
updatedDiscussionMessages: discussionsWithText,
}),
);
setIsBatchLoading(false);
},
);
} catch(err) {
setIsBatchLoading(false);
}
};

useDeepCompareEffect(() => {
Expand All @@ -316,70 +320,74 @@ export const useDiscussionMessagesById = ({
return;
}

const discussionMessages = [...state.data];

// if (discussionMessages.length > 0 && users.length === 0) {
// return;
// }
try {
const discussionMessages = [...state.data];

const filteredMessages = discussionMessages.filter(
({ moderation }) =>
moderation?.flag !== ModerationFlags.Hidden || hasPermissionToHide,
);
const loadedDiscussionMessages = await Promise.all(
filteredMessages.map(async (d) => {
const newDiscussionMessage = { ...d };
const parentMessage = filteredMessages.find(
({ id }) => id === d.parentId,
);
if (
checkIsUserDiscussionMessage(d) &&
checkIsUserDiscussionMessage(newDiscussionMessage)
) {
const commonMemberMessageOwner = [
AI_USER,
AI_PRO_USER,
...users,
...externalCommonUsers,
].find((o) => o.uid === d.ownerId);
const messageOwner =
commonMemberMessageOwner ||
(await UserService.getUserById(d.ownerId));
newDiscussionMessage.owner = messageOwner;
if (!commonMemberMessageOwner && messageOwner) {
dispatch(
cacheActions.addUserToExternalCommonUsers({
user: messageOwner,
}),
);
}
}
newDiscussionMessage.parentMessage = parentMessage
? {
id: parentMessage.id,
text: parentMessage.text,
ownerName: parentMessage?.ownerName,
...(checkIsUserDiscussionMessage(parentMessage) && {
ownerId: parentMessage.ownerId,
}),
moderation: parentMessage?.moderation,
images: parentMessage?.images,
files: parentMessage?.files,
createdAt: parentMessage.createdAt,
const filteredMessages = discussionMessages.filter(
({ moderation }) =>
moderation?.flag !== ModerationFlags.Hidden || hasPermissionToHide,
);
const loadedDiscussionMessages = await Promise.all(
filteredMessages.map(async (d) => {
const newDiscussionMessage = { ...d };
const parentMessage = filteredMessages.find(
({ id }) => id === d.parentId,
);
if (
checkIsUserDiscussionMessage(d) &&
checkIsUserDiscussionMessage(newDiscussionMessage)
) {
const commonMemberMessageOwner = [
AI_USER,
AI_PRO_USER,
...users,
...externalCommonUsers,
].find((o) => o.uid === d.ownerId);
const messageOwner =
commonMemberMessageOwner ||
(await UserService.getUserById(d.ownerId));
newDiscussionMessage.owner = messageOwner;
if (!commonMemberMessageOwner && messageOwner) {
dispatch(
cacheActions.addUserToExternalCommonUsers({
user: messageOwner,
}),
);
}
: null;

return newDiscussionMessage;
}),
);

setDiscussionMessagesWithOwners(loadedDiscussionMessages);
setIsFirstBatchLoaded((prev) => ({
...prev,
[discussionId]: true,
}));
}
newDiscussionMessage.parentMessage = parentMessage
? {
id: parentMessage.id,
text: parentMessage.text,
ownerName: parentMessage?.ownerName,
...(checkIsUserDiscussionMessage(parentMessage) && {
ownerId: parentMessage.ownerId,
}),
moderation: parentMessage?.moderation,
images: parentMessage?.images,
files: parentMessage?.files,
createdAt: parentMessage.createdAt,
}
: null;

return newDiscussionMessage;
}),
);

setDiscussionMessagesWithOwners(loadedDiscussionMessages);
setIsFirstBatchLoaded((prev) => ({
...prev,
[discussionId]: true,
}));
} catch(err) {
setDiscussionMessagesWithOwners([]);
setIsFirstBatchLoaded((prev) => ({
...prev,
[discussionId]: true,
}));
}
})();
}, [state.data, hasPermissionToHide, users, externalCommonUsers]);
}, [state.data, hasPermissionToHide, users, externalCommonUsers, discussionId]);

return {
...state,
Expand Down
Loading

0 comments on commit 7b9f153

Please sign in to comment.