Implement context menu for batch operations and implement apis

This commit is contained in:
Nicolas Mowen 2024-02-29 12:33:27 -07:00
parent ea9316e770
commit feb4a6fb32
5 changed files with 193 additions and 19 deletions

View File

@ -2464,6 +2464,24 @@ def set_reviewed(id):
) )
@bp.route("/reviews/<ids>/viewed", methods=("POST",))
def set_multiple_reviewed(ids: str):
list_of_ids = ids.split(",")
if not list_of_ids or len(list_of_ids) == 0:
return make_response(
jsonify({"success": False, "message": "Not a valid list of ids"}), 404
)
ReviewSegment.update(has_been_reviewed=True).where(
ReviewSegment.id << list_of_ids
).execute()
return make_response(
jsonify({"success": True, "message": "Reviewed multiple items"}), 200
)
@bp.route("/review/<id>/viewed", methods=("DELETE",)) @bp.route("/review/<id>/viewed", methods=("DELETE",))
def set_not_reviewed(id): def set_not_reviewed(id):
try: try:
@ -2481,6 +2499,20 @@ def set_not_reviewed(id):
) )
@bp.route("/reviews/<ids>", methods=("DELETE",))
def delete_reviews(ids: str):
list_of_ids = ids.split(",")
if not list_of_ids or len(list_of_ids) == 0:
return make_response(
jsonify({"success": False, "message": "Not a valid list of ids"}), 404
)
ReviewSegment.delete().where(ReviewSegment.id << list_of_ids).execute()
return make_response(jsonify({"success": True, "message": "Delete reviews"}), 200)
@bp.route("/review/<id>/preview.gif") @bp.route("/review/<id>/preview.gif")
def review_preview(id: str): def review_preview(id: str):
try: try:

View File

@ -0,0 +1,72 @@
import { LuCheckSquare, LuTrash, LuX } from "react-icons/lu";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "../ui/tooltip";
import { useCallback } from "react";
import axios from "axios";
type ReviewActionGroupProps = {
selectedReviews: string[];
setSelectedReviews: (ids: string[]) => void;
pullLatestData: () => void;
};
export default function ReviewActionGroup({
selectedReviews,
setSelectedReviews,
pullLatestData,
}: ReviewActionGroupProps) {
const onClearSelected = useCallback(() => {
setSelectedReviews([]);
}, [setSelectedReviews]);
const onMarkAsReviewed = useCallback(async () => {
const idList = selectedReviews.join(",");
await axios.post(`reviews/${idList}/viewed`);
setSelectedReviews([]);
pullLatestData();
}, [selectedReviews, setSelectedReviews, pullLatestData]);
const onDelete = useCallback(async () => {
const idList = selectedReviews.join(",");
await axios.delete(`reviews/${idList}`);
setSelectedReviews([]);
pullLatestData();
}, [selectedReviews, setSelectedReviews, pullLatestData]);
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">
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<div className="cursor-pointer" onClick={onClearSelected}>
<LuX />
</div>
</TooltipTrigger>
<TooltipContent>Unselect All</TooltipContent>
</Tooltip>
<div className="flex gap-2 items-center">
<Tooltip>
<TooltipTrigger asChild>
<div className="cursor-pointer" onClick={onMarkAsReviewed}>
<LuCheckSquare />
</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>
);
}

View File

@ -1,4 +1,10 @@
import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import React, {
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from "react";
import { useApiHost } from "@/api"; import { useApiHost } from "@/api";
import { isCurrentHour } from "@/utils/dateUtil"; import { isCurrentHour } from "@/utils/dateUtil";
import { ReviewSegment } from "@/types/review"; import { ReviewSegment } from "@/types/review";
@ -17,6 +23,7 @@ import {
ContextMenuTrigger, ContextMenuTrigger,
} from "../ui/context-menu"; } from "../ui/context-menu";
import { LuCheckSquare, LuFileUp, LuTrash } from "react-icons/lu"; import { LuCheckSquare, LuFileUp, LuTrash } from "react-icons/lu";
import { RiCheckboxMultipleLine } from "react-icons/ri";
import axios from "axios"; 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";
@ -28,8 +35,8 @@ type PreviewPlayerProps = {
relevantPreview?: Preview; relevantPreview?: Preview;
autoPlayback?: boolean; autoPlayback?: boolean;
setReviewed?: (reviewId: string) => void; setReviewed?: (reviewId: string) => void;
onClick?: (reviewId: string) => void;
onTimeUpdate?: (time: number | undefined) => void; onTimeUpdate?: (time: number | undefined) => void;
onClick: (reviewId: string, ctrl: boolean) => void;
}; };
type Preview = { type Preview = {
@ -57,11 +64,14 @@ export default function PreviewThumbnailPlayer({
// interaction // interaction
const handleOnClick = useCallback(() => { const handleOnClick = useCallback(
if (onClick && !ignoreClick) { (e: React.MouseEvent<HTMLDivElement>) => {
onClick(review.id); if (!ignoreClick) {
} onClick(review.id, e.metaKey);
}, [ignoreClick, review, onClick]); }
},
[ignoreClick, review, onClick],
);
const swipeHandlers = useSwipeable({ const swipeHandlers = useSwipeable({
onSwipedLeft: () => (setReviewed ? setReviewed(review.id) : null), onSwipedLeft: () => (setReviewed ? setReviewed(review.id) : null),
@ -186,7 +196,11 @@ export default function PreviewThumbnailPlayer({
)} )}
</div> </div>
</ContextMenuTrigger> </ContextMenuTrigger>
<PreviewContextItems review={review} setReviewed={handleSetReviewed} /> <PreviewContextItems
review={review}
onSelect={() => onClick(review.id, true)}
setReviewed={handleSetReviewed}
/>
</ContextMenu> </ContextMenu>
); );
} }
@ -557,10 +571,12 @@ function InProgressPreview({
type PreviewContextItemsProps = { type PreviewContextItemsProps = {
review: ReviewSegment; review: ReviewSegment;
onSelect: () => void;
setReviewed?: () => void; setReviewed?: () => void;
}; };
function PreviewContextItems({ function PreviewContextItems({
review, review,
onSelect,
setReviewed, setReviewed,
}: PreviewContextItemsProps) { }: PreviewContextItemsProps) {
const exportReview = useCallback(() => { const exportReview = useCallback(() => {
@ -570,27 +586,42 @@ function PreviewContextItems({
); );
}, [review]); }, [review]);
const deleteReview = useCallback(() => {
axios.delete(`reviews/${review.id}`);
}, [review]);
return ( return (
<ContextMenuContent> <ContextMenuContent>
{isMobile && (
<>
<ContextMenuItem onSelect={onSelect}>
<div className="w-full flex justify-between items-center">
Select
<RiCheckboxMultipleLine className="ml-4 size-4" />
</div>
</ContextMenuItem>
<ContextMenuSeparator />
</>
)}
{!review.has_been_reviewed && ( {!review.has_been_reviewed && (
<ContextMenuItem onSelect={() => (setReviewed ? setReviewed() : null)}> <ContextMenuItem onSelect={() => (setReviewed ? setReviewed() : null)}>
<div className="w-full flex justify-between items-center"> <div className="w-full flex justify-between items-center">
Mark As Reviewed Mark As Reviewed
<LuCheckSquare className="ml-4 w-4 h-4" /> <LuCheckSquare className="ml-4 size-4" />
</div> </div>
</ContextMenuItem> </ContextMenuItem>
)} )}
<ContextMenuItem onSelect={() => exportReview()}> <ContextMenuItem onSelect={exportReview}>
<div className="w-full flex justify-between items-center"> <div className="w-full flex justify-between items-center">
Export Export
<LuFileUp className="ml-4 w-4 h-4" /> <LuFileUp className="ml-4 size-4" />
</div> </div>
</ContextMenuItem> </ContextMenuItem>
<ContextMenuSeparator /> <ContextMenuSeparator />
<ContextMenuItem> <ContextMenuItem onSelect={deleteReview}>
<div className="w-full flex justify-between items-center text-danger"> <div className="w-full flex justify-between items-center text-danger">
Delete Delete
<LuTrash className="ml-4 w-4 h-4" /> <LuTrash className="ml-4 size-4" />
</div> </div>
</ContextMenuItem> </ContextMenuItem>
</ContextMenuContent> </ContextMenuContent>

View File

@ -9,7 +9,7 @@ import { useCallback, useMemo, useState } from "react";
import useSWR from "swr"; import useSWR from "swr";
import useSWRInfinite from "swr/infinite"; import useSWRInfinite from "swr/infinite";
const API_LIMIT = 250; const API_LIMIT = 100;
export default function Events() { export default function Events() {
// recordings viewer // recordings viewer
@ -221,7 +221,7 @@ export default function Events() {
setSeverity={setSeverity} setSeverity={setSeverity}
loadNextPage={onLoadNextPage} loadNextPage={onLoadNextPage}
markItemAsReviewed={markItemAsReviewed} markItemAsReviewed={markItemAsReviewed}
onSelectReview={setSelectedReviewId} onOpenReview={setSelectedReviewId}
pullLatestData={reloadData} pullLatestData={reloadData}
updateFilter={onUpdateFilter} updateFilter={onUpdateFilter}
/> />

View File

@ -1,5 +1,6 @@
import Logo from "@/components/Logo"; import Logo from "@/components/Logo";
import NewReviewData from "@/components/dynamic/NewReviewData"; import NewReviewData from "@/components/dynamic/NewReviewData";
import ReviewActionGroup from "@/components/filter/ReviewActionGroup";
import ReviewFilterGroup from "@/components/filter/ReviewFilterGroup"; import ReviewFilterGroup from "@/components/filter/ReviewFilterGroup";
import PreviewThumbnailPlayer from "@/components/player/PreviewThumbnailPlayer"; import PreviewThumbnailPlayer from "@/components/player/PreviewThumbnailPlayer";
import EventReviewTimeline from "@/components/timeline/EventReviewTimeline"; import EventReviewTimeline from "@/components/timeline/EventReviewTimeline";
@ -26,7 +27,7 @@ type EventViewProps = {
setSeverity: (severity: ReviewSeverity) => void; setSeverity: (severity: ReviewSeverity) => void;
loadNextPage: () => void; loadNextPage: () => void;
markItemAsReviewed: (reviewId: string) => void; markItemAsReviewed: (reviewId: string) => void;
onSelectReview: (reviewId: string) => void; onOpenReview: (reviewId: string) => void;
pullLatestData: () => void; pullLatestData: () => void;
updateFilter: (filter: ReviewFilter) => void; updateFilter: (filter: ReviewFilter) => void;
}; };
@ -41,7 +42,7 @@ export default function EventView({
setSeverity, setSeverity,
loadNextPage, loadNextPage,
markItemAsReviewed, markItemAsReviewed,
onSelectReview, onOpenReview,
pullLatestData, pullLatestData,
updateFilter, updateFilter,
}: EventViewProps) { }: EventViewProps) {
@ -110,6 +111,36 @@ export default function EventView({
// review interaction // review interaction
const [selectedReviews, setSelectedReviews] = useState<string[]>([]);
const onSelectReview = useCallback(
(reviewId: string, ctrl: boolean) => {
if (selectedReviews.length > 0 || ctrl) {
const index = selectedReviews.indexOf(reviewId);
if (index != -1) {
if (selectedReviews.length == 1) {
setSelectedReviews([]);
} else {
const copy = [
...selectedReviews.slice(0, index),
...selectedReviews.slice(index + 1),
];
setSelectedReviews(copy);
}
} else {
const copy = [...selectedReviews];
copy.push(reviewId);
setSelectedReviews(copy);
}
} else {
onOpenReview(reviewId);
}
},
[selectedReviews, setSelectedReviews],
);
// timeline interaction
const pagingObserver = useRef<IntersectionObserver | null>(); const pagingObserver = useRef<IntersectionObserver | null>();
const lastReviewRef = useCallback( const lastReviewRef = useCallback(
(node: HTMLElement | null) => { (node: HTMLElement | null) => {
@ -236,6 +267,13 @@ export default function EventView({
</ToggleGroupItem> </ToggleGroupItem>
</ToggleGroup> </ToggleGroup>
<ReviewFilterGroup filter={filter} onUpdateFilter={updateFilter} /> <ReviewFilterGroup filter={filter} onUpdateFilter={updateFilter} />
{selectedReviews.length > 0 && (
<ReviewActionGroup
selectedReviews={selectedReviews}
setSelectedReviews={setSelectedReviews}
pullLatestData={pullLatestData}
/>
)}
</div> </div>
<div className="flex h-full overflow-hidden"> <div className="flex h-full overflow-hidden">
@ -260,12 +298,13 @@ export default function EventView({
)} )}
<div <div
className="w-full m-2 md:grid md:grid-cols-3 3xl:grid-cols-4 gap-4" className="w-full m-2 grid md:grid-cols-3 3xl:grid-cols-4 gap-2 md:gap-4"
ref={contentRef} ref={contentRef}
> >
{currentItems ? ( {currentItems ? (
currentItems.map((value, segIdx) => { currentItems.map((value, segIdx) => {
const lastRow = segIdx == reviewItems[severity].length - 1; const lastRow = segIdx == reviewItems[severity].length - 1;
const selected = selectedReviews.includes(value.id);
const relevantPreview = Object.values( const relevantPreview = Object.values(
relevantPreviews || [], relevantPreviews || [],
).find( ).find(
@ -284,7 +323,7 @@ export default function EventView({
alignStartDateToTimeline(value.start_time) - alignStartDateToTimeline(value.start_time) -
segmentDuration segmentDuration
} }
className="outline outline-offset-1 outline-0 rounded-lg shadow-none transition-all duration-500 my-1 md:my-0" className={`outline outline-offset-1 rounded-lg shadow-none transition-all my-1 md:my-0 ${selected ? `outline-4 shadow-[0_0_6px_1px] outline-severity_${value.severity} shadow-severity_${value.severity}` : "outline-0 duration-500"}`}
> >
<div className="aspect-video rounded-lg overflow-hidden"> <div className="aspect-video rounded-lg overflow-hidden">
<PreviewThumbnailPlayer <PreviewThumbnailPlayer