From db5f37d5d8cecd4ce82812f2d10c572c25749b2a Mon Sep 17 00:00:00 2001
From: anovazzi1 <otavio2204@gmail.com>
Date: Tue, 4 Apr 2023 17:23:15 -0300
Subject: [PATCH] delete send message when backend return error

---
 src/frontend/package.json                     |  2 +-
 .../src/components/chatComponent/index.tsx    | 73 +++++++++++++------
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/src/frontend/package.json b/src/frontend/package.json
index 41b9bcdfe..6bd8211e8 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -59,5 +59,5 @@
             "last 1 safari version"
         ]
     },
-    "proxy": "http://localhost:7860"
+    "proxy": "http://backend:7860"
 }
diff --git a/src/frontend/src/components/chatComponent/index.tsx b/src/frontend/src/components/chatComponent/index.tsx
index 99aff511e..ea7236f40 100644
--- a/src/frontend/src/components/chatComponent/index.tsx
+++ b/src/frontend/src/components/chatComponent/index.tsx
@@ -5,7 +5,13 @@ import {
 	PaperAirplaneIcon,
 	XMarkIcon,
 } from "@heroicons/react/24/outline";
-import { MouseEventHandler, useContext, useEffect, useRef, useState } from "react";
+import {
+	MouseEventHandler,
+	useContext,
+	useEffect,
+	useRef,
+	useState,
+} from "react";
 import { sendAll } from "../../controllers/API";
 import { alertContext } from "../../contexts/alertContext";
 import { classNames, nodeColors } from "../../utils";
@@ -13,11 +19,11 @@ import { TabsContext } from "../../contexts/tabsContext";
 import { ChatType } from "../../types/chat";
 import ChatMessage from "./chatMessage";
 
-
 const _ = require("lodash");
 
 export default function Chat({ flow, reactFlowInstance }: ChatType) {
-	const { updateFlow,lockChat,setLockChat,flows,tabIndex } = useContext(TabsContext);
+	const { updateFlow, lockChat, setLockChat, flows, tabIndex } =
+		useContext(TabsContext);
 	const [saveChat, setSaveChat] = useState(false);
 	const [open, setOpen] = useState(true);
 	const [chatValue, setChatValue] = useState("");
@@ -26,14 +32,14 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
 	const addChatHistory = (
 		message: string,
 		isSend: boolean,
-		thought?: string,
+		thought?: string
 	) => {
 		let tabsChange = false;
 		setChatHistory((old) => {
 			let newChat = _.cloneDeep(old);
-			if(JSON.stringify(flow.chat) !==JSON.stringify(old)){
-				tabsChange = true
-				return old
+			if (JSON.stringify(flow.chat) !== JSON.stringify(old)) {
+				tabsChange = true;
+				return old;
 			}
 			if (thought) {
 				newChat.push({ message, isSend, thought });
@@ -42,12 +48,17 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
 			}
 			return newChat;
 		});
-		if(tabsChange){
-			if(thought){
-				updateFlow({..._.cloneDeep(flow),chat:[...flow.chat,{isSend,message,thought}]})
-			}
-			else{
-				updateFlow({..._.cloneDeep(flow),chat:[...flow.chat,{isSend,message}]})
+		if (tabsChange) {
+			if (thought) {
+				updateFlow({
+					..._.cloneDeep(flow),
+					chat: [...flow.chat, { isSend, message, thought }],
+				});
+			} else {
+				updateFlow({
+					..._.cloneDeep(flow),
+					chat: [...flow.chat, { isSend, message }],
+				});
 			}
 		}
 		setSaveChat((chat) => !chat);
@@ -98,19 +109,38 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
 				setChatValue("");
 				addChatHistory(message, true);
 
-				sendAll({ ...reactFlowInstance.toObject(), message, chatHistory,name:flow.name,description:flow.description})
+				sendAll({
+					...reactFlowInstance.toObject(),
+					message,
+					chatHistory,
+					name: flow.name,
+					description: flow.description,
+				})
 					.then((r) => {
-						addChatHistory(r.data.result, false,r.data.thought);
+						addChatHistory(r.data.result, false, r.data.thought);
 						setLockChat(false);
 					})
 					.catch((error) => {
-						setErrorData({ title: error.message ?? "Unknown Error", list: [error.response.data.detail]});
+						setErrorData({
+							title: error.message ?? "Unknown Error",
+							list: [error.response.data.detail],
+						});
 						setLockChat(false);
+						let lastMessage;
+						setChatHistory((chatHistory) => {
+							let newChat = chatHistory;
+
+							lastMessage= newChat.pop().message;
+							return newChat;
+						});
+						setChatValue(lastMessage)
 					});
 			} else {
 				setErrorData({
 					title: "Error sending message",
-					list: [ "Oops! Looks like you missed some required information. Please fill in all the required fields before continuing."],
+					list: [
+						"Oops! Looks like you missed some required information. Please fill in all the required fields before continuing.",
+					],
 				});
 			}
 		} else {
@@ -121,8 +151,8 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
 		}
 	}
 	function clearChat() {
-		setChatHistory([])
-		updateFlow({ ..._.cloneDeep(flow), chat: []});
+		setChatHistory([]);
+		updateFlow({ ..._.cloneDeep(flow), chat: [] });
 	}
 
 	return (
@@ -152,9 +182,10 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
 								/>
 								Chat
 							</div>
-							<button className="hover:text-blue-500 dark:text-white"
+							<button
+								className="hover:text-blue-500 dark:text-white"
 								onClick={(e) => {
-									e.stopPropagation()
+									e.stopPropagation();
 									clearChat();
 								}}
 							>