From ca339f14c71b365b9cc5326c088cc8f3c9c7b587 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Tue, 5 Nov 2024 07:30:56 -0600
Subject: [PATCH] fix api filter from matching event id as timestamp

---
 web/src/components/input/InputWithTags.tsx | 18 ++++++++++++------
 web/src/hooks/use-api-filter.ts            |  6 +++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/web/src/components/input/InputWithTags.tsx b/web/src/components/input/InputWithTags.tsx
index ff46375fd..e5b492bcc 100644
--- a/web/src/components/input/InputWithTags.tsx
+++ b/web/src/components/input/InputWithTags.tsx
@@ -463,9 +463,13 @@ export default function InputWithTags({
   }, [setFilters, resetSuggestions, setSearch, setInputFocused]);
 
   const handleClearSimilarity = useCallback(() => {
-    removeFilter("event_id", filters.event_id!);
-    removeFilter("search_type", "similarity");
-  }, [removeFilter, filters]);
+    const newFilters = { ...filters };
+    if (newFilters.event_id === filters.event_id) {
+      delete newFilters.event_id;
+    }
+    delete newFilters.search_type;
+    setFilters(newFilters);
+  }, [setFilters, filters]);
 
   const handleInputBlur = useCallback(
     (e: React.FocusEvent) => {
@@ -763,13 +767,15 @@ export default function InputWithTags({
                             </button>
                           </span>
                         ))
-                    : filterType !== "event_id" && (
+                    : !(filterType == "event_id" && isSimilaritySearch) && (
                         <span
                           key={filterType}
                           className="inline-flex items-center whitespace-nowrap rounded-full bg-green-100 px-2 py-0.5 text-sm capitalize text-green-800"
                         >
-                          {filterType.replaceAll("_", " ")}:{" "}
-                          {formatFilterValues(filterType, filterValues)}
+                          {filterType === "event_id"
+                            ? "Tracked Object ID"
+                            : filterType.replaceAll("_", " ")}
+                          : {formatFilterValues(filterType, filterValues)}
                           <button
                             onClick={() =>
                               removeFilter(
diff --git a/web/src/hooks/use-api-filter.ts b/web/src/hooks/use-api-filter.ts
index 5c707a315..bffbff7e8 100644
--- a/web/src/hooks/use-api-filter.ts
+++ b/web/src/hooks/use-api-filter.ts
@@ -65,10 +65,14 @@ export function useApiFilterArgs<
     const filter: { [key: string]: unknown } = {};
 
     rawParams.forEach((value, key) => {
+      const isValidNumber = /^-?\d+(\.\d+)?(?!.)/.test(value);
+      const isValidEventID = /^\d+\.\d+-[a-zA-Z0-9]+$/.test(value);
+
       if (
         value != "true" &&
         value != "false" &&
-        (/[^0-9,]/.test(value) || isNaN(parseFloat(value)))
+        !isValidNumber &&
+        !isValidEventID
       ) {
         filter[key] = value.includes(",") ? value.split(",") : [value];
       } else {