From 9fa9bfb560c6133908ed4cafaedc848fc351ef30 Mon Sep 17 00:00:00 2001 From: canove Date: Fri, 31 Jul 2020 08:45:17 -0300 Subject: [PATCH] fix: redirect to chat when ticket deleted by other --- frontend/src/components/MessagesList/TicketOptionsMenu.js | 8 -------- frontend/src/components/TicketsList/index.js | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/MessagesList/TicketOptionsMenu.js b/frontend/src/components/MessagesList/TicketOptionsMenu.js index f5f777a..da6f05b 100644 --- a/frontend/src/components/MessagesList/TicketOptionsMenu.js +++ b/frontend/src/components/MessagesList/TicketOptionsMenu.js @@ -1,6 +1,5 @@ import React, { useState } from "react"; -import { useHistory } from "react-router-dom"; import { toast } from "react-toastify"; import MenuItem from "@material-ui/core/MenuItem"; @@ -10,21 +9,15 @@ import api from "../../services/api"; import ConfirmationModal from "../ConfirmationModal"; const TicketOptionsMenu = ({ ticket, menuOpen, handleClose, anchorEl }) => { - const history = useHistory(); - const [confirmationOpen, setConfirmationOpen] = useState(false); const handleDeleteTicket = async () => { try { await api.delete(`/tickets/${ticket.id}`); toast.success("Ticket deletado com sucesso."); - history.push("/chat"); } catch (err) { toast.error("Erro ao deletar o ticket"); } - - console.log("deleted"); - handleClose(); }; const handleTransferTicket = e => { @@ -37,7 +30,6 @@ const TicketOptionsMenu = ({ ticket, menuOpen, handleClose, anchorEl }) => { handleClose(); }; - console.log(ticket); return ( <> { } if (data.action === "delete") { deleteTicket(data); + if (ticketId && data.ticketId === +ticketId) { + toast.warn("O ticket que vocĂȘ estava foi deletado."); + history.push("/chat"); + } } }); @@ -278,7 +283,7 @@ const TicketsList = () => { return () => { socket.disconnect(); }; - }, [ticketId, userId]); + }, [ticketId, userId, history]); const updateUnreadMessagesCount = ({ message, ticket }) => { setTickets(prevState => {