adminizer 5.1.0-build.26 → 5.1.0-build.28

package/system/bindInertia.js

@@ -168,6 +168,22 @@ export function bindInertia(adminizer) {
             },
             menu,
             menuSections: req.user ? menuHelper.getSections(req) : null,
+            // Auto breadcrumbs. A function prop is evaluated by the Inertia
+            // adapter only when the key is rendered and only when the page did
+            // not send `breadcrumbs` of its own — page props override shared
+            // props before evaluation.
+            ...(menu && adminizer.config.navbar?.breadcrumbs === 'auto' ? {
+                breadcrumbs: async () => {
+                    try {
+                        const crumbs = await adminizer.adminLinkHandler.locate(req.user, req.originalUrl || req.url, menu);
+                        return crumbs.map((crumb) => ({ ...crumb, title: req.i18n.__(crumb.title) }));
+                    }
+                    catch (error) {
+                        Adminizer.log.error(`bindInertia > breadcrumbs failed: ${error}`);
+                        return [];
+                    }
+                },
+            } : {}),
             title: menuHelper.getBrandTitle(),
             brand: menuHelper.getBrandTitle(),
             logout: menuHelper.getLogoutUrl(),

package/ui/components/VanillaJSONEditor.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createJSONEditor, createAjvValidator } from 'vanilla-jsoneditor';
+import { createJSONEditor, createAjvValidator, isTextContent, toJSONContent } from 'vanilla-jsoneditor';
 import { useEffect, useRef, useState } from 'react';
 import { useAppearance } from "@/hooks/use-appearance";
 import { setFieldError } from "@/hooks/form-state";
@@ -11,10 +11,32 @@ function normalizeContent(content, json) {
     }
     return json !== undefined ? { json } : undefined;
 }
+function contentKey(content) {
+    return content === undefined ? 'undefined' : JSON.stringify(content);
+}
+// In text mode the editor emits {text}, in tree mode {json}. Consumers expect the parsed
+// value, so always hand them {json} and report unparsable text as a field error.
+function toJson(content) {
+    if (!isTextContent(content)) {
+        return { json: content.json };
+    }
+    if (content.text.trim() === '') {
+        return { json: undefined };
+    }
+    try {
+        return { json: toJSONContent(content).json };
+    }
+    catch (err) {
+        return { parseError: err instanceof Error ? err.message : 'Invalid JSON' };
+    }
+}
 export default function VanillaJSONEditor(props) {
     const refContainer = useRef(null);
     const refEditor = useRef(null);
     const refPrevProps = useRef(props);
+    // Serialized content of the last onChange we emitted: the parent feeds it straight back
+    // as a prop, and pushing that echo into the editor would rewrite what the user is typing.
+    const refEmittedContent = useRef(undefined);
     const { appearance } = useAppearance();
     const [theme, setTheme] = useState('');
     useEffect(() => {
@@ -23,9 +45,11 @@ export default function VanillaJSONEditor(props) {
     }, [appearance]);
     useEffect(() => {
         if (refEditor.current) {
-            refEditor.current.updateProps({
-                content: normalizeContent(props.content, props.json)
-            });
+            const content = normalizeContent(props.content, props.json);
+            if (contentKey(content) === refEmittedContent.current) {
+                return;
+            }
+            refEditor.current.updateProps({ content });
         }
     }, [props.content, props.json]);
     useEffect(() => {
@@ -38,15 +62,23 @@ export default function VanillaJSONEditor(props) {
                 validator,
                 content,
                 onChange: (content, previousContent, status) => {
-                    if (validator) {
-                        const isEmpty = content.json === undefined;
+                    const { json, parseError } = toJson(content);
+                    if (parseError) {
+                        setFieldError(props.name, true, parseError);
+                    }
+                    else if (validator) {
+                        const isEmpty = json === undefined;
                         const validationError = isEmpty
                             ? ['error']
                             : status.contentErrors?.validationErrors;
                         setFieldError(props.name, !!validationError?.length, 'Error validation JSON schema');
                     }
+                    else {
+                        setFieldError(props.name, false);
+                    }
                     if (props.onChange) {
-                        props.onChange(content, previousContent, status);
+                        refEmittedContent.current = contentKey(normalizeContent(json, undefined));
+                        props.onChange({ json }, previousContent, status);
                     }
                 }
             }
@@ -54,13 +86,14 @@ export default function VanillaJSONEditor(props) {
         // Trigger onChange manually
         if (refEditor.current) {
             // Get the current content
-            const currentContent = refEditor.current.get();
+            const { json, parseError } = toJson(refEditor.current.get());
             // Validate the content
             const validationResult = refEditor.current.validate();
             // @ts-ignore
             const hasErrors = !!validationResult?.validationErrors?.length;
             if (props.onChange) {
-                props.onChange(currentContent, 
+                refEmittedContent.current = contentKey(normalizeContent(json, undefined));
+                props.onChange({ json }, 
                 //@ts-ignore
                 undefined, {
                     contentErrors: validationResult,
@@ -71,7 +104,7 @@ export default function VanillaJSONEditor(props) {
                 });
             }
             // Set the error state
-            setFieldError(props.name, hasErrors, 'Error validation JSON schema');
+            setFieldError(props.name, hasErrors || !!parseError, parseError ?? 'Error validation JSON schema');
         }
         return () => {
             // destroy editor
@@ -88,7 +121,13 @@ export default function VanillaJSONEditor(props) {
             // since the last time to prevent syncing issues
             const changedProps = filterUnchangedProps(props, refPrevProps.current);
             if ('content' in changedProps || 'json' in changedProps) {
-                changedProps.content = normalizeContent(props.content, props.json);
+                const content = normalizeContent(props.content, props.json);
+                if (contentKey(content) === refEmittedContent.current) {
+                    delete changedProps.content;
+                }
+                else {
+                    changedProps.content = content;
+                }
                 delete changedProps.json;
             }
             if ('schema' in changedProps) {

package/ui/components/ui/badge.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { type VariantProps } from "class-variance-authority";
 declare const badgeVariants: (props?: ({
-    variant?: "default" | "secondary" | "destructive" | "outline" | null | undefined;
+    variant?: "default" | "secondary" | "destructive" | "warning" | "outline" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 declare function Badge({ className, variant, asChild, ...props }: React.ComponentProps<"span"> & VariantProps<typeof badgeVariants> & {
     asChild?: boolean;

package/ui/components/ui/badge.js

@@ -8,6 +8,7 @@ const badgeVariants = cva("inline-flex items-center justify-center rounded-md bo
             default: "border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",
             secondary: "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",
             destructive: "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
+            warning: "border-transparent bg-warning text-warning-foreground [a&]:hover:bg-warning/90",
             outline: "text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",
         },
     },

package/ui/components/ui/command.d.ts

@@ -2,9 +2,11 @@ import * as React from "react";
 import { Command as CommandPrimitive } from "cmdk";
 import { Dialog } from "@/components/ui/dialog";
 declare function Command({ className, ...props }: React.ComponentProps<typeof CommandPrimitive>): React.JSX.Element;
-declare function CommandDialog({ title, description, children, ...props }: React.ComponentProps<typeof Dialog> & {
+declare function CommandDialog({ title, description, shouldFilter, children, ...props }: React.ComponentProps<typeof Dialog> & {
     title?: string;
     description?: string;
+    /** Pass `false` when the items are already filtered by the server. */
+    shouldFilter?: boolean;
 }): React.JSX.Element;
 declare function CommandInput({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.Input>): React.JSX.Element;
 declare function CommandList({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.List>): React.JSX.Element;

package/ui/components/ui/command.js

@@ -6,8 +6,8 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, }
 function Command({ className, ...props }) {
     return (_jsx(CommandPrimitive, { "data-slot": "command", className: cn("bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md", className), ...props }));
 }
-function CommandDialog({ title = "Command Palette", description = "Search for a command to run...", children, ...props }) {
-    return (_jsxs(Dialog, { ...props, children: [_jsxs(DialogHeader, { className: "sr-only", children: [_jsx(DialogTitle, { children: title }), _jsx(DialogDescription, { children: description })] }), _jsx(DialogContent, { className: "overflow-hidden p-0", children: _jsx(Command, { className: "[&_[cmdk-group-heading]]:text-muted-foreground **:data-[slot=command-input-wrapper]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5", children: children }) })] }));
+function CommandDialog({ title = "Command Palette", description = "Search for a command to run...", shouldFilter, children, ...props }) {
+    return (_jsxs(Dialog, { ...props, children: [_jsxs(DialogHeader, { className: "sr-only", children: [_jsx(DialogTitle, { children: title }), _jsx(DialogDescription, { children: description })] }), _jsx(DialogContent, { className: "overflow-hidden p-0 z-[1011]", children: _jsx(Command, { shouldFilter: shouldFilter, className: "[&_[cmdk-group-heading]]:text-muted-foreground **:data-[slot=command-input-wrapper]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5", children: children }) })] }));
 }
 function CommandInput({ className, ...props }) {
     return (_jsxs("div", { "data-slot": "command-input-wrapper", className: "flex h-9 items-center gap-2 border-b px-3", children: [_jsx(SearchIcon, { className: "size-4 shrink-0 opacity-50" }), _jsx(CommandPrimitive.Input, { "data-slot": "command-input", className: cn("placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50", className), ...props })] }));

package/assets/add-BJKSs5TK.js

@@ -1 +0,0 @@
-import{u as e,r as a,t,j as r,T as c,A as u}from"./app-BKQr0JOg.js";import{w as p}from"./with-app-layout-R5blfHwR.js";import"./use-appearance-B1Ulba0z.js";const f=[];function n(){const o=e();return a.useEffect(()=>{const s=o.props.flash;s&&(s.success&&t.success(s.success),s.error&&t.error(s.error))},[o.props.flash]),r.jsxs(r.Fragment,{children:[r.jsx(c,{position:"top-center",richColors:!0,closeButton:!0}),r.jsx(u,{page:o,catalog:!1})]})}const d=p(n,{breadcrumbs:f,className:"overflow-auto h-[calc(100svh-16px)]"});export{d as default};