Merge remote-tracking branch 'upstream/dev' into dev-rk

a2nt · Aug 29, 2024 · 56af28c · 56af28c
2 parents be48851 + f4f3cfa
commit 56af28c
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 30 deletions.
diff --git a/docs/docs/configuration/reference.md b/docs/docs/configuration/reference.md
@@ -466,7 +466,7 @@ snapshots:
   quality: 70
 
 # Optional: Restream configuration
-# Uses https://github.com/AlexxIT/go2rtc (v1.8.3)
+# Uses https://github.com/AlexxIT/go2rtc (v1.9.2)
 go2rtc:
 
 # Optional: jsmpeg stream configuration for WebUI

diff --git a/web/src/components/card/ReviewCard.tsx b/web/src/components/card/ReviewCard.tsx
@@ -32,6 +32,8 @@ import { Drawer, DrawerContent } from "../ui/drawer";
 import axios from "axios";
 import { toast } from "sonner";
 import useKeyboardListener from "@/hooks/use-keyboard-listener";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
+import { capitalizeFirstLetter } from "@/utils/stringUtil";
 
 type ReviewCardProps = {
   event: ReviewSegment;
@@ -153,21 +155,43 @@ export default function ReviewCard({
         }}
       />
       <div className="flex items-center justify-between">
-        <div className="flex items-center justify-evenly gap-1">
-          {event.data.objects.map((object) => {
-            return getIconForLabel(
-              object,
-              "size-3 text-primary dark:text-white",
-            );
-          })}
-          {event.data.audio.map((audio) => {
-            return getIconForLabel(
-              audio,
-              "size-3 text-primary dark:text-white",
-            );
-          })}
-          <div className="font-extra-light text-xs">{formattedDate}</div>
-        </div>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <div className="flex items-center justify-evenly gap-1">
+              <>
+                {event.data.objects.map((object) => {
+                  return getIconForLabel(
+                    object,
+                    "size-3 text-primary dark:text-white",
+                  );
+                })}
+                {event.data.audio.map((audio) => {
+                  return getIconForLabel(
+                    audio,
+                    "size-3 text-primary dark:text-white",
+                  );
+                })}
+              </>
+              <div className="font-extra-light text-xs">{formattedDate}</div>
+            </div>
+          </TooltipTrigger>
+          <TooltipContent className="capitalize">
+            {[
+              ...new Set([
+                ...(event.data.objects || []),
+                ...(event.data.sub_labels || []),
+                ...(event.data.audio || []),
+              ]),
+            ]
+              .filter(
+                (item) => item !== undefined && !item.includes("-verified"),
+              )
+              .map((text) => capitalizeFirstLetter(text))
+              .sort()
+              .join(", ")
+              .replaceAll("-verified", "")}
+          </TooltipContent>
+        </Tooltip>
         <TimeAgo
           className="text-xs text-muted-foreground"
           time={event.start_time * 1000}

diff --git a/web/src/components/filter/CameraGroupSelector.tsx b/web/src/components/filter/CameraGroupSelector.tsx
@@ -551,6 +551,14 @@ export function CameraGroupEdit({
           message: "Camera group name already exists.",
         },
       )
+      .refine(
+        (value: string) => {
+          return !value.includes(".");
+        },
+        {
+          message: "Camera group name must not contain a period.",
+        },
+      )
       .refine((value: string) => value.toLowerCase() !== "default", {
         message: "Invalid camera group name.",
       }),

diff --git a/web/src/components/player/LivePlayer.tsx b/web/src/components/player/LivePlayer.tsx
@@ -18,6 +18,7 @@ import Chip from "../indicators/Chip";
 import { capitalizeFirstLetter } from "@/utils/stringUtil";
 import { cn } from "@/lib/utils";
 import { TbExclamationCircle } from "react-icons/tb";
+import { TooltipPortal } from "@radix-ui/react-tooltip";
 
 type LivePlayerProps = {
   cameraRef?: (ref: HTMLDivElement | null) => void;
@@ -258,20 +259,22 @@ export default function LivePlayer({
                   </div>
                 </TooltipTrigger>
               </div>
-              <TooltipContent className="capitalize">
-                {[
-                  ...new Set([
-                    ...(objects || []).map(({ label, sub_label }) =>
-                      label.endsWith("verified") ? sub_label : label,
-                    ),
-                  ]),
-                ]
-                  .filter((label) => label?.includes("-verified") == false)
-                  .map((label) => capitalizeFirstLetter(label))
-                  .sort()
-                  .join(", ")
-                  .replaceAll("-verified", "")}
-              </TooltipContent>
+              <TooltipPortal>
+                <TooltipContent className="capitalize">
+                  {[
+                    ...new Set([
+                      ...(objects || []).map(({ label, sub_label }) =>
+                        label.endsWith("verified") ? sub_label : label,
+                      ),
+                    ]),
+                  ]
+                    .filter((label) => label?.includes("-verified") == false)
+                    .map((label) => capitalizeFirstLetter(label))
+                    .sort()
+                    .join(", ")
+                    .replaceAll("-verified", "")}
+                </TooltipContent>
+              </TooltipPortal>
             </Tooltip>
           </div>
         )}

diff --git a/web/src/components/settings/ZoneEditPane.tsx b/web/src/components/settings/ZoneEditPane.tsx
@@ -106,6 +106,14 @@ export default function ZoneEditPane({
         {
           message: "Zone name already exists on this camera.",
         },
+      )
+      .refine(
+        (value: string) => {
+          return !value.includes(".");
+        },
+        {
+          message: "Zone name must not contain a period.",
+        },
       ),
     inertia: z.coerce
       .number()