Adjustments and fixes (#10346)

* Increase duration of alerts and detections

* Add key

* Fix cancel button

* Fix motion review when switching days

* Add reset buttons and make calendar apply immediately

* Adjust apis for motion and audio activity

* Write review thumbs as webp and reduce size
This commit is contained in:
Nicolas Mowen
2024-03-09 07:08:06 -07:00
committed by GitHub
parent eeb2187b97
commit 62d13024f6
7 changed files with 111 additions and 50 deletions

View File

@@ -222,7 +222,7 @@ function NewGroupDialog({ open, setOpen, currentGroups }: NewGroupDialogProps) {
<DialogContent className="min-w-0 w-96">
<DialogTitle>Camera Groups</DialogTitle>
{currentGroups.map((group) => (
<div className="flex justify-between items-center">
<div key={group[0]} className="flex justify-between items-center">
{group[0]}
<div className="flex justify-center gap-1">
<Button

View File

@@ -212,7 +212,7 @@ function CamerasFilterButton({
))}
</div>
<DropdownMenuSeparator />
<div className="flex justify-center items-center">
<div className="flex justify-evenly items-center">
<Button
variant="select"
onClick={() => {
@@ -222,6 +222,15 @@ function CamerasFilterButton({
>
Apply
</Button>
<Button
variant="secondary"
onClick={() => {
setCurrentCameras(undefined);
updateCameraFilter(undefined);
}}
>
Reset
</Button>
</div>
</>
);
@@ -271,8 +280,6 @@ function CalendarFilterButton({
day,
updateSelectedDay,
}: CalendarFilterButtonProps) {
const [open, setOpen] = useState(false);
const [selectedDay, setSelectedDay] = useState(day);
const disabledDates = useMemo(() => {
const tomorrow = new Date();
tomorrow.setHours(tomorrow.getHours() + 24, -1, 0, 0);
@@ -298,22 +305,21 @@ function CalendarFilterButton({
<Calendar
mode="single"
disabled={disabledDates}
selected={selectedDay}
selected={day}
showOutsideDays={false}
onSelect={(day) => {
setSelectedDay(day);
updateSelectedDay(day);
}}
/>
<DropdownMenuSeparator />
<div className="flex justify-center items-center">
<Button
variant="select"
variant="secondary"
onClick={() => {
updateSelectedDay(selectedDay);
setOpen(false);
updateSelectedDay(undefined);
}}
>
Apply
Reset
</Button>
</div>
</>
@@ -321,16 +327,7 @@ function CalendarFilterButton({
if (isMobile) {
return (
<Drawer
open={open}
onOpenChange={(open) => {
if (!open) {
setSelectedDay(day);
}
setOpen(open);
}}
>
<Drawer>
<DrawerTrigger asChild>{trigger}</DrawerTrigger>
<DrawerContent>{content}</DrawerContent>
</Drawer>
@@ -338,16 +335,7 @@ function CalendarFilterButton({
}
return (
<Popover
open={open}
onOpenChange={(open) => {
if (!open) {
setSelectedDay(day);
}
setOpen(open);
}}
>
<Popover>
<PopoverTrigger asChild>{trigger}</PopoverTrigger>
<PopoverContent>{content}</PopoverContent>
</Popover>
@@ -433,7 +421,7 @@ function GeneralFilterButton({
))}
</div>
<DropdownMenuSeparator />
<div className="flex justify-center items-center">
<div className="flex justify-evenly items-center">
<Button
variant="select"
onClick={() => {
@@ -450,6 +438,17 @@ function GeneralFilterButton({
>
Apply
</Button>
<Button
variant="secondary"
onClick={() => {
setReviewed(0);
setShowReviewed(undefined);
setCurrentLabels(undefined);
updateLabelFilter(undefined);
}}
>
Reset
</Button>
</div>
</>
);