Refactor grouped face card into generic component

web/src/components/card/ClassificationCard.tsx

@@ -5,9 +5,15 @@ import {
   ClassificationItemData,
   ClassificationThreshold,
 } from "@/types/classification";
+import { Event } from "@/types/event";
 import { useMemo, useRef, useState } from "react";
-import { isMobile } from "react-device-detect";
+import { isDesktop, isMobile } from "react-device-detect";
 import { useTranslation } from "react-i18next";
+import TimeAgo from "../dynamic/TimeAgo";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
+import { LuSearch } from "react-icons/lu";
+import { TooltipPortal } from "@radix-ui/react-tooltip";
+import { useNavigate } from "react-router-dom";
 
 type ClassificationCardProps = {
   className?: string;
@@ -120,3 +126,135 @@ export function ClassificationCard({
     </>
   );
 }
+
+type GroupedClassificationCardProps = {
+  group: ClassificationItemData[];
+  event?: Event;
+  threshold?: ClassificationThreshold;
+  selectedItems: string[];
+  i18nLibrary: string;
+  onClick: (data: ClassificationItemData | undefined) => void;
+  onSelectEvent: (event: Event) => void;
+  children?: (data: ClassificationItemData) => React.ReactNode;
+};
+export function GroupedClassificationCard({
+  group,
+  event,
+  threshold,
+  selectedItems,
+  i18nLibrary,
+  onClick,
+  onSelectEvent,
+  children,
+}: GroupedClassificationCardProps) {
+  const navigate = useNavigate();
+  const { t } = useTranslation(["views/explore", i18nLibrary]);
+
+  // data
+
+  const allItemsSelected = useMemo(
+    () => group.every((data) => selectedItems.includes(data.filename)),
+    [group, selectedItems],
+  );
+
+  const time = useMemo(() => {
+    const item = group[0];
+
+    if (!item?.timestamp) {
+      return undefined;
+    }
+
+    return item.timestamp * 1000;
+  }, [group]);
+
+  return (
+    <div
+      className={cn(
+        "flex cursor-pointer flex-col gap-2 rounded-lg bg-card p-2 outline outline-[3px]",
+        isMobile && "w-full",
+        allItemsSelected
+          ? "shadow-selected outline-selected"
+          : "outline-transparent duration-500",
+      )}
+      onClick={() => {
+        if (selectedItems.length) {
+          onClick(undefined);
+        }
+      }}
+      onContextMenu={(e) => {
+        e.stopPropagation();
+        e.preventDefault();
+        onClick(undefined);
+      }}
+    >
+      <div className="flex flex-row justify-between">
+        <div className="flex flex-col gap-1">
+          <div className="select-none smart-capitalize">
+            {t("details.person")}
+            {event?.sub_label
+              ? `: ${event.sub_label} (${Math.round((event.data.sub_label_score || 0) * 100)}%)`
+              : ": " + t("details.unknown")}
+          </div>
+          {time && (
+            <TimeAgo
+              className="text-sm text-secondary-foreground"
+              time={time}
+              dense
+            />
+          )}
+        </div>
+        {event && (
+          <Tooltip>
+            <TooltipTrigger>
+              <div
+                className="cursor-pointer"
+                onClick={() => {
+                  navigate(`/explore?event_id=${event.id}`);
+                }}
+              >
+                <LuSearch className="size-4 text-muted-foreground" />
+              </div>
+            </TooltipTrigger>
+            <TooltipPortal>
+              <TooltipContent>
+                {t("details.item.button.viewInExplore", {
+                  ns: "views/explore",
+                })}
+              </TooltipContent>
+            </TooltipPortal>
+          </Tooltip>
+        )}
+      </div>
+
+      <div
+        className={cn(
+          "gap-2",
+          isDesktop
+            ? "flex flex-row flex-wrap"
+            : "grid grid-cols-2 sm:grid-cols-5 lg:grid-cols-6",
+        )}
+      >
+        {group.map((data: ClassificationItemData) => (
+          <ClassificationCard
+            key={data.filename}
+            data={data}
+            threshold={threshold}
+            selected={
+              allItemsSelected ? false : selectedItems.includes(data.filename)
+            }
+            i18nLibrary={i18nLibrary}
+            onClick={(data, meta) => {
+              if (meta || selectedItems.length > 0) {
+                onClick(data);
+              } else if (event) {
+                onSelectEvent(event);
+              }
+            }}
+          >
+            {children?.(data)}
+          </ClassificationCard>
+        ))}
+      </div>
+    </div>
+  );
+}

web/src/pages/FaceLibrary.tsx

@@ -1,4 +1,3 @@
-import TimeAgo from "@/components/dynamic/TimeAgo";
 import AddFaceIcon from "@/components/icons/AddFaceIcon";
 import ActivityIndicator from "@/components/indicators/activity-indicator";
 import CreateFaceWizardDialog from "@/components/overlay/detail/FaceCreateWizardDialog";
@@ -52,7 +51,7 @@ import {
   useRef,
   useState,
 } from "react";
-import { isDesktop, isMobile } from "react-device-detect";
+import { isDesktop } from "react-device-detect";
 import { Trans, useTranslation } from "react-i18next";
 import {
   LuFolderCheck,
@@ -60,17 +59,18 @@ import {
   LuPencil,
   LuRefreshCw,
   LuScanFace,
-  LuSearch,
   LuTrash2,
 } from "react-icons/lu";
-import { useNavigate } from "react-router-dom";
 import { toast } from "sonner";
 import useSWR from "swr";
 import SearchDetailDialog, {
   SearchTab,
 } from "@/components/overlay/detail/SearchDetailDialog";
 import { SearchResult } from "@/types/search";
-import { ClassificationCard } from "@/components/card/ClassificationCard";
+import {
+  ClassificationCard,
+  GroupedClassificationCard,
+} from "@/components/card/ClassificationCard";
 import { ClassificationItemData } from "@/types/classification";
 
 export default function FaceLibrary() {
@@ -758,16 +758,10 @@ function FaceAttemptGroup({
   onSelectEvent,
   onRefresh,
 }: FaceAttemptGroupProps) {
-  const navigate = useNavigate();
   const { t } = useTranslation(["views/faceLibrary", "views/explore"]);
 
   // data
 
-  const allFacesSelected = useMemo(
-    () => group.every((face) => selectedFaces.includes(face.filename)),
-    [group, selectedFaces],
-  );
-
   const threshold = useMemo(() => {
     return {
       recognition: config.face_recognition.recognition_threshold,
@@ -775,16 +769,6 @@ function FaceAttemptGroup({
     };
   }, [config]);
 
-  const time = useMemo(() => {
-    const item = group[0];
-
-    if (!item?.timestamp) {
-      return undefined;
-    }
-
-    return item.timestamp * 1000;
-  }, [group]);
-
   // interaction
 
   const handleClickEvent = useCallback(
@@ -875,108 +859,41 @@ function FaceAttemptGroup({
   );
 
   return (
-    <div
+    <GroupedClassificationCard
-      className={cn(
+      group={group}
-        "flex cursor-pointer flex-col gap-2 rounded-lg bg-card p-2 outline outline-[3px]",
+      event={event}
-        isMobile && "w-full",
+      threshold={threshold}
-        allFacesSelected
+      selectedItems={selectedFaces}
-          ? "shadow-selected outline-selected"
+      i18nLibrary="views/faceLibrary"
-          : "outline-transparent duration-500",
+      onClick={(data) => {
-      )}
+        if (data) {
-      onClick={() => {
+          onClickFaces([data.filename], true);
-        if (selectedFaces.length) {
+        } else {
           handleClickEvent(true);
         }
       }}
-      onContextMenu={(e) => {
+      onSelectEvent={onSelectEvent}
-        e.stopPropagation();
-        e.preventDefault();
-        handleClickEvent(true);
-      }}
     >
-      <div className="flex flex-row justify-between">
+      {(data) => (
-        <div className="flex flex-col gap-1">
+        <>
-          <div className="select-none smart-capitalize">
+          <FaceSelectionDialog
-            {t("details.person")}
+            faceNames={faceNames}
-            {event?.sub_label
+            onTrainAttempt={(name) => onTrainAttempt(data, name)}
-              ? `: ${event.sub_label} (${Math.round((event.data.sub_label_score || 0) * 100)}%)`
+          >
-              : ": " + t("details.unknown")}
+            <AddFaceIcon className="size-5 cursor-pointer text-primary-variant hover:text-primary" />
-          </div>
+          </FaceSelectionDialog>
-          {time && (
-            <TimeAgo
-              className="text-sm text-secondary-foreground"
-              time={time}
-              dense
-            />
-          )}
-        </div>
-        {event && (
           <Tooltip>
             <TooltipTrigger>
-              <div
+              <LuRefreshCw
-                className="cursor-pointer"
+                className="size-5 cursor-pointer text-primary-variant hover:text-primary"
-                onClick={() => {
+                onClick={() => onReprocess(data)}
-                  navigate(`/explore?event_id=${event.id}`);
+              />
-                }}
-              >
-                <LuSearch className="size-4 text-muted-foreground" />
-              </div>
             </TooltipTrigger>
-            <TooltipPortal>
+            <TooltipContent>{t("button.reprocessFace")}</TooltipContent>
-              <TooltipContent>
-                {t("details.item.button.viewInExplore", {
-                  ns: "views/explore",
-                })}
-              </TooltipContent>
-            </TooltipPortal>
           </Tooltip>
-        )}
+        </>
-      </div>
+      )}
-
+    </GroupedClassificationCard>
-      <div
-        className={cn(
-          "gap-2",
-          isDesktop
-            ? "flex flex-row flex-wrap"
-            : "grid grid-cols-2 sm:grid-cols-5 lg:grid-cols-6",
-        )}
-      >
-        {group.map((data: ClassificationItemData) => (
-          <ClassificationCard
-            key={data.filename}
-            data={data}
-            threshold={threshold}
-            selected={
-              allFacesSelected ? false : selectedFaces.includes(data.filename)
-            }
-            i18nLibrary="views/faceLibrary"
-            onClick={(data, meta) => {
-              if (meta || selectedFaces.length > 0) {
-                onClickFaces([data.filename], true);
-              } else if (event) {
-                onSelectEvent(event);
-              }
-            }}
-          >
-            <FaceSelectionDialog
-              faceNames={faceNames}
-              onTrainAttempt={(name) => onTrainAttempt(data, name)}
-            >
-              <AddFaceIcon className="size-5 cursor-pointer text-primary-variant hover:text-primary" />
-            </FaceSelectionDialog>
-            <Tooltip>
-              <TooltipTrigger>
-                <LuRefreshCw
-                  className="size-5 cursor-pointer text-primary-variant hover:text-primary"
-                  onClick={() => onReprocess(data)}
-                />
-              </TooltipTrigger>
-              <TooltipContent>{t("button.reprocessFace")}</TooltipContent>
-            </Tooltip>
-          </ClassificationCard>
-        ))}
-      </div>
-    </div>
   );
 }
 

web/src/views/classification/ModelTrainingView.tsx

@@ -818,3 +818,79 @@ function StateTrainGrid({
     </div>
   );
 }
+
+type ObjectTrainGridProps = {
+  model: CustomClassificationModelConfig;
+  contentRef: MutableRefObject<HTMLDivElement | null>;
+  classes: string[];
+  trainData?: ClassificationItemData[];
+  selectedImages: string[];
+  onClickImages: (images: string[], ctrl: boolean) => void;
+  onRefresh: () => void;
+  onDelete: (ids: string[]) => void;
+};
+function ObjectTrainGrid({
+  model,
+  contentRef,
+  classes,
+  trainData,
+  selectedImages,
+  onClickImages,
+  onRefresh,
+  onDelete,
+}: ObjectTrainGridProps) {
+  const { t } = useTranslation(["views/classificationModel"]);
+
+  const threshold = useMemo(() => {
+    return {
+      recognition: model.threshold,
+      unknown: model.threshold,
+    };
+  }, [model]);
+
+  return (
+    <div
+      ref={contentRef}
+      className={cn(
+        "scrollbar-container flex flex-wrap gap-2 overflow-y-auto p-2",
+        isMobile && "justify-center",
+      )}
+    >
+      {trainData?.map((data) => (
+        <ClassificationCard
+          className="w-60 gap-2 rounded-lg bg-card p-2"
+          imgClassName="size-auto"
+          data={data}
+          threshold={threshold}
+          selected={selectedImages.includes(data.filename)}
+          i18nLibrary="views/classificationModel"
+          showArea={false}
+          onClick={(data, meta) => onClickImages([data.filename], meta)}
+        >
+          <ClassificationSelectionDialog
+            classes={classes}
+            modelName={model.name}
+            image={data.filename}
+            onRefresh={onRefresh}
+          >
+            <TbCategoryPlus className="size-5 cursor-pointer text-primary-variant hover:text-primary" />
+          </ClassificationSelectionDialog>
+          <Tooltip>
+            <TooltipTrigger>
+              <LuTrash2
+                className="size-5 cursor-pointer text-primary-variant hover:text-primary"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  onDelete([data.filename]);
+                }}
+              />
+            </TooltipTrigger>
+            <TooltipContent>
+              {t("button.deleteClassificationAttempts")}
+            </TooltipContent>
+          </Tooltip>
+        </ClassificationCard>
+      ))}
+    </div>
+  );
+}