mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-26 02:40:44 -06:00
small spacing tweaks and fix config editor schema load (#13841)
This commit is contained in:
parent
6c43e5dba9
commit
515f06ba6c
@ -121,7 +121,7 @@ export function AnnotationSettingsPane({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-3 rounded-lg border border-secondary-foreground bg-background_alt p-2">
|
<div className="mb-3 space-y-3 rounded-lg border border-secondary-foreground bg-background_alt p-2">
|
||||||
<Heading as="h4" className="my-2">
|
<Heading as="h4" className="my-2">
|
||||||
Annotation Settings
|
Annotation Settings
|
||||||
</Heading>
|
</Heading>
|
||||||
@ -152,8 +152,8 @@ export function AnnotationSettingsPane({
|
|||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<FormItem>
|
<FormItem>
|
||||||
<FormLabel>Annotation Offset</FormLabel>
|
<FormLabel>Annotation Offset</FormLabel>
|
||||||
<div className="flex flex-col gap-8 md:flex-row-reverse">
|
<div className="flex flex-col gap-3 md:flex-row-reverse md:gap-8">
|
||||||
<div className="my-5 flex flex-row items-center gap-3 rounded-lg bg-destructive/50 p-3 text-sm text-primary-variant md:my-0">
|
<div className="flex flex-row items-center gap-3 rounded-lg bg-destructive/50 p-3 text-sm text-primary-variant md:my-0 md:my-5">
|
||||||
<PiWarningCircle className="size-24" />
|
<PiWarningCircle className="size-24" />
|
||||||
<div>
|
<div>
|
||||||
This data comes from your camera's detect feed but is
|
This data comes from your camera's detect feed but is
|
||||||
@ -161,7 +161,7 @@ export function AnnotationSettingsPane({
|
|||||||
unlikely that the two streams are perfectly in sync. As a
|
unlikely that the two streams are perfectly in sync. As a
|
||||||
result, the bounding box and the footage will not line up
|
result, the bounding box and the footage will not line up
|
||||||
perfectly. However, the <code>annotation_offset</code>{" "}
|
perfectly. However, the <code>annotation_offset</code>{" "}
|
||||||
field in your config can be used to adjust this.
|
field can be used to adjust this.
|
||||||
<div className="mt-2 flex items-center text-primary">
|
<div className="mt-2 flex items-center text-primary">
|
||||||
<Link
|
<Link
|
||||||
to="https://docs.frigate.video/configuration/reference"
|
to="https://docs.frigate.video/configuration/reference"
|
||||||
|
@ -357,10 +357,7 @@ export default function ObjectLifecycle({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="relative flex flex-col items-center justify-center">
|
<div className="relative flex flex-col items-center justify-center">
|
||||||
<Carousel
|
<Carousel className="m-0 w-full" setApi={setMainApi}>
|
||||||
className={cn("m-0 w-full", fullscreen && isDesktop && "w-[75%]")}
|
|
||||||
setApi={setMainApi}
|
|
||||||
>
|
|
||||||
<CarouselContent>
|
<CarouselContent>
|
||||||
{eventSequence.map((item, index) => (
|
{eventSequence.map((item, index) => (
|
||||||
<CarouselItem key={index}>
|
<CarouselItem key={index}>
|
||||||
|
@ -234,7 +234,7 @@ export default function ReviewDetailDialog({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{pane == "details" && selectedEvent && (
|
{pane == "details" && selectedEvent && (
|
||||||
<div className="scrollbar-container overflow-x-none mt-0 flex size-full flex-col gap-2 overflow-y-auto overflow-x-hidden">
|
<div className="mt-0 flex size-full flex-col gap-2">
|
||||||
<ObjectLifecycle event={selectedEvent} setPane={setPane} />
|
<ObjectLifecycle event={selectedEvent} setPane={setPane} />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
@ -31,6 +31,7 @@ function ConfigEditor() {
|
|||||||
const editorRef = useRef<monaco.editor.IStandaloneCodeEditor | null>(null);
|
const editorRef = useRef<monaco.editor.IStandaloneCodeEditor | null>(null);
|
||||||
const modelRef = useRef<monaco.editor.ITextModel | null>(null);
|
const modelRef = useRef<monaco.editor.ITextModel | null>(null);
|
||||||
const configRef = useRef<HTMLDivElement | null>(null);
|
const configRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
const schemaConfiguredRef = useRef(false);
|
||||||
|
|
||||||
const onHandleSaveConfig = useCallback(
|
const onHandleSaveConfig = useCallback(
|
||||||
async (save_option: SaveOptions) => {
|
async (save_option: SaveOptions) => {
|
||||||
@ -79,50 +80,59 @@ function ConfigEditor() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (modelRef.current != null) {
|
const modelUri = monaco.Uri.parse(
|
||||||
// we don't need to recreate the editor if it already exists
|
`a://b/api/config/schema_${Date.now()}.json`,
|
||||||
editorRef.current?.layout();
|
);
|
||||||
return;
|
|
||||||
|
// Configure Monaco YAML schema only once
|
||||||
|
if (!schemaConfiguredRef.current) {
|
||||||
|
configureMonacoYaml(monaco, {
|
||||||
|
enableSchemaRequest: true,
|
||||||
|
hover: true,
|
||||||
|
completion: true,
|
||||||
|
validate: true,
|
||||||
|
format: true,
|
||||||
|
schemas: [
|
||||||
|
{
|
||||||
|
uri: `${apiHost}api/config/schema.json`,
|
||||||
|
fileMatch: [String(modelUri)],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
schemaConfiguredRef.current = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const modelUri = monaco.Uri.parse("a://b/api/config/schema.json");
|
if (!modelRef.current) {
|
||||||
|
|
||||||
if (monaco.editor.getModels().length > 0) {
|
|
||||||
modelRef.current = monaco.editor.getModel(modelUri);
|
|
||||||
} else {
|
|
||||||
modelRef.current = monaco.editor.createModel(config, "yaml", modelUri);
|
modelRef.current = monaco.editor.createModel(config, "yaml", modelUri);
|
||||||
|
} else {
|
||||||
|
modelRef.current.setValue(config);
|
||||||
}
|
}
|
||||||
|
|
||||||
configureMonacoYaml(monaco, {
|
|
||||||
enableSchemaRequest: true,
|
|
||||||
hover: true,
|
|
||||||
completion: true,
|
|
||||||
validate: true,
|
|
||||||
format: true,
|
|
||||||
schemas: [
|
|
||||||
{
|
|
||||||
uri: `${apiHost}api/config/schema.json`,
|
|
||||||
fileMatch: [String(modelUri)],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
const container = configRef.current;
|
const container = configRef.current;
|
||||||
|
|
||||||
if (container != null) {
|
if (container && !editorRef.current) {
|
||||||
editorRef.current = monaco.editor.create(container, {
|
editorRef.current = monaco.editor.create(container, {
|
||||||
language: "yaml",
|
language: "yaml",
|
||||||
model: modelRef.current,
|
model: modelRef.current,
|
||||||
scrollBeyondLastLine: false,
|
scrollBeyondLastLine: false,
|
||||||
theme: (systemTheme || theme) == "dark" ? "vs-dark" : "vs-light",
|
theme: (systemTheme || theme) == "dark" ? "vs-dark" : "vs-light",
|
||||||
});
|
});
|
||||||
|
} else if (editorRef.current) {
|
||||||
|
editorRef.current.setModel(modelRef.current);
|
||||||
}
|
}
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
configRef.current = null;
|
if (editorRef.current) {
|
||||||
modelRef.current = null;
|
editorRef.current.dispose();
|
||||||
|
editorRef.current = null;
|
||||||
|
}
|
||||||
|
if (modelRef.current) {
|
||||||
|
modelRef.current.dispose();
|
||||||
|
modelRef.current = null;
|
||||||
|
}
|
||||||
|
schemaConfiguredRef.current = false;
|
||||||
};
|
};
|
||||||
});
|
}, [config, apiHost, systemTheme, theme]);
|
||||||
|
|
||||||
// monitoring state
|
// monitoring state
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user