From bf2d444116b5e7079f33b33f258c49c225763cf1 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Mon, 9 Sep 2024 15:25:55 -0600
Subject: [PATCH] Always show eents when searching

---
 web/src/pages/Search.tsx            | 23 +++++++---
 web/src/views/search/SearchView.tsx | 70 +++++++++++++++++------------
 2 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/web/src/pages/Search.tsx b/web/src/pages/Search.tsx
index 644167173..da1cdb851 100644
--- a/web/src/pages/Search.tsx
+++ b/web/src/pages/Search.tsx
@@ -60,10 +60,6 @@ export default function Search() {
   }, [search]);
 
   const searchQuery = useMemo(() => {
-    if (searchTerm.length == 0) {
-      return null;
-    }
-
     if (similaritySearch) {
       return [
         "events/search",
@@ -80,10 +76,25 @@ export default function Search() {
       ];
     }
 
+    if (searchTerm) {
+      return [
+        "events/search",
+        {
+          query: searchTerm,
+          cameras: searchSearchParams["cameras"],
+          labels: searchSearchParams["labels"],
+          zones: searchSearchParams["zones"],
+          before: searchSearchParams["before"],
+          after: searchSearchParams["after"],
+          search_type: searchSearchParams["search_type"],
+          include_thumbnails: 0,
+        },
+      ];
+    }
+
     return [
-      "events/search",
+      "events",
       {
-        query: searchTerm,
         cameras: searchSearchParams["cameras"],
         labels: searchSearchParams["labels"],
         zones: searchSearchParams["zones"],
diff --git a/web/src/views/search/SearchView.tsx b/web/src/views/search/SearchView.tsx
index 57a6beeb4..bd2ae5d65 100644
--- a/web/src/views/search/SearchView.tsx
+++ b/web/src/views/search/SearchView.tsx
@@ -96,6 +96,11 @@ export default function SearchView({
     return Math.round(confidence * 100);
   };
 
+  const hasExistingSearch = useMemo(
+    () => searchResults != undefined || searchFilter != undefined,
+    [searchResults, searchFilter],
+  );
+
   return (
     <div className="flex size-full flex-col pt-2 md:py-2">
       <Toaster closeButton={true} />
@@ -108,7 +113,12 @@ export default function SearchView({
       />
 
       <div className="relative mb-2 flex h-11 items-center justify-between pl-2 pr-2 md:pl-3">
-        <div className="relative mr-3 w-full md:w-1/3">
+        <div
+          className={cn(
+            "relative w-full",
+            hasExistingSearch ? "mr-3 md:w-1/3" : "md:ml-[25%] md:w-1/2",
+          )}
+        >
           <Input
             className="text-md w-full bg-muted pr-10"
             placeholder={
@@ -125,10 +135,12 @@ export default function SearchView({
           )}
         </div>
 
-        <SearchFilterGroup
-          filter={searchFilter}
-          onUpdateFilter={onUpdateFilter}
-        />
+        {hasExistingSearch && (
+          <SearchFilterGroup
+            filter={searchFilter}
+            onUpdateFilter={onUpdateFilter}
+          />
+        )}
       </div>
 
       <div className="no-scrollbar flex flex-1 flex-wrap content-start gap-2 overflow-y-auto md:gap-4">
@@ -186,34 +198,36 @@ export default function SearchView({
                       scrollLock={false}
                       onClick={onSelectSearch}
                     />
-                    <div className={cn("absolute right-2 top-2 z-40")}>
-                      <Tooltip>
-                        <TooltipTrigger>
-                          <Chip
-                            className={`flex select-none items-center justify-between space-x-1 bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500 text-xs capitalize text-white`}
-                          >
-                            {value.search_source == "thumbnail" ? (
-                              <LuImage className="mr-1 size-3" />
-                            ) : (
-                              <LuText className="mr-1 size-3" />
-                            )}
+                    {searchTerm && (
+                      <div className={cn("absolute right-2 top-2 z-40")}>
+                        <Tooltip>
+                          <TooltipTrigger>
+                            <Chip
+                              className={`flex select-none items-center justify-between space-x-1 bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500 text-xs capitalize text-white`}
+                            >
+                              {value.search_source == "thumbnail" ? (
+                                <LuImage className="mr-1 size-3" />
+                              ) : (
+                                <LuText className="mr-1 size-3" />
+                              )}
+                              {zScoreToConfidence(
+                                value.search_distance,
+                                value.search_source,
+                              )}
+                              %
+                            </Chip>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            Matched {value.search_source} at{" "}
                             {zScoreToConfidence(
                               value.search_distance,
                               value.search_source,
                             )}
                             %
-                          </Chip>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                          Matched {value.search_source} at{" "}
-                          {zScoreToConfidence(
-                            value.search_distance,
-                            value.search_source,
-                          )}
-                          %
-                        </TooltipContent>
-                      </Tooltip>
-                    </div>
+                          </TooltipContent>
+                        </Tooltip>
+                      </div>
+                    )}
                   </div>
                   <div
                     className={`review-item-ring pointer-events-none absolute inset-0 z-10 size-full rounded-lg outline outline-[3px] -outline-offset-[2.8px] ${selected ? `shadow-severity_alert outline-severity_alert` : "outline-transparent duration-500"}`}