chris/frigate
1
0
Fork 0
forked from Github/frigate
Code Pull Requests Packages Activity

retain the set topic for switches

Browse Source
This commit is contained in:
Blake Blackshear
2022-04-25 06:59:52 -05:00
parent f536494a38
commit bc0206de9d
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/src/routes/Cameras.jsx
View File

@@ -22,12 +22,13 @@ export default function Cameras() {
}
function SortedCameras({ unsortedCameras }) {
const sortedCameras = useMemo(() =>
Object.entries(unsortedCameras)
.filter(([_, conf]) => conf.ui.dashboard)
.sort(([_, aConf], [__, bConf]) => aConf.ui.order - bConf.ui.order),
[unsortedCameras]);
const sortedCameras = useMemo(
() =>
Object.entries(unsortedCameras)
.filter(([_, conf]) => conf.ui.dashboard)
.sort(([_, aConf], [__, bConf]) => aConf.ui.order - bConf.ui.order),
[unsortedCameras]
);
return (
<Fragment>
@@ -56,7 +57,7 @@ function Camera({ name }) {
icon: MotionIcon,
color: detectValue === 'ON' ? 'blue' : 'gray',
onClick: () => {
sendDetect(detectValue === 'ON' ? 'OFF' : 'ON');
sendDetect(detectValue === 'ON' ? 'OFF' : 'ON', true);
},
},
{
@@ -64,7 +65,7 @@ function Camera({ name }) {
icon: ClipIcon,
color: recordValue === 'ON' ? 'blue' : 'gray',
onClick: () => {
sendRecordings(recordValue === 'ON' ? 'OFF' : 'ON');
sendRecordings(recordValue === 'ON' ? 'OFF' : 'ON', true);
},
},
{
@@ -72,7 +73,7 @@ function Camera({ name }) {
icon: SnapshotIcon,
color: snapshotValue === 'ON' ? 'blue' : 'gray',
onClick: () => {
sendSnapshots(snapshotValue === 'ON' ? 'OFF' : 'ON');
sendSnapshots(snapshotValue === 'ON' ? 'OFF' : 'ON', true);
},
},
],

6
web/src/routes/__tests__/Cameras.test.jsx
View File

@@ -54,14 +54,14 @@ describe('Cameras Route', () => {
await waitForElementToBeRemoved(() => screen.queryByLabelText('Loading…'));
fireEvent.click(screen.getAllByLabelText('Toggle detect off')[0]);
expect(sendDetect).toHaveBeenCalledWith('OFF');
expect(sendDetect).toHaveBeenCalledWith('OFF', true);
expect(sendDetect).toHaveBeenCalledTimes(1);
fireEvent.click(screen.getAllByLabelText('Toggle snapshots off')[0]);
expect(sendSnapshots).toHaveBeenCalledWith('OFF');
expect(sendSnapshots).toHaveBeenCalledWith('OFF', true);
fireEvent.click(screen.getAllByLabelText('Toggle recordings on')[0]);
expect(sendRecordings).toHaveBeenCalledWith('ON');
expect(sendRecordings).toHaveBeenCalledWith('ON', true);
expect(sendDetect).toHaveBeenCalledTimes(1);
expect(sendSnapshots).toHaveBeenCalledTimes(1);