fix: receiving a message while in "search tab" makes ticket appears in search results

This commit is contained in:
canove
2020-10-15 19:58:02 -03:00
parent f03d0a23db
commit 42f298ae8a

View File

@@ -111,13 +111,13 @@ const reducer = (state, action) => {
} }
if (action.type === "UPDATE_TICKET_MESSAGES_COUNT") { 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); const ticketIndex = state.findIndex(t => t.id === ticket.id);
if (ticketIndex !== -1) { if (ticketIndex !== -1) {
state[ticketIndex] = ticket; state[ticketIndex] = ticket;
state.unshift(state.splice(ticketIndex, 1)[0]); state.unshift(state.splice(ticketIndex, 1)[0]);
} else { } else if (!searchParam) {
state.unshift(ticket); state.unshift(ticket);
} }
@@ -211,7 +211,10 @@ const TicketsList = ({ status, searchParam, showAll }) => {
) { ) {
dispatch({ dispatch({
type: "UPDATE_TICKET_MESSAGES_COUNT", type: "UPDATE_TICKET_MESSAGES_COUNT",
payload: data.ticket, payload: {
ticket: data.ticket,
searchParam,
},
}); });
} }
}); });
@@ -228,7 +231,7 @@ const TicketsList = ({ status, searchParam, showAll }) => {
return () => { return () => {
socket.disconnect(); socket.disconnect();
}; };
}, [status, showAll, userId]); }, [status, showAll, userId, searchParam]);
const loadMore = () => { const loadMore = () => {
setPageNumber(prevState => prevState + 1); setPageNumber(prevState => prevState + 1);