From acece272ab7daedab998958c0722954526315838 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Fri, 6 Oct 2023 06:51:44 -0500 Subject: [PATCH] formatting fixes --- web/src/components/MultiSelect.jsx | 3 +- web/src/routes/CameraMap.jsx | 69 ++++++++------ web/src/routes/Config.jsx | 10 +- web/src/routes/Events.jsx | 14 +-- web/src/routes/System.jsx | 148 +++++++++++++++-------------- 5 files changed, 128 insertions(+), 116 deletions(-) diff --git a/web/src/components/MultiSelect.jsx b/web/src/components/MultiSelect.jsx index a04fc7778..b2b3ab053 100644 --- a/web/src/components/MultiSelect.jsx +++ b/web/src/components/MultiSelect.jsx @@ -61,8 +61,7 @@ export default function MultiSelect({ className, title, options, selection, onTo className="max-h-[35px] mx-2" onClick={() => onSelectSingle(item)} > - { (title === "Labels" && config.audio.listen.includes(item)) ? ( ) : ( ) } - + {title === 'Labels' && config.audio.listen.includes(item) ? : } diff --git a/web/src/routes/CameraMap.jsx b/web/src/routes/CameraMap.jsx index 1df6a7930..a508d80b2 100644 --- a/web/src/routes/CameraMap.jsx +++ b/web/src/routes/CameraMap.jsx @@ -30,8 +30,8 @@ export default function CameraMasks({ camera }) { Array.isArray(motionMask) ? motionMask.map((mask) => getPolylinePoints(mask)) : motionMask - ? [getPolylinePoints(motionMask)] - : [] + ? [getPolylinePoints(motionMask)] + : [] ); const [zonePoints, setZonePoints] = useState( @@ -45,8 +45,8 @@ export default function CameraMasks({ camera }) { [name]: Array.isArray(objectFilters[name].mask) ? objectFilters[name].mask.map((mask) => getPolylinePoints(mask)) : objectFilters[name].mask - ? [getPolylinePoints(objectFilters[name].mask)] - : [], + ? [getPolylinePoints(objectFilters[name].mask)] + : [], }), {} ) @@ -146,7 +146,6 @@ export default function CameraMasks({ camera }) { } }, [camera, motionMaskPoints]); - // Zone methods const handleEditZone = useCallback( (key) => { @@ -175,9 +174,11 @@ export default function CameraMasks({ camera }) { const handleCopyZones = useCallback(async () => { const textToCopy = ` zones: ${Object.keys(zonePoints) - .map( - (zoneName) => ` ${zoneName}: - coordinates: ${polylinePointsToPolyline(zonePoints[zoneName])}`).join('\n')}`; + .map( + (zoneName) => ` ${zoneName}: + coordinates: ${polylinePointsToPolyline(zonePoints[zoneName])}` + ) + .join('\n')}`; if (window.navigator.clipboard && window.navigator.clipboard.writeText) { // Use Clipboard API if available @@ -207,7 +208,10 @@ ${Object.keys(zonePoints) const handleSaveZones = useCallback(async () => { try { const queryParameters = Object.keys(zonePoints) - .map((zoneName) => `cameras.${camera}.zones.${zoneName}.coordinates=${polylinePointsToPolyline(zonePoints[zoneName])}`) + .map( + (zoneName) => + `cameras.${camera}.zones.${zoneName}.coordinates=${polylinePointsToPolyline(zonePoints[zoneName])}` + ) .join('&'); const endpoint = `config/set?${queryParameters}`; const response = await axios.put(endpoint); @@ -252,21 +256,26 @@ ${Object.keys(zonePoints) await window.navigator.clipboard.writeText(` objects: filters: ${Object.keys(objectMaskPoints) - .map((objectName) => - objectMaskPoints[objectName].length - ? ` ${objectName}: + .map((objectName) => + objectMaskPoints[objectName].length + ? ` ${objectName}: mask: ${polylinePointsToPolyline(objectMaskPoints[objectName])}` - : '' - ) - .filter(Boolean) - .join('\n')}`); + : '' + ) + .filter(Boolean) + .join('\n')}`); }, [objectMaskPoints]); const handleSaveObjectMasks = useCallback(async () => { try { const queryParameters = Object.keys(objectMaskPoints) .filter((objectName) => objectMaskPoints[objectName].length > 0) - .map((objectName, index) => `cameras.${camera}.objects.filters.${objectName}.mask.${index}=${polylinePointsToPolyline(objectMaskPoints[objectName])}`) + .map( + (objectName, index) => + `cameras.${camera}.objects.filters.${objectName}.mask.${index}=${polylinePointsToPolyline( + objectMaskPoints[objectName] + )}` + ) .join('&'); const endpoint = `config/set?${queryParameters}`; const response = await axios.put(endpoint); @@ -324,8 +333,8 @@ ${Object.keys(objectMaskPoints) - When done, copy each mask configuration into your config.yml file - restart your Frigate instance to save your changes. + When done, copy each mask configuration into your config.yml file restart + your Frigate instance to save your changes.

} header="Warning" @@ -487,16 +496,16 @@ function EditableMask({ onChange, points, scale, snap, width, height }) { {!scaledPoints ? null : scaledPoints.map(([x, y], i) => ( - - ))} + + ))}
diff --git a/web/src/routes/Config.jsx b/web/src/routes/Config.jsx index cdd19bb6a..33354b30b 100644 --- a/web/src/routes/Config.jsx +++ b/web/src/routes/Config.jsx @@ -34,7 +34,7 @@ export default function Config() { }) .catch((error) => { setSuccess(''); - + if (error.response) { setError(error.response.data.message); } else { @@ -61,9 +61,9 @@ export default function Config() { let yamlModel; if (editor.getModels().length > 0) { - yamlModel = editor.getModel(modelUri) + yamlModel = editor.getModel(modelUri); } else { - yamlModel = editor.createModel(config, 'yaml', modelUri) + yamlModel = editor.createModel(config, 'yaml', modelUri); } setDiagnosticsOptions({ @@ -100,10 +100,10 @@ export default function Config() { - -
diff --git a/web/src/routes/Events.jsx b/web/src/routes/Events.jsx index 88f80635f..b0afff971 100644 --- a/web/src/routes/Events.jsx +++ b/web/src/routes/Events.jsx @@ -419,13 +419,13 @@ export default function Events({ path, ...props }) { downloadEvent.end_time && downloadEvent.has_snapshot && !downloadEvent.plus_id && ( - showSubmitToPlus(downloadEvent.id, downloadEvent.label, downloadEvent.box)} - /> - )} + showSubmitToPlus(downloadEvent.id, downloadEvent.label, downloadEvent.box)} + /> + )} {downloadEvent.plus_id && ( ) : (
- {cameraNames.map((camera) => ( config.cameras[camera]["enabled"] && ( -
-
- {camera.replaceAll('_', ' ')} - -
-
- - - - - - - - - {config.telemetry.network_bandwidth && } - - - - - - - - - - {config.telemetry.network_bandwidth && ( - - )} - - - - - - - - {config.telemetry.network_bandwidth && } - - - - + {cameraNames.map( + (camera) => + config.cameras[camera]['enabled'] && ( +
+
+ {camera.replaceAll('_', ' ')} + +
+
+
ProcessP-IDFPSCPU %Memory %Network Bandwidth
- ffmpeg - - {cameras[camera]['ffmpeg_pid'] || '- '}{cameras[camera]['camera_fps'] || '- '}{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cpu'] || '- '}%{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['mem'] || '- '}%{bandwidth_usages[cameras[camera]['ffmpeg_pid']]?.['bandwidth'] || '- '}KB/s
Capture{cameras[camera]['capture_pid'] || '- '}{cameras[camera]['process_fps'] || '- '}{cpu_usages[cameras[camera]['capture_pid']]?.['cpu'] || '- '}%{cpu_usages[cameras[camera]['capture_pid']]?.['mem'] || '- '}%-
Detect{cameras[camera]['pid'] || '- '}
+ + + + + + + + {config.telemetry.network_bandwidth && } + + + + + + + + + + {config.telemetry.network_bandwidth && ( + + )} + + + + + + + + {config.telemetry.network_bandwidth && } + + + + - {(() => { - if (cameras[camera]['pid'] && cameras[camera]['detection_enabled'] == 1) - return ( - - ); - else if (cameras[camera]['pid'] && cameras[camera]['detection_enabled'] == 0) - return ; + {(() => { + if (cameras[camera]['pid'] && cameras[camera]['detection_enabled'] == 1) + return ( + + ); + else if (cameras[camera]['pid'] && cameras[camera]['detection_enabled'] == 0) + return ; - return ; - })()} + return ; + })()} - - - {config.telemetry.network_bandwidth && } - - -
ProcessP-IDFPSCPU %Memory %Network Bandwidth
+ ffmpeg + + {cameras[camera]['ffmpeg_pid'] || '- '}{cameras[camera]['camera_fps'] || '- '}{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cpu'] || '- '}%{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['mem'] || '- '}%{bandwidth_usages[cameras[camera]['ffmpeg_pid']]?.['bandwidth'] || '- '}KB/s
Capture{cameras[camera]['capture_pid'] || '- '}{cameras[camera]['process_fps'] || '- '}{cpu_usages[cameras[camera]['capture_pid']]?.['cpu'] || '- '}%{cpu_usages[cameras[camera]['capture_pid']]?.['mem'] || '- '}%-
Detect{cameras[camera]['pid'] || '- '} - {cameras[camera]['detection_fps']} ({cameras[camera]['skipped_fps']} skipped) - disabled + {cameras[camera]['detection_fps']} ({cameras[camera]['skipped_fps']} skipped) + disabled- - {cpu_usages[cameras[camera]['pid']]?.['cpu'] || '- '}%{cpu_usages[cameras[camera]['pid']]?.['mem'] || '- '}%-
-
-
) - ))} + {cpu_usages[cameras[camera]['pid']]?.['cpu'] || '- '}% + {cpu_usages[cameras[camera]['pid']]?.['mem'] || '- '}% + {config.telemetry.network_bandwidth && -} + + + +
+
+ ) + )} )}