From daccbd9c2b0a163204cbcc371ff03c26977e4d37 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Thu, 3 Jul 2025 15:17:03 -0500
Subject: [PATCH] highlight entry in UI when triggered

---
 web/public/locales/en/views/settings.json |  7 +--
 web/src/api/ws.tsx                        | 11 ++++
 web/src/types/ws.ts                       |  8 +++
 web/src/views/settings/TriggerView.tsx    | 62 +++++++++++++++++++----
 4 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/web/public/locales/en/views/settings.json b/web/public/locales/en/views/settings.json
index c4ae23115..6fe5adde3 100644
--- a/web/public/locales/en/views/settings.json
+++ b/web/public/locales/en/views/settings.json
@@ -660,7 +660,8 @@
       "actions": "Actions",
       "noTriggers": "No triggers configured for this camera.",
       "edit": "Edit",
-      "deleteTrigger": "Delete Trigger"
+      "deleteTrigger": "Delete Trigger",
+      "lastTriggered": "Last triggered"
     },
     "type": {
       "thumbnail": "Thumbnail",
@@ -685,7 +686,7 @@
       },
       "form": {
         "name": {
-          "title": "Trigger Name",
+          "title": "Name",
           "placeholder": "Enter trigger name",
           "error": {
             "minLength": "Name must be at least 2 characters long.",
@@ -697,7 +698,7 @@
           "description": "Enable or disable this trigger"
         },
         "type": {
-          "title": "Trigger Type",
+          "title": "Type",
           "placeholder": "Select trigger type"
         },
         "content": {
diff --git a/web/src/api/ws.tsx b/web/src/api/ws.tsx
index 78c596e13..cc3ea05bf 100644
--- a/web/src/api/ws.tsx
+++ b/web/src/api/ws.tsx
@@ -9,6 +9,7 @@ import {
   ModelState,
   ToggleableSetting,
   TrackedObjectUpdateReturnType,
+  TriggerStatus,
 } from "@/types/ws";
 import { FrigateStats } from "@/types/stats";
 import { createContainer } from "react-tracked";
@@ -572,3 +573,13 @@ export function useNotificationTest(): {
   } = useWs("notification_test", "notification_test");
   return { payload: payload as string, send };
 }
+
+export function useTriggers(): { payload: TriggerStatus } {
+  const {
+    value: { payload },
+  } = useWs("triggers", "");
+  const parsed = payload
+    ? JSON.parse(payload as string)
+    : { name: "", camera: "", event_id: "", type: "", score: 0 };
+  return { payload: useDeepMemo(parsed) };
+}
diff --git a/web/src/types/ws.ts b/web/src/types/ws.ts
index 06ec9ae1d..7fad6e953 100644
--- a/web/src/types/ws.ts
+++ b/web/src/types/ws.ts
@@ -105,3 +105,11 @@ export type TrackedObjectUpdateReturnType = {
   timestamp?: number;
   text?: string;
 } | null;
+
+export type TriggerStatus = {
+  name: string;
+  camera: string;
+  event_id: string;
+  type: string;
+  score: number;
+};
diff --git a/web/src/views/settings/TriggerView.tsx b/web/src/views/settings/TriggerView.tsx
index d96e26244..ad471120a 100644
--- a/web/src/views/settings/TriggerView.tsx
+++ b/web/src/views/settings/TriggerView.tsx
@@ -22,6 +22,7 @@ import { useSearchEffect } from "@/hooks/use-overlay-state";
 import { cn } from "@/lib/utils";
 import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
 import { Link } from "react-router-dom";
+import { useTriggers } from "@/api/ws";
 
 type ConfigSetBody = {
   requires_restart: number;
@@ -65,10 +66,16 @@ export default function TriggerView({
   const { t } = useTranslation("views/settings");
   const { data: config, mutate: updateConfig } =
     useSWR<FrigateConfig>("config");
-  const { data: trigger_status } = useSWR(`/triggers/status/${selectedCamera}`);
+  const { data: trigger_status, mutate } = useSWR(
+    `/triggers/status/${selectedCamera}`,
+    {
+      revalidateOnFocus: false,
+    },
+  );
   const [showCreate, setShowCreate] = useState(false);
   const [showDelete, setShowDelete] = useState(false);
   const [selectedTrigger, setSelectedTrigger] = useState<Trigger | null>(null);
+  const [triggeredTrigger, setTriggeredTrigger] = useState<string>();
   const [isLoading, setIsLoading] = useState(false);
 
   const triggers = useMemo(() => {
@@ -91,6 +98,38 @@ export default function TriggerView({
     }));
   }, [config, selectedCamera]);
 
+  // watch websocket for updates
+  const { payload: triggers_status_ws } = useTriggers();
+
+  useEffect(() => {
+    if (!triggers_status_ws) return;
+
+    mutate();
+
+    setTriggeredTrigger(triggers_status_ws.name);
+    const target = document.querySelector(
+      `#trigger-${triggers_status_ws.name}`,
+    );
+    if (target) {
+      target.scrollIntoView({
+        block: "center",
+        behavior: "smooth",
+        inline: "nearest",
+      });
+      const ring = target.querySelector(".trigger-ring");
+      if (ring) {
+        ring.classList.add(`outline-selected`);
+        ring.classList.remove("outline-transparent");
+
+        const timeout = setTimeout(() => {
+          ring.classList.remove(`outline-selected`);
+          ring.classList.add("outline-transparent");
+        }, 3000);
+        return () => clearTimeout(timeout);
+      }
+    }
+  }, [triggers_status_ws, selectedCamera, mutate]);
+
   useEffect(() => {
     document.title = t("triggers.documentTitle");
   }, [t]);
@@ -382,8 +421,17 @@ export default function TriggerView({
                   {triggers.map((trigger) => (
                     <div
                       key={trigger.name}
-                      className="flex items-center justify-between rounded-lg border border-border bg-background p-4 transition-opacity"
+                      id={`trigger-${trigger.name}`}
+                      className="relative flex items-center justify-between rounded-lg border border-border bg-background p-4 transition-all"
                     >
+                      <div
+                        className={cn(
+                          "trigger-ring pointer-events-none absolute inset-0 z-10 size-full rounded-md outline outline-[3px] -outline-offset-[2.8px] duration-500",
+                          triggeredTrigger === trigger.name
+                            ? "shadow-selected outline-selected"
+                            : "outline-transparent duration-500",
+                        )}
+                      />
                       <div className="min-w-0 flex-1">
                         <h3
                           className={cn(
@@ -395,7 +443,7 @@ export default function TriggerView({
                         </h3>
                         <div
                           className={cn(
-                            "mt-1 flex flex-col gap-0.5 text-sm text-muted-foreground md:flex-row md:items-center md:gap-3",
+                            "mt-1 flex flex-col gap-1 text-sm text-muted-foreground md:flex-row md:items-center md:gap-3",
                             !trigger.enabled && "opacity-60",
                           )}
                         >
@@ -416,10 +464,6 @@ export default function TriggerView({
                             </Badge>
                           </div>
 
-                          <span>{trigger.threshold.toFixed(2)} threshold</span>
-
-                          <span>{trigger.actions.length} actions</span>
-
                           <Link
                             to={`/explore?event_id=${trigger_status?.triggers[trigger.name]?.triggering_event_id || ""}`}
                             className={cn(
@@ -429,8 +473,8 @@ export default function TriggerView({
                                 "pointer-events-none opacity-60",
                             )}
                           >
-                            <div className="flex flex-row items-center justify-center">
-                              Last:{" "}
+                            <div className="flex flex-row items-center">
+                              {t("triggers.table.lastTriggered")}{" "}
                               {trigger_status &&
                               trigger_status.triggers[trigger.name]
                                 ?.last_triggered