administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-07-09 21:41:15 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

render orphaned filter entries as collapsibles instead of the Key/Value editor

Browse Source
This commit is contained in:
Josh Hawkins 2026-05-19 17:51:28 -05:00
parent 03f4f76b72
commit 14318357c6
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
web/src/components/config-form/sections/section-special-cases.ts
View File

@ -171,7 +171,20 @@ function modifyObjectsSchema(
ctx.fullConfig.objects?.track ?? ctx.fullConfig.objects?.track ??
[]; [];
if (track.length === 0) return schema; // Also promote any label that has a saved filter entry but isn't in
// `track` (e.g. the user toggled an object off but left a customized
// filter in YAML). Without this, RJSF falls back to the additional-
// properties Key/Value editor for those orphans.
const filtersSaved =
(ctx.level !== "global"
? ctx.fullCameraConfig?.objects?.filters
: undefined) ??
ctx.fullConfig.objects?.filters ??
{};
if (track.length === 0 && Object.keys(filtersSaved).length === 0) {
return schema;
}
const schemaProperties = isJsonObject( const schemaProperties = isJsonObject(
(schema as { properties?: unknown }).properties, (schema as { properties?: unknown }).properties,
@ -199,16 +212,27 @@ function modifyObjectsSchema(
? (filtersSchema as { properties: Record<string, RJSFSchema> }).properties ? (filtersSchema as { properties: Record<string, RJSFSchema> }).properties
: {}; : {};
// Promote every tracked label to an explicit property entry so RJSF // Promote every tracked label (and any orphaned filter entry) to an
// renders it as a normal collapsible (no additionalProperties key/value // explicit property entry so RJSF renders it as a normal collapsible
// editor UI). Attribute labels get a restricted shape with only // (no additionalProperties key/value editor UI). Attribute labels get a
// `min_score`; non-attribute labels get the full FilterConfig. Sorted // restricted shape with only `min_score`/`min_area`/`max_area`;
// alphabetically so the filter collapsibles match the order of the // non-attribute labels get the full FilterConfig. Sorted alphabetically
// sibling `track` switches. // so the filter collapsibles match the order of the sibling `track`
const sortedTrackedLabels = track // switches.
.filter((label): label is string => typeof label === "string") const labelsToPromote = new Set<string>();
.slice() for (const label of track) {
.sort((a, b) => a.localeCompare(b)); if (typeof label === "string") labelsToPromote.add(label);
}
for (const key of Object.keys(filtersSaved)) {
// Skip attribute labels that aren't tracked — those are hidden
// entirely via hideAttributeFilters; promoting them would surface a
// collapsible we then have to hide separately.
if (attributeSet.has(key) && !labelsToPromote.has(key)) continue;
labelsToPromote.add(key);
}
const sortedTrackedLabels = [...labelsToPromote].sort((a, b) =>
a.localeCompare(b),
);
const updatedFilterProperties: Record<string, RJSFSchema> = { const updatedFilterProperties: Record<string, RJSFSchema> = {
...existingProperties, ...existingProperties,
}; };