feat: finished queue filter on tickets list

backend/src/controllers/TicketController.ts

@@ -63,7 +63,7 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
 
   const io = getIO();
   io.to(ticket.status).emit("ticket", {
-    action: "create",
+    action: "update",
     ticket
   });
 
@@ -100,7 +100,7 @@ export const update = async (
   }
 
   io.to(ticket.status).to("notification").to(ticketId).emit("ticket", {
-    action: "updateStatus",
+    action: "update",
     ticket
   });
 

backend/src/services/TicketServices/ListTicketsService.ts

@@ -34,12 +34,6 @@ const ListTicketsService = async ({
   userId,
   withUnreadMessages
 }: Request): Promise<Response> => {
-  // const user = await ShowUserService(userId);
-
-  // const userQueueIds = user.queues.map(queue => queue.id);
-
-  // console.log(userQueueIds);
-
   let whereCondition: Filterable["where"] = {
     [Op.or]: [{ userId }, { status: "pending" }],
     queueId: { [Op.or]: [queueIds, null] }
@@ -60,7 +54,7 @@ const ListTicketsService = async ({
   ];
 
   if (showAll === "true") {
-    whereCondition = {};
+    whereCondition = { queueId: { [Op.or]: [queueIds, null] } };
   }
 
   if (status) {
@@ -92,6 +86,7 @@ const ListTicketsService = async ({
     ];
 
     whereCondition = {
+      ...whereCondition,
       [Op.or]: [
         {
           "$contact.name$": where(

frontend/src/components/Ticket/index.js

@@ -90,7 +90,7 @@ const Ticket = () => {
 		socket.on("connect", () => socket.emit("joinChatBox", ticketId));
 
 		socket.on("ticket", data => {
-			if (data.action === "updateStatus") {
+			if (data.action === "update") {
 				setTicket(data.ticket);
 			}
 

frontend/src/components/TicketsList/index.js

@@ -7,10 +7,8 @@ import Paper from "@material-ui/core/Paper";
 
 import TicketListItem from "../TicketListItem";
 import TicketsListSkeleton from "../TicketsListSkeleton";
-import TicketsListQueueSelect from "../TicketsListQueueSelect";
 
 import useTickets from "../../hooks/useTickets";
-import { useLocalStorage } from "../../hooks/useLocalStorage";
 import { i18n } from "../../translate/i18n";
 import { ListSubheader } from "@material-ui/core";
 import { AuthContext } from "../../context/Auth/AuthContext";
@@ -117,14 +115,14 @@ const reducer = (state, action) => {
 		return [...state];
 	}
 
-	if (action.type === "UPDATE_TICKET_MESSAGES_COUNT") {
+	if (action.type === "UPDATE_TICKET_UNREAD_MESSAGES") {
-		const { ticket, searchParam } = action.payload;
+		const ticket = action.payload;
 
 		const ticketIndex = state.findIndex(t => t.id === ticket.id);
 		if (ticketIndex !== -1) {
 			state[ticketIndex] = ticket;
 			state.unshift(state.splice(ticketIndex, 1)[0]);
-		} else if (!searchParam) {
+		} else {
 			state.unshift(ticket);
 		}
 
@@ -155,53 +153,40 @@ const reducer = (state, action) => {
 	}
 };
 
-const TicketsList = ({ status, searchParam, showAll }) => {
+const TicketsList = ({ status, searchParam, showAll, selectedQueueIds }) => {
 	const classes = useStyles();
 	const [pageNumber, setPageNumber] = useState(1);
 	const [ticketsList, dispatch] = useReducer(reducer, []);
 	const { user } = useContext(AuthContext);
-	const [pendingSelectedQueueIds, setPendingSelectedQueueIds] = useLocalStorage(
-		"pendingSelectedQueues",
-		[]
-	);
-	const [openSelectedQueueIds, setOpenSelectedQueueIds] = useLocalStorage(
-		"openSelectedQueues",
-		[]
-	);
 
 	useEffect(() => {
 		dispatch({ type: "RESET" });
 		setPageNumber(1);
-	}, [
+	}, [status, searchParam, dispatch, showAll, selectedQueueIds]);
-		status,
-		searchParam,
-		dispatch,
-		showAll,
-		openSelectedQueueIds,
-		pendingSelectedQueueIds,
-	]);
 
 	const { tickets, hasMore, loading } = useTickets({
 		pageNumber,
 		searchParam,
 		status,
 		showAll,
-		queueIds:
+		queueIds: JSON.stringify(selectedQueueIds),
-			status === "open"
-				? JSON.stringify(openSelectedQueueIds)
-				: JSON.stringify(pendingSelectedQueueIds),
 	});
 
 	useEffect(() => {
+		if (!status && !searchParam) return;
 		dispatch({
 			type: "LOAD_TICKETS",
 			payload: tickets,
 		});
-	}, [tickets]);
+	}, [tickets, status, searchParam]);
 
 	useEffect(() => {
 		const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
 
+		const shouldUpdateTicket = ticket =>
+			(!ticket.userId || ticket.userId === user?.id || showAll) &&
+			selectedQueueIds.indexOf(ticket.queueId) > -1;
+
 		socket.on("connect", () => {
 			if (status) {
 				socket.emit("joinTickets", status);
@@ -218,10 +203,7 @@ const TicketsList = ({ status, searchParam, showAll }) => {
 				});
 			}
 
-			if (
+			if (data.action === "update" && shouldUpdateTicket(data.ticket)) {
-				(data.action === "updateStatus" || data.action === "create") &&
-				(!data.ticket.userId || data.ticket.userId === user?.id || showAll)
-			) {
 				dispatch({
 					type: "UPDATE_TICKET",
 					payload: data.ticket,
@@ -234,16 +216,10 @@ const TicketsList = ({ status, searchParam, showAll }) => {
 		});
 
 		socket.on("appMessage", data => {
-			if (
+			if (data.action === "create" && shouldUpdateTicket(data.ticket)) {
-				data.action === "create" &&
-				(!data.ticket.userId || data.ticket.userId === user?.id || showAll)
-			) {
 				dispatch({
-					type: "UPDATE_TICKET_MESSAGES_COUNT",
+					type: "UPDATE_TICKET_UNREAD_MESSAGES",
-					payload: {
+					payload: data.ticket,
-						ticket: data.ticket,
-						searchParam,
-					},
 				});
 			}
 		});
@@ -260,7 +236,7 @@ const TicketsList = ({ status, searchParam, showAll }) => {
 		return () => {
 			socket.disconnect();
 		};
-	}, [status, showAll, user, searchParam]);
+	}, [status, showAll, user, selectedQueueIds]);
 
 	const loadMore = () => {
 		setPageNumber(prevState => prevState + 1);
@@ -276,15 +252,6 @@ const TicketsList = ({ status, searchParam, showAll }) => {
 		}
 	};
 
-	const handleSelectedQueues = values => {
-		if (status === "open") {
-			setOpenSelectedQueueIds(values);
-		}
-		if (status === "pending") {
-			setPendingSelectedQueueIds(values);
-		}
-	};
-
 	return (
 		<div className={classes.ticketsListWrapper}>
 			<Paper
@@ -303,11 +270,6 @@ const TicketsList = ({ status, searchParam, showAll }) => {
 									{ticketsList.length}
 								</span>
 							</div>
-							<TicketsListQueueSelect
-								selectedQueueIds={openSelectedQueueIds}
-								userQueues={user?.queues}
-								onChange={handleSelectedQueues}
-							/>
 						</ListSubheader>
 					)}
 					{status === "pending" && (
@@ -318,11 +280,6 @@ const TicketsList = ({ status, searchParam, showAll }) => {
 									{ticketsList.length}
 								</span>
 							</div>
-							<TicketsListQueueSelect
-								selectedQueueIds={pendingSelectedQueueIds}
-								userQueues={user?.queues}
-								onChange={handleSelectedQueues}
-							/>
 						</ListSubheader>
 					)}
 					{ticketsList.length === 0 && !loading ? (

frontend/src/components/TicketsManager/index.js

@@ -1,4 +1,4 @@
-import React, { useContext, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 
 import { makeStyles } from "@material-ui/core/styles";
 import Paper from "@material-ui/core/Paper";
@@ -8,8 +8,7 @@ import Tabs from "@material-ui/core/Tabs";
 import Tab from "@material-ui/core/Tab";
 import MoveToInboxIcon from "@material-ui/icons/MoveToInbox";
 import CheckBoxIcon from "@material-ui/icons/CheckBox";
-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";
 
@@ -20,6 +19,9 @@ import TabPanel from "../TabPanel";
 import { i18n } from "../../translate/i18n";
 import { AuthContext } from "../../context/Auth/AuthContext";
 import Can from "../Can";
+import TicketsQueueSelect from "../TicketsQueueSelect";
+import { Button } from "@material-ui/core";
+import { useLocalStorage } from "../../hooks/useLocalStorage";
 
 const useStyles = makeStyles(theme => ({
 	ticketsWrapper: {
@@ -48,17 +50,12 @@ const useStyles = makeStyles(theme => ({
 		width: 120,
 	},
 
-	ticketsListActions: {
+	ticketOptionsBox: {
-		flex: "none",
-		marginLeft: "auto",
-	},
-
-	searchBox: {
-		position: "relative",
 		display: "flex",
+		justifyContent: "space-between",
 		alignItems: "center",
 		background: "#fafafa",
-		padding: "10px 13px",
+		padding: theme.spacing(1),
 	},
 
 	serachInputWrapper: {
@@ -67,6 +64,7 @@ const useStyles = makeStyles(theme => ({
 		display: "flex",
 		borderRadius: 40,
 		padding: 4,
+		marginRight: theme.spacing(1),
 	},
 
 	searchIcon: {
@@ -91,15 +89,34 @@ const TicketsManager = () => {
 	const [newTicketModalOpen, setNewTicketModalOpen] = useState(false);
 	const [showAllTickets, setShowAllTickets] = useState(false);
 	const { user } = useContext(AuthContext);
+	const searchInputRef = useRef();
+	const [selectedQueueIds, setSelectedQueueIds] = useLocalStorage(
+		"selectedQueueIds",
+		[]
+	);
 
-	const handleSearchContact = e => {
+	useEffect(() => {
-		if (e.target.value === "") {
+		if (tab === "search") {
-			setSearchParam(e.target.value.toLowerCase());
+			searchInputRef.current.focus();
+		}
+	}, [tab]);
+
+	let searchTimeout;
+
+	const handleSearch = e => {
+		const searchedTerm = e.target.value.toLowerCase();
+
+		clearTimeout(searchTimeout);
+
+		if (searchedTerm === "") {
+			setSearchParam(searchedTerm);
 			setTab("open");
 			return;
 		}
-		setSearchParam(e.target.value.toLowerCase());
+
-		setTab("search");
+		searchTimeout = setTimeout(() => {
+			setSearchParam(searchedTerm);
+		}, 500);
 	};
 
 	const handleChangeTab = (e, newValue) => {
@@ -141,57 +158,78 @@ const TicketsManager = () => {
 					/>
 				</Tabs>
 			</Paper>
-			<Paper square elevation={0} className={classes.searchBox}>
+			<Paper square elevation={0} className={classes.ticketOptionsBox}>
-				<div className={classes.serachInputWrapper}>
+				{tab === "search" ? (
-					<SearchIcon className={classes.searchIcon} />
+					<div className={classes.serachInputWrapper}>
-					<InputBase
+						<SearchIcon className={classes.searchIcon} />
-						className={classes.searchInput}
+						<InputBase
-						placeholder={i18n.t("tickets.search.placeholder")}
+							className={classes.searchInput}
-						type="search"
+							inputRef={searchInputRef}
-						onChange={handleSearchContact}
+							placeholder={i18n.t("tickets.search.placeholder")}
-					/>
+							type="search"
-				</div>
+							onChange={handleSearch}
-				<div className={classes.ticketsListActions}>
+						/>
-					<Can
+					</div>
-						role={user.profile}
+				) : (
-						perform="tickets-manager:showall"
+					<>
-						yes={() => (
+						<Button
-							<FormControlLabel
+							variant="outlined"
-								label={i18n.t("tickets.buttons.showAll")}
+							color="primary"
-								labelPlacement="start"
+							onClick={() => setNewTicketModalOpen(true)}
-								control={
+						>
-									<Switch
+							Novo
-										size="small"
+						</Button>
-										checked={showAllTickets}
+						<Can
-										onChange={() => setShowAllTickets(prevState => !prevState)}
+							role={user.profile}
-										name="showAllTickets"
+							perform="tickets-manager:showall"
-										color="primary"
+							yes={() => (
-									/>
+								<FormControlLabel
-								}
+									label={i18n.t("tickets.buttons.showAll")}
-							/>
+									labelPlacement="start"
-						)}
+									control={
-					/>
+										<Switch
-
+											size="small"
-					<IconButton
+											checked={showAllTickets}
-						aria-label="add ticket"
+											onChange={() =>
-						size="small"
+												setShowAllTickets(prevState => !prevState)
-						color="primary"
+											}
-						onClick={e => setNewTicketModalOpen(true)}
+											name="showAllTickets"
-						style={{ marginLeft: 20 }}
+											color="primary"
-					>
+										/>
-						<AddIcon />
+									}
-					</IconButton>
+								/>
-				</div>
+							)}
+						/>
+					</>
+				)}
+				<TicketsQueueSelect
+					style={{ marginLeft: 6 }}
+					selectedQueueIds={selectedQueueIds}
+					userQueues={user?.queues}
+					onChange={values => setSelectedQueueIds(values)}
+				/>
 			</Paper>
 			<TabPanel value={tab} name="open" className={classes.ticketsWrapper}>
-				<TicketsList status="open" showAll={showAllTickets} />
+				<TicketsList
-				<TicketsList status="pending" />
+					status="open"
+					showAll={showAllTickets}
+					selectedQueueIds={selectedQueueIds}
+				/>
+				<TicketsList status="pending" selectedQueueIds={selectedQueueIds} />
 			</TabPanel>
 			<TabPanel value={tab} name="closed" className={classes.ticketsWrapper}>
-				<TicketsList status="closed" showAll={showAllTickets} />
+				<TicketsList
+					status="closed"
+					showAll={true}
+					selectedQueueIds={selectedQueueIds}
+				/>
 			</TabPanel>
 			<TabPanel value={tab} name="search" className={classes.ticketsWrapper}>
-				<TicketsList searchParam={searchParam} showAll={showAllTickets} />
+				<TicketsList
+					searchParam={searchParam}
+					showAll={true}
+					selectedQueueIds={selectedQueueIds}
+				/>
 			</TabPanel>
 		</Paper>
 	);

frontend/src/components/TicketsQueueSelect/index.js

@@ -5,7 +5,7 @@ import FormControl from "@material-ui/core/FormControl";
 import Select from "@material-ui/core/Select";
 import { Checkbox, ListItemText } from "@material-ui/core";
 
-const TicketsListQueueSelect = ({
+const TicketsQueueSelect = ({
 	userQueues,
 	selectedQueueIds = [],
 	onChange,
@@ -15,7 +15,7 @@ const TicketsListQueueSelect = ({
 	};
 
 	return (
-		<div style={{ width: 120, marginTop: -5 }}>
+		<div style={{ width: 120, marginTop: -4 }}>
 			<FormControl fullWidth margin="dense">
 				<Select
 					multiple
@@ -56,4 +56,4 @@ const TicketsListQueueSelect = ({
 	);
 };
 
-export default TicketsListQueueSelect;
+export default TicketsQueueSelect;