adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: adriano.andrade:0a031bd9a8a0ee493747b4dc939c7bea0273c353
Branches Tags
adriano.andrade:feat_faro
adriano.andrade:gertec
adriano.andrade:master
adriano.andrade:feat-resolve-contact-duplicate
adriano.andrade:merge-socket
adriano.andrade:feat-hitphone-integration
adriano.andrade:updates-el-lojas
adriano.andrade:feat-scaling-ticket-remote-creation
adriano.andrade:websocket
..
compare: adriano.andrade:dc44dccd827dfc00071123e52172b7ff9ea609ee
Branches Tags
adriano.andrade:feat_faro
adriano.andrade:gertec
adriano.andrade:master
adriano.andrade:feat-resolve-contact-duplicate
adriano.andrade:merge-socket
adriano.andrade:feat-hitphone-integration
adriano.andrade:updates-el-lojas
adriano.andrade:feat-scaling-ticket-remote-creation
adriano.andrade:websocket

No commits in common. "0a031bd9a8a0ee493747b4dc939c7bea0273c353" and "dc44dccd827dfc00071123e52172b7ff9ea609ee" have entirely different histories.
0a031bd9a8 ... dc44dccd82

31 changed files with 338 additions and 515 deletions
Show Stats Expand all files Collapse all files

5
backend/package.json
View File

@ -17,7 +17,6 @@
"license": "MIT",
"dependencies": {
"@sentry/node": "^5.29.2",
"@socket.io/redis-adapter": "^7.2.0",
"@types/fluent-ffmpeg": "^2.1.21",
"@types/pino": "^6.3.4",
"axios": "^1.2.3",
@ -42,20 +41,18 @@
"pino": "^6.9.0",
"pino-pretty": "^9.1.1",
"qrcode-terminal": "^0.12.0",
"redis": "^4.6.13",
"reflect-metadata": "^0.1.13",
"sequelize": "^5.22.3",
"sequelize-cli": "^5.5.1",
"sequelize-typescript": "^1.1.0",
"sharp": "^0.32.5",
"socket.io": "^4.7.5",
"socket.io": "^3.0.5",
"socket.io-client": "^4.5.4",
"uuid": "^8.3.2",
"whatsapp-web.js": "github:pedroslopez/whatsapp-web.js",
"yup": "^0.32.8"
},
"devDependencies": {
"@types/lodash": "4.14",
"@types/bcryptjs": "^2.4.2",
"@types/bluebird": "^3.5.32",
"@types/cookie-parser": "^1.4.2",

38
backend/src/libs/socket.ts
View File

@ -3,9 +3,6 @@ import { Server } from "http";
import AppError from "../errors/AppError";
import { logger } from "../utils/logger";
import { createAdapter } from "@socket.io/redis-adapter";
import { createClient } from 'redis';
import { v4 as uuidv4 } from "uuid";
import ListUserParamiterService from "../services/UserServices/ListUserParamiterService";
import {
@ -30,7 +27,6 @@ import {
} from "../services/WbotServices/wbotMessageListener";
import { join } from "path";
import Whatsapp from "../models/Whatsapp";
import { get } from "../helpers/RedisClient"
let count: number = 0;
let listOnline: any[] = [];
@ -46,30 +42,14 @@ let dateTime = splitDateTime(
new Date(format(new Date(), "yyyy-MM-dd HH:mm:ss", { locale: ptBR }))
);
const pubClient = createClient({ url: 'redis://172.31.187.29:6379' });
const subClient = pubClient.duplicate();
pubClient.connect().catch(console.error);
subClient.connect().catch(console.error);
export const initIO = (httpServer: Server): SocketIO => {
io = new SocketIO(httpServer, {
cors: {
origin: process.env.FRONTEND_URL,
//allowedHeaders: ["my-custom-header"],
//credentials: true
origin: process.env.FRONTEND_URL
},
maxHttpBufferSize: 1e8,
// pingInterval: 25000,
// pingTimeout: 60000,
// adapter: createAdapter(pubClient, subClient)
maxHttpBufferSize: 1e8
});
io.on("connection", socket => {
logger.info("Client Connected");
@ -127,7 +107,6 @@ export const initIO = (httpServer: Server): SocketIO => {
socket.on("online", (userId: any) => {
// console.log('userId: ', userId)
return
obj.uuid = uuidv4();
if (userId.logoutUserId) {
@ -254,18 +233,13 @@ export const initIO = (httpServer: Server): SocketIO => {
if (rooms && rooms.size == 2 && ![...rooms][1].startsWith("session_"))
return;
let whatsappIds = await get({
key: "whatsapp:*",
parse: true
let whatsappIds: any = await Whatsapp.findAll({
attributes: ["id"],
raw: true
});
// let whatsappIds: any = await Whatsapp.findAll({
// attributes: ["id"],
// raw: true
// });
if (whatsappIds && whatsappIds.length > 0) {
// whatsappIds = whatsappIds.map((e: any) => `${e.id}`);
whatsappIds = whatsappIds.map((e: any) => `${e.id}`);
console.log(
"whatsappIds whatsappIds whatsappIds whatsappIds whatsappIds: ",

2
frontend/package.json
View File

@ -43,7 +43,7 @@
"yup": "^0.32.8"
},
"scripts": {
"start": "PORT=3331 react-scripts start",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"

25
frontend/src/components/MessagesList/index.js
View File

@ -1,9 +1,7 @@
import React, { useContext, useState, useEffect, useReducer, useRef } from "react"
import { isSameDay, parseISO, format } from "date-fns"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import clsx from "clsx"
import { AuthContext } from "../../context/Auth/AuthContext"
@ -440,18 +438,11 @@ const MessagesList = ({ ticketId, isGroup }) => {
}, [pageNumber, ticketId])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onConnectMessagesList = () => {
socket.emit("joinChatBox", ticketId)
}
socket.on("connect", () => socket.emit("joinChatBox", ticketId))
onConnectMessagesList()
socket.on("connect", onConnectMessagesList)
const onAppMessageMessagesList = (data) => {
if (+data.message.ticketId !== +ticketId) return
socket.on("appMessage", (data) => {
if (data.action === "create") {
@ -463,14 +454,10 @@ const MessagesList = ({ ticketId, isGroup }) => {
if (data.action === "update") {
dispatch({ type: "UPDATE_MESSAGE", payload: data.message })
}
}
socket.on("appMessage", onAppMessageMessagesList)
})
return () => {
socket.emit("leaveChatBox", ticketId)
socket.off("connect", onConnectMessagesList)
socket.off("appMessage", onAppMessageMessagesList)
socket.disconnect()
}
}, [ticketId])

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

@ -2,8 +2,7 @@ import React, { useState, useRef, useEffect, useContext } from "react"
import { useHistory } from "react-router-dom"
import { format } from "date-fns"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import useSound from "use-sound"
import Popover from "@material-ui/core/Popover"
@ -133,7 +132,7 @@ const NotificationsPopOver = () => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
socket.on("reload_page", (data) => {
@ -194,8 +193,7 @@ const NotificationsPopOver = () => {
return () => {
socket.removeAllListeners('reload_page');
socket.removeAllListeners('onlineStatus');
socket.disconnect()
}
}, [user.id, handleLogout, user.profile])
@ -203,17 +201,12 @@ const NotificationsPopOver = () => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onConnectNotifications = () => {
socket.emit("joinNotification")
}
socket.on("connect", () => socket.emit("joinNotification"))
onConnectNotifications()
socket.on("connect", onConnectNotifications)
const onTicketNotifications = data => {
socket.on("ticket", data => {
if (data.action === "updateUnread" || data.action === "delete") {
@ -239,18 +232,25 @@ const NotificationsPopOver = () => {
return prevState
})
}
}
})
socket.on("appMessage", data => {
socket.on("ticket", onTicketNotifications)
const onAppMessageNotifications = data => {
if (
data.action === "create" &&
!data.message.read &&
(data.ticket.userId === user?.id || !data.ticket.userId)
) {
setNotifications(prevState => {
// prevState.forEach((e)=>{
//
// })
@ -265,6 +265,8 @@ const NotificationsPopOver = () => {
return [data.ticket, ...prevState]
})
const shouldNotNotificate = (data.message.ticketId === ticketIdRef.current && document.visibilityState === "visible") ||
(data.ticket.userId && data.ticket.userId !== user?.id) ||
data.ticket.isGroup || !data.ticket.userId
@ -273,19 +275,14 @@ const NotificationsPopOver = () => {
handleNotifications(data)
}
}
socket.on("appMessage", onAppMessageNotifications)
})
socket.on('notifyPeding', data =>{
if(settings?.length > 0 && getSettingValue('notificationTransferQueue') === 'enabled') handleNotifications("", data);
});
return () => {
socket.off('connect', onConnectNotifications);
socket.off('ticket', onTicketNotifications);
socket.off('appMessage', onAppMessageNotifications);
socket.removeAllListeners('notifyPeding');
socket.disconnect()
}
}, [user, settings])

13
frontend/src/components/PositionModal/index.js
View File

@ -3,8 +3,7 @@ import React, { useState, useEffect, useRef, useContext } from "react"
import * as Yup from "yup"
import { Formik, Form, Field } from "formik"
import { toast } from "react-toastify"
//import openSocket from 'socket.io-client'
import { socket } from "../../services/socket"
import openSocket from 'socket.io-client'
import {
makeStyles,
@ -87,9 +86,9 @@ const PositionModal = ({
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onSettingsPosition = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -98,12 +97,10 @@ const PositionModal = ({
return aux
})
}
}
socket.on('settings', onSettingsPosition)
})
return () => {
socket.off("settings", onSettingsPosition)
socket.disconnect()
}
}, [])

14
frontend/src/components/QrcodeModal/index.js
View File

@ -1,8 +1,6 @@
import React, { useEffect, useState, useContext } from "react";
import QRCode from "qrcode.react";
//import openSocket from "socket.io-client";
import { socket } from "../../services/socket";
import openSocket from "socket.io-client";
import toastError from "../../errors/toastError";
import { Dialog, DialogContent, Paper, Typography } from "@material-ui/core";
@ -33,9 +31,9 @@ const QrcodeModal = ({ open, onClose, whatsAppId }) => {
useEffect(() => {
if (!whatsAppId) return;
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
const onWhatsAppSessionQrCode = data => {
socket.on("whatsappSession", data => {
if (data.action === "update" && data.session.id === whatsAppId) {
setQrCode(data.session.qrcode);
}
@ -55,12 +53,10 @@ const QrcodeModal = ({ open, onClose, whatsAppId }) => {
}
}
}
socket.on("whatsappSession", onWhatsAppSessionQrCode);
});
return () => {
socket.off("whatsappSession", onWhatsAppSessionQrCode);
socket.disconnect();
};
}, [whatsAppId, onClose, user.profile]);

14
frontend/src/components/QueueModal/index.js
View File

@ -23,8 +23,8 @@ import { IconButton, InputAdornment } from "@material-ui/core"
import { Colorize } from "@material-ui/icons"
import { AuthContext } from '../../context/Auth/AuthContext'
//import openSocket from 'socket.io-client'
import { socket } from "../../services/socket"
import openSocket from 'socket.io-client'
const useStyles = makeStyles(theme => ({
@ -92,9 +92,9 @@ const QueueModal = ({ open, onClose, queueId }) => {
}, [setting])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onSettingsQueueModal = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -103,12 +103,10 @@ const QueueModal = ({ open, onClose, queueId }) => {
return aux
})
}
}
socket.on('settings', onSettingsQueueModal)
})
return () => {
socket.off("settings", onSettingsQueueModal)
socket.disconnect()
}
}, [])

14
frontend/src/components/QuickAnswersModal/index.js
View File

@ -3,8 +3,8 @@ import React, { useState, useEffect, useRef, useContext } from "react"
import * as Yup from "yup"
import { Formik, Form, Field } from "formik"
import { toast } from "react-toastify"
//import openSocket from 'socket.io-client'
import { socket } from "../../services/socket"
import openSocket from 'socket.io-client'
import {
makeStyles,
@ -101,9 +101,9 @@ const QuickAnswersModal = ({
}, [open,])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onSettingsQuickAnswersModal = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -112,12 +112,10 @@ const QuickAnswersModal = ({
return aux
})
}
}
socket.on('settings', onSettingsQuickAnswersModal)
})
return () => {
socket.off("settings", onSettingsQuickAnswersModal)
socket.disconnect()
}
}, [])

14
frontend/src/components/StatusChatEndModal/index.js
View File

@ -3,8 +3,8 @@ import React, { useState, useEffect, useRef, useContext } from "react"
import * as Yup from "yup"
import { Formik, Form, Field } from "formik"
import { toast } from "react-toastify"
//import openSocket from 'socket.io-client'
import { socket } from "../../services/socket"
import openSocket from 'socket.io-client'
import {
makeStyles,
@ -91,9 +91,9 @@ const StatusChatEndModal = ({
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onSettingsStatusChatEndModal = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -102,12 +102,10 @@ const StatusChatEndModal = ({
return aux
})
}
}
socket.on('settings', onSettingsStatusChatEndModal)
})
return () => {
socket.off("settings", onSettingsStatusChatEndModal)
socket.disconnect()
}
}, [])

41
frontend/src/components/Ticket/index.js
View File

@ -2,9 +2,7 @@ import React, { useState, useEffect } from "react"
import { useParams, useHistory } from "react-router-dom"
import { toast } from "react-toastify"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import clsx from "clsx"
import { Paper, makeStyles } from "@material-ui/core"
@ -134,32 +132,22 @@ const Ticket = () => {
}, [])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onConnectTicket = () => socket.emit("joinChatBox", ticketId)
onConnectTicket()
socket.on("connect", onConnectTicket)
const onTicketTicket = (data) => {
const isSameTicket = +data?.ticket?.id === +ticketId || +data.ticketId === +ticketId
if (!isSameTicket) return
socket.on("connect", () => socket.emit("joinChatBox", ticketId))
socket.on("ticket", (data) => {
if (data.action === "update") {
setTicket(data.ticket)
}
if (data.action === "deleteForever") {
console.log('delete forever')
if (data.action === "delete") {
toast.success("Ticket deleted sucessfully.")
history.push("/tickets")
}
}
})
socket.on("ticket", onTicketTicket)
const onContactTicket = (data) => {
socket.on("contact", (data) => {
if (data.action === "update") {
setContact((prevState) => {
if (prevState.id === data.contact?.id) {
@ -168,11 +156,9 @@ const Ticket = () => {
return prevState
})
}
}
})
socket.on("contact", onContactTicket)
const onRemoteTicketsControllIdleOpenTicket = (data) => {
socket.on("remoteTickesControllIdleOpen", (data) => {
if (data.action === "update") {
let url_ticketId
try {
@ -189,15 +175,10 @@ const Ticket = () => {
console.log('error on try do the send seen: ', error)
}
}
}
socket.on("remoteTickesControllIdleOpen", onRemoteTicketsControllIdleOpenTicket)
})
return () => {
socket.off("connect", onConnectTicket)
socket.off("ticket", onTicketTicket)
socket.off("contact", onContactTicket)
socket.off("remoteTickesControllIdleOpen", onRemoteTicketsControllIdleOpenTicket)
socket.disconnect()
}
}, [ticketId, history])

18
frontend/src/components/TicketListItem/index.js
View File

@ -22,8 +22,7 @@ import MarkdownWrapper from "../MarkdownWrapper"
import { Tooltip } from "@material-ui/core"
import { AuthContext } from "../../context/Auth/AuthContext"
import toastError from "../../errors/toastError"
//import openSocket from 'socket.io-client'
import { socket } from "../../services/socket"
import openSocket from 'socket.io-client'
const useStyles = makeStyles(theme => ({
ticket: {
@ -152,18 +151,17 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onRemoteTickesControllTicketListItem = (data) => {
socket.on('remoteTickesControll', (data) => {
console.log('REMOTE TICKETS CONTROLL UPDATE2: ', data.tickets)
if (data.action === 'update') {
setRemoteTicketsControll(data.tickets)
}
}
})
socket.on('remoteTickesControll', onRemoteTickesControllTicketListItem)
const onSettingsTicketListItem = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -172,13 +170,11 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
return aux
})
}
}
})
socket.on('settings', onSettingsTicketListItem)
return () => {
socket.off('remoteTickesControll', onRemoteTickesControllTicketListItem);
socket.off('settings', onSettingsTicketListItem);
socket.disconnect()
}
}, [])

43
frontend/src/components/TicketsList/index.js
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect, useReducer, useContext } from "react"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import { makeStyles } from "@material-ui/core/styles"
import List from "@material-ui/core/List"
@ -243,29 +243,27 @@ const TicketsList = (props) => {
// if (tab=='search')return
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const shouldUpdateTicket = ticket =>
(status === ticket.status) &&
(!ticket.userId || ticket.userId === user?.id || showAll) &&
(!ticket.queueId || selectedQueueIds.indexOf(ticket.queueId) > -1)
const notBelongsToUserQueues = ticket =>
ticket.queueId && selectedQueueIds.indexOf(ticket.queueId) === -1
const onConnectTicketList = () => {
socket.on("connect", () => {
if (status) {
socket.emit("joinTickets", status)
} else {
socket.emit("joinNotification")
}
}
onConnectTicketList()
})
socket.on("connect", onConnectTicketList)
const onTicketTicketList = data => {
socket.on("ticket", data => {
if (data.action === "updateUnread") {
@ -294,11 +292,10 @@ const TicketsList = (props) => {
if (data.action === "delete") {
dispatch({ type: "DELETE_TICKET", payload: data.ticketId })
}
}
})
socket.on("ticket", onTicketTicketList)
const onAppMessageTicketList = data => {
socket.on("appMessage", data => {
if (data.action === "create" && shouldUpdateTicket(data.ticket)) {
@ -310,9 +307,7 @@ const TicketsList = (props) => {
payload: data,
})
}
}
socket.on("appMessage", onAppMessageTicketList)
})
socket.on("contact", data => {
if (data.action === "update") {
@ -323,16 +318,16 @@ const TicketsList = (props) => {
}
})
const onRemoteTickesControllTicketList = (data) => {
socket.on('remoteTickesControll', (data) => {
console.log('REMOTE TICKETS CONTROLL UPDATE 1: ', data.tickets)
if (data.action === 'update') {
setRemoteTicketsControll(data.tickets)
}
}
})
socket.on('remoteTickesControll', onRemoteTickesControllTicketList)
const onSettingsTicketList = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -341,17 +336,11 @@ const TicketsList = (props) => {
return aux
})
}
}
})
socket.on('settings', onSettingsTicketList)
return () => {
socket.off("ticket", onTicketTicketList)
socket.off('appMessage', onAppMessageTicketList);
socket.removeAllListeners("contact")
socket.off('connect', onConnectTicketList);
socket.off('settings', onSettingsTicketList);
socket.off('remoteTickesControll', onRemoteTickesControllTicketList);
socket.disconnect()
}
}, [status, showAll, user, selectedQueueIds, tab])

13
frontend/src/components/TicketsManager/index.js
View File

@ -19,6 +19,7 @@ import FindInPageIcon from '@material-ui/icons/FindInPage'
import FormControlLabel from "@material-ui/core/FormControlLabel"
import Switch from "@material-ui/core/Switch"
import openSocket from "socket.io-client"
import NewTicketModal from "../NewTicketModal"
import TicketsList from "../TicketsList"
@ -152,7 +153,7 @@ const TicketsManager = () => {
const [openCount, setOpenCount] = useState(0)
const [pendingCount, setPendingCount] = useState(0)
const userQueueIds = user?.queues?.map((q) => q?.id)
const userQueueIds = user.queues.map((q) => q.id)
const [selectedQueueIds, setSelectedQueueIds] = useState(userQueueIds || [])
const [showContentSearch, setShowContentSearch] = useState(false)
@ -177,9 +178,9 @@ const TicketsManager = () => {
}, [setting])
useEffect(() => {
if (user?.profile?.toUpperCase() === "ADMIN" ||
user?.profile?.toUpperCase() === "SUPERVISOR" ||
user?.profile?.toUpperCase() === "MASTER") {
if (user.profile.toUpperCase() === "ADMIN" ||
user.profile.toUpperCase() === "SUPERVISOR" ||
user.profile.toUpperCase() === "MASTER") {
setShowAllTickets(true)
}
// eslint-disable-next-line react-hooks/exhaustive-deps
@ -202,11 +203,11 @@ const TicketsManager = () => {
if (tickets.length > 0) {
const now = new Date()
const differenceTime = tickets?.map(ticket => {
const createdAt = new Date(ticket?.createdAt)
const createdAt = new Date(ticket.createdAt)
const difference = now - createdAt
return difference
})
const sumDifferences = differenceTime?.reduce((total, difference) => total + difference, 0)
const sumDifferences = differenceTime.reduce((total, difference) => total + difference, 0)
const averageTimeMilliseconds = sumDifferences / tickets?.length
let hours = Math.floor(averageTimeMilliseconds / 3600000)
const minutes = Math.floor((averageTimeMilliseconds % 3600000) / 60000)

15
frontend/src/components/TransferTicketModal/index.js
View File

@ -1,7 +1,6 @@
import React, { useState, useContext, useMemo, useEffect } from "react"
import { useHistory } from "react-router-dom"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import Button from "@material-ui/core/Button"
import Dialog from "@material-ui/core/Dialog"
@ -111,9 +110,9 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onSettingsTransferTicketModal = (data) => {
socket.on('settings', (data) => {
console.log('settings updated ----------------------------xxxxxxxxxxxx')
if (data.action === 'update') {
@ -124,12 +123,10 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
return aux
})
}
}
socket.on('settings', onSettingsTransferTicketModal)
})
return () => {
socket.off("settings", onSettingsTransferTicketModal)
socket.disconnect()
}
}, [])
@ -262,7 +259,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
required
>
<MenuItem style={{ background: "white", }} value={''}>&nbsp;</MenuItem>
{queues?.map((queue) => (
{queues.map((queue) => (
<MenuItem
key={queue.id}
value={queue.id}

14
frontend/src/hooks/useAuth.js/index.js
View File

@ -1,7 +1,6 @@
import { useState, useEffect } from 'react'
import { useHistory } from 'react-router-dom'
//import openSocket from 'socket.io-client'
import { socket } from '../../services/socket'
import openSocket from 'socket.io-client'
import { toast } from 'react-toastify'
@ -91,7 +90,7 @@ const useAuth = () => {
}, [])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
socket.on('user', (data) => {
if (data.action === 'update' && data.user.id === user.id) {
@ -99,7 +98,7 @@ const useAuth = () => {
}
})
const onSettingsAuth = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSetting((prevState) => {
const aux = [...prevState]
@ -108,13 +107,10 @@ const useAuth = () => {
return aux
})
}
}
socket.on('settings', onSettingsAuth)
})
return () => {
socket.removeAllListeners('user');
socket.off('settings', onSettingsAuth);
socket.disconnect()
}
}, [user])

10
frontend/src/hooks/useWhatsApps/index.js
View File

@ -1,7 +1,5 @@
import { useState, useEffect, useReducer } from "react";
//import openSocket from "socket.io-client";
import { socket } from "../../services/socket";
import openSocket from "socket.io-client";
import toastError from "../../errors/toastError";
@ -128,7 +126,7 @@ const useWhatsApps = () => {
}, []);
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
socket.on("whatsapp", data => {
if (data.action === "update") {
@ -160,9 +158,7 @@ const useWhatsApps = () => {
return () => {
socket.removeAllListeners('whatsapp');
socket.removeAllListeners('whatsappSession');
socket.removeAllListeners('whatsappSessionMonit');
socket.disconnect();
};
}, []);

13
frontend/src/layout/MainListItems.js
View File

@ -31,8 +31,7 @@ import { i18n } from '../translate/i18n'
import { WhatsAppsContext } from '../context/WhatsApp/WhatsAppsContext'
import { AuthContext } from '../context/Auth/AuthContext'
import { Can } from '../components/Can'
//import openSocket from 'socket.io-client'
import { socket } from '../services/socket'
import openSocket from 'socket.io-client'
import api from '../services/api'
@ -119,9 +118,9 @@ const MainListItems = (props) => {
}
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onSettingsMainListItem = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -130,12 +129,10 @@ const MainListItems = (props) => {
return aux
})
}
}
socket.on('settings', onSettingsMainListItem)
})
return () => {
socket.off('settings', onSettingsMainListItem);
socket.disconnect()
}
}, [])

21
frontend/src/pages/Campaign/index.js
View File

@ -1,8 +1,7 @@
import React, { useState, useCallback, useEffect, useReducer, useContext } from 'react'
import { toast } from 'react-toastify'
//import openSocket from 'socket.io-client'
import { socket } from '../../services/socket'
import openSocket from 'socket.io-client'
import { makeStyles } from '@material-ui/core/styles'
import { green } from '@material-ui/core/colors'
@ -297,9 +296,10 @@ const Campaign = () => {
}
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onContactsBulkCampaing = (data) => {
socket.on("contactsBulkInsertOnQueueStatus", (data) => {
if (data.action === 'update') {
if (String(data.insertOnQueue.adminId) === String(user.id)) {
@ -312,24 +312,19 @@ const Campaign = () => {
}
}
}
})
socket.on("contactsBulkInsertOnQueueStatus", onContactsBulkCampaing)
const onCampaignCampaign = (data) => {
socket.on('campaign', (data) => {
if (data.action === 'update') {
dispatch({ type: "UPDATE_CAMPAIGNS", payload: data.campaign })
}
}
socket.on('campaign', onCampaignCampaign)
})
return () => {
socket.off("campaign", onCampaignCampaign)
socket.off("contactsBulkInsertOnQueueStatus", onContactsBulkCampaing)
socket.disconnect()
}
}, [user.id])

20
frontend/src/pages/Connections/index.js
View File

@ -2,8 +2,7 @@ import React, { useState, useCallback, useEffect, useContext } from 'react'
import { toast } from 'react-toastify'
import { format, parseISO } from 'date-fns'
//import openSocket from 'socket.io-client'
import { socket } from '../../services/socket'
import openSocket from 'socket.io-client'
import { makeStyles } from '@material-ui/core/styles'
import { green, red, yellow, grey } from '@material-ui/core/colors'
@ -452,17 +451,15 @@ const Connections = () => {
}, [])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onDiskSpaceMonitConnections = (data) => {
socket.on('diskSpaceMonit', (data) => {
if (data.action === 'update') {
setDiskSpaceInfo(data.diskSpace)
}
}
})
socket.on('diskSpaceMonit', onDiskSpaceMonitConnections)
const onSettingsConnections = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -471,13 +468,10 @@ const Connections = () => {
return aux
})
}
}
socket.on('settings', onSettingsConnections)
})
return () => {
socket.off("settings", onSettingsConnections)
socket.off("diskSpaceMonit", onDiskSpaceMonitConnections)
socket.disconnect()
}
}, [])

20
frontend/src/pages/Contacts/index.js
View File

@ -1,6 +1,5 @@
import React, { useState, useEffect, useReducer, useCallback, useContext } from "react"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import { toast } from "react-toastify"
import { useHistory } from "react-router-dom"
@ -261,9 +260,9 @@ const Contacts = () => {
}, [searchParam, pageNumber])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onContactsBulkContacts = (data) => {
socket.on("contactsBulkInsertOnQueueStatus", (data) => {
if (data.action === 'update') {
if (String(data.insertOnQueue.adminId) === String(user.id)) {
@ -279,11 +278,9 @@ const Contacts = () => {
}
}
}
})
socket.on("contactsBulkInsertOnQueueStatus", onContactsBulkContacts)
const onContactContacts = (data) => {
socket.on("contact", (data) => {
if (data.action === "update" || data.action === "create") {
dispatch({ type: "UPDATE_CONTACTS", payload: data.contact })
}
@ -291,13 +288,10 @@ const Contacts = () => {
if (data.action === "delete") {
dispatch({ type: "DELETE_CONTACT", payload: +data.contactId })
}
}
socket.on("contact", onContactContacts)
})
return () => {
socket.off("contact", onContactContacts)
socket.off("contactsBulkInsertOnQueueStatus", onContactsBulkContacts)
socket.disconnect()
}
}, [user, history])

27
frontend/src/pages/Dashboard/index.js
View File

@ -17,8 +17,7 @@ import { AuthContext } from "../../context/Auth/AuthContext"
import { i18n } from "../../translate/i18n";
import Chart from "./Chart"
import PieChart from "./PieChart"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import api from "../../services/api"
import { Can } from "../../components/Can"
@ -357,40 +356,32 @@ const Dashboard = () => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onTicketsStatusDashboard = (data) => {
socket.on("ticketStatus", (data) => {
if (data.action === "update") {
setStatus("")
setStatus(data.ticketStatus.status)
}
}
})
socket.on("ticketStatus", onTicketsStatusDashboard)
const onOnlineStatusDashboard = (data) => {
socket.on("onlineStatus", (data) => {
if (data.action === "logout" || data.action === "update") {
dispatch({ type: "UPDATE_STATUS_ONLINE", payload: data.userOnlineTime })
} else if (data.action === "delete") {
dispatch({ type: "DELETE_USER_STATUS", payload: data.userOnlineTime })
}
}
})
socket.on("onlineStatus", onOnlineStatusDashboard)
const onUserDashboard = (data) => {
socket.on("user", (data) => {
if (data.action === "delete") {
dispatch({ type: "DELETE_USER", payload: +data.userId })
}
}
socket.on("user", onUserDashboard)
})
return () => {
socket.off("user", onUserDashboard)
socket.off("onlineStatus", onOnlineStatusDashboard)
socket.off("ticketStatus", onTicketsStatusDashboard)
socket.disconnect()
}
}, [])

13
frontend/src/pages/Position/index.js
View File

@ -1,6 +1,5 @@
import React, { useState, useContext, useEffect, useReducer } from "react"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import {
Button,
@ -126,9 +125,9 @@ const Position = () => {
}, [searchParam, pageNumber])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onPositionPosition = (data) => {
socket.on("position", (data) => {
if (data.action === "update" || data.action === "create") {
dispatch({ type: "UPDATE_POSITIONS", payload: data.position })
}
@ -139,12 +138,10 @@ const Position = () => {
payload: +data.positionId,
})
}
}
socket.on("position", onPositionPosition)
})
return () => {
socket.off("position", onPositionPosition)
socket.disconnect()
}
}, [])

20
frontend/src/pages/Queues/index.js
View File

@ -1,7 +1,6 @@
import React, { useEffect, useReducer, useState, useContext } from 'react'
//import openSocket from 'socket.io-client'
import { socket } from '../../services/socket'
import openSocket from 'socket.io-client'
import {
Button,
@ -124,9 +123,9 @@ const Queues = () => {
}, [])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onQueueQueues = (data) => {
socket.on('queue', (data) => {
if (data.action === 'update' || data.action === 'create') {
dispatch({ type: 'UPDATE_QUEUES', payload: data.queue })
}
@ -134,11 +133,9 @@ const Queues = () => {
if (data.action === 'delete') {
dispatch({ type: 'DELETE_QUEUE', payload: data.queueId })
}
}
})
socket.on('queue', onQueueQueues)
const onSettingsQueues = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -147,13 +144,10 @@ const Queues = () => {
return aux
})
}
}
socket.on('settings', onSettingsQueues)
})
return () => {
socket.off("settings", onSettingsQueues)
socket.off("queue", onQueueQueues)
socket.disconnect()
}
}, [])

12
frontend/src/pages/QuickAnswers/index.js
View File

@ -1,6 +1,5 @@
import React, { useState, useContext, useEffect, useReducer } from "react"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import {
Button,
@ -126,9 +125,9 @@ const QuickAnswers = () => {
}, [searchParam, pageNumber])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onQuickAnswerQuickAnswers = (data) => {
socket.on("quickAnswer", (data) => {
if (data.action === "update" || data.action === "create") {
dispatch({ type: "UPDATE_QUICK_ANSWERS", payload: data.quickAnswer })
}
@ -139,11 +138,10 @@ const QuickAnswers = () => {
payload: +data.quickAnswerId,
})
}
}
socket.on("quickAnswer", onQuickAnswerQuickAnswers)
})
return () => {
socket.off("quickAnswer", onQuickAnswerQuickAnswers)
socket.disconnect()
}
}, [])

29
frontend/src/pages/Report/index.js
View File

@ -18,8 +18,7 @@ import MaterialTable from 'material-table'
import LogoutIcon from '@material-ui/icons/CancelOutlined'
import apiBroker from "../../services/apiBroker"
import fileDownload from 'js-file-download'
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import { i18n } from "../../translate/i18n"
import Switch from '@mui/material/Switch'
@ -592,9 +591,9 @@ const Report = () => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onQueryOnQueueStatusReport = (data) => {
socket.on("queryOnQueueStatus", (data) => {
if (data.action === 'update') {
if (String(data.queryOnQueue.adminId) === String(userA.id)) {
@ -605,11 +604,12 @@ const Report = () => {
}
}
}
})
socket.on("queryOnQueueStatus", onQueryOnQueueStatusReport)
if (reportOption === '2') {
const onOnlineStatusReport = (data) => {
socket.on("onlineStatus", (data) => {
let date = new Date().toLocaleDateString('pt-BR').split('/')
let dateToday = `${date[2]}-${date[1]}-${date[0]}`
@ -624,20 +624,15 @@ const Report = () => {
dispatchQ({ type: "DELETE_USER_STATUS", payload: data.userOnlineTime })
}
}
})
const onUserReport = (data) => {
socket.on("user", (data) => {
if (data.action === "delete") {
dispatch({ type: "DELETE_USER", payload: +data.userId })
}
}
})
if (reportOption === '2') {
socket.on("onlineStatus", onOnlineStatusReport)
socket.on("user", onUserReport)
}
else if (reportOption === "1") {
@ -646,9 +641,7 @@ const Report = () => {
}
return () => {
socket.off("onlineStatus", onOnlineStatusReport)
socket.off("user", onUserReport)
socket.off("queryOnQueueStatus", onQueryOnQueueStatusReport)
socket.disconnect()
}

16
frontend/src/pages/SchedulesReminder/index.js
View File

@ -28,8 +28,8 @@ import { render } from '@testing-library/react'
// import Modal from "../../../..ChatEnd/ModalChatEnd";
import Modal from "../../components/ModalUpdateScheduleReminder"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
@ -204,9 +204,11 @@ const SchedulesReminder = () => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
socket.on("schedulingNotify", (data) => {
const onSchedulingNotifySchedulesRemider = (data) => {
setLoading(true)
@ -226,12 +228,10 @@ const SchedulesReminder = () => {
setLoading(false)
}
socket.on("schedulingNotify", onSchedulingNotifySchedulesRemider)
})
return () => {
socket.off("schedulingNotify", onSchedulingNotifySchedulesRemider)
socket.disconnect()
}
}, [])

19
frontend/src/pages/Settings/index.js
View File

@ -1,6 +1,5 @@
import React, { useState, useEffect, useContext } from 'react'
//import openSocket from 'socket.io-client'
import { socket } from '../../services/socket.js'
import openSocket from 'socket.io-client'
import { makeStyles } from '@material-ui/core/styles'
import Paper from '@material-ui/core/Paper'
@ -125,9 +124,9 @@ const Settings = () => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onSettingsSettings = (data) => {
socket.on('settings', (data) => {
console.log('settings updated ----------------------------')
if (data.action === 'update') {
@ -138,12 +137,10 @@ const Settings = () => {
return aux
})
}
}
socket.on('settings', onSettingsSettings)
})
return () => {
socket.off("settings", onSettingsSettings)
socket.disconnect()
}
}, [])
@ -182,11 +179,7 @@ const Settings = () => {
}
const getSettingValue = (key, _obj = false) => {
//const { value, obj } = settings.find((s) => s.key === key)
const setting = settings.find((s) => s.key === key)
const value = setting?.value || ""
const obj = setting?.obj || null
const { value, obj } = settings.find((s) => s.key === key)
if (_obj)
return obj

13
frontend/src/pages/StatusChatEnd/index.js
View File

@ -1,6 +1,5 @@
import React, { useState, useContext, useEffect, useReducer } from "react"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import {
Button,
@ -132,9 +131,9 @@ const StatusChatEnd = () => {
}, [searchParam, pageNumber])
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onStatusChatEndStatusChatEnd = (data) => {
socket.on("statusChatEnd", (data) => {
if (data.action === "update" || data.action === "create") {
dispatch({ type: "UPDATE_STATUS_CHAT_END", payload: data.statusChatEnd })
}
@ -145,12 +144,10 @@ const StatusChatEnd = () => {
payload: +data.statusChatEndId,
})
}
}
socket.on("statusChatEnd", onStatusChatEndStatusChatEnd)
})
return () => {
socket.off("statusChatEnd", onStatusChatEndStatusChatEnd)
socket.disconnect()
}
}, [])

18
frontend/src/pages/Users/index.js
View File

@ -1,7 +1,6 @@
import React, { useState, useEffect, useReducer, useContext } from "react"
import { toast } from "react-toastify"
//import openSocket from "socket.io-client"
import { socket } from "../../services/socket"
import openSocket from "socket.io-client"
import { makeStyles } from "@material-ui/core/styles"
import Paper from "@material-ui/core/Paper"
@ -166,9 +165,9 @@ const Users = () => {
useEffect(() => {
//const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const socket = openSocket(process.env.REACT_APP_BACKEND_URL)
const onUserUsers = (data) => {
socket.on("user", (data) => {
if (data.action === "update" || data.action === "create") {
dispatch({ type: "UPDATE_USERS", payload: data.user })
}
@ -176,11 +175,10 @@ const Users = () => {
if (data.action === "delete") {
dispatch({ type: "DELETE_USER", payload: +data.userId })
}
}
})
socket.on("user", onUserUsers)
const onSettingsUsers = (data) => {
socket.on('settings', (data) => {
if (data.action === 'update') {
setSettings((prevState) => {
const aux = [...prevState]
@ -189,12 +187,10 @@ const Users = () => {
return aux
})
}
}
socket.on('settings', onSettingsUsers)
})
return () => {
socket.off("settings", onSettingsUsers)
socket.off("user", onUserUsers)
socket.disconnect()
}
}, [])

14
frontend/src/services/socket.js
View File

@ -1,14 +0,0 @@
import { io } from 'socket.io-client';
// "undefined" means the URL will be computed from the `window.location` object
const URL = process.env.REACT_APP_BACKEND_URL
export const socket = io(URL,
//{
// withCredentials: true,
// extraHeaders: {
// "my-custom-header": "abcd"
// },
// transports: ['websocket', 'polling']
//}
);