mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-06-29 16:41:16 +03:00
Compare commits
20 Commits
a31ccc13d5
...
0d1d13d025
| Author | SHA1 | Date | |
|---|---|---|---|
|
0d1d13d025 | ||
|
|
7efda899ee | ||
|
|
68834191ce | ||
|
|
60d1a07615 | ||
|
|
f5f3bcb90c | ||
|
|
c42c3f7613 | ||
|
|
bf7cc6ea08 | ||
|
|
654811c145 | ||
|
|
0026d9c8f7 | ||
|
|
c32b1501b2 | ||
|
|
d3a7038925 | ||
|
|
3949076129 | ||
|
|
ac9711bdbf | ||
|
|
560cece938 | ||
|
|
ba284ffbf5 | ||
|
|
ad7571ee9d | ||
|
|
07db2ffb5e | ||
|
|
ec5bef4660 | ||
|
|
03c33a7901 | ||
|
|
fe4a872f93 |
@ -280,7 +280,7 @@ async def create_face(request: Request, name: str):
|
||||
success response with details about the registration, or an error if face recognition
|
||||
is not enabled or the image cannot be processed.""",
|
||||
)
|
||||
def register_face(request: Request, name: str, file: UploadFile):
|
||||
async def register_face(request: Request, name: str, file: UploadFile):
|
||||
if not request.app.frigate_config.face_recognition.enabled:
|
||||
return JSONResponse(
|
||||
status_code=400,
|
||||
@ -288,7 +288,7 @@ def register_face(request: Request, name: str, file: UploadFile):
|
||||
)
|
||||
|
||||
context: EmbeddingsContext = request.app.embeddings
|
||||
result = None if context is None else context.register_face(name, file.file.read())
|
||||
result = None if context is None else context.register_face(name, await file.read())
|
||||
|
||||
if not isinstance(result, dict):
|
||||
return JSONResponse(
|
||||
@ -313,7 +313,7 @@ def register_face(request: Request, name: str, file: UploadFile):
|
||||
registered faces in the system. Returns the recognized face name and confidence score,
|
||||
or an error if face recognition is not enabled or the image cannot be processed.""",
|
||||
)
|
||||
def recognize_face(request: Request, file: UploadFile):
|
||||
async def recognize_face(request: Request, file: UploadFile):
|
||||
if not request.app.frigate_config.face_recognition.enabled:
|
||||
return JSONResponse(
|
||||
status_code=400,
|
||||
@ -321,7 +321,7 @@ def recognize_face(request: Request, file: UploadFile):
|
||||
)
|
||||
|
||||
context: EmbeddingsContext = request.app.embeddings
|
||||
result = context.recognize_face(file.file.read())
|
||||
result = context.recognize_face(await file.read())
|
||||
|
||||
if not isinstance(result, dict):
|
||||
return JSONResponse(
|
||||
|
||||
@ -94,21 +94,9 @@ class AudioProcessor(FrigateProcess):
|
||||
self.camera_metrics = camera_metrics
|
||||
self.config = config
|
||||
|
||||
def __stop_audio_thread(self, camera: str) -> None:
|
||||
thread = self.audio_threads.pop(camera, None)
|
||||
if thread is None:
|
||||
return
|
||||
|
||||
thread.stop()
|
||||
thread.join(10)
|
||||
if thread.is_alive():
|
||||
self.logger.warning(f"Audio maintainer thread for {camera} is still alive")
|
||||
else:
|
||||
self.logger.info(f"Audio maintainer stopped for {camera}")
|
||||
|
||||
def run(self) -> None:
|
||||
self.pre_run_setup(self.config.logger)
|
||||
self.audio_threads: dict[str, AudioEventMaintainer] = {}
|
||||
audio_threads: dict[str, AudioEventMaintainer] = {}
|
||||
|
||||
threading.current_thread().name = "process:audio_manager"
|
||||
|
||||
@ -132,13 +120,12 @@ class AudioProcessor(FrigateProcess):
|
||||
CameraConfigUpdateEnum.add,
|
||||
CameraConfigUpdateEnum.audio,
|
||||
CameraConfigUpdateEnum.ffmpeg,
|
||||
CameraConfigUpdateEnum.remove,
|
||||
],
|
||||
)
|
||||
|
||||
def spawn_if_needed(camera: CameraConfig) -> None:
|
||||
name = camera.name
|
||||
if name is None or name in self.audio_threads:
|
||||
if name is None or name in audio_threads:
|
||||
return
|
||||
if not camera.enabled or not camera.audio.enabled:
|
||||
return
|
||||
@ -152,7 +139,7 @@ class AudioProcessor(FrigateProcess):
|
||||
self.transcription_model_runner,
|
||||
self.stop_event, # type: ignore[arg-type]
|
||||
)
|
||||
self.audio_threads[name] = thread
|
||||
audio_threads[name] = thread
|
||||
thread.start()
|
||||
self.logger.info(f"Audio maintainer started for {name}")
|
||||
|
||||
@ -161,31 +148,21 @@ class AudioProcessor(FrigateProcess):
|
||||
|
||||
self.logger.info(f"Audio processor started (pid: {self.pid})")
|
||||
|
||||
# poll for newly added/removed cameras or cameras flipped to
|
||||
# audio.enabled at runtime
|
||||
# poll for newly added cameras or cameras flipped to audio.enabled at runtime
|
||||
while not self.stop_event.wait(timeout=1.0):
|
||||
updated_topics = config_subscriber.check_for_updates()
|
||||
|
||||
# stop maintainers for removed cameras so their ffmpeg process is
|
||||
# torn down and they stop touching camera_metrics (which the camera
|
||||
# maintainer has already popped for the removed camera)
|
||||
for removed_camera in updated_topics.get(
|
||||
CameraConfigUpdateEnum.remove.name, []
|
||||
):
|
||||
self.__stop_audio_thread(removed_camera)
|
||||
|
||||
config_subscriber.check_for_updates()
|
||||
for camera in self.config.cameras.values():
|
||||
spawn_if_needed(camera)
|
||||
|
||||
config_subscriber.stop()
|
||||
|
||||
for thread in self.audio_threads.values():
|
||||
for thread in audio_threads.values():
|
||||
thread.join(1)
|
||||
if thread.is_alive():
|
||||
self.logger.info(f"Waiting for thread {thread.name:s} to exit")
|
||||
thread.join(10)
|
||||
|
||||
for thread in self.audio_threads.values():
|
||||
for thread in audio_threads.values():
|
||||
if thread.is_alive():
|
||||
self.logger.warning(f"Thread {thread.name} is still alive")
|
||||
|
||||
@ -207,9 +184,6 @@ class AudioEventMaintainer(threading.Thread):
|
||||
self.camera_config = camera
|
||||
self.camera_metrics = camera_metrics
|
||||
self.stop_event = stop_event
|
||||
# per-camera stop signal so a single maintainer can be torn down at
|
||||
# runtime (e.g. on camera removal) without stopping the whole process
|
||||
self.camera_stop_event = threading.Event()
|
||||
self.detector = AudioTfl(stop_event, self.camera_config.audio.num_threads)
|
||||
self.shape = (int(round(AUDIO_DURATION * AUDIO_SAMPLE_RATE)),)
|
||||
self.chunk_size = int(round(AUDIO_DURATION * AUDIO_SAMPLE_RATE * 2))
|
||||
@ -259,11 +233,7 @@ class AudioEventMaintainer(threading.Thread):
|
||||
self.was_audio_enabled = camera.audio.enabled
|
||||
|
||||
def detect_audio(self, audio: np.ndarray) -> None:
|
||||
if (
|
||||
not self.camera_config.audio.enabled
|
||||
or self.stop_event.is_set()
|
||||
or self.camera_stop_event.is_set()
|
||||
):
|
||||
if not self.camera_config.audio.enabled or self.stop_event.is_set():
|
||||
return
|
||||
|
||||
audio_as_float: np.ndarray = audio.astype(np.float32)
|
||||
@ -382,15 +352,11 @@ class AudioEventMaintainer(threading.Thread):
|
||||
self.logger.error(f"Error reading audio data from ffmpeg process: {e}")
|
||||
log_and_restart()
|
||||
|
||||
def stop(self) -> None:
|
||||
"""Signal this maintainer to exit its run loop and clean up."""
|
||||
self.camera_stop_event.set()
|
||||
|
||||
def run(self) -> None:
|
||||
if self.camera_config.enabled:
|
||||
self.start_or_restart_ffmpeg()
|
||||
|
||||
while not self.stop_event.is_set() and not self.camera_stop_event.is_set():
|
||||
while not self.stop_event.is_set():
|
||||
# check if there is an updated config
|
||||
self.config_subscriber.check_for_updates()
|
||||
|
||||
|
||||
@ -1,181 +0,0 @@
|
||||
/**
|
||||
* Camera clone dialog E2E tests.
|
||||
*
|
||||
* Covers the design invariants that don't depend on per-camera resolution
|
||||
* differences in the mock fixture:
|
||||
* 1. Dialog opens from the "Clone settings" button below Add/Delete.
|
||||
* 2. A source camera must be chosen inside the dialog before cloning.
|
||||
* 3. "Stream URLs and roles" is forced on and disabled for new-camera target.
|
||||
* 4. Cloning to a new camera issues a single add PUT and shows a restart prompt.
|
||||
* 5. The existing-camera target selects multiple destinations via a switch
|
||||
* popover (with an "All cameras" toggle and source exclusion); the closed
|
||||
* trigger summarizes the selection by name or as "All cameras".
|
||||
*
|
||||
* The spatial-mismatch warning path is exercised in unit-level review and via
|
||||
* manual QA — the shared mock fixture ships every camera at 1280×720. The
|
||||
* existing-camera PUT fan-out is likewise not asserted here: the mock cameras
|
||||
* are identical apart from stream URLs (which existing-camera clones never
|
||||
* copy) and the schema mock is empty, so a clone onto them produces no diff
|
||||
* and no PUT. That path is covered by unit-level review and manual QA.
|
||||
*/
|
||||
|
||||
import { test, expect } from "../fixtures/frigate-test";
|
||||
|
||||
async function openCloneDialog(frigateApp: {
|
||||
page: import("@playwright/test").Page;
|
||||
}) {
|
||||
await frigateApp.page
|
||||
.getByRole("button", { name: /^Clone settings$/i })
|
||||
.click();
|
||||
await expect(frigateApp.page.getByRole("dialog")).toBeVisible();
|
||||
}
|
||||
|
||||
async function selectSource(
|
||||
frigateApp: { page: import("@playwright/test").Page },
|
||||
source: string,
|
||||
) {
|
||||
await frigateApp.page.getByRole("dialog").getByRole("combobox").click();
|
||||
await frigateApp.page
|
||||
.getByRole("option", { name: source, exact: true })
|
||||
.click();
|
||||
}
|
||||
|
||||
test.describe("Camera clone dialog @medium @mobile", () => {
|
||||
test.beforeEach(async ({ frigateApp }) => {
|
||||
await frigateApp.goto("/settings?page=cameraManagement");
|
||||
await expect(
|
||||
frigateApp.page.getByRole("heading", { name: /Manage Cameras/i }),
|
||||
).toBeVisible();
|
||||
});
|
||||
|
||||
test("opens the dialog from the Clone settings button", async ({
|
||||
frigateApp,
|
||||
}) => {
|
||||
await openCloneDialog(frigateApp);
|
||||
|
||||
await expect(
|
||||
frigateApp.page.getByRole("dialog").getByText(/Clone camera settings/i),
|
||||
).toBeVisible();
|
||||
|
||||
// The Clone button is disabled until a source (and target) is chosen.
|
||||
await expect(
|
||||
frigateApp.page.getByRole("button", { name: /^Clone$/i }),
|
||||
).toBeDisabled();
|
||||
});
|
||||
|
||||
test("forces Stream URLs and roles on for new-camera target", async ({
|
||||
frigateApp,
|
||||
}) => {
|
||||
await openCloneDialog(frigateApp);
|
||||
await selectSource(frigateApp, "Front Door");
|
||||
|
||||
// The "New camera" radio is selected by default; the Streams group renders
|
||||
// the ffmpeg_live checkbox as forced-checked and disabled.
|
||||
const streamsLabel = frigateApp.page
|
||||
.locator("label")
|
||||
.filter({ hasText: /Stream URLs and roles/i });
|
||||
await expect(streamsLabel).toBeVisible();
|
||||
|
||||
const streamsCheckbox = streamsLabel.getByRole("checkbox");
|
||||
await expect(streamsCheckbox).toBeChecked();
|
||||
await expect(streamsCheckbox).toBeDisabled();
|
||||
});
|
||||
|
||||
test("issues a single add PUT and shows restart toast for new-camera target", async ({
|
||||
frigateApp,
|
||||
}) => {
|
||||
const requests: { body: unknown }[] = [];
|
||||
|
||||
await frigateApp.page.route("**/api/config/set", async (route) => {
|
||||
const body = route.request().postDataJSON();
|
||||
requests.push({ body });
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: "application/json",
|
||||
body: JSON.stringify({ success: true, require_restart: false }),
|
||||
});
|
||||
});
|
||||
|
||||
await frigateApp.goto("/settings?page=cameraManagement");
|
||||
await expect(
|
||||
frigateApp.page.getByRole("heading", { name: /Manage Cameras/i }),
|
||||
).toBeVisible();
|
||||
|
||||
await openCloneDialog(frigateApp);
|
||||
await selectSource(frigateApp, "Front Door");
|
||||
|
||||
const nameInput = frigateApp.page.getByPlaceholder(
|
||||
/e\.g\., back_door or Back Door/i,
|
||||
);
|
||||
await nameInput.fill("clone_target_one");
|
||||
|
||||
// With a source picked and a valid name, changeCount > 0 enables Clone.
|
||||
await expect(
|
||||
frigateApp.page.getByRole("button", { name: /^Clone$/i }),
|
||||
).toBeEnabled({ timeout: 5_000 });
|
||||
|
||||
await frigateApp.page.getByRole("button", { name: /^Clone$/i }).click();
|
||||
|
||||
// New-camera clones bundle into a single atomic add PUT (avoids
|
||||
// per-section validation ordering issues).
|
||||
await expect.poll(() => requests.length, { timeout: 10_000 }).toBe(1);
|
||||
|
||||
const firstBody = requests[0].body as {
|
||||
requires_restart?: number;
|
||||
update_topic?: string;
|
||||
};
|
||||
expect(firstBody.update_topic).toMatch(
|
||||
/config\/cameras\/clone_target_one\/add/,
|
||||
);
|
||||
expect(firstBody.requires_restart).toBe(1);
|
||||
|
||||
// The toast offers a Restart action because new-camera always needs restart.
|
||||
// .first() avoids strict-mode rejection when both the toast action and the
|
||||
// RestartDialog trigger render concurrently.
|
||||
await expect(
|
||||
frigateApp.page.getByRole("button", { name: /Restart/i }).first(),
|
||||
).toBeVisible({ timeout: 8_000 });
|
||||
});
|
||||
|
||||
test("selects multiple existing destination cameras via a switch popover", async ({
|
||||
frigateApp,
|
||||
}) => {
|
||||
await openCloneDialog(frigateApp);
|
||||
await selectSource(frigateApp, "Front Door");
|
||||
|
||||
await frigateApp.page
|
||||
.getByRole("radio", { name: /Existing cameras/i })
|
||||
.click();
|
||||
|
||||
const dialog = frigateApp.page.getByRole("dialog");
|
||||
|
||||
// The destination trigger starts with the empty-selection placeholder.
|
||||
await dialog
|
||||
.getByRole("button", { name: /Select at least one camera/i })
|
||||
.click();
|
||||
|
||||
// The chosen source is excluded from the destination switch list.
|
||||
await expect(
|
||||
dialog.getByRole("switch", { name: /Backyard/i }),
|
||||
).toBeVisible();
|
||||
await expect(dialog.getByRole("switch", { name: /Garage/i })).toBeVisible();
|
||||
await expect(
|
||||
dialog.getByRole("switch", { name: /^Front Door$/i }),
|
||||
).toHaveCount(0);
|
||||
|
||||
// Selecting a single camera summarizes by name once the popover closes.
|
||||
await dialog.getByRole("switch", { name: /Backyard/i }).click();
|
||||
await frigateApp.page.keyboard.press("Escape");
|
||||
await expect(
|
||||
dialog.getByRole("button", { name: /^Backyard$/i }),
|
||||
).toBeVisible();
|
||||
|
||||
// Reopen and select everything; the trigger collapses to "All cameras".
|
||||
await dialog.getByRole("button", { name: /^Backyard$/i }).click();
|
||||
await dialog.getByRole("switch", { name: /^All cameras$/i }).click();
|
||||
await frigateApp.page.keyboard.press("Escape");
|
||||
await expect(
|
||||
dialog.getByRole("button", { name: /^All cameras$/i }),
|
||||
).toBeVisible();
|
||||
});
|
||||
});
|
||||
@ -544,92 +544,6 @@
|
||||
"normal": "Normal",
|
||||
"dedicatedLpr": "Dedicated LPR",
|
||||
"saveSuccess": "Updated camera type for {{cameraName}}. Restart Frigate to apply the changes."
|
||||
},
|
||||
"clone": {
|
||||
"sectionTitle": "Clone settings",
|
||||
"sectionDescription": "Copy configuration from one camera to another camera or a new one.",
|
||||
"button": "Clone settings",
|
||||
"title": "Clone camera settings",
|
||||
"description": "Copy a camera's configuration to one or more other cameras or a new camera. Identity (name, friendly name, web UI URL, display order) is never copied.",
|
||||
"source": {
|
||||
"label": "Source camera",
|
||||
"placeholder": "Select a source camera",
|
||||
"required": "Select a source camera"
|
||||
},
|
||||
"target": {
|
||||
"legend": "Target",
|
||||
"newRadio": "New camera",
|
||||
"newNameLabel": "Camera name",
|
||||
"newNamePlaceholder": "e.g., back_door or Back Door",
|
||||
"newNameRequired": "Camera name is required",
|
||||
"newNameInvalid": "Invalid camera name",
|
||||
"newNameCollision": "A camera with this name already exists",
|
||||
"newStreamsForced": "Streams are always copied for a new camera.",
|
||||
"existingCamerasRadio": "Existing cameras",
|
||||
"allCameras": "All cameras",
|
||||
"existingPlaceholder": "Select at least one camera",
|
||||
"existingDisabled": "No other cameras to copy to"
|
||||
},
|
||||
"categories": {
|
||||
"legend": "Settings to clone",
|
||||
"description": "Choose which settings to copy from the source camera.",
|
||||
"selectAll": "Select all",
|
||||
"selectNone": "Select none",
|
||||
"resetDefaults": "Reset to defaults",
|
||||
"general": "General",
|
||||
"spatial": "Spatial settings",
|
||||
"streams": "Streams",
|
||||
"spatialWarningTitle": "Resolution mismatch",
|
||||
"spatialWarning": "Source camera {{srcCamera}} detect resolution ({{srcWidth}}×{{srcHeight}}) differs from: {{cameras}}. Polygons may not align on those cameras. These defaults are off; enable to copy as-is.",
|
||||
"restartHint": "Restart required",
|
||||
"items": {
|
||||
"record": "Recording",
|
||||
"snapshots": "Snapshots",
|
||||
"review": "Review",
|
||||
"motion": "Motion detection",
|
||||
"objects": "Objects",
|
||||
"audio": "Audio detection",
|
||||
"audio_transcription": "Audio transcription",
|
||||
"notifications": "Notifications",
|
||||
"birdseye": "Birdseye",
|
||||
"mqtt": "MQTT",
|
||||
"timestamp_style": "Timestamp style",
|
||||
"onvif": "ONVIF",
|
||||
"lpr": "License plate recognition",
|
||||
"face_recognition": "Face recognition",
|
||||
"semantic_search": "Semantic search",
|
||||
"genai": "Generative AI",
|
||||
"type": "Camera type (normal / dedicated LPR)",
|
||||
"profiles": "Profiles",
|
||||
"detect": "Detect dimensions",
|
||||
"zones": "Zones",
|
||||
"motion_mask": "Motion masks",
|
||||
"object_masks": "Object masks",
|
||||
"ffmpeg_live": "Stream URLs and roles"
|
||||
}
|
||||
},
|
||||
"footer": {
|
||||
"changeCount_zero": "No changes selected",
|
||||
"changeCount_one": "{{count}} change will be applied",
|
||||
"changeCount_other": "{{count}} changes will be applied",
|
||||
"restartNeeded": "Restart will be required for some changes.",
|
||||
"liveOnly": "All changes will apply live without a restart.",
|
||||
"submit": "Clone",
|
||||
"submitting": "Cloning…"
|
||||
},
|
||||
"toast": {
|
||||
"success": "Settings copied to {{cameraName}}",
|
||||
"successWithRestart": "Settings copied to {{cameraName}}. Restart Frigate to apply all changes.",
|
||||
"successMulti_one": "Settings copied to {{count}} camera",
|
||||
"successMulti_other": "Settings copied to {{count}} cameras",
|
||||
"successMultiWithRestart_one": "Settings copied to {{count}} camera. Restart Frigate to apply all changes.",
|
||||
"successMultiWithRestart_other": "Settings copied to {{count}} cameras. Restart Frigate to apply all changes.",
|
||||
"partialFailure": "{{successCount}} sections applied; '{{failedSection}}' failed: {{errorMessage}}",
|
||||
"partialFailureMulti": "Copied to {{successCount}} camera(s); failed for {{failed}}: {{errorMessage}}",
|
||||
"newCameraPartialFailure": "Camera {{cameraName}} was created but some settings failed to copy: {{errorMessage}}",
|
||||
"sourceMissing": "Source camera no longer exists",
|
||||
"submitError": "Failed to clone camera: {{errorMessage}}"
|
||||
}
|
||||
}
|
||||
},
|
||||
"cameraReview": {
|
||||
|
||||
@ -277,8 +277,7 @@
|
||||
"error": {
|
||||
"title": "Falha ao salvar as alterações de configuração: {{errorMessage}}",
|
||||
"noMessage": "Falha ao salvar as alterações de configuração"
|
||||
},
|
||||
"success": "Alterações salvas com sucesso."
|
||||
}
|
||||
}
|
||||
},
|
||||
"role": {
|
||||
@ -321,10 +320,5 @@
|
||||
"field": {
|
||||
"optional": "Opcional",
|
||||
"internalID": "O ID interno que o Frigate usa na configuração e banco de dados"
|
||||
},
|
||||
"no_items": "Sem itens",
|
||||
"validation_errors": "Erros de validação",
|
||||
"credentialField": {
|
||||
"savedPlaceholder": "Salvo - deixar em branco para manter a atual"
|
||||
}
|
||||
}
|
||||
|
||||
@ -82,7 +82,6 @@
|
||||
"motion": "Movimento",
|
||||
"regions": "Regiões",
|
||||
"boundingBox": "Caixa Delimitadora",
|
||||
"timestamp": "Timestamp",
|
||||
"paths": "Caminhos"
|
||||
"timestamp": "Timestamp"
|
||||
}
|
||||
}
|
||||
|
||||
@ -68,45 +68,7 @@
|
||||
},
|
||||
"case": {
|
||||
"label": "Caso",
|
||||
"placeholder": "Selecione um caso",
|
||||
"newCaseOption": "Criar novo caso de uso",
|
||||
"newCaseNamePlaceholder": "Novo caso de uso",
|
||||
"newCaseDescriptionPlaceholder": "Descrição do caso de uso",
|
||||
"nonAdminHelp": "Um novo caso de uso será criado para estas exportações."
|
||||
},
|
||||
"queueing": "Exportação na fila...",
|
||||
"tabs": {
|
||||
"export": "Câmera única",
|
||||
"multiCamera": "Multi-Câmera"
|
||||
},
|
||||
"multiCamera": {
|
||||
"timeRange": "Intervalo de tempo",
|
||||
"selectFromTimeline": "Selecione do intervale de tempo",
|
||||
"cameraSelection": "Câmeras",
|
||||
"cameraSelectionHelp": "Câmeras com objetos localizados neste intervalo de tempo estão pré-selecionados",
|
||||
"checkingActivity": "Verificando se a câmera está ativa...",
|
||||
"noCameras": "Sem câmeras disponíveis",
|
||||
"detectionCount_one": "Objeto localizado",
|
||||
"detectionCount_many": "{{count}} objetos localizados",
|
||||
"detectionCount_other": "{{count}} objetos localizados",
|
||||
"nameLabel": "Nome do arquivo exportado",
|
||||
"namePlaceholder": "Padrão de nome para exportação",
|
||||
"queueingButton": "Exportações na fila...",
|
||||
"exportButton_one": "Exportar câmera",
|
||||
"exportButton_many": "Exportar {{count}} câmeras",
|
||||
"exportButton_other": "Exportar {{count}} câmeras"
|
||||
},
|
||||
"multi": {
|
||||
"title_one": "Exportar análise",
|
||||
"title_many": "Exportar {{count}} análises",
|
||||
"title_other": "Exportar {{count}} análises",
|
||||
"description": "Exportar cada análise selecionada. Todas as exportações serão agrupadas em um único caso.",
|
||||
"descriptionNoCase": "Exportar cada análise selecionada.",
|
||||
"caseNamePlaceholder": "Exportar análise - {{date}}",
|
||||
"exportButton_one": "Exportar análise",
|
||||
"exportButton_many": "Exportar {{count}} análises",
|
||||
"exportButton_other": "Exportar {{count}} análises",
|
||||
"exportingButton": "Exportando..."
|
||||
"placeholder": "Selecione um caso"
|
||||
}
|
||||
},
|
||||
"streaming": {
|
||||
|
||||
@ -56,25 +56,18 @@ export function CameraLineGraph({
|
||||
});
|
||||
}, [t, timeFormat]);
|
||||
|
||||
const updateTimesRef = useRef(updateTimes);
|
||||
useEffect(() => {
|
||||
updateTimesRef.current = updateTimes;
|
||||
}, [updateTimes]);
|
||||
|
||||
const formatTime = useCallback(
|
||||
(val: unknown) => {
|
||||
const times = updateTimesRef.current;
|
||||
const ts = times[Math.round(val as number)];
|
||||
if (isNaN(ts)) {
|
||||
return "";
|
||||
}
|
||||
return formatUnixTimestampToDateTime(ts, {
|
||||
timezone: config?.ui.timezone,
|
||||
date_format: format,
|
||||
locale,
|
||||
});
|
||||
return formatUnixTimestampToDateTime(
|
||||
updateTimes[Math.round(val as number)],
|
||||
{
|
||||
timezone: config?.ui.timezone,
|
||||
date_format: format,
|
||||
locale,
|
||||
},
|
||||
);
|
||||
},
|
||||
[config?.ui.timezone, format, locale],
|
||||
[config?.ui.timezone, format, locale, updateTimes],
|
||||
);
|
||||
|
||||
const options = useMemo(() => {
|
||||
@ -218,25 +211,18 @@ export function EventsPerSecondsLineGraph({
|
||||
});
|
||||
}, [t, timeFormat]);
|
||||
|
||||
const updateTimesRef = useRef(updateTimes);
|
||||
useEffect(() => {
|
||||
updateTimesRef.current = updateTimes;
|
||||
}, [updateTimes]);
|
||||
|
||||
const formatTime = useCallback(
|
||||
(val: unknown) => {
|
||||
const times = updateTimesRef.current;
|
||||
const ts = times[Math.round(val as number) - 1];
|
||||
if (isNaN(ts)) {
|
||||
return "";
|
||||
}
|
||||
return formatUnixTimestampToDateTime(ts, {
|
||||
timezone: config?.ui.timezone,
|
||||
date_format: format,
|
||||
locale,
|
||||
});
|
||||
return formatUnixTimestampToDateTime(
|
||||
updateTimes[Math.round(val as number) - 1],
|
||||
{
|
||||
timezone: config?.ui.timezone,
|
||||
date_format: format,
|
||||
locale,
|
||||
},
|
||||
);
|
||||
},
|
||||
[config?.ui.timezone, format, locale],
|
||||
[config?.ui.timezone, format, locale, updateTimes],
|
||||
);
|
||||
|
||||
const options = useMemo(() => {
|
||||
|
||||
@ -61,11 +61,6 @@ export function ThresholdBarGraph({
|
||||
});
|
||||
}, [t, timeFormat]);
|
||||
|
||||
const updateTimesRef = useRef(updateTimes);
|
||||
useEffect(() => {
|
||||
updateTimesRef.current = updateTimes;
|
||||
}, [updateTimes]);
|
||||
|
||||
const formatTime = useCallback(
|
||||
(val: unknown) => {
|
||||
const dateIndex = Math.round(val as number);
|
||||
@ -74,18 +69,16 @@ export function ThresholdBarGraph({
|
||||
if (dateIndex < 0) {
|
||||
timeOffset = 5 * Math.abs(dateIndex);
|
||||
}
|
||||
const times = updateTimesRef.current;
|
||||
const ts = times[Math.max(1, dateIndex) - 1] - timeOffset;
|
||||
if (isNaN(ts)) {
|
||||
return "";
|
||||
}
|
||||
return formatUnixTimestampToDateTime(ts, {
|
||||
timezone: config?.ui.timezone,
|
||||
date_format: format,
|
||||
locale,
|
||||
});
|
||||
return formatUnixTimestampToDateTime(
|
||||
updateTimes[Math.max(1, dateIndex) - 1] - timeOffset,
|
||||
{
|
||||
timezone: config?.ui.timezone,
|
||||
date_format: format,
|
||||
locale,
|
||||
},
|
||||
);
|
||||
},
|
||||
[config?.ui.timezone, format, locale],
|
||||
[config?.ui.timezone, format, locale, updateTimes],
|
||||
);
|
||||
|
||||
const options = useMemo(() => {
|
||||
|
||||
@ -287,7 +287,7 @@ export default function ExportDialog({
|
||||
<Content
|
||||
className={
|
||||
isDesktop
|
||||
? "scrollbar-container max-h-[90dvh] overflow-y-auto sm:rounded-lg md:rounded-2xl"
|
||||
? "sm:rounded-lg md:rounded-2xl"
|
||||
: "mx-4 rounded-lg px-4 pb-4 md:rounded-2xl"
|
||||
}
|
||||
>
|
||||
|
||||
@ -22,7 +22,6 @@ type SaveAllPreviewPopoverProps = {
|
||||
className?: string;
|
||||
align?: "start" | "center" | "end";
|
||||
side?: "top" | "bottom" | "left" | "right";
|
||||
disablePortal?: boolean;
|
||||
};
|
||||
|
||||
export default function SaveAllPreviewPopover({
|
||||
@ -30,7 +29,6 @@ export default function SaveAllPreviewPopover({
|
||||
className,
|
||||
align = "end",
|
||||
side = "bottom",
|
||||
disablePortal = false,
|
||||
}: SaveAllPreviewPopoverProps) {
|
||||
const { t } = useTranslation(["views/settings", "common"]);
|
||||
const [open, setOpen] = useState(false);
|
||||
@ -69,7 +67,6 @@ export default function SaveAllPreviewPopover({
|
||||
<PopoverContent
|
||||
align={align}
|
||||
side={side}
|
||||
disablePortal={disablePortal}
|
||||
className="w-[90vw] max-w-sm border bg-background p-4 shadow-lg"
|
||||
onOpenAutoFocus={(event) => event.preventDefault()}
|
||||
>
|
||||
@ -111,13 +108,13 @@ export default function SaveAllPreviewPopover({
|
||||
}`}
|
||||
className="rounded-md border border-secondary bg-background_alt p-2"
|
||||
>
|
||||
<div className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-1 text-xs">
|
||||
<div className="grid grid-cols-[auto_1fr] gap-x-3 gap-y-1 text-xs">
|
||||
<span className="text-muted-foreground">
|
||||
{t("saveAllPreview.scope.label", {
|
||||
ns: "views/settings",
|
||||
})}
|
||||
</span>
|
||||
<span className="min-w-0 truncate">{scopeLabel}</span>
|
||||
<span className="truncate">{scopeLabel}</span>
|
||||
{item.profileName && (
|
||||
<>
|
||||
<span className="text-muted-foreground">
|
||||
@ -125,7 +122,7 @@ export default function SaveAllPreviewPopover({
|
||||
ns: "views/settings",
|
||||
})}
|
||||
</span>
|
||||
<span className="min-w-0 truncate font-medium">
|
||||
<span className="truncate font-medium">
|
||||
{item.profileName}
|
||||
</span>
|
||||
</>
|
||||
@ -135,7 +132,7 @@ export default function SaveAllPreviewPopover({
|
||||
ns: "views/settings",
|
||||
})}
|
||||
</span>
|
||||
<span className="min-w-0 break-all font-mono">
|
||||
<span className="break-all font-mono">
|
||||
{item.fieldPath}
|
||||
</span>
|
||||
<span className="text-muted-foreground">
|
||||
@ -143,7 +140,7 @@ export default function SaveAllPreviewPopover({
|
||||
ns: "views/settings",
|
||||
})}
|
||||
</span>
|
||||
<span className="min-w-0 whitespace-pre-wrap break-all font-mono">
|
||||
<span className="whitespace-pre-wrap break-words font-mono">
|
||||
{formatValue(item.value)}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,856 +0,0 @@
|
||||
import cloneDeep from "lodash/cloneDeep";
|
||||
import isEqual from "lodash/isEqual";
|
||||
import merge from "lodash/merge";
|
||||
import type { RJSFSchema } from "@rjsf/utils";
|
||||
|
||||
import {
|
||||
buildOverrides,
|
||||
cameraUpdateTopicMap,
|
||||
flattenOverrides,
|
||||
getEffectiveAttributeLabels,
|
||||
getSectionConfig,
|
||||
prepareSectionSavePayload,
|
||||
resolveHiddenFieldEntries,
|
||||
sanitizeSectionData,
|
||||
type SectionSavePayload,
|
||||
} from "@/utils/configUtil";
|
||||
import { applySchemaDefaults } from "@/lib/config-schema";
|
||||
import type { SaveAllPreviewItem } from "@/components/overlay/detail/SaveAllPreviewPopover";
|
||||
import type { CameraConfig, FrigateConfig } from "@/types/frigateConfig";
|
||||
import type {
|
||||
ConfigSectionData,
|
||||
JsonObject,
|
||||
JsonValue,
|
||||
} from "@/types/configForm";
|
||||
import { processCameraName } from "@/utils/cameraUtil";
|
||||
|
||||
/**
|
||||
* Sections whose `filters` dict is auto-populated by the backend at parse
|
||||
* time. `attributeBump` reflects the global-level `min_score=0.7` override
|
||||
* the backend applies to attribute labels (face, license_plate, Frigate+
|
||||
* couriers) — see `frigate/config/config.py`.
|
||||
*/
|
||||
const FILTER_SECTION_DEFS: Record<
|
||||
string,
|
||||
{
|
||||
listField: string;
|
||||
filterDef: string;
|
||||
attributeBump?: { min_score: number };
|
||||
}
|
||||
> = {
|
||||
objects: {
|
||||
listField: "track",
|
||||
filterDef: "FilterConfig",
|
||||
attributeBump: { min_score: 0.7 },
|
||||
},
|
||||
audio: { listField: "listen", filterDef: "AudioFilterConfig" },
|
||||
};
|
||||
|
||||
function resolveDef(schema: RJSFSchema, name: string): RJSFSchema | undefined {
|
||||
const defs =
|
||||
(schema as { $defs?: Record<string, RJSFSchema> }).$defs ??
|
||||
(schema as { definitions?: Record<string, RJSFSchema> }).definitions;
|
||||
return defs ? defs[name] : undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reduce each filter entry to the fields that differ from the backend's
|
||||
* auto-default. An entry that is entirely auto-populated drops out; a
|
||||
* partially-customized entry keeps only its customized fields, so cloning
|
||||
* doesn't copy the auto-populated default for every other field.
|
||||
*/
|
||||
function stripAutoDefaultFilters(
|
||||
section: string,
|
||||
sourceSection: JsonObject,
|
||||
fullSchema: RJSFSchema,
|
||||
fullConfig: FrigateConfig,
|
||||
fullCameraConfig: CameraConfig,
|
||||
): JsonObject {
|
||||
const def = FILTER_SECTION_DEFS[section];
|
||||
if (!def) return sourceSection;
|
||||
const filters = sourceSection.filters;
|
||||
if (!filters || typeof filters !== "object" || Array.isArray(filters)) {
|
||||
return sourceSection;
|
||||
}
|
||||
const filterDef = resolveDef(fullSchema, def.filterDef);
|
||||
if (!filterDef) return sourceSection;
|
||||
const baseDefaults = applySchemaDefaults(filterDef, {}) as JsonObject;
|
||||
const attributeDefaults = def.attributeBump
|
||||
? ({ ...baseDefaults, ...def.attributeBump } as JsonObject)
|
||||
: baseDefaults;
|
||||
const attributeSet =
|
||||
section === "objects"
|
||||
? new Set(
|
||||
getEffectiveAttributeLabels(fullConfig, fullCameraConfig, "camera"),
|
||||
)
|
||||
: new Set<string>();
|
||||
|
||||
// Ignore runtime-only `mask`/`raw_mask`: the API ships them as `{}` while the
|
||||
// schema default omits them, which would otherwise break the equality check.
|
||||
const withoutRuntimeFields = (entry: JsonValue): JsonValue => {
|
||||
if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
|
||||
return entry;
|
||||
}
|
||||
const copy = { ...(entry as JsonObject) };
|
||||
delete copy.mask;
|
||||
delete copy.raw_mask;
|
||||
return copy;
|
||||
};
|
||||
|
||||
const cleaned: JsonObject = {};
|
||||
for (const [label, value] of Object.entries(filters as JsonObject)) {
|
||||
const expected = attributeSet.has(label) ? attributeDefaults : baseDefaults;
|
||||
const valNorm = withoutRuntimeFields(value as JsonValue);
|
||||
const expNorm = withoutRuntimeFields(expected as JsonValue);
|
||||
|
||||
// Non-object filter value: keep only if it differs from the default.
|
||||
if (
|
||||
!valNorm ||
|
||||
typeof valNorm !== "object" ||
|
||||
Array.isArray(valNorm) ||
|
||||
!expNorm ||
|
||||
typeof expNorm !== "object" ||
|
||||
Array.isArray(expNorm)
|
||||
) {
|
||||
if (!isEqual(valNorm, expNorm)) {
|
||||
cleaned[label] = value as JsonValue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
const diff: JsonObject = {};
|
||||
for (const [field, fieldValue] of Object.entries(valNorm as JsonObject)) {
|
||||
if (!isEqual(fieldValue, (expNorm as JsonObject)[field])) {
|
||||
diff[field] = fieldValue as JsonValue;
|
||||
}
|
||||
}
|
||||
if (Object.keys(diff).length > 0) {
|
||||
cleaned[label] = diff;
|
||||
}
|
||||
}
|
||||
return { ...sourceSection, filters: cleaned };
|
||||
}
|
||||
|
||||
/**
|
||||
* Strip runtime-only fields from each entry of a dict-of-objects (mask
|
||||
* `enabled_in_config`/`raw_coordinates`, zone `color`) that clone re-injects
|
||||
* from the API.
|
||||
*/
|
||||
function stripDictEntryFields(
|
||||
dict: unknown,
|
||||
fieldsToStrip: readonly string[],
|
||||
): unknown {
|
||||
if (!dict || typeof dict !== "object" || Array.isArray(dict)) return dict;
|
||||
const result: JsonObject = {};
|
||||
for (const [key, value] of Object.entries(dict as JsonObject)) {
|
||||
if (value && typeof value === "object" && !Array.isArray(value)) {
|
||||
const cleaned = { ...(value as JsonObject) };
|
||||
for (const field of fieldsToStrip) {
|
||||
delete cleaned[field];
|
||||
}
|
||||
result[key] = cleaned as JsonValue;
|
||||
} else {
|
||||
result[key] = value as JsonValue;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Per-object masks (`objects.filters.<label>.mask`) for the labels that define
|
||||
* one, stripped of runtime fields. The objects form hides `filters.*.mask`, so
|
||||
* clone re-injects these like the camera-wide `objects.mask`.
|
||||
*/
|
||||
function extractFilterMasks(objectsSection: unknown): JsonObject | undefined {
|
||||
if (!objectsSection || typeof objectsSection !== "object") return undefined;
|
||||
const filters = (objectsSection as JsonObject).filters;
|
||||
if (!filters || typeof filters !== "object" || Array.isArray(filters)) {
|
||||
return undefined;
|
||||
}
|
||||
const result: JsonObject = {};
|
||||
for (const [label, filter] of Object.entries(filters as JsonObject)) {
|
||||
if (!filter || typeof filter !== "object" || Array.isArray(filter))
|
||||
continue;
|
||||
const mask = (filter as JsonObject).mask;
|
||||
if (
|
||||
mask &&
|
||||
typeof mask === "object" &&
|
||||
!Array.isArray(mask) &&
|
||||
Object.keys(mask as JsonObject).length > 0
|
||||
) {
|
||||
result[label] = {
|
||||
mask: stripDictEntryFields(mask, [
|
||||
"enabled_in_config",
|
||||
"raw_coordinates",
|
||||
]) as JsonValue,
|
||||
};
|
||||
}
|
||||
}
|
||||
return Object.keys(result).length > 0 ? result : undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Drop `""` (Reset) markers — meaningless for a new camera and unsafe
|
||||
* (backend `update_yaml` raises KeyError trying to `del` a missing key).
|
||||
*/
|
||||
function stripResetMarkers(
|
||||
value: JsonValue | undefined,
|
||||
): JsonValue | undefined {
|
||||
if (value === undefined || value === "") return undefined;
|
||||
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
||||
return value;
|
||||
}
|
||||
const result: JsonObject = {};
|
||||
for (const [key, child] of Object.entries(value as JsonObject)) {
|
||||
const cleaned = stripResetMarkers(child);
|
||||
if (cleaned !== undefined) result[key] = cleaned;
|
||||
}
|
||||
return Object.keys(result).length > 0 ? result : undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Collapse per-section payloads into one camera-level `…/add` payload. The
|
||||
* backend's `add` handler validates atomically, avoiding the per-section
|
||||
* ordering problem (e.g. `review.required_zones` referencing unwritten zones).
|
||||
*/
|
||||
function bundleNewCameraPayload(
|
||||
payloads: SectionSavePayload[],
|
||||
target: string,
|
||||
): SectionSavePayload {
|
||||
const prefix = `cameras.${target}`;
|
||||
const camera: JsonObject = {};
|
||||
for (const p of payloads) {
|
||||
if (p.basePath === prefix) {
|
||||
merge(camera, p.sanitizedOverrides);
|
||||
} else if (p.basePath.startsWith(`${prefix}.`)) {
|
||||
merge(camera, {
|
||||
[p.basePath.slice(prefix.length + 1)]: p.sanitizedOverrides,
|
||||
});
|
||||
}
|
||||
}
|
||||
return {
|
||||
basePath: prefix,
|
||||
sanitizedOverrides: camera,
|
||||
updateTopic: `config/cameras/${target}/add`,
|
||||
needsRestart: true,
|
||||
pendingDataKey: `${target}::add`,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Drop empty `*_args` arrays from ffmpeg inputs — the establishing payload
|
||||
* uses `buildOverrides` directly, bypassing `sanitizeOverridesForSection`.
|
||||
*/
|
||||
function cleanupFfmpegInputArgs(
|
||||
ffmpeg: JsonValue | undefined,
|
||||
): JsonValue | undefined {
|
||||
if (!ffmpeg || typeof ffmpeg !== "object" || Array.isArray(ffmpeg)) {
|
||||
return ffmpeg;
|
||||
}
|
||||
const obj = ffmpeg as JsonObject;
|
||||
const inputs = obj.inputs;
|
||||
if (!Array.isArray(inputs)) return ffmpeg;
|
||||
const cleanedInputs = inputs.map((input) => {
|
||||
if (!input || typeof input !== "object" || Array.isArray(input))
|
||||
return input;
|
||||
const cleaned = { ...(input as JsonObject) };
|
||||
for (const argsKey of ["global_args", "hwaccel_args", "input_args"]) {
|
||||
const v = cleaned[argsKey];
|
||||
if (Array.isArray(v) && v.length === 0) delete cleaned[argsKey];
|
||||
}
|
||||
return cleaned as JsonValue;
|
||||
});
|
||||
return { ...obj, inputs: cleanedInputs as JsonValue };
|
||||
}
|
||||
|
||||
/** Subset of `/api/config/raw_paths` used to unmask source credentials. */
|
||||
export type RawCameraPaths = {
|
||||
cameras?: Record<
|
||||
string,
|
||||
{ ffmpeg?: { inputs?: Array<{ path?: string; roles?: string[] }> } }
|
||||
>;
|
||||
};
|
||||
|
||||
/**
|
||||
* Replace each ffmpeg input's `path` with the unmasked value from
|
||||
* `rawInputs` at the same index. Mirrors `_restore_masked_camera_paths`.
|
||||
*/
|
||||
function restoreFfmpegPaths(
|
||||
ffmpeg: unknown,
|
||||
rawInputs: Array<{ path?: string }> | undefined,
|
||||
): unknown {
|
||||
if (!ffmpeg || typeof ffmpeg !== "object" || Array.isArray(ffmpeg)) {
|
||||
return ffmpeg;
|
||||
}
|
||||
const obj = cloneDeep(ffmpeg) as JsonObject;
|
||||
const inputs = obj.inputs;
|
||||
if (!Array.isArray(inputs) || !rawInputs) return obj;
|
||||
inputs.forEach((input, i) => {
|
||||
if (!input || typeof input !== "object" || Array.isArray(input)) return;
|
||||
const rawPath = rawInputs[i]?.path;
|
||||
if (typeof rawPath !== "string") return;
|
||||
(input as JsonObject).path = rawPath;
|
||||
});
|
||||
return obj;
|
||||
}
|
||||
|
||||
/**
|
||||
* Replay the backend's per-camera detect-field formulas on the synthetic
|
||||
* baseline so the source's computed values cancel out of the diff (the global
|
||||
* config has no per-camera derivation).
|
||||
*/
|
||||
function applyDetectComputedDefaults(
|
||||
detect: JsonObject,
|
||||
fpsOverride?: number,
|
||||
): JsonObject {
|
||||
const result = { ...detect };
|
||||
const fps =
|
||||
typeof fpsOverride === "number"
|
||||
? fpsOverride
|
||||
: typeof result.fps === "number"
|
||||
? result.fps
|
||||
: 5;
|
||||
if (result.min_initialized == null) {
|
||||
result.min_initialized = Math.max(Math.floor(fps / 2), 2);
|
||||
}
|
||||
if (result.max_disappeared == null) {
|
||||
result.max_disappeared = fps * 5;
|
||||
}
|
||||
const threshold = fps * 10;
|
||||
const stationary = result.stationary;
|
||||
const stat: JsonObject =
|
||||
stationary && typeof stationary === "object" && !Array.isArray(stationary)
|
||||
? { ...(stationary as JsonObject) }
|
||||
: {};
|
||||
if (stat.threshold == null) stat.threshold = threshold;
|
||||
if (stat.interval == null) stat.interval = threshold;
|
||||
result.stationary = stat as JsonValue;
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Categories the dialog exposes. Most map 1:1 to a section config and flow
|
||||
* through `prepareSectionSavePayload`. Special cases:
|
||||
* - `motion_mask`/`object_masks`: carve-outs merged into the parent
|
||||
* section's payload, or emitted standalone if the parent is unselected.
|
||||
* - `ffmpeg_live`: new-camera target only.
|
||||
* - `type`/`profiles`: not schema-driven; built directly below.
|
||||
*/
|
||||
export type CloneCategoryKey =
|
||||
| "record"
|
||||
| "snapshots"
|
||||
| "review"
|
||||
| "motion"
|
||||
| "objects"
|
||||
| "audio"
|
||||
| "audio_transcription"
|
||||
| "notifications"
|
||||
| "birdseye"
|
||||
| "mqtt"
|
||||
| "timestamp_style"
|
||||
| "onvif"
|
||||
| "lpr"
|
||||
| "face_recognition"
|
||||
| "semantic_search"
|
||||
| "genai"
|
||||
| "type"
|
||||
| "profiles"
|
||||
| "detect"
|
||||
| "zones"
|
||||
| "motion_mask"
|
||||
| "object_masks"
|
||||
| "ffmpeg_live";
|
||||
|
||||
export type CloneCategoryGroup = "general" | "spatial" | "streams";
|
||||
|
||||
export type CloneCategory = {
|
||||
key: CloneCategoryKey;
|
||||
group: CloneCategoryGroup;
|
||||
/** True when this category is only valid for "new camera" targets. */
|
||||
newCameraOnly?: boolean;
|
||||
/** True when this category is forced selected for new-camera targets. */
|
||||
forcedForNewCamera?: boolean;
|
||||
/** Default selection state for "existing camera" targets when resolutions match. */
|
||||
defaultOnExisting: boolean;
|
||||
};
|
||||
|
||||
export const CLONE_CATEGORIES: readonly CloneCategory[] = [
|
||||
// General
|
||||
{ key: "record", group: "general", defaultOnExisting: true },
|
||||
{ key: "snapshots", group: "general", defaultOnExisting: true },
|
||||
{ key: "review", group: "general", defaultOnExisting: true },
|
||||
{ key: "motion", group: "general", defaultOnExisting: true },
|
||||
{ key: "objects", group: "general", defaultOnExisting: true },
|
||||
{ key: "audio", group: "general", defaultOnExisting: true },
|
||||
{ key: "audio_transcription", group: "general", defaultOnExisting: true },
|
||||
{ key: "notifications", group: "general", defaultOnExisting: true },
|
||||
{ key: "birdseye", group: "general", defaultOnExisting: true },
|
||||
{ key: "mqtt", group: "general", defaultOnExisting: true },
|
||||
{ key: "timestamp_style", group: "general", defaultOnExisting: true },
|
||||
{ key: "onvif", group: "general", defaultOnExisting: false },
|
||||
{ key: "lpr", group: "general", defaultOnExisting: true },
|
||||
{ key: "face_recognition", group: "general", defaultOnExisting: true },
|
||||
{ key: "semantic_search", group: "general", defaultOnExisting: true },
|
||||
{ key: "genai", group: "general", defaultOnExisting: true },
|
||||
{ key: "type", group: "general", defaultOnExisting: false },
|
||||
{ key: "profiles", group: "general", defaultOnExisting: true },
|
||||
// Spatial — defaults computed via resolutionsMatch()
|
||||
{ key: "detect", group: "spatial", defaultOnExisting: true },
|
||||
{ key: "zones", group: "spatial", defaultOnExisting: true },
|
||||
{ key: "motion_mask", group: "spatial", defaultOnExisting: true },
|
||||
{ key: "object_masks", group: "spatial", defaultOnExisting: true },
|
||||
// Streams — only for new-camera target, forced on
|
||||
{
|
||||
key: "ffmpeg_live",
|
||||
group: "streams",
|
||||
newCameraOnly: true,
|
||||
forcedForNewCamera: true,
|
||||
defaultOnExisting: false,
|
||||
},
|
||||
] as const;
|
||||
|
||||
/**
|
||||
* Exact-match detect dimensions. Aspect-ratio tolerance isn't safe because
|
||||
* zone/mask coords may be stored as explicit pixels, not just 0-1 relative.
|
||||
*/
|
||||
export function resolutionsMatch(
|
||||
srcDetect: CameraConfig["detect"] | undefined,
|
||||
dstDetect: CameraConfig["detect"] | undefined,
|
||||
): boolean {
|
||||
if (!srcDetect || !dstDetect) return false;
|
||||
if (
|
||||
typeof srcDetect.width !== "number" ||
|
||||
typeof srcDetect.height !== "number"
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
if (
|
||||
typeof dstDetect.width !== "number" ||
|
||||
typeof dstDetect.height !== "number"
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return (
|
||||
srcDetect.width === dstDetect.width && srcDetect.height === dstDetect.height
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Initial selection set. Existing-camera targets start empty — copying onto
|
||||
* a configured camera is destructive, so the user opts in explicitly.
|
||||
* New-camera targets pre-select `defaultOnExisting` categories plus
|
||||
* `forcedForNewCamera`.
|
||||
*/
|
||||
export function getCategoryDefaults(
|
||||
targetIsNew: boolean,
|
||||
): Set<CloneCategoryKey> {
|
||||
const selected = new Set<CloneCategoryKey>();
|
||||
if (!targetIsNew) return selected;
|
||||
for (const cat of CLONE_CATEGORIES) {
|
||||
if (cat.forcedForNewCamera || cat.defaultOnExisting) selected.add(cat.key);
|
||||
}
|
||||
return selected;
|
||||
}
|
||||
|
||||
type BuildClonedPayloadsArgs = {
|
||||
sourceCfg: CameraConfig;
|
||||
sourceName: string;
|
||||
/** Raw user input for new camera, or the existing-camera key. */
|
||||
targetInput: string;
|
||||
targetIsNew: boolean;
|
||||
selectedKeys: Set<CloneCategoryKey>;
|
||||
fullConfig: FrigateConfig;
|
||||
fullSchema: RJSFSchema;
|
||||
rawPaths?: RawCameraPaths;
|
||||
};
|
||||
|
||||
/**
|
||||
* Build the ordered payloads to PUT. Order: new-camera `…/add`, then
|
||||
* `type` (LPR vs normal affects attribute resolution for later payloads),
|
||||
* then per-section, then `profiles` (no hot-reload topic).
|
||||
*/
|
||||
export function buildClonedCameraPayloads({
|
||||
sourceCfg,
|
||||
sourceName,
|
||||
targetInput,
|
||||
targetIsNew,
|
||||
selectedKeys,
|
||||
fullConfig,
|
||||
fullSchema,
|
||||
rawPaths,
|
||||
}: BuildClonedPayloadsArgs): SectionSavePayload[] {
|
||||
const payloads: SectionSavePayload[] = [];
|
||||
|
||||
const { finalCameraName: target, friendlyName } = targetIsNew
|
||||
? processCameraName(targetInput)
|
||||
: { finalCameraName: targetInput, friendlyName: undefined };
|
||||
|
||||
// New-camera establishing payload (carries the `…/add` topic).
|
||||
if (targetIsNew) {
|
||||
const addOverrides: Record<string, unknown> = {
|
||||
enabled: true,
|
||||
};
|
||||
if (friendlyName) {
|
||||
addOverrides.friendly_name = friendlyName;
|
||||
}
|
||||
// Diff ffmpeg/live against the global config so fields matching
|
||||
// inherited defaults drop out. Required fields (ffmpeg.inputs) come
|
||||
// along because the source differs from global there.
|
||||
if (selectedKeys.has("ffmpeg_live") && sourceCfg.ffmpeg) {
|
||||
// /api/config masks `user:pass` as `*:*`; backend's restoration
|
||||
// only handles existing cameras, so we unmask here for new ones.
|
||||
const ffmpegWithRealPaths = restoreFfmpegPaths(
|
||||
sourceCfg.ffmpeg,
|
||||
rawPaths?.cameras?.[sourceName]?.ffmpeg?.inputs,
|
||||
);
|
||||
const diff = buildOverrides(
|
||||
ffmpegWithRealPaths,
|
||||
undefined,
|
||||
fullConfig.ffmpeg,
|
||||
);
|
||||
const cleaned = cleanupFfmpegInputArgs(diff as JsonValue | undefined);
|
||||
if (cleaned !== undefined) addOverrides.ffmpeg = cleaned;
|
||||
}
|
||||
if (selectedKeys.has("ffmpeg_live") && sourceCfg.live) {
|
||||
const diff = buildOverrides(
|
||||
sourceCfg.live,
|
||||
undefined,
|
||||
(fullConfig as unknown as JsonObject).live,
|
||||
);
|
||||
if (diff !== undefined) addOverrides.live = diff;
|
||||
}
|
||||
payloads.push({
|
||||
basePath: `cameras.${target}`,
|
||||
sanitizedOverrides: addOverrides as JsonObject,
|
||||
updateTopic: `config/cameras/${target}/add`,
|
||||
needsRestart: true,
|
||||
pendingDataKey: `${target}::__add__`,
|
||||
});
|
||||
}
|
||||
|
||||
// Camera type — top-level scalar, no schema-driven section.
|
||||
if (selectedKeys.has("type")) {
|
||||
const srcType = (sourceCfg as { type?: string | null }).type;
|
||||
if (srcType !== undefined && srcType !== null) {
|
||||
payloads.push({
|
||||
basePath: `cameras.${target}`,
|
||||
sanitizedOverrides: { type: srcType },
|
||||
updateTopic: undefined,
|
||||
needsRestart: true,
|
||||
pendingDataKey: `${target}::type`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Order matters for the existing-camera multi-PUT path (each PUT re-validates
|
||||
// the whole config): `detect` then `zones` must precede sections that
|
||||
// reference zones via `required_zones` (review, objects, snapshots, mqtt).
|
||||
const SECTION_KEYS: Array<{ key: CloneCategoryKey; section: string }> = [
|
||||
{ key: "detect", section: "detect" },
|
||||
{ key: "zones", section: "zones" },
|
||||
{ key: "motion", section: "motion" },
|
||||
{ key: "objects", section: "objects" },
|
||||
{ key: "record", section: "record" },
|
||||
{ key: "snapshots", section: "snapshots" },
|
||||
{ key: "review", section: "review" },
|
||||
{ key: "audio", section: "audio" },
|
||||
{ key: "audio_transcription", section: "audio_transcription" },
|
||||
{ key: "notifications", section: "notifications" },
|
||||
{ key: "birdseye", section: "birdseye" },
|
||||
{ key: "mqtt", section: "mqtt" },
|
||||
{ key: "timestamp_style", section: "timestamp_style" },
|
||||
{ key: "onvif", section: "onvif" },
|
||||
{ key: "lpr", section: "lpr" },
|
||||
{ key: "face_recognition", section: "face_recognition" },
|
||||
{ key: "semantic_search", section: "semantic_search" },
|
||||
{ key: "genai", section: "genai" },
|
||||
];
|
||||
|
||||
// Synthetic target reused as the diff baseline. New-camera: seed sections
|
||||
// whose camera schema accepts all global fields (correct inheritance
|
||||
// baseline), but leave divergent per-camera sections (mqtt, birdseye, lpr,
|
||||
// face_recognition, semantic_search, audio_transcription, genai) unset —
|
||||
// seeding from global would surface its extra fields as Reset markers.
|
||||
const GLOBAL_INHERITED_SECTIONS = [
|
||||
"detect",
|
||||
"objects",
|
||||
"motion",
|
||||
"record",
|
||||
"snapshots",
|
||||
"review",
|
||||
"audio",
|
||||
"notifications",
|
||||
"ffmpeg",
|
||||
"live",
|
||||
"timestamp_style",
|
||||
];
|
||||
const syntheticTargetCamera = targetIsNew
|
||||
? ({
|
||||
enabled: true,
|
||||
...Object.fromEntries(
|
||||
GLOBAL_INHERITED_SECTIONS.map((s) => [
|
||||
s,
|
||||
cloneDeep((fullConfig as unknown as JsonObject)[s]),
|
||||
]).filter(([, value]) => value !== undefined && value !== null),
|
||||
),
|
||||
} as unknown as FrigateConfig["cameras"][string])
|
||||
: ((fullConfig.cameras?.[target]
|
||||
? cloneDeep(fullConfig.cameras[target])
|
||||
: { enabled: true }) as unknown as FrigateConfig["cameras"][string]);
|
||||
|
||||
// Strip auto-default filters from the baseline (matching the per-section
|
||||
// source strip) so default-only entries cancel. Includes `base_config` (the
|
||||
// pre-profile parse getBaseCameraSectionValue reads) — otherwise its
|
||||
// auto-populated entries become `""` resets and the backend KeyErrors
|
||||
// deleting a key not in the YAML. Cloned above so this won't mutate the cache.
|
||||
const syntheticCameraObj = syntheticTargetCamera as unknown as JsonObject;
|
||||
const baseConfigObj = syntheticCameraObj.base_config as
|
||||
| Record<string, JsonObject>
|
||||
| undefined;
|
||||
for (const section of Object.keys(FILTER_SECTION_DEFS)) {
|
||||
const syntheticSection = syntheticCameraObj[section];
|
||||
if (syntheticSection && typeof syntheticSection === "object") {
|
||||
syntheticCameraObj[section] = stripAutoDefaultFilters(
|
||||
section,
|
||||
syntheticSection as JsonObject,
|
||||
fullSchema,
|
||||
fullConfig,
|
||||
syntheticTargetCamera as CameraConfig,
|
||||
);
|
||||
}
|
||||
const baseSection = baseConfigObj?.[section];
|
||||
if (baseConfigObj && baseSection && typeof baseSection === "object") {
|
||||
baseConfigObj[section] = stripAutoDefaultFilters(
|
||||
section,
|
||||
baseSection,
|
||||
fullSchema,
|
||||
fullConfig,
|
||||
syntheticTargetCamera as CameraConfig,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// New-camera: synthetic's detect is from global (no per-camera derive),
|
||||
// so apply the formulas using source's fps to keep both sides aligned.
|
||||
// Existing-camera target already has the values from its own parse.
|
||||
if (targetIsNew && sourceCfg.detect) {
|
||||
const syntheticDetect = syntheticCameraObj.detect;
|
||||
if (syntheticDetect && typeof syntheticDetect === "object") {
|
||||
syntheticCameraObj.detect = applyDetectComputedDefaults(
|
||||
syntheticDetect as JsonObject,
|
||||
typeof sourceCfg.detect.fps === "number"
|
||||
? sourceCfg.detect.fps
|
||||
: undefined,
|
||||
) as JsonValue;
|
||||
}
|
||||
}
|
||||
|
||||
const syntheticConfig: FrigateConfig = {
|
||||
...fullConfig,
|
||||
cameras: {
|
||||
...fullConfig.cameras,
|
||||
[target]: syntheticTargetCamera,
|
||||
},
|
||||
};
|
||||
|
||||
for (const { key, section } of SECTION_KEYS) {
|
||||
if (!selectedKeys.has(key)) continue;
|
||||
const sourceSectionValue = (
|
||||
sourceCfg as unknown as Record<string, unknown>
|
||||
)[section];
|
||||
if (sourceSectionValue == null) continue;
|
||||
|
||||
// Sanitize the source like BaseSection's form does: strip runtime/derived
|
||||
// and hidden-path fields (e.g. `hideAttributeFilters` drops untracked
|
||||
// attributes based on the source's track list).
|
||||
const sectionConfig = getSectionConfig(section, "camera");
|
||||
const resolvedHiddenFields = resolveHiddenFieldEntries(
|
||||
sectionConfig.hiddenFields,
|
||||
{
|
||||
fullConfig,
|
||||
fullCameraConfig: sourceCfg,
|
||||
level: "camera",
|
||||
formData: sourceSectionValue as ConfigSectionData,
|
||||
},
|
||||
);
|
||||
let pendingSectionValue: unknown = sanitizeSectionData(
|
||||
cloneDeep(sourceSectionValue) as ConfigSectionData,
|
||||
resolvedHiddenFields,
|
||||
);
|
||||
|
||||
if (FILTER_SECTION_DEFS[section]) {
|
||||
pendingSectionValue = stripAutoDefaultFilters(
|
||||
section,
|
||||
pendingSectionValue as JsonObject,
|
||||
fullSchema,
|
||||
fullConfig,
|
||||
syntheticTargetCamera as CameraConfig,
|
||||
);
|
||||
}
|
||||
|
||||
// Re-inject masks the parent section's hiddenFields just stripped,
|
||||
// when the mask category is also selected. `raw_mask` is never in
|
||||
// the API response; `enabled_in_config` is runtime-only.
|
||||
if (key === "motion" && selectedKeys.has("motion_mask")) {
|
||||
const srcMask = (sourceSectionValue as { mask?: unknown }).mask;
|
||||
if (srcMask !== undefined) {
|
||||
pendingSectionValue = {
|
||||
...(pendingSectionValue as object),
|
||||
mask: stripDictEntryFields(srcMask, [
|
||||
"enabled_in_config",
|
||||
"raw_coordinates",
|
||||
]),
|
||||
};
|
||||
}
|
||||
}
|
||||
if (key === "objects" && selectedKeys.has("object_masks")) {
|
||||
const next = { ...(pendingSectionValue as JsonObject) };
|
||||
// Camera-wide object mask (applies to all objects).
|
||||
const srcMask = (sourceSectionValue as { mask?: unknown }).mask;
|
||||
if (srcMask !== undefined) {
|
||||
next.mask = stripDictEntryFields(srcMask, [
|
||||
"enabled_in_config",
|
||||
"raw_coordinates",
|
||||
]) as JsonValue;
|
||||
}
|
||||
// Per-object masks (objects.filters.<label>.mask), stripped by the
|
||||
// section's hiddenFields above. Merge them onto the reduced filters
|
||||
// (creating the entry when the filter was otherwise all-default).
|
||||
const filterMasks = extractFilterMasks(sourceSectionValue);
|
||||
if (filterMasks) {
|
||||
const mergedFilters: JsonObject = {
|
||||
...((next.filters as JsonObject) ?? {}),
|
||||
};
|
||||
for (const [label, overlay] of Object.entries(filterMasks)) {
|
||||
mergedFilters[label] = {
|
||||
...((mergedFilters[label] as JsonObject) ?? {}),
|
||||
...(overlay as JsonObject),
|
||||
};
|
||||
}
|
||||
next.filters = mergedFilters;
|
||||
}
|
||||
pendingSectionValue = next;
|
||||
}
|
||||
|
||||
// `color` is a Pydantic PrivateAttr (runtime-only).
|
||||
if (key === "zones") {
|
||||
pendingSectionValue = stripDictEntryFields(pendingSectionValue, [
|
||||
"color",
|
||||
]);
|
||||
}
|
||||
|
||||
const payload = prepareSectionSavePayload({
|
||||
pendingDataKey: `${target}::${section}`,
|
||||
pendingData: pendingSectionValue,
|
||||
config: syntheticConfig,
|
||||
fullSchema,
|
||||
});
|
||||
if (payload) {
|
||||
payloads.push(payload);
|
||||
}
|
||||
}
|
||||
|
||||
// Standalone mask payloads — only when the parent section isn't also
|
||||
// selected (otherwise the masks were merged into its payload above).
|
||||
if (selectedKeys.has("motion_mask") && !selectedKeys.has("motion")) {
|
||||
const srcMask = (sourceCfg.motion as { mask?: unknown } | undefined)?.mask;
|
||||
if (srcMask !== undefined) {
|
||||
payloads.push({
|
||||
basePath: `cameras.${target}.motion`,
|
||||
sanitizedOverrides: {
|
||||
mask: stripDictEntryFields(srcMask, [
|
||||
"enabled_in_config",
|
||||
"raw_coordinates",
|
||||
]) as JsonValue,
|
||||
},
|
||||
updateTopic: `config/cameras/${target}/${cameraUpdateTopicMap.motion}`,
|
||||
needsRestart: false,
|
||||
pendingDataKey: `${target}::motion.masks`,
|
||||
});
|
||||
}
|
||||
}
|
||||
if (selectedKeys.has("object_masks") && !selectedKeys.has("objects")) {
|
||||
const overrides: JsonObject = {};
|
||||
const srcMask = (sourceCfg.objects as { mask?: unknown } | undefined)?.mask;
|
||||
if (srcMask !== undefined) {
|
||||
overrides.mask = stripDictEntryFields(srcMask, [
|
||||
"enabled_in_config",
|
||||
"raw_coordinates",
|
||||
]) as JsonValue;
|
||||
}
|
||||
const filterMasks = extractFilterMasks(sourceCfg.objects);
|
||||
if (filterMasks) {
|
||||
overrides.filters = filterMasks;
|
||||
}
|
||||
if (Object.keys(overrides).length > 0) {
|
||||
payloads.push({
|
||||
basePath: `cameras.${target}.objects`,
|
||||
sanitizedOverrides: overrides,
|
||||
updateTopic: `config/cameras/${target}/${cameraUpdateTopicMap.objects}`,
|
||||
needsRestart: false,
|
||||
pendingDataKey: `${target}::objects.masks`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Profiles — wholesale dict replacement; no hot-reload topic.
|
||||
if (selectedKeys.has("profiles")) {
|
||||
const srcProfiles = (sourceCfg as { profiles?: unknown }).profiles;
|
||||
if (srcProfiles && typeof srcProfiles === "object") {
|
||||
payloads.push({
|
||||
basePath: `cameras.${target}.profiles`,
|
||||
sanitizedOverrides: cloneDeep(srcProfiles) as JsonObject,
|
||||
updateTopic: undefined,
|
||||
needsRestart: true,
|
||||
pendingDataKey: `${target}::profiles`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// New camera: scrub Reset markers (see stripResetMarkers), then bundle
|
||||
// into one atomic `…/add` PUT so the backend validates the full camera
|
||||
// at once (avoids per-section ordering issues).
|
||||
if (targetIsNew) {
|
||||
const scrubbed = payloads
|
||||
.map((p) => {
|
||||
const cleaned = stripResetMarkers(p.sanitizedOverrides as JsonValue);
|
||||
return cleaned === undefined
|
||||
? null
|
||||
: { ...p, sanitizedOverrides: cleaned as JsonObject };
|
||||
})
|
||||
.filter((p): p is SectionSavePayload => p !== null);
|
||||
return [bundleNewCameraPayload(scrubbed, target)];
|
||||
}
|
||||
|
||||
return payloads;
|
||||
}
|
||||
|
||||
/**
|
||||
* Flatten payloads to `SaveAllPreviewItem`s with camera-relative
|
||||
* `fieldPath`s (matches BaseSection's per-section preview).
|
||||
*/
|
||||
export function buildClonePreviewItems(
|
||||
payloads: SectionSavePayload[],
|
||||
targetCamera: string,
|
||||
): SaveAllPreviewItem[] {
|
||||
const cameraBase = `cameras.${targetCamera}`;
|
||||
return payloads.flatMap((p) => {
|
||||
const flattened = flattenOverrides(p.sanitizedOverrides as JsonValue);
|
||||
const sectionRelativeBase =
|
||||
p.basePath === cameraBase
|
||||
? ""
|
||||
: p.basePath.startsWith(`${cameraBase}.`)
|
||||
? p.basePath.slice(cameraBase.length + 1)
|
||||
: p.basePath;
|
||||
return flattened.map(({ path, value }) => ({
|
||||
scope: "camera" as const,
|
||||
cameraName: targetCamera,
|
||||
fieldPath: path
|
||||
? sectionRelativeBase
|
||||
? `${sectionRelativeBase}.${path}`
|
||||
: path
|
||||
: sectionRelativeBase,
|
||||
value,
|
||||
}));
|
||||
});
|
||||
}
|
||||
@ -81,7 +81,6 @@ export const cameraUpdateTopicMap: Record<string, string> = {
|
||||
mqtt: "mqtt",
|
||||
onvif: "onvif",
|
||||
ui: "ui",
|
||||
zones: "zones",
|
||||
};
|
||||
|
||||
// Sections where global config serves as the default for per-camera config.
|
||||
|
||||
@ -1,18 +1,12 @@
|
||||
import Heading from "@/components/ui/heading";
|
||||
import {
|
||||
useCallback,
|
||||
useContext,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
} from "react";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import {
|
||||
CONTROL_COLUMN_CLASS_NAME,
|
||||
SettingsGroupCard,
|
||||
SPLIT_ROW_CLASS_NAME,
|
||||
} from "@/components/card/SettingsGroupCard";
|
||||
import { toast } from "sonner";
|
||||
import { Toaster } from "@/components/ui/sonner";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import useSWR from "swr";
|
||||
import { FrigateConfig } from "@/types/frigateConfig";
|
||||
@ -21,7 +15,6 @@ import CameraWizardDialog from "@/components/settings/CameraWizardDialog";
|
||||
import DeleteCameraDialog from "@/components/overlay/dialog/DeleteCameraDialog";
|
||||
import {
|
||||
LuCheck,
|
||||
LuCopy,
|
||||
LuExternalLink,
|
||||
LuGripVertical,
|
||||
LuPencil,
|
||||
@ -29,7 +22,6 @@ import {
|
||||
LuRefreshCcw,
|
||||
LuTrash2,
|
||||
} from "react-icons/lu";
|
||||
import CloneCameraDialog from "@/components/settings/CloneCameraDialog";
|
||||
import { Reorder, useDragControls } from "framer-motion";
|
||||
import { Link } from "react-router-dom";
|
||||
import { useDocDomain } from "@/hooks/use-doc-domain";
|
||||
@ -58,7 +50,6 @@ import {
|
||||
import type { ProfileState } from "@/types/profile";
|
||||
import { getProfileColor } from "@/utils/profileColors";
|
||||
import { isReplayCamera } from "@/utils/cameraUtil";
|
||||
import { StatusBarMessagesContext } from "@/context/statusbar-provider";
|
||||
import { cn } from "@/lib/utils";
|
||||
import {
|
||||
Select,
|
||||
@ -97,7 +88,6 @@ export default function CameraManagementView({
|
||||
|
||||
const [showWizard, setShowWizard] = useState(false);
|
||||
const [showDeleteDialog, setShowDeleteDialog] = useState(false);
|
||||
const [showCloneDialog, setShowCloneDialog] = useState(false);
|
||||
|
||||
// State for restart dialog when enabling a disabled camera
|
||||
const [restartDialogOpen, setRestartDialogOpen] = useState(false);
|
||||
@ -227,6 +217,12 @@ export default function CameraManagementView({
|
||||
|
||||
return (
|
||||
<>
|
||||
<Toaster
|
||||
richColors
|
||||
className="z-[1000]"
|
||||
position="top-center"
|
||||
closeButton
|
||||
/>
|
||||
<div className="flex size-full space-y-6">
|
||||
<div className="scrollbar-container flex-1 overflow-y-auto pb-2">
|
||||
<Heading as="h4" className="mb-2">
|
||||
@ -258,27 +254,6 @@ export default function CameraManagementView({
|
||||
)}
|
||||
</div>
|
||||
|
||||
{enabledCameras.length + disabledCameras.length > 0 && (
|
||||
<div className="mb-5 space-y-3">
|
||||
<div className="space-y-0.5">
|
||||
<div className="text-md font-medium">
|
||||
{t("cameraManagement.clone.sectionTitle")}
|
||||
</div>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{t("cameraManagement.clone.sectionDescription")}
|
||||
</p>
|
||||
</div>
|
||||
<Button
|
||||
variant="select"
|
||||
onClick={() => setShowCloneDialog(true)}
|
||||
className="flex max-w-48 items-center gap-2"
|
||||
>
|
||||
<LuCopy className="h-4 w-4" />
|
||||
{t("cameraManagement.clone.button")}
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{(enabledCameras.length > 0 || disabledCameras.length > 0) && (
|
||||
<SettingsGroupCard
|
||||
title={
|
||||
@ -389,10 +364,6 @@ export default function CameraManagementView({
|
||||
onClose={() => setRestartDialogOpen(false)}
|
||||
onRestart={() => sendRestart("restart")}
|
||||
/>
|
||||
<CloneCameraDialog
|
||||
open={showCloneDialog}
|
||||
onClose={() => setShowCloneDialog(false)}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -530,7 +501,6 @@ function CameraStatusSelect({
|
||||
]);
|
||||
const { payload: enabledState, send: sendEnabled } =
|
||||
useEnabledState(cameraName);
|
||||
const statusBar = useContext(StatusBarMessagesContext);
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
|
||||
const currentStatus: CameraStatus = isDisabledInConfig
|
||||
@ -616,12 +586,6 @@ function CameraStatusSelect({
|
||||
},
|
||||
});
|
||||
await onConfigChanged();
|
||||
statusBar?.addMessage(
|
||||
"config_restart_required",
|
||||
t("configForm.restartRequiredFooter", { ns: "views/settings" }),
|
||||
undefined,
|
||||
"config_restart_required",
|
||||
);
|
||||
toast.success(
|
||||
t("cameraManagement.streams.disableSuccess", {
|
||||
ns: "views/settings",
|
||||
@ -653,7 +617,6 @@ function CameraStatusSelect({
|
||||
onConfigChanged,
|
||||
sendEnabled,
|
||||
setRestartDialogOpen,
|
||||
statusBar,
|
||||
t,
|
||||
],
|
||||
);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user