- {options.map((option) => (
+ {props.options.map((option) => (
))}
diff --git a/src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.module.scss b/src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.module.scss
index ba631f17..b8e82e23 100644
--- a/src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.module.scss
+++ b/src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.module.scss
@@ -1,3 +1,5 @@
+@import "@scss_mixins";
+
.container {
display: flex;
flex-direction: column;
@@ -12,6 +14,7 @@
gap: 1rem;
padding: 0.6rem 0.8rem;
border-radius: 0.4rem;
+ position: relative;
&:hover {
background-color: var(--dark_800_color);
}
@@ -38,4 +41,8 @@ input[type="radio"] {
.radio_button_label {
font-size: 1.4rem;
font-weight: 300;
+}
+
+.loader {
+ @include loader(2rem, 0.2rem, left, -1.6rem);
}
\ No newline at end of file
diff --git a/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx b/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx
new file mode 100644
index 00000000..dabb27d1
--- /dev/null
+++ b/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx
@@ -0,0 +1,40 @@
+import { useTranslation } from "react-i18next";
+import { useSettingBox } from "../components/useSettingBox";
+// import {
+// useEnableAutoClearMessageBox,
+// } from "@store";
+
+import { useConfig } from "@logics/useConfig";
+
+export const Others = () => {
+ const { t } = useTranslation();
+ const {
+ CheckboxContainer,
+ RadioButtonContainer,
+ } = useSettingBox();
+
+ const { currentEnableAutoClearMessageBox, toggleEnableAutoClearMessageBox } = useConfig();
+ const { currentSendMessageButtonType, setSendMessageButtonType } = useConfig();
+
+
+ return (
+ <>
+
+
+
+ >
+ );
+};
\ No newline at end of file
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 7446823b..8ed027d1 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
@@ -33,10 +33,11 @@ export const MessageContainer = ({ messages, status, category, created_at }) =>
};
const WithTranslatedMessages = ({ messages }) => {
+ const translated_data = Array.isArray(messages.translated) ? messages.translated : [messages.translated];
return (
<>
{messages.original}
- {messages.translated.map((message, index) => (
+ {translated_data.map((message, index) => (
{message}
))}
>
diff --git a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
index 951ec4b8..dfffc2cb 100644
--- a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
+++ b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
@@ -2,18 +2,23 @@ import { useState } from "react";
import styles from "./MessageInputBox.module.scss";
import SendMessageSvg from "@images/send_message.svg?react";
import { useMessage } from "@logics/useMessage";
-import { store } from "@store";
+import { store, useEnableAutoClearMessageBox } from "@store";
import { scrollToBottom } from "@logics/scrollToBottom";
-
+import { useConfig } from "@logics/useConfig";
export const MessageInputBox = () => {
const [inputValue, setInputValue] = useState("");
const { sendMessage } = useMessage();
+ const { currentEnableAutoClearMessageBox } = useEnableAutoClearMessageBox();
+ const { currentSendMessageButtonType } = useConfig();
+
const onSubmitFunction = (e) => {
e.preventDefault();
sendMessage(inputValue);
+ if (currentEnableAutoClearMessageBox.data) setInputValue("");
+
setTimeout(() => {
scrollToBottom(store.log_box_ref);
}, 10);
@@ -24,6 +29,13 @@ export const MessageInputBox = () => {
setInputValue(e.currentTarget.value);
};
+ const onKeyDownFunction = (e) => {
+ if (currentSendMessageButtonType.data === "show_and_disable_enter_key") return;
+ if (e.keyCode == 13 && e.shiftKey == false) {
+ onSubmitFunction(e);
+ }
+ };
+
return (
@@ -31,15 +43,24 @@ export const MessageInputBox = () => {
className={styles.message_box_input_area}
onChange={onChangeFunction}
placeholder="Input Textfield"
+ value={inputValue}
+ onKeyDown={onKeyDownFunction}
/>
-
+ { currentSendMessageButtonType.data !== "hide" &&
}
);
};
+
+
+const SendMessageButton = ({onSubmitFunction}) => {
+ return (
+
+ );
+};
\ No newline at end of file
diff --git a/src-ui/logics/useConfig.js b/src-ui/logics/useConfig.js
index fb7c54fc..1557c119 100644
--- a/src-ui/logics/useConfig.js
+++ b/src-ui/logics/useConfig.js
@@ -6,6 +6,9 @@ import {
useSelectedMicDevice,
useSpeakerDeviceList,
useSelectedSpeakerDevice,
+
+ useEnableAutoClearMessageBox,
+ useSendMessageButtonType,
} from "@store";
import { useStdoutToPython } from "./useStdoutToPython";
@@ -22,6 +25,8 @@ export const useConfig = () => {
const { updateSelectedMicDevice } = useSelectedMicDevice();
const { updateSpeakerDeviceList } = useSpeakerDeviceList();
const { updateSelectedSpeakerDevice } = useSelectedSpeakerDevice();
+ const { currentEnableAutoClearMessageBox, updateEnableAutoClearMessageBox } = useEnableAutoClearMessageBox();
+ const { currentSendMessageButtonType, updateSendMessageButtonType } = useSendMessageButtonType();
const asyncPending = () => new Promise(() => {});
@@ -95,5 +100,39 @@ export const useConfig = () => {
},
+
+ // Others
+ getEnableAutoClearMessageBox: () => {
+ updateEnableAutoClearMessageBox(asyncPending);
+ asyncStdoutToPython("/config/enable_auto_clear_message_box");
+ },
+ toggleEnableAutoClearMessageBox: () => {
+ updateEnableAutoClearMessageBox(asyncPending);
+ if (currentEnableAutoClearMessageBox.data) {
+ asyncStdoutToPython("/controller/callback_disable_auto_clear_chatbox");
+ } else {
+ asyncStdoutToPython("/controller/callback_enable_auto_clear_chatbox");
+ }
+ },
+ currentEnableAutoClearMessageBox: currentEnableAutoClearMessageBox,
+ updateEnableAutoClearMessageBox: (payload) => {
+ updateEnableAutoClearMessageBox(payload.data);
+ },
+
+ getSendMessageButtonType: () => {
+ updateSendMessageButtonType(asyncPending);
+ asyncStdoutToPython("/config/send_message_button_type");
+ },
+ setSendMessageButtonType: (selected_type) => {
+ updateSendMessageButtonType(asyncPending);
+ asyncStdoutToPython("/controller/callback_set_send_message_button_type", selected_type);
+ },
+ currentSendMessageButtonType: currentSendMessageButtonType,
+ updateSendMessageButtonType: (payload) => {
+ updateSendMessageButtonType(payload.data);
+ },
+
+
+
};
};
\ No newline at end of file
diff --git a/src-ui/logics/useMessage.js b/src-ui/logics/useMessage.js
index ebdb1b19..089a72b4 100644
--- a/src-ui/logics/useMessage.js
+++ b/src-ui/logics/useMessage.js
@@ -32,7 +32,7 @@ export const useMessage = () => {
updateSentMessageLog: (payload) => {
const data = payload.data;
- updateMessageLogsStatus(updateItemById(data.id));
+ updateMessageLogsStatus(updateItemById(data.id, data.translation));
},
addSentMessageLog: (payload) => {
const data = payload.data;
@@ -63,16 +63,17 @@ const generateMessageObject = (data, category) => {
status: "ok",
messages: {
original: data.message,
- translated: [],
+ translated: data.translation,
},
};
};
-const updateItemById = (id) => (prev_items) => {
+const updateItemById = (id, translated_data) => (prev_items) => {
return prev_items.map(item => {
if (item.id === id) {
item.status = "ok";
+ item.messages.translated = translated_data;
}
return item;
});
diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js
index f624513d..18d5ecd5 100644
--- a/src-ui/logics/useReceiveRoutes.js
+++ b/src-ui/logics/useReceiveRoutes.js
@@ -26,6 +26,9 @@ export const useReceiveRoutes = () => {
updateSpeakerDeviceList,
updateSelectedSpeakerDevice,
+
+ updateEnableAutoClearMessageBox,
+ updateSendMessageButtonType,
} = useConfig();
const { updateVolumeVariable_Mic, updateVolumeVariable_Speaker } = useVolume();
@@ -56,6 +59,13 @@ export const useReceiveRoutes = () => {
"/action/check_mic_threshold_energy": updateVolumeVariable_Mic,
"/action/check_speaker_threshold_energy": updateVolumeVariable_Speaker,
+ "/config/enable_auto_clear_message_box": updateEnableAutoClearMessageBox,
+ "/controller/callback_enable_auto_clear_chatbox": updateEnableAutoClearMessageBox,
+ "/controller/callback_disable_auto_clear_chatbox": updateEnableAutoClearMessageBox,
+
+ "/config/send_message_button_type": updateSendMessageButtonType,
+ "/controller/callback_set_send_message_button_type": updateSendMessageButtonType,
+
"/controller/callback_messagebox_send": updateSentMessageLog,
"/action/transcription_send_mic_message": addSentMessageLog,
diff --git a/src-ui/store.js b/src-ui/store.js
index 0bafb5d0..3c57adb4 100644
--- a/src-ui/store.js
+++ b/src-ui/store.js
@@ -152,6 +152,14 @@ export const { atomInstance: Atom_IsOpenedWordFilterList, useHook: useIsOpenedWo
export const { atomInstance: Atom_WordFilterList, useHook: useWordFilterList } = createAtomWithHook(word_filter_list, "WordFilterList");
+
+// Others
+export const { atomInstance: Atom_EnableAutoClearMessageBox, useHook: useEnableAutoClearMessageBox } = createAsyncAtomWithHook(true, "EnableAutoClearMessageBox");
+export const { atomInstance: Atom_SendMessageButtonType, useHook: useSendMessageButtonType } = createAsyncAtomWithHook("show", "SendMessageButtonType");
+
+
+
+
export const { atomInstance: Atom_TranslatorListStatus, useHook: useTranslatorListStatus } = createAtomWithHook(translator_list, "TranslatorListStatus");
export const { atomInstance: Atom_SelectedTranslatorIdStatus, useHook: useSelectedTranslatorIdStatus } = createAtomWithHook("CTranslate2", "SelectedTranslatorIdStatus");
export const { atomInstance: Atom_IsOpenedTranslatorSelector, useHook: useIsOpenedTranslatorSelector } = createAtomWithHook(false, "IsOpenedTranslatorSelector");