Simplify return values

This commit is contained in:
Nicolas Mowen 2024-07-11 07:48:14 -06:00
parent be24cec78d
commit 6dedcd47d5
6 changed files with 9 additions and 12 deletions

View File

@ -207,20 +207,18 @@ export function useFrigateEvents(): { payload: FrigateEvent } {
return { payload: JSON.parse(payload as string) }; return { payload: JSON.parse(payload as string) };
} }
export function useFrigateReviews(): { payload: FrigateReview } { export function useFrigateReviews(): FrigateReview {
const { const {
value: { payload }, value: { payload },
} = useWs("reviews", ""); } = useWs("reviews", "");
const review = useDeepMemo(JSON.parse(payload as string)); return useDeepMemo(JSON.parse(payload as string));
return { payload: review };
} }
export function useFrigateStats(): { payload: FrigateStats } { export function useFrigateStats(): FrigateStats {
const { const {
value: { payload }, value: { payload },
} = useWs("stats", ""); } = useWs("stats", "");
const stats = useDeepMemo(JSON.parse(payload as string)); return useDeepMemo(JSON.parse(payload as string));
return { payload: stats };
} }
export function useInitialCameraState( export function useInitialCameraState(

View File

@ -48,7 +48,7 @@ function StatusAlertNav({ className }: StatusAlertNavProps) {
const { data: initialStats } = useSWR<FrigateStats>("stats", { const { data: initialStats } = useSWR<FrigateStats>("stats", {
revalidateOnFocus: false, revalidateOnFocus: false,
}); });
const { payload: latestStats } = useFrigateStats(); const latestStats = useFrigateStats();
const { messages, addMessage, clearMessages } = useContext( const { messages, addMessage, clearMessages } = useContext(
StatusBarMessagesContext, StatusBarMessagesContext,

View File

@ -97,7 +97,7 @@ export function useAutoFrigateStats() {
const { data: initialStats } = useSWR<FrigateStats>("stats", { const { data: initialStats } = useSWR<FrigateStats>("stats", {
revalidateOnFocus: false, revalidateOnFocus: false,
}); });
const { payload: latestStats } = useFrigateStats(); const latestStats = useFrigateStats();
const stats = useMemo(() => { const stats = useMemo(() => {
if (latestStats) { if (latestStats) {

View File

@ -31,7 +31,6 @@ import { cn } from "@/lib/utils";
import { LivePlayerError, LivePlayerMode } from "@/types/live"; import { LivePlayerError, LivePlayerMode } from "@/types/live";
import { FaCompress, FaExpand } from "react-icons/fa"; import { FaCompress, FaExpand } from "react-icons/fa";
import { useResizeObserver } from "@/hooks/resize-observer"; import { useResizeObserver } from "@/hooks/resize-observer";
import useDeepMemo from "@/hooks/use-deep-memo";
type LiveDashboardViewProps = { type LiveDashboardViewProps = {
cameras: CameraConfig[]; cameras: CameraConfig[];
@ -64,7 +63,7 @@ export default function LiveDashboardView({
// recent events // recent events
const { payload: eventUpdate } = useFrigateReviews(); const eventUpdate = useFrigateReviews();
const { data: allEvents, mutate: updateEvents } = useSWR<ReviewSegment[]>([ const { data: allEvents, mutate: updateEvents } = useSWR<ReviewSegment[]>([
"review", "review",
{ limit: 10, severity: "alert" }, { limit: 10, severity: "alert" },

View File

@ -26,7 +26,7 @@ export default function CameraMetrics({
); );
const [statsHistory, setStatsHistory] = useState<FrigateStats[]>([]); const [statsHistory, setStatsHistory] = useState<FrigateStats[]>([]);
const { payload: updatedStats } = useFrigateStats(); const updatedStats = useFrigateStats();
useEffect(() => { useEffect(() => {
if (initialStats == undefined || initialStats.length == 0) { if (initialStats == undefined || initialStats.length == 0) {

View File

@ -40,7 +40,7 @@ export default function GeneralMetrics({
); );
const [statsHistory, setStatsHistory] = useState<FrigateStats[]>([]); const [statsHistory, setStatsHistory] = useState<FrigateStats[]>([]);
const { payload: updatedStats } = useFrigateStats(); const updatedStats = useFrigateStats();
useEffect(() => { useEffect(() => {
if (initialStats == undefined || initialStats.length == 0) { if (initialStats == undefined || initialStats.length == 0) {