From f9b61cd39854cf1b22f63543e5f572f7cd849b83 Mon Sep 17 00:00:00 2001
From: canove <cassio@economicros.com.br>
Date: Thu, 14 Jan 2021 21:03:11 -0300
Subject: [PATCH] fix: remove ticket queue when transfer

---
 backend/src/controllers/TicketController.ts          | 1 +
 frontend/src/components/TicketsList/index.js         | 2 +-
 frontend/src/components/TransferTicketModal/index.js | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/controllers/TicketController.ts b/backend/src/controllers/TicketController.ts
index bd6da64..fe2c47f 100644
--- a/backend/src/controllers/TicketController.ts
+++ b/backend/src/controllers/TicketController.ts
@@ -20,6 +20,7 @@ type IndexQuery = {
 interface TicketData {
   contactId: number;
   status: string;
+  queueId: number;
   userId: number;
 }
 
diff --git a/frontend/src/components/TicketsList/index.js b/frontend/src/components/TicketsList/index.js
index 50fc1af..80da507 100644
--- a/frontend/src/components/TicketsList/index.js
+++ b/frontend/src/components/TicketsList/index.js
@@ -188,7 +188,7 @@ const TicketsList = ({ status, searchParam, showAll, selectedQueueIds }) => {
 			(!ticket.queueId || selectedQueueIds.indexOf(ticket.queueId) > -1);
 
 		const notBelongsToUserQueues = ticket =>
-			selectedQueueIds.indexOf(ticket.queueId) === -1;
+			ticket.queueId && selectedQueueIds.indexOf(ticket.queueId) === -1;
 
 		socket.on("connect", () => {
 			if (status) {
diff --git a/frontend/src/components/TransferTicketModal/index.js b/frontend/src/components/TransferTicketModal/index.js
index 024cec1..495a714 100644
--- a/frontend/src/components/TransferTicketModal/index.js
+++ b/frontend/src/components/TransferTicketModal/index.js
@@ -67,6 +67,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
 		try {
 			await api.put(`/tickets/${ticketid}`, {
 				userId: selectedUser.id,
+				queueId: null,
 				status: "open",
 			});
 			setLoading(false);