Skip to content

fix: add boolean value style and error list #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sirily11 merged 1 commit into from
Jul 7, 2026
Merged

fix: add boolean value style and error list #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions packages/admin-next/src/components/resource-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

import * as React from "react";
import Form from "@rjsf/core";
import type { RegistryWidgetsType } from "@rjsf/utils";
import type {
ErrorListProps,
RegistryWidgetsType,
TemplatesType,
} from "@rjsf/utils";
import validator from "@rjsf/validator-ajv8";
import type { FormSchema } from "../types.js";
import { isDetail } from "../types.js";
Expand Down Expand Up @@ -32,6 +36,27 @@ const widgets: RegistryWidgetsType = {
ObjectSearch: ForeignKeyWidget,
};

/** Clean, shadcn-styled summary of validation errors shown atop the form. */
function ErrorListTemplate({ errors }: ErrorListProps): React.JSX.Element {
return (
<div className="ag-error-list" role="alert">
<p className="ag-error-list-title">
Please fix the following{" "}
{errors.length === 1 ? "error" : `${errors.length} errors`}:
</p>
<ul className="ag-error-list-items">
{errors.map((error, i) => (
<li key={i}>{error.stack}</li>
))}
</ul>
</div>
);
}

const templates: Partial<TemplatesType> = {
ErrorListTemplate,
};

export interface ResourceFormProps {
resourceId: string;
action: "create" | "edit";
Expand Down Expand Up @@ -108,11 +133,12 @@ export function ResourceForm({
uiSchema={schema.uiSchema}
formData={formData}
widgets={widgets}
templates={templates}
validator={validator}
extraErrors={extraErrors as never}
onChange={(e) => setFormData(e.formData as Record<string, unknown>)}
onSubmit={(e) => submit(e.formData as Record<string, unknown>)}
showErrorList={false}
showErrorList="top"
>
{submitError && (
<p className="mb-2 text-sm text-destructive">{submitError}</p>
Expand Down
70 changes: 70 additions & 0 deletions packages/admin-next/src/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,76 @@
margin: 0.25rem 0 0;
}

/* Field help text: smaller and muted, sitting under the label. */
.ag-form .field-description {
margin: 0 0 0.375rem;
font-size: 0.8125rem;
line-height: 1.25rem;
color: var(--muted-foreground);
}

.ag-form .field-description p {
margin: 0;
}

/* Boolean (checkbox) field: control and label share one aligned row. */
.ag-form .checkbox label {
display: flex;
align-items: center;
gap: 0.5rem;
margin-bottom: 0;
font-size: 0.875rem;
font-weight: 400;
cursor: pointer;
}

.ag-form .checkbox input[type="checkbox"] {
width: 1rem;
height: 1rem;
margin: 0;
flex-shrink: 0;
accent-color: var(--primary);
cursor: pointer;
}

.ag-form .checkbox.disabled label {
cursor: not-allowed;
opacity: 0.6;
}

.ag-form .checkbox .field-description {
margin-bottom: 0.375rem;
}

/* Validation error summary at the top of the form. */
.ag-form .ag-error-list {
margin-bottom: 1rem;
border: 1px solid var(--destructive);
border-radius: 0.5rem;
background: color-mix(in oklab, var(--destructive) 8%, var(--background));
padding: 0.75rem 0.875rem;
}

.ag-form .ag-error-list-title {
margin: 0 0 0.375rem;
font-size: 0.8125rem;
font-weight: 600;
color: var(--destructive);
}

.ag-form .ag-error-list-items {
margin: 0;
padding-left: 1rem;
list-style: disc;
}

.ag-form .ag-error-list-items li {
margin-top: 0.125rem;
font-size: 0.8125rem;
line-height: 1.35;
color: var(--destructive);
}

.ag-sheet-overlay[data-state="open"] {
animation: ag-sheet-overlay-in 160ms ease-out;
}
Expand Down