Always show eents when searching

This commit is contained in:
Nicolas Mowen 2024-09-09 15:25:55 -06:00
parent d57c958a6c
commit bf2d444116
2 changed files with 59 additions and 34 deletions

View File

@ -60,10 +60,6 @@ export default function Search() {
}, [search]);
const searchQuery = useMemo(() => {
if (searchTerm.length == 0) {
return null;
}
if (similaritySearch) {
return [
"events/search",
@ -80,6 +76,7 @@ export default function Search() {
];
}
if (searchTerm) {
return [
"events/search",
{
@ -93,6 +90,20 @@ export default function Search() {
include_thumbnails: 0,
},
];
}
return [
"events",
{
cameras: searchSearchParams["cameras"],
labels: searchSearchParams["labels"],
zones: searchSearchParams["zones"],
before: searchSearchParams["before"],
after: searchSearchParams["after"],
search_type: searchSearchParams["search_type"],
include_thumbnails: 0,
},
];
}, [searchTerm, searchSearchParams, similaritySearch]);
const { data: searchResults, isLoading } =

View File

@ -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>
{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,6 +198,7 @@ export default function SearchView({
scrollLock={false}
onClick={onSelectSearch}
/>
{searchTerm && (
<div className={cn("absolute right-2 top-2 z-40")}>
<Tooltip>
<TooltipTrigger>
@ -214,6 +227,7 @@ export default function SearchView({
</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"}`}