fix: notification not closing after click on ticket

This commit is contained in:
canove
2020-09-24 17:27:30 -03:00
parent 8125b36083
commit c58baf3470
2 changed files with 10 additions and 9 deletions

View File

@@ -82,7 +82,10 @@ const NotificationsPopOver = () => {
}, [history, ticketId, userId]); }, [history, ticketId, userId]);
const { tickets: openTickets } = useTickets({ status: "open" }); const { tickets: openTickets } = useTickets({ status: "open" });
const { tickets: pendingTickets } = useTickets({ status: "pending" }); const { tickets: pendingTickets } = useTickets({
status: "pending",
showAll: true,
});
useEffect(() => { useEffect(() => {
if (openTickets.length > 0 || pendingTickets.length > 0) { if (openTickets.length > 0 || pendingTickets.length > 0) {
@@ -136,9 +139,8 @@ const NotificationsPopOver = () => {
setIsOpen(false); setIsOpen(false);
}, [setIsOpen]); }, [setIsOpen]);
const handleSelectTicket = (e, ticket) => { const NotificationTicket = ({ children }) => {
history.push(`/tickets/${ticket.id}`); return <div onClick={handleClickAway}>{children}</div>;
handleClickAway();
}; };
return ( return (
@@ -175,11 +177,9 @@ const NotificationsPopOver = () => {
</ListItem> </ListItem>
) : ( ) : (
notifications.map(ticket => ( notifications.map(ticket => (
<TicketListItem <NotificationTicket key={ticket.id}>
key={ticket.id} <TicketListItem ticket={ticket} />
ticket={ticket} </NotificationTicket>
handleSelectTicket={handleSelectTicket}
/>
)) ))
)} )}
</List> </List>

View File

@@ -79,6 +79,7 @@ const useTickets = ({ searchParam, pageNumber, status, date, showAll }) => {
useEffect(() => { useEffect(() => {
setLoading(true); setLoading(true);
const delayDebounceFn = setTimeout(() => { const delayDebounceFn = setTimeout(() => {
console.log(showAll);
const fetchTickets = async () => { const fetchTickets = async () => {
try { try {
const { data } = await api.get("/tickets", { const { data } = await api.get("/tickets", {