From 83b23529c575b76660cdc8fd4d7708aae2446361 Mon Sep 17 00:00:00 2001 From: canove Date: Wed, 29 Jul 2020 10:50:52 -0300 Subject: [PATCH] feat: option to show all (other users) tickets --- frontend/src/components/TicketsList/index.js | 41 ++++++++++++++------ 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/TicketsList/index.js b/frontend/src/components/TicketsList/index.js index e7459ed..1669f5a 100644 --- a/frontend/src/components/TicketsList/index.js +++ b/frontend/src/components/TicketsList/index.js @@ -23,6 +23,8 @@ import MoveToInboxIcon from "@material-ui/icons/MoveToInbox"; import CheckCircleOutlineIcon from "@material-ui/icons/CheckCircleOutline"; import IconButton from "@material-ui/core/IconButton"; import AddIcon from "@material-ui/icons/Add"; +import FormControlLabel from "@material-ui/core/FormControlLabel"; +import Switch from "@material-ui/core/Switch"; import TicketsSkeleton from "../TicketsSkeleton"; import NewTicketModal from "../NewTicketModal"; @@ -101,7 +103,7 @@ const useStyles = makeStyles(theme => ({ fontSize: "14px", }, - newTicketBtn: { + ticketsListActions: { marginLeft: "auto", }, @@ -212,6 +214,7 @@ const TicketsList = () => { const [searchParam, setSearchParam] = useState(""); const [tab, setTab] = useState("open"); const [newTicketModalOpen, setNewTicketModalOpen] = useState(false); + const [showAllTickets, setShowAllTickets] = useState(false); useEffect(() => { if (!("Notification" in window)) { @@ -308,8 +311,6 @@ const TicketsList = () => { }); }; - // let notification; - const showDesktopNotification = data => { console.log(data); const options = { @@ -381,6 +382,7 @@ const TicketsList = () => { const viewTickets = tickets.map(ticket => { if ( (ticket.status === status && ticket.userId === userId) || + (ticket.status === status && showAllTickets) || (ticket.status === "closed" && status === "closed") ) return ( @@ -527,17 +529,34 @@ const TicketsList = () => {
- Meus tickets + Atendendo {countTickets("open", userId)} - setNewTicketModalOpen(true)} - > - - +
+ + setShowAllTickets(prevState => !prevState) + } + name="showAllTickets" + color="primary" + /> + } + /> + setNewTicketModalOpen(true)} + style={{ marginLeft: 20 }} + > + + +
{renderTickets("open", userId)}