From 7bb73cfa19d67bbf36f1fe4064e20c047564bbef Mon Sep 17 00:00:00 2001
From: adriano <adriano08andrade@hotmail.com>
Date: Mon, 20 May 2024 17:24:06 -0300
Subject: [PATCH] fix: bugs de atualizacao dos tickets tempo real

---
 frontend/src/components/MessagesList/index.js        | 5 +++--
 frontend/src/components/Ticket/index.js              | 2 +-
 frontend/src/components/TicketsList/index.js         | 1 +
 frontend/src/components/TransferTicketModal/index.js | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js
index 8773cc1..b351237 100644
--- a/frontend/src/components/MessagesList/index.js
+++ b/frontend/src/components/MessagesList/index.js
@@ -452,14 +452,14 @@ const MessagesList = ({ ticketId, isGroup }) => {
 
     const onAppMessageMessagesList = (data) => {
 
-      if (data.action === "create") {
+      if (data.action === "create" && data.ticket.id == ticketId) {
 
         dispatch({ type: "ADD_MESSAGE", payload: data.message })
 
         scrollToBottom()
       }
 
-      if (data.action === "update") {
+      if (data.action === "update" && data.ticket.id == ticketId) {
         dispatch({ type: "UPDATE_MESSAGE", payload: data.message })
       }
     }
@@ -467,6 +467,7 @@ const MessagesList = ({ ticketId, isGroup }) => {
     socket.on("appMessage", onAppMessageMessagesList)
 
     return () => {
+      socket.emit("leaveChatBox", ticketId)
       socket.off("connect", onConnectMessagesList)
       socket.off("appMessage", onAppMessageMessagesList)
     }
diff --git a/frontend/src/components/Ticket/index.js b/frontend/src/components/Ticket/index.js
index cd6cb41..4ef036f 100644
--- a/frontend/src/components/Ticket/index.js
+++ b/frontend/src/components/Ticket/index.js
@@ -143,7 +143,7 @@ const Ticket = () => {
     socket.on("connect", onConnectTicket)
 
     const onTicketTicket = (data) => {
-      if (data.action === "update") {
+      if (data.action === "update" && data.ticket.id == ticketId) {
         setTicket(data.ticket)
       }
 
diff --git a/frontend/src/components/TicketsList/index.js b/frontend/src/components/TicketsList/index.js
index 36dee0a..73b0f1e 100644
--- a/frontend/src/components/TicketsList/index.js
+++ b/frontend/src/components/TicketsList/index.js
@@ -246,6 +246,7 @@ const TicketsList = (props) => {
 		//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
 
 		const shouldUpdateTicket = ticket =>
+			(status === ticket.status) &&
 			(!ticket.userId || ticket.userId === user?.id || showAll) &&
 			(!ticket.queueId || selectedQueueIds.indexOf(ticket.queueId) > -1)
 
diff --git a/frontend/src/components/TransferTicketModal/index.js b/frontend/src/components/TransferTicketModal/index.js
index 0b1fb5b..5f2671e 100644
--- a/frontend/src/components/TransferTicketModal/index.js
+++ b/frontend/src/components/TransferTicketModal/index.js
@@ -262,7 +262,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
 							required
 						>
 							<MenuItem style={{ background: "white", }} value={''}>&nbsp;</MenuItem>
-							{queues.map((queue) => (
+							{queues?.map((queue) => (
 								<MenuItem
 									key={queue.id}
 									value={queue.id}