From 92cb5801da5cbf886f86213ede4ce34d1881d093 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 26 Dec 2024 15:35:41 +0900 Subject: [PATCH] [Update] Main Page: Message Logs. Add system message (Word Filter) --- src-python/webui_controller.py | 2 +- .../message_container/MessageContainer.jsx | 26 ++++++++++++------- .../MessageContainer.module.scss | 24 +++++++++++++++++ src-ui/logics/common/useMessage.js | 17 ++++++++++-- src-ui/logics/useReceiveRoutes.js | 3 +++ 5 files changed, 60 insertions(+), 12 deletions(-) diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index a3aa90f3..b8b41e11 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -203,7 +203,7 @@ class Controller: self.run( 200, self.run_mapping["word_filter"], - {"message":f"Detected by word filter:{message}"}, + {"message":f"Detected by word filter: {message}"}, ) return elif model.detectRepeatSendMessage(message): diff --git a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx b/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx index be4e25d6..1298c8da 100644 --- a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx +++ b/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx @@ -5,6 +5,7 @@ import styles from "./MessageContainer.module.scss"; import { MessageSubMenuContainer } from "./message_sub_menu_container/MessageSubMenuContainer"; import { useMessage } from "@logics_common"; import { useIsVisibleResendButton } from "@logics_main"; + export const MessageContainer = ({ messages, status, category, created_at }) => { const { t } = useTranslation(); const { @@ -22,7 +23,6 @@ export const MessageContainer = ({ messages, status, category, created_at }) => updateMessageInputValue(messages.original); }; - const handleMouseEnter = () => { if (!is_locked) { setIsHovered(true); @@ -39,15 +39,20 @@ export const MessageContainer = ({ messages, status, category, created_at }) => setIsLocked(true); }; - const is_translated_exist = messages.translated.length >= 1; + const is_translated_exist = messages.translated?.length >= 1; const is_pending = status === "pending"; const is_sent_message = category === "sent"; - const category_text = is_sent_message ? t("main_page.message_log.sent") : t("main_page.message_log.received"); + const is_system_message = category === "system"; + const category_text = is_sent_message + ? t("main_page.message_log.sent") + : is_system_message + ? t("main_page.message_log.system") + : t("main_page.message_log.received"); const message_type_class_name = clsx({ [styles.sent_message]: is_sent_message, - [styles.is_shown_resend_button]: currentIsVisibleResendButton.data, - [styles.received_message]: !is_sent_message, + [styles.received_message]: !is_sent_message && !is_system_message, + [styles.system_message]: is_system_message, }); return ( @@ -63,10 +68,13 @@ export const MessageContainer = ({ messages, status, category, created_at }) => {is_sent_message && is_pending && }
{messages.original}
- } + {is_system_message ? ( +{messages.message}
+ ) : is_translated_exist ? ( +{messages.original}
+ )}