mirror of
https://github.com/cheveguerra/whaticket-community.git
synced 2026-04-21 05:09:18 +00:00
fix: notification not closing after click on ticket
This commit is contained in:
@@ -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>
|
||||||
|
|||||||
@@ -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", {
|
||||||
|
|||||||
Reference in New Issue
Block a user