mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-06-21 11:51:53 +03:00
add new ui options for collapsibles
This commit is contained in:
parent
45bd005ca1
commit
727df06929
@ -44,7 +44,14 @@ const record: SectionConfigOverrides = {
|
|||||||
hiddenFields: ["enabled_in_config", "sync_recordings"],
|
hiddenFields: ["enabled_in_config", "sync_recordings"],
|
||||||
advancedFields: ["expire_interval", "preview", "export"],
|
advancedFields: ["expire_interval", "preview", "export"],
|
||||||
uiSchema: {
|
uiSchema: {
|
||||||
|
continuous: {
|
||||||
|
"ui:options": { defaultOpen: true, disableCollapsible: true },
|
||||||
|
},
|
||||||
|
motion: {
|
||||||
|
"ui:options": { defaultOpen: true, disableCollapsible: true },
|
||||||
|
},
|
||||||
export: {
|
export: {
|
||||||
|
"ui:options": { defaultOpen: true, disableCollapsible: true },
|
||||||
hwaccel_args: {
|
hwaccel_args: {
|
||||||
"ui:widget": "FfmpegArgsWidget",
|
"ui:widget": "FfmpegArgsWidget",
|
||||||
"ui:options": {
|
"ui:options": {
|
||||||
@ -59,9 +66,12 @@ const record: SectionConfigOverrides = {
|
|||||||
"detections.retain.mode": {
|
"detections.retain.mode": {
|
||||||
"ui:options": { enumI18nPrefix: "retainMode" },
|
"ui:options": { enumI18nPrefix: "retainMode" },
|
||||||
},
|
},
|
||||||
"preview.quality": {
|
preview: {
|
||||||
"ui:options": {
|
"ui:options": { defaultOpen: true, disableCollapsible: true },
|
||||||
enumI18nPrefix: "previewQuality",
|
quality: {
|
||||||
|
"ui:options": {
|
||||||
|
enumI18nPrefix: "previewQuality",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@ -156,7 +156,8 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const hasModifiedDescendants = checkSubtreeModified(fieldPath);
|
const hasModifiedDescendants = checkSubtreeModified(fieldPath);
|
||||||
const [isOpen, setIsOpen] = useState(hasModifiedDescendants);
|
const defaultOpen = uiSchema?.["ui:options"]?.defaultOpen === true;
|
||||||
|
const [isOpen, setIsOpen] = useState(hasModifiedDescendants || defaultOpen);
|
||||||
const resetKey = `${formContext?.level ?? "global"}::${
|
const resetKey = `${formContext?.level ?? "global"}::${
|
||||||
formContext?.cameraName ?? "global"
|
formContext?.cameraName ?? "global"
|
||||||
}`;
|
}`;
|
||||||
@ -192,6 +193,8 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
|
|||||||
(uiSchema?.["ui:groups"] as Record<string, string[]> | undefined) || {};
|
(uiSchema?.["ui:groups"] as Record<string, string[]> | undefined) || {};
|
||||||
const disableNestedCard =
|
const disableNestedCard =
|
||||||
uiSchema?.["ui:options"]?.disableNestedCard === true;
|
uiSchema?.["ui:options"]?.disableNestedCard === true;
|
||||||
|
const disableCollapsible =
|
||||||
|
uiSchema?.["ui:options"]?.disableCollapsible === true;
|
||||||
|
|
||||||
const isHiddenProp = (prop: (typeof properties)[number]) =>
|
const isHiddenProp = (prop: (typeof properties)[number]) =>
|
||||||
(prop.content.props as RjsfElementProps).uiSchema?.["ui:widget"] ===
|
(prop.content.props as RjsfElementProps).uiSchema?.["ui:widget"] ===
|
||||||
@ -228,10 +231,10 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (lastResetKeyRef.current !== resetKey) {
|
if (lastResetKeyRef.current !== resetKey) {
|
||||||
lastResetKeyRef.current = resetKey;
|
lastResetKeyRef.current = resetKey;
|
||||||
setIsOpen(hasModifiedDescendants);
|
setIsOpen(hasModifiedDescendants || defaultOpen);
|
||||||
setShowAdvanced(hasModifiedAdvanced);
|
setShowAdvanced(hasModifiedAdvanced);
|
||||||
}
|
}
|
||||||
}, [resetKey, hasModifiedDescendants, hasModifiedAdvanced]);
|
}, [resetKey, hasModifiedDescendants, hasModifiedAdvanced, defaultOpen]);
|
||||||
const { children } = props as ObjectFieldTemplateProps & {
|
const { children } = props as ObjectFieldTemplateProps & {
|
||||||
children?: ReactNode;
|
children?: ReactNode;
|
||||||
};
|
};
|
||||||
@ -458,6 +461,75 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Label/description/docs header shared by the collapsible and static layouts.
|
||||||
|
const cardHeaderContent = (
|
||||||
|
<div className="min-w-0 pr-3">
|
||||||
|
<CardTitle
|
||||||
|
className={cn(
|
||||||
|
"flex items-center text-sm",
|
||||||
|
hasModifiedDescendants && "text-unsaved",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{inferredLabel}
|
||||||
|
{objectRequiresRestart && <RestartRequiredIndicator className="ml-2" />}
|
||||||
|
</CardTitle>
|
||||||
|
{inferredDescription && (
|
||||||
|
<p className="mt-1 text-xs text-muted-foreground">
|
||||||
|
{inferredDescription}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{fieldDocsUrl && (
|
||||||
|
<div className="mt-1 flex items-center text-xs text-primary-variant">
|
||||||
|
<Link
|
||||||
|
to={fieldDocsUrl}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="inline"
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
|
{t("readTheDocumentation", { ns: "common" })}
|
||||||
|
<LuExternalLink className="ml-2 inline-flex size-3" />
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
// Body shared by the collapsible and static layouts.
|
||||||
|
const cardBody = hasCustomChildren ? (
|
||||||
|
children
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
{renderGroupedFields(regularProps)}
|
||||||
|
<AddPropertyButton
|
||||||
|
onAddProperty={onAddProperty}
|
||||||
|
schema={schema}
|
||||||
|
uiSchema={uiSchema}
|
||||||
|
formData={formData}
|
||||||
|
disabled={disabled}
|
||||||
|
readonly={readonly}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<AdvancedCollapsible
|
||||||
|
count={advancedProps.length}
|
||||||
|
open={showAdvanced}
|
||||||
|
onOpenChange={setShowAdvanced}
|
||||||
|
>
|
||||||
|
{renderGroupedFields(advancedProps)}
|
||||||
|
</AdvancedCollapsible>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
|
||||||
|
// Static (non-collapsible) card: keep the labeled header, always show content.
|
||||||
|
if (disableCollapsible) {
|
||||||
|
return (
|
||||||
|
<Card className="w-full">
|
||||||
|
<CardHeader className="p-4">{cardHeaderContent}</CardHeader>
|
||||||
|
<CardContent className="space-y-6 p-4 pt-0">{cardBody}</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Nested objects render as collapsible cards
|
// Nested objects render as collapsible cards
|
||||||
return (
|
return (
|
||||||
<Card className="w-full">
|
<Card className="w-full">
|
||||||
@ -465,38 +537,7 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
|
|||||||
<CollapsibleTrigger asChild>
|
<CollapsibleTrigger asChild>
|
||||||
<CardHeader className="cursor-pointer p-4 transition-colors hover:bg-muted/50">
|
<CardHeader className="cursor-pointer p-4 transition-colors hover:bg-muted/50">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<div className="min-w-0 pr-3">
|
{cardHeaderContent}
|
||||||
<CardTitle
|
|
||||||
className={cn(
|
|
||||||
"flex items-center text-sm",
|
|
||||||
hasModifiedDescendants && "text-unsaved",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{inferredLabel}
|
|
||||||
{objectRequiresRestart && (
|
|
||||||
<RestartRequiredIndicator className="ml-2" />
|
|
||||||
)}
|
|
||||||
</CardTitle>
|
|
||||||
{inferredDescription && (
|
|
||||||
<p className="mt-1 text-xs text-muted-foreground">
|
|
||||||
{inferredDescription}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
{fieldDocsUrl && (
|
|
||||||
<div className="mt-1 flex items-center text-xs text-primary-variant">
|
|
||||||
<Link
|
|
||||||
to={fieldDocsUrl}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="inline"
|
|
||||||
onClick={(e) => e.stopPropagation()}
|
|
||||||
>
|
|
||||||
{t("readTheDocumentation", { ns: "common" })}
|
|
||||||
<LuExternalLink className="ml-2 inline-flex size-3" />
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
{isOpen ? (
|
{isOpen ? (
|
||||||
<LuChevronDown className="h-4 w-4 shrink-0" />
|
<LuChevronDown className="h-4 w-4 shrink-0" />
|
||||||
) : (
|
) : (
|
||||||
@ -506,31 +547,7 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
|
|||||||
</CardHeader>
|
</CardHeader>
|
||||||
</CollapsibleTrigger>
|
</CollapsibleTrigger>
|
||||||
<CollapsibleContent>
|
<CollapsibleContent>
|
||||||
<CardContent className="space-y-6 p-4 pt-0">
|
<CardContent className="space-y-6 p-4 pt-0">{cardBody}</CardContent>
|
||||||
{hasCustomChildren ? (
|
|
||||||
children
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
{renderGroupedFields(regularProps)}
|
|
||||||
<AddPropertyButton
|
|
||||||
onAddProperty={onAddProperty}
|
|
||||||
schema={schema}
|
|
||||||
uiSchema={uiSchema}
|
|
||||||
formData={formData}
|
|
||||||
disabled={disabled}
|
|
||||||
readonly={readonly}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<AdvancedCollapsible
|
|
||||||
count={advancedProps.length}
|
|
||||||
open={showAdvanced}
|
|
||||||
onOpenChange={setShowAdvanced}
|
|
||||||
>
|
|
||||||
{renderGroupedFields(advancedProps)}
|
|
||||||
</AdvancedCollapsible>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</CardContent>
|
|
||||||
</CollapsibleContent>
|
</CollapsibleContent>
|
||||||
</Collapsible>
|
</Collapsible>
|
||||||
</Card>
|
</Card>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user