Merge pull request #469 from Horgun/fix/search

Fix search

frontend/src/components/TicketsList/index.js

@@ -179,12 +179,12 @@ const reducer = (state, action) => {
 			type: "LOAD_TICKETS",
 			payload: tickets,
 		});
-	}, [tickets, status, searchParam]);
+	}, [tickets]);
 
 	useEffect(() => {
 		const socket = openSocket();
 
-		const shouldUpdateTicket = ticket =>
+		const shouldUpdateTicket = ticket => !searchParam &&
 			(!ticket.userId || ticket.userId === user?.id || showAll) &&
 			(!ticket.queueId || selectedQueueIds.indexOf(ticket.queueId) > -1);
 
@@ -244,7 +244,7 @@ const reducer = (state, action) => {
 		return () => {
 			socket.disconnect();
 		};
-	}, [status, showAll, user, selectedQueueIds]);
+	}, [status, searchParam, showAll, user, selectedQueueIds]);
 
 	useEffect(() => {
     if (typeof updateCount === "function") {
@@ -263,6 +263,7 @@ const reducer = (state, action) => {
 		const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
 
 		if (scrollHeight - (scrollTop + 100) < clientHeight) {
+			e.currentTarget.scrollTop = scrollTop - 100;
 			loadMore();
 		}
 	};

frontend/src/components/TicketsManager/index.js

@@ -118,6 +118,7 @@ const TicketsManager = () => {
   useEffect(() => {
     if (tab === "search") {
       searchInputRef.current.focus();
+      setSearchParam("");
     }
   }, [tab]);