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

improvement: redirect to ticketId after new ticket

Browse Source
This commit is contained in:
canove
2020-08-04 15:29:14 -03:00
parent f7e8fed7d8
commit 87dc0c0625
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/controllers/MessageController.js
View File

@@ -61,7 +61,7 @@ exports.index = async (req, res, next) => {
}); });
if (!ticket) { if (!ticket) {
return res.status(400).json({ error: "No ticket found with this ID" }); return res.status(404).json({ error: "No ticket found with this ID" });
} }
await setMessagesAsRead(ticketId); await setMessagesAsRead(ticketId);

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

@@ -1,6 +1,7 @@
import React, { useState, useEffect, useRef } from "react"; import React, { useState, useEffect, useRef } from "react";
import { useParams, useHistory } from "react-router-dom"; import { useParams, useHistory } from "react-router-dom";
import { toast } from "react-toastify";
import { isSameDay, parseISO, format } from "date-fns"; import { isSameDay, parseISO, format } from "date-fns";
import openSocket from "socket.io-client"; import openSocket from "socket.io-client";
import InfiniteScrollReverse from "react-infinite-scroll-reverse"; import InfiniteScrollReverse from "react-infinite-scroll-reverse";
@@ -263,13 +264,14 @@ const MessagesList = () => {
} }
} catch (err) { } catch (err) {
console.log(err); console.log(err);
alert(err); toast.error("Ticket não encontrado");
history.push("/chat");
} }
}; };
fetchMessages(); fetchMessages();
}, 1000); }, 1000);
return () => clearTimeout(delayDebounceFn); return () => clearTimeout(delayDebounceFn);
}, [searchParam, pageNumber, ticketId, token]); }, [searchParam, pageNumber, ticketId, token, history]);
useEffect(() => { useEffect(() => {
const socket = openSocket(process.env.REACT_APP_BACKEND_URL); const socket = openSocket(process.env.REACT_APP_BACKEND_URL);

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

@@ -1,4 +1,5 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { useHistory } from "react-router-dom";
import Button from "@material-ui/core/Button"; import Button from "@material-ui/core/Button";
import TextField from "@material-ui/core/TextField"; import TextField from "@material-ui/core/TextField";
@@ -37,6 +38,7 @@ const useStyles = makeStyles(theme => ({
})); }));
const NewTicketModal = ({ modalOpen, onClose, contactId }) => { const NewTicketModal = ({ modalOpen, onClose, contactId }) => {
const history = useHistory();
const classes = useStyles(); const classes = useStyles();
const userId = +localStorage.getItem("userId"); const userId = +localStorage.getItem("userId");
@@ -77,11 +79,12 @@ const NewTicketModal = ({ modalOpen, onClose, contactId }) => {
if (!selectedContact) return; if (!selectedContact) return;
setLoading(true); setLoading(true);
try { try {
await api.post("/tickets", { const { data: ticket } = await api.post("/tickets", {
contactId: selectedContact.id, contactId: selectedContact.id,
userId: userId, userId: userId,
status: "open", status: "open",
}); });
history.push(`/chat/${ticket.id}`);
} catch (err) { } catch (err) {
alert(err); alert(err);
} }