Skip to content

Add ability to link to review items directly #11002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions frigate/api/review.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import pandas as pd
from flask import Blueprint, jsonify, make_response, request
from peewee import Case, DoesNotExist, fn, operator
from playhouse.shortcuts import model_to_dict

from frigate.models import Recordings, ReviewSegment
from frigate.util.builtin import get_tz_modifiers
Expand Down Expand Up @@ -78,6 +79,14 @@ def review():
return jsonify([r for r in review])


@ReviewBp.route("/review/<id>")
def get_review(id: str):
try:
return model_to_dict(ReviewSegment.get(ReviewSegment.id == id))
except DoesNotExist:
return "Review item not found", 404


@ReviewBp.route("/review/summary")
def review_summary():
tz_name = request.args.get("timezone", default="utc", type=str)
Expand Down
8 changes: 4 additions & 4 deletions web/src/components/filter/ReviewActionGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default function ReviewActionGroup({
onClearSelected();
}}
>
<FaCompactDisc />
<FaCompactDisc className="text-secondary-foreground" />
{isDesktop && <div className="text-primary">Export</div>}
</Button>
)}
Expand All @@ -65,15 +65,15 @@ export default function ReviewActionGroup({
size="sm"
onClick={onMarkAsReviewed}
>
<FaCircleCheck />
<FaCircleCheck className="text-secondary-foreground" />
{isDesktop && <div className="text-primary">Mark as reviewed</div>}
</Button>
<Button
className="p-2 flex items-center gap-1"
className="p-2 flex items-center gap-2"
size="sm"
onClick={onDelete}
>
<HiTrash />
<HiTrash className="text-secondary-foreground" />
{isDesktop && <div className="text-primary">Delete</div>}
</Button>
</div>
Expand Down
29 changes: 28 additions & 1 deletion web/src/hooks/use-overlay-state.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCallback, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import { usePersistence } from "./use-persistence";

Expand Down Expand Up @@ -91,3 +91,30 @@ export function useHashState<S extends string>(): [

return [hash, setHash];
}

export function useSearchEffect(
key: string,
callback: (value: string) => void,
) {
const location = useLocation();

const param = useMemo(() => {
if (!location || !location.search || location.search.length == 0) {
return undefined;
}

const params = location.search.substring(1).split("&");

return params
.find((p) => p.includes("=") && p.split("=")[0] == key)
?.split("=");
}, [location, key]);

useEffect(() => {
if (!param) {
return;
}

callback(param[1]);
}, [param, callback]);
}
20 changes: 19 additions & 1 deletion web/src/pages/Events.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ActivityIndicator from "@/components/indicators/activity-indicator";
import useApiFilter from "@/hooks/use-api-filter";
import { useTimezone } from "@/hooks/use-date-utils";
import { useOverlayState } from "@/hooks/use-overlay-state";
import { useOverlayState, useSearchEffect } from "@/hooks/use-overlay-state";
import { FrigateConfig } from "@/types/frigateConfig";
import { Preview } from "@/types/preview";
import { RecordingStartingPoint } from "@/types/record";
Expand Down Expand Up @@ -33,6 +33,24 @@ export default function Events() {
const [recording, setRecording] =
useOverlayState<RecordingStartingPoint>("recording");

useSearchEffect("id", (reviewId: string) => {
axios
.get(`review/${reviewId}`)
.then((resp) => {
if (resp.status == 200 && resp.data) {
setRecording(
{
camera: resp.data.camera,
startTime: resp.data.start_time,
severity: resp.data.severity,
},
true,
);
}
})
.catch(() => {});
});

const [startTime, setStartTime] = useState<number>();

useEffect(() => {
Expand Down