This commit is contained in:
@@ -6,7 +6,7 @@ export function PageTitle({ className, ...props }: ComponentProps<"h1">) {
|
||||
return (
|
||||
<h1
|
||||
data-slot="page-title"
|
||||
className={cn("text-2xl font-semibold tracking-tight", className)}
|
||||
className={cn("text-2xl font-semibold tracking-tight text-balance", className)}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -110,6 +110,8 @@ export function FieldForm({
|
||||
)}
|
||||
</div>
|
||||
|
||||
{isEdit && <p className="text-xs text-muted-foreground">{t("fields.lockedNote")}</p>}
|
||||
|
||||
<div className="space-y-1">
|
||||
<Label htmlFor="field-key">{t("fields.key")}</Label>
|
||||
<Input
|
||||
|
||||
@@ -90,18 +90,23 @@ export function FieldList({
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
className={cn("flex flex-1 items-center gap-2 rounded-sm text-left", focusRing)}
|
||||
className={cn(
|
||||
"flex min-w-0 flex-1 items-center gap-2 rounded-sm text-left",
|
||||
focusRing,
|
||||
)}
|
||||
aria-pressed={def.key === selectedKey}
|
||||
onClick={() => onSelect(def)}
|
||||
>
|
||||
<span className="font-medium">{labelText(def.labels, lang)}</span>
|
||||
<span className="min-w-0 truncate font-medium">
|
||||
{labelText(def.labels, lang)}
|
||||
</span>
|
||||
<span className="text-xs text-muted-foreground">{def.key}</span>
|
||||
<Badge variant="secondary">
|
||||
<Badge variant="secondary" className="shrink-0">
|
||||
{t(`fields.types.${def.data_type}`)}
|
||||
</Badge>
|
||||
{def.required && (
|
||||
<span
|
||||
className="text-xs text-destructive"
|
||||
className="shrink-0 text-xs text-destructive"
|
||||
title={t("fields.required")}
|
||||
aria-label={t("fields.required")}
|
||||
>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"objects": { "title": "Objects", "empty": "No objects yet", "loadError": "Could not load objects", "notFound": "Object not found", "prev": "Previous", "next": "Next", "of": "of", "new": "New object", "filter": "Filter objects…", "pageSize": "Per page", "columns": { "number": "Object №", "name": "Name", "visibility": "Visibility", "location": "Location", "count": "#", "updated": "Updated" }, "unknownRef": "(unknown)", "detailTitle": "Object detail", "tableLabel": "Objects" },
|
||||
"fieldsLabels": { "objectNumber": "Object number", "objectName": "Name", "count": "Number of objects", "briefDescription": "Brief description", "currentLocation": "Current location", "currentOwner": "Current owner", "recorder": "Recorder", "recordingDate": "Recording date", "visibility": "Visibility" },
|
||||
"visibility": { "draft": "Draft", "internal": "Internal", "public": "Public" },
|
||||
"form": { "selectPlaceholder": "— select —", "create": "Create object", "save": "Save", "cancel": "Cancel", "visibility": "Visibility", "draft": "Draft", "internal": "Internal", "required": "This field is required", "rejected": "The server rejected the changes — check required and referenced fields", "fieldRejected": "The field \"{{field}}\" was rejected — check its value", "createdButFieldRejected": "Object created, but a field was rejected — fix it below.", "flexibleHeading": "Catalogue fields", "saving": "Saving…", "createAnother": "Save & create another", "minCount": "Must be at least 1", "fieldError": { "type_mismatch": "Wrong type for this field", "unresolved": "Referenced value not found", "unknown": "Unknown field" }, "unsaved": { "title": "Discard unsaved changes?", "body": "You have unsaved changes that will be lost.", "stay": "Keep editing", "leave": "Discard" } },
|
||||
"form": { "selectPlaceholder": "Select…", "create": "Create object", "save": "Save", "cancel": "Cancel", "visibility": "Visibility", "draft": "Draft", "internal": "Internal", "required": "This field is required", "rejected": "The server rejected the changes — check required and referenced fields", "fieldRejected": "The field \"{{field}}\" was rejected — check its value", "createdButFieldRejected": "Object created, but a field was rejected — fix it below.", "flexibleHeading": "Catalogue fields", "saving": "Saving…", "createAnother": "Save & create another", "minCount": "Must be at least 1", "fieldError": { "type_mismatch": "Wrong type for this field", "unresolved": "Referenced value not found", "unknown": "Unknown field" }, "unsaved": { "title": "Discard unsaved changes?", "body": "You have unsaved changes that will be lost.", "stay": "Keep editing", "leave": "Discard" } },
|
||||
"actions": { "deleting": "Deleting…", "edit": "Edit", "delete": "Delete", "rename": "Rename", "save": "Save", "closeDetail": "Close detail", "confirmDelete": "Delete this object? This cannot be undone.", "confirmDeleteTerm": "Delete this term? This cannot be undone.", "confirmDeleteAuthority": "Delete this authority? This cannot be undone.", "confirmDeleteField": "Delete this field definition? This cannot be undone.", "confirmDeleteVocabulary": "Delete this vocabulary? This cannot be undone.", "inUse": "Can't delete — used by {{count}} object(s). Clear those fields first." },
|
||||
"labels": { "label": "Label", "externalUri": "External URI (optional)", "otherLanguages": "This entry also has labels in other languages, which are kept.", "uriPlaceholder": "https://…" },
|
||||
"theme": { "light": "Light", "dark": "Dark", "system": "System" },
|
||||
@@ -41,6 +41,7 @@
|
||||
"authorityKind": "Authority kind",
|
||||
"anyKind": "Any",
|
||||
"group": "Group",
|
||||
"lockedNote": "Key and type can't be changed after creation.",
|
||||
"required": "Required",
|
||||
"create": "Create field",
|
||||
"empty": "No field definitions yet",
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"objects": { "title": "Föremål", "empty": "Inga föremål ännu", "loadError": "Kunde inte ladda föremål", "notFound": "Föremålet hittades inte", "prev": "Föregående", "next": "Nästa", "of": "av", "new": "Nytt föremål", "filter": "Filtrera föremål…", "pageSize": "Per sida", "columns": { "number": "Föremålsnr", "name": "Namn", "visibility": "Synlighet", "location": "Plats", "count": "Antal", "updated": "Uppdaterad" }, "unknownRef": "(okänd)", "detailTitle": "Objektdetalj", "tableLabel": "Objekt" },
|
||||
"fieldsLabels": { "objectNumber": "Föremålsnummer", "objectName": "Namn", "count": "Antal föremål", "briefDescription": "Kort beskrivning", "currentLocation": "Nuvarande plats", "currentOwner": "Nuvarande ägare", "recorder": "Registrerad av", "recordingDate": "Registreringsdatum", "visibility": "Synlighet" },
|
||||
"visibility": { "draft": "Utkast", "internal": "Intern", "public": "Publik" },
|
||||
"form": { "selectPlaceholder": "— välj —", "create": "Skapa föremål", "save": "Spara", "cancel": "Avbryt", "visibility": "Synlighet", "draft": "Utkast", "internal": "Intern", "required": "Fältet är obligatoriskt", "rejected": "Servern avvisade ändringarna — kontrollera obligatoriska och refererade fält", "fieldRejected": "Fältet \"{{field}}\" avvisades — kontrollera värdet", "createdButFieldRejected": "Föremålet skapades, men ett fält avvisades — åtgärda nedan.", "flexibleHeading": "Katalogfält", "saving": "Sparar…", "createAnother": "Spara & skapa ny", "minCount": "Måste vara minst 1", "fieldError": { "type_mismatch": "Fel typ för detta fält", "unresolved": "Refererat värde hittades inte", "unknown": "Okänt fält" }, "unsaved": { "title": "Kasta osparade ändringar?", "body": "Du har osparade ändringar som går förlorade.", "stay": "Fortsätt redigera", "leave": "Kasta" } },
|
||||
"form": { "selectPlaceholder": "Välj…", "create": "Skapa föremål", "save": "Spara", "cancel": "Avbryt", "visibility": "Synlighet", "draft": "Utkast", "internal": "Intern", "required": "Fältet är obligatoriskt", "rejected": "Servern avvisade ändringarna — kontrollera obligatoriska och refererade fält", "fieldRejected": "Fältet \"{{field}}\" avvisades — kontrollera värdet", "createdButFieldRejected": "Föremålet skapades, men ett fält avvisades — åtgärda nedan.", "flexibleHeading": "Katalogfält", "saving": "Sparar…", "createAnother": "Spara & skapa ny", "minCount": "Måste vara minst 1", "fieldError": { "type_mismatch": "Fel typ för detta fält", "unresolved": "Refererat värde hittades inte", "unknown": "Okänt fält" }, "unsaved": { "title": "Kasta osparade ändringar?", "body": "Du har osparade ändringar som går förlorade.", "stay": "Fortsätt redigera", "leave": "Kasta" } },
|
||||
"actions": { "deleting": "Tar bort…", "edit": "Redigera", "delete": "Ta bort", "rename": "Byt namn", "save": "Spara", "closeDetail": "Stäng detalj", "confirmDelete": "Ta bort detta föremål? Detta kan inte ångras.", "confirmDeleteTerm": "Ta bort denna term? Detta kan inte ångras.", "confirmDeleteAuthority": "Ta bort denna auktoritet? Detta kan inte ångras.", "confirmDeleteField": "Ta bort denna fältdefinition? Detta kan inte ångras.", "confirmDeleteVocabulary": "Ta bort denna vokabulär? Detta kan inte ångras.", "inUse": "Kan inte ta bort — används av {{count}} föremål. Rensa de fälten först." },
|
||||
"labels": { "label": "Etikett", "externalUri": "Extern URI (valfritt)", "otherLanguages": "Denna post har även etiketter på andra språk, som behålls.", "uriPlaceholder": "https://…" },
|
||||
"theme": { "light": "Ljust", "dark": "Mörkt", "system": "System" },
|
||||
@@ -41,6 +41,7 @@
|
||||
"authorityKind": "Auktoritetstyp",
|
||||
"anyKind": "Alla",
|
||||
"group": "Grupp",
|
||||
"lockedNote": "Nyckel och typ kan inte ändras efter att fältet skapats.",
|
||||
"required": "Obligatoriskt",
|
||||
"create": "Skapa fält",
|
||||
"empty": "Inga fältdefinitioner ännu",
|
||||
|
||||
@@ -54,7 +54,7 @@ test("term field filters and selects from the vocabulary combobox", async () =>
|
||||
|
||||
renderApp(<FormHarness defKey="material" onSubmit={(v) => submitted.push(v)} />);
|
||||
|
||||
const input = await screen.findByPlaceholderText("— select —");
|
||||
const input = await screen.findByPlaceholderText("Select…");
|
||||
|
||||
await user.click(input);
|
||||
await user.type(input, "bro");
|
||||
@@ -73,7 +73,7 @@ test("authority field filters and selects from the authority combobox", async ()
|
||||
|
||||
renderApp(<FormHarness defKey="maker" onSubmit={(v) => submitted.push(v)} />);
|
||||
|
||||
const input = await screen.findByPlaceholderText("— select —");
|
||||
const input = await screen.findByPlaceholderText("Select…");
|
||||
|
||||
await user.click(input);
|
||||
await user.type(input, "ada");
|
||||
|
||||
@@ -80,15 +80,16 @@ export function Sidebar() {
|
||||
<button
|
||||
type="button"
|
||||
onClick={toggle}
|
||||
disabled={narrow}
|
||||
aria-expanded={!collapsed}
|
||||
aria-label={t(collapsed ? "nav.expandSidebar" : "nav.collapseSidebar")}
|
||||
title={t(collapsed ? "nav.expandSidebar" : "nav.collapseSidebar")}
|
||||
className={cn(
|
||||
"flex items-center justify-center rounded-md p-1 outline-none",
|
||||
// On narrow viewports the rail is forced collapsed, so the toggle
|
||||
// is hidden rather than shown disabled (a grayed button reads as
|
||||
// broken, not unavailable).
|
||||
"hidden items-center justify-center rounded-md p-1 outline-none md:flex",
|
||||
"hover:bg-accent",
|
||||
focusRing,
|
||||
"disabled:pointer-events-none disabled:opacity-50",
|
||||
)}
|
||||
>
|
||||
{collapsed ? (
|
||||
|
||||
Reference in New Issue
Block a user