cheveguerra/whaticket-community
1
0
Fork 0
mirror of https://github.com/cheveguerra/whaticket-community.git synced 2026-04-19 20:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: deleting a ticket with unreadMessages keeps ticket in notifications

Browse Source
This commit is contained in:
canove
2020-09-29 06:20:16 -03:00
parent c36096c4b9
commit d78df2bf2e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/controllers/TicketController.ts
View File

@@ -101,6 +101,7 @@ export const remove = async (
const io = getIO(); const io = getIO();
io.to(ticket.status) io.to(ticket.status)
.to(ticketId) .to(ticketId)
.to("notification")
.emit("ticket", { .emit("ticket", {
action: "delete", action: "delete",
ticketId: +ticketId ticketId: +ticketId

4
frontend/src/components/NotificationsPopOver/index.js
View File

@@ -73,7 +73,7 @@ const NotificationsPopOver = () => {
socket.emit("joinNotification"); socket.emit("joinNotification");
socket.on("ticket", data => { socket.on("ticket", data => {
if (data.action === "updateUnread") { if (data.action === "updateUnread" || data.action === "delete") {
setNotifications(prevState => { setNotifications(prevState => {
const ticketIndex = prevState.findIndex(t => t.id === data.ticketId); const ticketIndex = prevState.findIndex(t => t.id === data.ticketId);
if (ticketIndex !== -1) { if (ticketIndex !== -1) {
@@ -103,7 +103,7 @@ const NotificationsPopOver = () => {
(ticketIdRef.current && (ticketIdRef.current &&
data.message.ticketId === ticketIdRef.current && data.message.ticketId === ticketIdRef.current &&
document.visibilityState === "visible") || document.visibilityState === "visible") ||
(data.ticket.userId !== userId && data.ticket.userId) (data.ticket.userId && data.ticket.userId !== userId)
) )
return; return;
else { else {