diff --git a/src-ui/logics/useMainFunction.js b/src-ui/logics/useMainFunction.js index cae1c4e6..c91d6785 100644 --- a/src-ui/logics/useMainFunction.js +++ b/src-ui/logics/useMainFunction.js @@ -82,12 +82,4 @@ export const useMainFunction = () => { }, currentForegroundStatus: currentForegroundStatus, }; -}; - -const asyncTestFunction = (...args) => { - return new Promise((resolve) => { - setTimeout(() => { - resolve(...args); - }, 3000); - }); }; \ No newline at end of file diff --git a/src-ui/logics/useMessage.js b/src-ui/logics/useMessage.js index 7522c6cc..5318a896 100644 --- a/src-ui/logics/useMessage.js +++ b/src-ui/logics/useMessage.js @@ -10,8 +10,12 @@ export const useMessage = () => { return { sendMessage: (message) => { - asyncStdoutToPython({id: "send_message", data: message}); const uuid = crypto.randomUUID(); + const send_message_object = { + id: uuid, + message: message, + }; + asyncStdoutToPython("/controller/callback_messagebox_press_key_enter", send_message_object); addMessageLogsStatus({ id: uuid, @@ -20,26 +24,16 @@ export const useMessage = () => { created_at: generateTimeData(), messages: { original: message, - translated: [ - message, - ], + translated: [], }, }); - - setTimeout(() => { - const updateItemById = (id) => (prevItems) => { - return prevItems.map(item => { - if (item.id === id) { - item.status = "ok"; - } - return item; - }); - }; - updateMessageLogsStatus(updateItemById(uuid)); - }, 3000); }, currentMessageLogsStatus: currentMessageLogsStatus, + updateSentMessageLog: (payload) => { + const data = payload.data; + updateMessageLogsStatus(updateItemById(data.id)); + }, addSentMessageLog: (payload) => { const data = payload.data; const message_object = generateMessageObject(data, "sent"); @@ -72,4 +66,14 @@ const generateMessageObject = (data, category) => { translated: [], }, }; +}; + + +const updateItemById = (id) => (prev_items) => { + return prev_items.map(item => { + if (item.id === id) { + item.status = "ok"; + } + return item; + }); }; \ No newline at end of file diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index be471b9e..bfd33756 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -9,7 +9,11 @@ export const useReceiveRoutes = () => { updateTranscriptionReceiveStatus, } = useMainFunction(); - const { addSentMessageLog, addReceivedMessageLog } = useMessage(); + const { + updateSentMessageLog, + addSentMessageLog, + addReceivedMessageLog, + } = useMessage(); const { updateSoftwareVersion, @@ -25,6 +29,7 @@ export const useReceiveRoutes = () => { "/config/version": updateSoftwareVersion, + "/controller/callback_messagebox_press_key_enter": updateSentMessageLog, "/action/transcription_send_mic_message": addSentMessageLog, "/action/transcription_receive_speaker_message": addReceivedMessageLog };