Front-End: Fixing indexing issue when chaining messages

king112ola · Aug 10, 2024 · 9a175ce · 9a175ce
1 parent cf91c89
commit 9a175ce
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 52 deletions.
diff --git a/Front-End/src/layout/MainLayout/Header/NotificationSection/index.jsx b/Front-End/src/layout/MainLayout/Header/NotificationSection/index.jsx
@@ -123,27 +123,6 @@ const NotificationSection = () => {
                     break;
             }
 
-        // if (messages[lastMessageId - 1].contentType == "image")
-        //    { 
-
-        // messages[lastMessageId - 1].messageBody.forEach(element => {
-
-        //     switch (Object.keys(element)[0]) {
-        //         case 'imageUrlOnIpfs':
-        //             setIpfsHash(element.imageUrlOnIpfs)
-        //             break;
-        //         case 'promptOnIpfs':
-        //             // element.prompt should be the one stored on the ipfs, but i think we should use the redux record for simplicity 
-        //             setPromptForIpfsHash(messages[lastMessageId - 1].prompt)
-        //         default:
-        //             break;
-        //     }
-        //     //.split('ipfs/')[1]
-        // })}
-        // setIpfsHash
-        // if (messages[lastMessageId - 1].contentType == "image")
-        //     
-
     }, [messages])
     // 
 

diff --git a/Front-End/src/views/chatgpt/dropdownMenu/index.jsx b/Front-End/src/views/chatgpt/dropdownMenu/index.jsx
@@ -20,9 +20,6 @@ export const DropdownMenu = ({ id, itemid, handleMessageInput, scrollRef }) => {
     // Load message/ Init message from Redux store
     const messages = useSelector((state) => state.messagesFromUserAndServer.messages, shallowEqual)
 
-    // Find the last Id from the message list
-    const lastMessageId = useSelector((state) => state.messagesFromUserAndServer.lastMessageId, shallowEqual)
-
     // close all of the dropdown menu and with the closing fade out + slide down effect
     const clearDropdownMenu = (handleMessageInput) => {
 
@@ -61,10 +58,7 @@ export const DropdownMenu = ({ id, itemid, handleMessageInput, scrollRef }) => {
                 break;
         }
 
-        // Inject a user side message to notify the user that the message is being redirected
-        handleMessageInput("Sending to " +aiEngineNameOutputToScreen[desireAiEngine] +"...", desireAiEngine,null, null, null, true)
-
-        clearDropdownMenu(() => handleMessageInput(inputFromUser, desireAiEngine, hiddenFromUser))
+        clearDropdownMenu(() => handleMessageInput(inputFromUser,desireAiEngine,null, null, null, true))
 
     }
 

diff --git a/Front-End/src/views/chatgpt/index.jsx b/Front-End/src/views/chatgpt/index.jsx
@@ -256,32 +256,44 @@ const ChatGptIndex = () => {
 
     // Create method that handles the input and dispatch to the reducer
     // desireAiEngine only be used when data-chaining happens, if input is from input filed, desireAiEngine will he undefined
-    const handleMessageInput = async (inputFromUser, desireAiEngine, hiddenFromUser, inputType, extraConfigPdfTransLanguage, internalMessage) => {
+    const handleMessageInput = async (inputFromUser, desireAiEngine, hiddenFromUser, inputType, extraConfigPdfTransLanguage, messageChaining) => {
 
         setLoadingStage('loading');
 
         // saving the user sending message into redux, change to the desire ai engine when data chaining happens
 
-        let responseData
 
-        let messageToSave
+        // Stop sending request to AI Engines if its a internal message 
+        if (messageChaining) {
+            dispatch(SET_AddMessage({
+                id: lastMessageId + 1,
+                messageBody: "Sending to " + aiEngineNameOutputToScreen[desireAiEngine] + "...",
+                sender: 'User',
+                contentType: inputType ?? 'text',
+                prompt: inputFromUser,
+                currentAiEngine: desireAiEngine ?? currentAiEngine,
+                hiddenFromUser: hiddenFromUser ?? false,
+                messageChaining: messageChaining ?? false
+            }))
 
-        dispatch(SET_AddMessage({
-            id: Number(customAlphabet('1234567890', 64)()),
-            messageBody: inputFromUser,
-            sender: 'User',
-            contentType: inputType ?? 'text',
-            currentAiEngine: desireAiEngine ?? currentAiEngine,
-            hiddenFromUser: hiddenFromUser ?? false,
-            internalMessage: internalMessage?? false
-        }))
+        }
+        else {
+            dispatch(SET_AddMessage({
+                id: lastMessageId + 1,
+                messageBody: inputFromUser,
+                sender: 'User',
+                contentType: inputType ?? 'text',
+                currentAiEngine: desireAiEngine ?? currentAiEngine,
+                hiddenFromUser: hiddenFromUser ?? false,
+                messageChaining: messageChaining ?? false
+            }))
+        }
 
-        // Stop sending request to AI Engines if its a internal message 
-        if(internalMessage) return
+        let messageToSave
 
         try {
 
-            responseData = await aiEngineApiCall(inputFromUser, desireAiEngine ?? currentAiEngine, inputType == 'pdf' ? extraConfigPdfTransLanguage : null)
+            let responseData = await aiEngineApiCall(inputFromUser, desireAiEngine ?? currentAiEngine, inputType == 'pdf' ? extraConfigPdfTransLanguage : null)
 
             // Set loading to false when the request is complete
             setTimeout(() => {
@@ -294,7 +306,6 @@ const ChatGptIndex = () => {
             let dynamicSelectedAiEngine
 
             messageToSave = {
-                // TODO: make this id to be nano id as well, but got content type error, need fix
                 id: lastMessageId + 2,
                 sender: desireAiEngine ?? currentAiEngine,
                 prompt: inputFromUser,
@@ -395,14 +406,6 @@ const ChatGptIndex = () => {
         } catch (error) {
 
             console.error("Error occurs while handleMessageInput:", error)
-            // messageToSave = {
-            //     id: lastMessageId + 2,
-            //     sender: desireAiEngine ?? currentAiEngine,
-            //     contentType: "text",
-            //     prompt: inputFromUser,
-            //     currentAiEngine: desireAiEngine ?? currentAiEngine,
-            //     messageBody: responseData,
-            // }
 
         } finally {