From 42f298ae8aa44c7c586379f1b8b9ad8786e2a9bd Mon Sep 17 00:00:00 2001 From: canove Date: Thu, 15 Oct 2020 19:58:02 -0300 Subject: [PATCH] fix: receiving a message while in "search tab" makes ticket appears in search results --- frontend/src/components/TicketsList/index.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/TicketsList/index.js b/frontend/src/components/TicketsList/index.js index 5ad3f4b..458081d 100644 --- a/frontend/src/components/TicketsList/index.js +++ b/frontend/src/components/TicketsList/index.js @@ -111,13 +111,13 @@ const reducer = (state, action) => { } if (action.type === "UPDATE_TICKET_MESSAGES_COUNT") { - const ticket = action.payload; + const { ticket, searchParam } = action.payload; const ticketIndex = state.findIndex(t => t.id === ticket.id); if (ticketIndex !== -1) { state[ticketIndex] = ticket; state.unshift(state.splice(ticketIndex, 1)[0]); - } else { + } else if (!searchParam) { state.unshift(ticket); } @@ -211,7 +211,10 @@ const TicketsList = ({ status, searchParam, showAll }) => { ) { dispatch({ type: "UPDATE_TICKET_MESSAGES_COUNT", - payload: data.ticket, + payload: { + ticket: data.ticket, + searchParam, + }, }); } }); @@ -228,7 +231,7 @@ const TicketsList = ({ status, searchParam, showAll }) => { return () => { socket.disconnect(); }; - }, [status, showAll, userId]); + }, [status, showAll, userId, searchParam]); const loadMore = () => { setPageNumber(prevState => prevState + 1);