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

fix: websocket handlers

Browse Source
This commit is contained in:
canove
2020-08-10 19:24:15 -03:00
parent 1c0e251b24
commit c7c451d227
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ const useStyles = makeStyles(theme => ({
}, },
})); }));
const socket = openSocket(process.env.REACT_APP_BACKEND_URL); let socket;
const MessagesList = () => { const MessagesList = () => {
const { ticketId } = useParams(); const { ticketId } = useParams();
@@ -272,6 +272,7 @@ const MessagesList = () => {
}, [pageNumber, ticketId, history]); }, [pageNumber, ticketId, history]);
useEffect(() => { useEffect(() => {
socket = openSocket(process.env.REACT_APP_BACKEND_URL);
socket.emit("joinChatBox", ticketId, () => {}); socket.emit("joinChatBox", ticketId, () => {});
return () => { return () => {

5
frontend/src/components/Tickets/index.js
View File

@@ -25,7 +25,7 @@ import TabPanel from "../TabPanel";
import api from "../../services/api"; import api from "../../services/api";
const socket = openSocket(process.env.REACT_APP_BACKEND_URL); let socket;
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
ticketsWrapper: { ticketsWrapper: {
@@ -209,12 +209,13 @@ const Tickets = () => {
}, [searchParam, pageNumber, token, tab]); }, [searchParam, pageNumber, token, tab]);
useEffect(() => { useEffect(() => {
socket = openSocket(process.env.REACT_APP_BACKEND_URL);
socket.emit("joinNotification"); socket.emit("joinNotification");
return () => { return () => {
socket.disconnect(); socket.disconnect();
}; };
}, [ticketId]); }, []);
useEffect(() => { useEffect(() => {
socket.on("ticket", data => { socket.on("ticket", data => {

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

@@ -28,7 +28,7 @@ import ContactsSekeleton from "../../components/ContactsSekeleton";
import ContactModal from "../../components/ContactModal"; import ContactModal from "../../components/ContactModal";
import ConfirmationModal from "../../components/ConfirmationModal/"; import ConfirmationModal from "../../components/ConfirmationModal/";
const socket = openSocket(process.env.REACT_APP_BACKEND_URL); let socket;
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
mainContainer: { mainContainer: {
@@ -105,6 +105,7 @@ const Contacts = () => {
}, [searchParam, page, rowsPerPage]); }, [searchParam, page, rowsPerPage]);
useEffect(() => { useEffect(() => {
socket = openSocket(process.env.REACT_APP_BACKEND_URL);
return () => { return () => {
socket.disconnect(); socket.disconnect();
}; };

14
frontend/src/pages/WhatsAuth/WhatsAuth.js
View File

@@ -10,7 +10,7 @@ import Paper from "@material-ui/core/Paper";
import SessionInfo from "../../components/SessionInfo"; import SessionInfo from "../../components/SessionInfo";
import Qrcode from "../../components/Qrcode"; import Qrcode from "../../components/Qrcode";
const socket = openSocket(process.env.REACT_APP_BACKEND_URL); let socket;
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
root: { root: {
@@ -54,6 +54,14 @@ const WhatsAuth = () => {
fetchSession(); fetchSession();
}, []); }, []);
useEffect(() => {
socket = openSocket(process.env.REACT_APP_BACKEND_URL);
return () => {
socket.disconnect();
};
}, []);
useEffect(() => { useEffect(() => {
socket.on("qrcode", data => { socket.on("qrcode", data => {
if (data.action === "update") { if (data.action === "update") {
@@ -68,10 +76,6 @@ const WhatsAuth = () => {
history.push("/chat"); history.push("/chat");
} }
}); });
return () => {
socket.disconnect();
};
}, [history]); }, [history]);
return ( return (