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

Feat: Contacts custom fields working

Browse Source
This commit is contained in:
canove
2020-07-24 16:35:08 -03:00
parent e266765caa
commit 9292c2c27d
2 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/pages/Chat/components/TicketsList/TicketsList.js
View File

@@ -14,14 +14,11 @@ import ListItemText from "@material-ui/core/ListItemText";
import ListItemAvatar from "@material-ui/core/ListItemAvatar";
import Typography from "@material-ui/core/Typography";
import Avatar from "@material-ui/core/Avatar";
// import AddIcon from "@material-ui/icons/Add";
import Divider from "@material-ui/core/Divider";
import Badge from "@material-ui/core/Badge";
import SearchIcon from "@material-ui/icons/Search";
import InputBase from "@material-ui/core/InputBase";
import Button from "@material-ui/core/Button";
// import Fab from "@material-ui/core/Fab";
// import AddContactModal from "../AddContact/AddContactModal";
import Tabs from "@material-ui/core/Tabs";
import Tab from "@material-ui/core/Tab";
@@ -84,7 +81,7 @@ const useStyles = makeStyles(theme => ({
// flexShrink: 0,
// -webkitBoxAlign: "center",
alignItems: "center",
fontWeight: 600,
fontWeight: 500,
fontSize: "16px",
height: "56px",
// backgroundColor: "#eee",
@@ -294,16 +291,18 @@ const TicketsList = () => {
ticket => ticket.id === data.ticket.id
);
if (ticketIndex !== -1) {
if (ticketIndex === -1) {
return [data.ticket, ...prevState];
} else {
let aux = [...prevState];
aux[ticketIndex] = data.ticket;
return aux;
} else {
return [data.ticket, ...prevState];
}
});
};
console.log(tickets);
const showDesktopNotification = data => {
const options = {
body: `${data.message.body} - ${format(new Date(), "HH:mm")}`,
@@ -350,6 +349,7 @@ const TicketsList = () => {
} catch (err) {
alert(err);
}
history.push(`/chat/${ticketId}`);
};
const countTickets = (status, userId) => {
@@ -365,7 +365,7 @@ const TicketsList = () => {
const viewTickets = tickets.map(ticket => {
if (
(ticket.status === status && ticket.userId === userId) ||
ticket.status === "closed"
(ticket.status === "closed" && status === "closed")
)
return (
<React.Fragment key={ticket.id}>