From fac1f455cbe0b50f6de7e2f5e090e6b9be45ed3a Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward@in4it.io>
Date: Fri, 6 Sep 2024 10:57:31 -0500
Subject: [PATCH] search field

---
 pkg/rest/stats.go                           | 14 +++++++-
 webapp/src/Routes/PacketLogs/PacketLogs.tsx | 37 +++++++++++++++++----
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/pkg/rest/stats.go b/pkg/rest/stats.go
index 915d051..ed75df5 100644
--- a/pkg/rest/stats.go
+++ b/pkg/rest/stats.go
@@ -256,6 +256,7 @@ func (c *Context) packetLogsHandler(w http.ResponseWriter, r *http.Request) {
 			pos = i
 		}
 	}
+	search := r.FormValue("search")
 	// get all users
 	users := c.UserStore.ListUsers()
 	userMap := make(map[string]string)
@@ -314,7 +315,7 @@ func (c *Context) packetLogsHandler(w http.ResponseWriter, r *http.Request) {
 			}
 			timestamp = timestamp.Add(time.Duration(offset) * time.Minute)
 			if dateEqual(timestamp, date) {
-				if !filterLogRecord(logTypeFilter, inputSplit[1]) {
+				if !filterLogRecord(logTypeFilter, inputSplit[1]) && matchesSearch(search, inputSplit) {
 					row := LogRow{
 						Timestamp: timestamp.Format("2006-01-02 15:04:05"),
 						Data:      inputSplit[1:],
@@ -415,3 +416,14 @@ func filterLogRecord(logTypeFilter []string, logType string) bool {
 	}
 	return false
 }
+func matchesSearch(search string, data []string) bool {
+	if search == "" {
+		return true
+	}
+	for _, element := range data {
+		if strings.Contains(element, search) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/webapp/src/Routes/PacketLogs/PacketLogs.tsx b/webapp/src/Routes/PacketLogs/PacketLogs.tsx
index 3f9ab1a..8f2b681 100644
--- a/webapp/src/Routes/PacketLogs/PacketLogs.tsx
+++ b/webapp/src/Routes/PacketLogs/PacketLogs.tsx
@@ -1,9 +1,9 @@
-import { Card, Container, Text, Table, Title, Button, Grid, Select, MultiSelect, Popover, Group} from "@mantine/core";
+import { Card, Container, Text, Table, Title, Button, Grid, Select, MultiSelect, Popover, Group, TextInput, rem, ActionIcon, Highlight} from "@mantine/core";
 import { AppSettings } from "../../Constants/Constants";
-import { useInfiniteQuery, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useInfiniteQuery } from "@tanstack/react-query";
 import { useAuthContext } from "../../Auth/Auth";
 import { Link, useSearchParams } from "react-router-dom";
-import { TbSettings } from "react-icons/tb";
+import { TbArrowRight, TbSearch, TbSettings } from "react-icons/tb";
 import { DatePickerInput } from "@mantine/dates";
 import { useEffect, useState } from "react";
 import React from "react";
@@ -44,12 +44,14 @@ export function PacketLogs() {
     const dateParam = currentQueryParameters.get("date")
     const userParam = currentQueryParameters.get("user")
     const [logType, setLogType] = useState<string[]>([])
+    const [search, setSearch] = useState<string>("")
+    const [searchParam, setSearchParam] = useState<string>("")
     const [logsDate, setLogsDate] = useState<Date | null>(dateParam === null ? new Date() : new Date(dateParam));
     const [user, setUser] = useState<string>(userParam === null ? "all" : userParam)
     const { isPending, fetchNextPage, hasNextPage, error, data } = useInfiniteQuery<LogsDataResponse>({
-      queryKey: ['packetlogs', user, logsDate, logType],
+      queryKey: ['packetlogs', user, logsDate, logType, searchParam],
       queryFn: async ({ pageParam }) =>
-        fetch(AppSettings.url + '/stats/packetlogs/'+(user === undefined || user === "" ? "all" : user)+'/'+(logsDate == undefined ? getDate(new Date()) : getDate(logsDate)) + "?pos="+pageParam+"&offset="+timezoneOffset+"&logtype="+encodeURIComponent(logType.join(",")), {
+        fetch(AppSettings.url + '/stats/packetlogs/'+(user === undefined || user === "" ? "all" : user)+'/'+(logsDate == undefined ? getDate(new Date()) : getDate(logsDate)) + "?pos="+pageParam+"&offset="+timezoneOffset+"&logtype="+encodeURIComponent(logType.join(","))+"&search="+encodeURIComponent(searchParam), {
           headers: {
             "Content-Type": "application/json",
             "Authorization": "Bearer " + authInfo.token
@@ -62,6 +64,12 @@ export function PacketLogs() {
         getNextPageParam: (lastRequest) => lastRequest.logData.nextPos === -1 ? null : lastRequest.logData.nextPos,
     })
 
+    const captureEnter = (e: React.KeyboardEvent<HTMLDivElement>) => {
+      if (e.key === "Enter") {
+        setSearchParam(search)
+      }
+    }
+
     useEffect(() => {
       const handleScroll = () => {
         const { scrollTop, clientHeight, scrollHeight } =
@@ -113,7 +121,7 @@ export function PacketLogs() {
             <Table.Td>{row.t}</Table.Td>
             {row.d.map((element, y) => {
               return (
-              <Table.Td key={i+"-"+y}>{element}</Table.Td>
+              <Table.Td key={i+"-"+y}>{searchParam === "" ? element : <Highlight color="lime" highlight={searchParam}>{element}</Highlight>}</Table.Td>
               )
             })}
           </Table.Tr>
@@ -126,7 +134,22 @@ export function PacketLogs() {
           Packet Logs
           </Title>
           <Grid>
-            <Grid.Col span={4}></Grid.Col>
+            <Grid.Col span={4}>
+            <TextInput
+                placeholder="Search..."
+                rightSectionWidth={30}
+                size="xs"
+                leftSection={<TbSearch style={{ width: rem(18), height: rem(18) }} />}
+                rightSection={
+                  <ActionIcon size={18} radius="xl" variant="filled" onClick={() => setSearchParam(search)}>
+                    <TbArrowRight style={{ width: rem(14), height: rem(14) }} />
+                  </ActionIcon>
+                }
+                onKeyDown={(e) => captureEnter(e)}
+                onChange={(e) => setSearch(e.currentTarget.value)}
+                value={search}
+              />
+            </Grid.Col>
             <Grid.Col span={4}>
                 <DatePickerInput
                 value={logsDate}