mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-04-14 01:17:50 +02:00
Revamp multiselect (#10172)
* Just use multiselect for mobile * Update revamped design and add export to values * Get actions looking good on mobile and desktop
This commit is contained in:
parent
a49e1bbc64
commit
ebf34ce378
@ -1,21 +1,19 @@
|
|||||||
import { LuCheckSquare, LuTrash, LuX } from "react-icons/lu";
|
import { LuCheckSquare, LuFileUp, LuTrash } from "react-icons/lu";
|
||||||
import {
|
|
||||||
Tooltip,
|
|
||||||
TooltipContent,
|
|
||||||
TooltipProvider,
|
|
||||||
TooltipTrigger,
|
|
||||||
} from "../ui/tooltip";
|
|
||||||
import { useCallback } from "react";
|
import { useCallback } from "react";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
|
import { Button } from "../ui/button";
|
||||||
|
import { isDesktop } from "react-device-detect";
|
||||||
|
|
||||||
type ReviewActionGroupProps = {
|
type ReviewActionGroupProps = {
|
||||||
selectedReviews: string[];
|
selectedReviews: string[];
|
||||||
setSelectedReviews: (ids: string[]) => void;
|
setSelectedReviews: (ids: string[]) => void;
|
||||||
|
onExport: (id: string) => void;
|
||||||
pullLatestData: () => void;
|
pullLatestData: () => void;
|
||||||
};
|
};
|
||||||
export default function ReviewActionGroup({
|
export default function ReviewActionGroup({
|
||||||
selectedReviews,
|
selectedReviews,
|
||||||
setSelectedReviews,
|
setSelectedReviews,
|
||||||
|
onExport,
|
||||||
pullLatestData,
|
pullLatestData,
|
||||||
}: ReviewActionGroupProps) {
|
}: ReviewActionGroupProps) {
|
||||||
const onClearSelected = useCallback(() => {
|
const onClearSelected = useCallback(() => {
|
||||||
@ -37,36 +35,47 @@ export default function ReviewActionGroup({
|
|||||||
}, [selectedReviews, setSelectedReviews, pullLatestData]);
|
}, [selectedReviews, setSelectedReviews, pullLatestData]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="absolute inset-x-2 md:inset-x-[40%] top-0 p-2 bg-primary-foreground md:border-2 md:rounded-lg flex justify-between items-center">
|
<div className="absolute inset-x-2 inset-y-0 md:left-auto md:right-2 p-2 flex gap-2 justify-between items-center bg-background">
|
||||||
<TooltipProvider>
|
<div className="flex items-center">
|
||||||
<Tooltip>
|
<div className="text-sm text-gray-500 mr-2">{`${selectedReviews.length} selected | `}</div>
|
||||||
<TooltipTrigger asChild>
|
<Button size="xs" variant="link" onClick={onClearSelected}>
|
||||||
<div className="cursor-pointer" onClick={onClearSelected}>
|
Unselect
|
||||||
<LuX />
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</TooltipTrigger>
|
<div className="flex items-center gap-1 md:gap-2">
|
||||||
<TooltipContent>Unselect All</TooltipContent>
|
{selectedReviews.length == 1 && (
|
||||||
</Tooltip>
|
<Button
|
||||||
<div className="flex gap-2 items-center">
|
className="flex items-center"
|
||||||
<Tooltip>
|
variant="secondary"
|
||||||
<TooltipTrigger asChild>
|
size="sm"
|
||||||
<div className="cursor-pointer" onClick={onMarkAsReviewed}>
|
onClick={() => {
|
||||||
<LuCheckSquare />
|
onExport(selectedReviews[0]);
|
||||||
|
onClearSelected();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<LuFileUp className="mr-1" />
|
||||||
|
{isDesktop && "Export"}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
className="flex items-center"
|
||||||
|
variant="secondary"
|
||||||
|
size="sm"
|
||||||
|
onClick={onMarkAsReviewed}
|
||||||
|
>
|
||||||
|
<LuCheckSquare className="mr-1" />
|
||||||
|
{isDesktop && "Mark as reviewed"}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
className="flex items-center"
|
||||||
|
variant="secondary"
|
||||||
|
size="sm"
|
||||||
|
onClick={onDelete}
|
||||||
|
>
|
||||||
|
<LuTrash className="mr-1" />
|
||||||
|
{isDesktop && "Delete"}
|
||||||
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipContent>Mark Selected As Reviewed</TooltipContent>
|
|
||||||
</Tooltip>
|
|
||||||
<div className="text-sm font-thin">|</div>
|
|
||||||
<Tooltip>
|
|
||||||
<TooltipTrigger asChild>
|
|
||||||
<div className="cursor-pointer" onClick={onDelete}>
|
|
||||||
<LuTrash />
|
|
||||||
</div>
|
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipContent>Delete Selected</TooltipContent>
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
|
||||||
</TooltipProvider>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -15,16 +15,6 @@ import useSWR from "swr";
|
|||||||
import { FrigateConfig } from "@/types/frigateConfig";
|
import { FrigateConfig } from "@/types/frigateConfig";
|
||||||
import { isFirefox, isMobile, isSafari } from "react-device-detect";
|
import { isFirefox, isMobile, isSafari } from "react-device-detect";
|
||||||
import Chip from "../Chip";
|
import Chip from "../Chip";
|
||||||
import {
|
|
||||||
ContextMenu,
|
|
||||||
ContextMenuContent,
|
|
||||||
ContextMenuItem,
|
|
||||||
ContextMenuSeparator,
|
|
||||||
ContextMenuTrigger,
|
|
||||||
} from "../ui/context-menu";
|
|
||||||
import { LuCheckCheck, LuCheckSquare, LuFileUp, LuTrash } from "react-icons/lu";
|
|
||||||
import { RiCheckboxMultipleLine } from "react-icons/ri";
|
|
||||||
import axios from "axios";
|
|
||||||
import { useFormattedTimestamp } from "@/hooks/use-date-utils";
|
import { useFormattedTimestamp } from "@/hooks/use-date-utils";
|
||||||
import useImageLoaded from "@/hooks/use-image-loaded";
|
import useImageLoaded from "@/hooks/use-image-loaded";
|
||||||
import { Skeleton } from "../ui/skeleton";
|
import { Skeleton } from "../ui/skeleton";
|
||||||
@ -35,7 +25,6 @@ type PreviewPlayerProps = {
|
|||||||
allPreviews?: Preview[];
|
allPreviews?: Preview[];
|
||||||
onTimeUpdate?: React.Dispatch<React.SetStateAction<number | undefined>>;
|
onTimeUpdate?: React.Dispatch<React.SetStateAction<number | undefined>>;
|
||||||
setReviewed: (reviewId: string) => void;
|
setReviewed: (reviewId: string) => void;
|
||||||
markAboveReviewed: () => void;
|
|
||||||
onClick: (reviewId: string, ctrl: boolean) => void;
|
onClick: (reviewId: string, ctrl: boolean) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -51,7 +40,6 @@ export default function PreviewThumbnailPlayer({
|
|||||||
review,
|
review,
|
||||||
allPreviews,
|
allPreviews,
|
||||||
setReviewed,
|
setReviewed,
|
||||||
markAboveReviewed,
|
|
||||||
onClick,
|
onClick,
|
||||||
onTimeUpdate,
|
onTimeUpdate,
|
||||||
}: PreviewPlayerProps) {
|
}: PreviewPlayerProps) {
|
||||||
@ -167,12 +155,14 @@ export default function PreviewThumbnailPlayer({
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ContextMenu>
|
|
||||||
<ContextMenuTrigger asChild>
|
|
||||||
<div
|
<div
|
||||||
className="relative size-full cursor-pointer"
|
className="relative size-full cursor-pointer"
|
||||||
onMouseEnter={isMobile ? undefined : () => onPlayback(true)}
|
onMouseEnter={isMobile ? undefined : () => onPlayback(true)}
|
||||||
onMouseLeave={isMobile ? undefined : () => onPlayback(false)}
|
onMouseLeave={isMobile ? undefined : () => onPlayback(false)}
|
||||||
|
onContextMenu={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
onClick(review.id, true);
|
||||||
|
}}
|
||||||
onClick={handleOnClick}
|
onClick={handleOnClick}
|
||||||
{...swipeHandlers}
|
{...swipeHandlers}
|
||||||
>
|
>
|
||||||
@ -195,10 +185,7 @@ export default function PreviewThumbnailPlayer({
|
|||||||
className={`w-full h-full transition-opacity ${
|
className={`w-full h-full transition-opacity ${
|
||||||
playingBack ? "opacity-0" : "opacity-100"
|
playingBack ? "opacity-0" : "opacity-100"
|
||||||
}`}
|
}`}
|
||||||
src={`${apiHost}${review.thumb_path.replace(
|
src={`${apiHost}${review.thumb_path.replace("/media/frigate/", "")}`}
|
||||||
"/media/frigate/",
|
|
||||||
"",
|
|
||||||
)}`}
|
|
||||||
loading={isSafari ? "eager" : "lazy"}
|
loading={isSafari ? "eager" : "lazy"}
|
||||||
onLoad={() => {
|
onLoad={() => {
|
||||||
onImgLoad();
|
onImgLoad();
|
||||||
@ -238,14 +225,6 @@ export default function PreviewThumbnailPlayer({
|
|||||||
<div className="absolute inset-0 z-10 bg-black bg-opacity-60" />
|
<div className="absolute inset-0 z-10 bg-black bg-opacity-60" />
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</ContextMenuTrigger>
|
|
||||||
<PreviewContextItems
|
|
||||||
review={review}
|
|
||||||
onSelect={() => onClick(review.id, true)}
|
|
||||||
setReviewed={handleSetReviewed}
|
|
||||||
markAboveReviewed={markAboveReviewed}
|
|
||||||
/>
|
|
||||||
</ContextMenu>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -613,71 +592,6 @@ function InProgressPreview({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type PreviewContextItemsProps = {
|
|
||||||
review: ReviewSegment;
|
|
||||||
onSelect: () => void;
|
|
||||||
setReviewed: () => void;
|
|
||||||
markAboveReviewed: () => void;
|
|
||||||
};
|
|
||||||
function PreviewContextItems({
|
|
||||||
review,
|
|
||||||
onSelect,
|
|
||||||
setReviewed,
|
|
||||||
markAboveReviewed,
|
|
||||||
}: PreviewContextItemsProps) {
|
|
||||||
const exportReview = useCallback(() => {
|
|
||||||
axios.post(
|
|
||||||
`export/${review.camera}/start/${review.start_time}/end/${review.end_time}`,
|
|
||||||
{ playback: "realtime" },
|
|
||||||
);
|
|
||||||
}, [review]);
|
|
||||||
|
|
||||||
const deleteReview = useCallback(() => {
|
|
||||||
axios.delete(`reviews/${review.id}`);
|
|
||||||
}, [review]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ContextMenuContent>
|
|
||||||
{isMobile && (
|
|
||||||
<ContextMenuItem onSelect={onSelect}>
|
|
||||||
<div className="w-full flex justify-between items-center">
|
|
||||||
Select
|
|
||||||
<RiCheckboxMultipleLine className="ml-4 size-4" />
|
|
||||||
</div>
|
|
||||||
</ContextMenuItem>
|
|
||||||
)}
|
|
||||||
<ContextMenuItem onSelect={markAboveReviewed}>
|
|
||||||
<div className="w-full flex justify-between items-center">
|
|
||||||
Mark Above as Reviewed
|
|
||||||
<LuCheckCheck className="ml-4 size-4" />
|
|
||||||
</div>
|
|
||||||
</ContextMenuItem>
|
|
||||||
<ContextMenuSeparator />
|
|
||||||
{!review.has_been_reviewed && (
|
|
||||||
<ContextMenuItem onSelect={() => (setReviewed ? setReviewed() : null)}>
|
|
||||||
<div className="w-full flex justify-between items-center">
|
|
||||||
Mark As Reviewed
|
|
||||||
<LuCheckSquare className="ml-4 size-4" />
|
|
||||||
</div>
|
|
||||||
</ContextMenuItem>
|
|
||||||
)}
|
|
||||||
<ContextMenuItem onSelect={exportReview}>
|
|
||||||
<div className="w-full flex justify-between items-center">
|
|
||||||
Export
|
|
||||||
<LuFileUp className="ml-4 size-4" />
|
|
||||||
</div>
|
|
||||||
</ContextMenuItem>
|
|
||||||
<ContextMenuSeparator />
|
|
||||||
<ContextMenuItem onSelect={deleteReview}>
|
|
||||||
<div className="w-full flex justify-between items-center text-danger">
|
|
||||||
Delete
|
|
||||||
<LuTrash className="ml-4 size-4" />
|
|
||||||
</div>
|
|
||||||
</ContextMenuItem>
|
|
||||||
</ContextMenuContent>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function PreviewPlaceholder({ imgLoaded }: { imgLoaded: boolean }) {
|
function PreviewPlaceholder({ imgLoaded }: { imgLoaded: boolean }) {
|
||||||
if (imgLoaded) {
|
if (imgLoaded) {
|
||||||
return;
|
return;
|
||||||
|
@ -223,28 +223,21 @@ export default function EventView({
|
|||||||
[selectedReviews, setSelectedReviews],
|
[selectedReviews, setSelectedReviews],
|
||||||
);
|
);
|
||||||
|
|
||||||
const markScrolledItemsAsReviewed = useCallback(async () => {
|
const exportReview = useCallback(
|
||||||
if (!currentItems) {
|
(id: string) => {
|
||||||
|
const review = currentItems?.find((seg) => seg.id == id);
|
||||||
|
|
||||||
|
if (!review) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const scrolled: string[] = [];
|
axios.post(
|
||||||
|
`export/${review.camera}/start/${review.start_time}/end/${review.end_time}`,
|
||||||
currentItems.find((value) => {
|
{ playback: "realtime" },
|
||||||
if (value.start_time > minimapBounds.end) {
|
);
|
||||||
scrolled.push(value.id);
|
},
|
||||||
return false;
|
[selectedReviews],
|
||||||
} else {
|
);
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const idList = scrolled.join(",");
|
|
||||||
|
|
||||||
await axios.post(`reviews/${idList}/viewed`);
|
|
||||||
setSelectedReviews([]);
|
|
||||||
pullLatestData();
|
|
||||||
}, [currentItems, minimapBounds]);
|
|
||||||
|
|
||||||
if (!config) {
|
if (!config) {
|
||||||
return <ActivityIndicator />;
|
return <ActivityIndicator />;
|
||||||
@ -252,7 +245,7 @@ export default function EventView({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col size-full">
|
<div className="flex flex-col size-full">
|
||||||
<div className="relative flex justify-between mb-2">
|
<div className="h-8 relative flex justify-between items-center mb-2">
|
||||||
{isMobile && (
|
{isMobile && (
|
||||||
<Logo className="absolute inset-y-0 inset-x-1/2 -translate-x-1/2 h-8" />
|
<Logo className="absolute inset-y-0 inset-x-1/2 -translate-x-1/2 h-8" />
|
||||||
)}
|
)}
|
||||||
@ -290,11 +283,14 @@ export default function EventView({
|
|||||||
<div className="hidden md:block">Motion</div>
|
<div className="hidden md:block">Motion</div>
|
||||||
</ToggleGroupItem>
|
</ToggleGroupItem>
|
||||||
</ToggleGroup>
|
</ToggleGroup>
|
||||||
|
|
||||||
|
{selectedReviews.length <= 0 ? (
|
||||||
<ReviewFilterGroup filter={filter} onUpdateFilter={updateFilter} />
|
<ReviewFilterGroup filter={filter} onUpdateFilter={updateFilter} />
|
||||||
{selectedReviews.length > 0 && (
|
) : (
|
||||||
<ReviewActionGroup
|
<ReviewActionGroup
|
||||||
selectedReviews={selectedReviews}
|
selectedReviews={selectedReviews}
|
||||||
setSelectedReviews={setSelectedReviews}
|
setSelectedReviews={setSelectedReviews}
|
||||||
|
onExport={exportReview}
|
||||||
pullLatestData={pullLatestData}
|
pullLatestData={pullLatestData}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@ -347,7 +343,6 @@ export default function EventView({
|
|||||||
allPreviews={relevantPreviews}
|
allPreviews={relevantPreviews}
|
||||||
setReviewed={markItemAsReviewed}
|
setReviewed={markItemAsReviewed}
|
||||||
onTimeUpdate={setPreviewTime}
|
onTimeUpdate={setPreviewTime}
|
||||||
markAboveReviewed={markScrolledItemsAsReviewed}
|
|
||||||
onClick={onSelectReview}
|
onClick={onSelectReview}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user