merge: follow-ups batch (#38 #28 #41 #26)
CI / web (push) Has been cancelled

#38 enum-type SearchHitView.visibility + tighten VisibilityBadge prop.
#28 set_fields 422 carries the offending field (FieldErrorView); the object form
highlights it (both direct-edit and create-redirect paths name the field).
#41 normalize localized_text values to the default language on save.
#26 pin pnpm via packageManager + align CI to pnpm 11.

85 web tests; api suite green; bundle 145.8 KB gz; en/sv parity.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-05 15:54:04 +02:00
18 changed files with 272 additions and 63 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
with: with:
version: 9 version: 11
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 20
+50 -18
View File
@@ -510,6 +510,15 @@ pub(crate) async fn create_field_definition(
} }
} }
/// Field-level rejection detail for `set_fields`, so the UI can highlight the field.
#[derive(Serialize, ToSchema)]
pub(crate) struct FieldErrorView {
/// The flexible-field key that was rejected.
pub field: String,
/// Machine code: "unknown" | "type_mismatch" | "unresolved".
pub code: String,
}
/// Replace an object's flexible-field values (validated against the registry). /// Replace an object's flexible-field values (validated against the registry).
/// ///
/// **Replace semantics:** the body is the *complete* desired field set. Omitting a key /// **Replace semantics:** the body is the *complete* desired field set. Omitting a key
@@ -525,7 +534,7 @@ pub(crate) async fn create_field_definition(
(status = 401), (status = 401),
(status = 403), (status = 403),
(status = 404, description = "Object not found"), (status = 404, description = "Object not found"),
(status = 422, description = "Unknown field, type mismatch, or unresolved reference") (status = 422, body = FieldErrorView, description = "A field was rejected")
) )
)] )]
pub(crate) async fn set_fields( pub(crate) async fn set_fields(
@@ -533,34 +542,57 @@ pub(crate) async fn set_fields(
State(state): State<AppState>, State(state): State<AppState>,
Path(id): Path<String>, Path(id): Path<String>,
Json(values): Json<serde_json::Map<String, serde_json::Value>>, Json(values): Json<serde_json::Map<String, serde_json::Value>>,
) -> Result<StatusCode, StatusCode> { ) -> axum::response::Response {
let object_id = id.parse::<ObjectId>().map_err(|_| StatusCode::NOT_FOUND)?; use axum::response::IntoResponse;
let mut tx = state let Ok(object_id) = id.parse::<ObjectId>() else {
.db return StatusCode::NOT_FOUND.into_response();
.pool() };
.begin()
.await let mut tx = match state.db.pool().begin().await {
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?; Ok(tx) => tx,
Err(_) => return StatusCode::INTERNAL_SERVER_ERROR.into_response(),
};
let result = let result =
db::catalog::set_object_fields(&mut tx, actor(&auth.user), object_id, &values).await; db::catalog::set_object_fields(&mut tx, actor(&auth.user), object_id, &values).await;
match result { match result {
Ok(()) => { Ok(()) => {
tx.commit() if tx.commit().await.is_err() {
.await return StatusCode::INTERNAL_SERVER_ERROR.into_response();
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?; }
reindex(&state, object_id).await; reindex(&state, object_id).await;
Ok(StatusCode::NO_CONTENT) StatusCode::NO_CONTENT.into_response()
} }
Err(db::catalog::FieldError::ObjectNotFound) => Err(StatusCode::NOT_FOUND), Err(db::catalog::FieldError::ObjectNotFound) => StatusCode::NOT_FOUND.into_response(),
Err(db::catalog::FieldError::Db(_)) => Err(StatusCode::INTERNAL_SERVER_ERROR), Err(db::catalog::FieldError::Db(_)) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
Err(db::catalog::FieldError::UnknownField(_)) => Err(StatusCode::UNPROCESSABLE_ENTITY), Err(db::catalog::FieldError::UnknownField(field)) => (
Err(db::catalog::FieldError::TypeMismatch { .. }) => Err(StatusCode::UNPROCESSABLE_ENTITY), StatusCode::UNPROCESSABLE_ENTITY,
Err(db::catalog::FieldError::Unresolved { .. }) => Err(StatusCode::UNPROCESSABLE_ENTITY), Json(FieldErrorView {
field,
code: "unknown".to_owned(),
}),
)
.into_response(),
Err(db::catalog::FieldError::TypeMismatch { field, .. }) => (
StatusCode::UNPROCESSABLE_ENTITY,
Json(FieldErrorView {
field,
code: "type_mismatch".to_owned(),
}),
)
.into_response(),
Err(db::catalog::FieldError::Unresolved { field, .. }) => (
StatusCode::UNPROCESSABLE_ENTITY,
Json(FieldErrorView {
field,
code: "unresolved".to_owned(),
}),
)
.into_response(),
} }
} }
+1
View File
@@ -28,6 +28,7 @@ pub(crate) struct SearchHitView {
pub object_number: String, pub object_number: String,
pub object_name: String, pub object_name: String,
pub brief_description: Option<String>, pub brief_description: Option<String>,
#[schema(value_type = domain::Visibility)]
pub visibility: String, pub visibility: String,
pub snippet: Option<String>, pub snippet: Option<String>,
} }
+1
View File
@@ -53,6 +53,7 @@ use crate::{
admin_objects::FieldDefinitionView, admin_objects::FieldDefinitionView,
admin_objects::NewFieldDefinitionRequest, admin_objects::NewFieldDefinitionRequest,
admin_objects::CreatedField, admin_objects::CreatedField,
admin_objects::FieldErrorView,
admin_vocab::VocabularyView, admin_vocab::VocabularyView,
admin_vocab::NewVocabularyRequest, admin_vocab::NewVocabularyRequest,
admin_vocab::NewTermRequest, admin_vocab::NewTermRequest,
+46
View File
@@ -434,6 +434,52 @@ async fn set_fields_and_list_field_definitions(pool: PgPool) {
assert_eq!(bad.status(), StatusCode::UNPROCESSABLE_ENTITY); assert_eq!(bad.status(), StatusCode::UNPROCESSABLE_ENTITY);
} }
#[sqlx::test(migrations = "../db/migrations")]
async fn set_fields_unknown_field_returns_field_detail(pool: PgPool) {
migrate_sessions(&db::Db::from_pool(pool.clone()))
.await
.unwrap();
seed_user(&pool, "ed@example.com", "pw-editor-123", Role::Editor).await;
let db = db::Db::from_pool(pool.clone());
let mut tx = db.pool().begin().await.unwrap();
let id = catalog::create_object(
&mut tx,
AuditActor::System,
&obj("A-1", "amphora", Visibility::Draft),
)
.await
.unwrap();
tx.commit().await.unwrap();
let app = build_app(state(pool));
let cookie = login(&app, "ed@example.com", "pw-editor-123").await;
let resp = app
.oneshot(
Request::builder()
.method("PUT")
.uri(format!("/api/admin/objects/{id}/fields"))
.header(header::COOKIE, &cookie)
.header(header::CONTENT_TYPE, "application/json")
.body(Body::from(r#"{"definitely_not_a_field":"x"}"#))
.unwrap(),
)
.await
.unwrap();
assert_eq!(resp.status(), StatusCode::UNPROCESSABLE_ENTITY);
let body: serde_json::Value =
serde_json::from_slice(&resp.into_body().collect().await.unwrap().to_bytes()).unwrap();
assert_eq!(body["field"], "definitely_not_a_field");
assert_eq!(body["code"], "unknown");
}
#[sqlx::test(migrations = "../db/migrations")] #[sqlx::test(migrations = "../db/migrations")]
async fn create_requires_auth(pool: PgPool) { async fn create_requires_auth(pool: PgPool) {
migrate_sessions(&db::Db::from_pool(pool.clone())) migrate_sessions(&db::Db::from_pool(pool.clone()))
+1
View File
@@ -2,6 +2,7 @@
"name": "web", "name": "web",
"private": true, "private": true,
"version": "0.0.0", "version": "0.0.0",
"packageManager": "pnpm@11.5.1",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
+16 -2
View File
@@ -10,6 +10,13 @@ export class HttpError extends Error {
} }
} }
export class FieldRejection extends Error {
constructor(public readonly field: string, public readonly code: string) {
super(`field rejected: ${field}`);
this.name = "FieldRejection";
}
}
type UserView = components["schemas"]["UserView"]; type UserView = components["schemas"]["UserView"];
type LoginRequest = components["schemas"]["LoginRequest"]; type LoginRequest = components["schemas"]["LoginRequest"];
@@ -179,12 +186,19 @@ export function useSetFields() {
return useMutation({ return useMutation({
mutationFn: async ({ id, fields }: { id: string; fields: Record<string, unknown> }) => { mutationFn: async ({ id, fields }: { id: string; fields: Record<string, unknown> }) => {
const { response } = await api.PUT("/api/admin/objects/{id}/fields", { const { response, error } = await api.PUT("/api/admin/objects/{id}/fields", {
params: { path: { id } }, params: { path: { id } },
body: fields as Record<string, never>, body: fields as Record<string, never>,
}); });
if (response.status !== 204) throw new Error("set fields failed"); if (response.status === 204) return;
if (response.status === 422 && error && typeof error === "object" && "field" in error) {
const detail = error as { field: string; code: string };
throw new FieldRejection(detail.field, detail.code);
}
throw new Error("set fields failed");
}, },
onSuccess: (_d, { id }) => { onSuccess: (_d, { id }) => {
void qc.invalidateQueries({ queryKey: ["object", id] }); void qc.invalidateQueries({ queryKey: ["object", id] });
+12 -3
View File
@@ -408,6 +408,13 @@ export interface components {
required: boolean; required: boolean;
vocabulary_id?: string | null; vocabulary_id?: string | null;
}; };
/** @description Field-level rejection detail for `set_fields`, so the UI can highlight the field. */
FieldErrorView: {
/** @description Machine code: "unknown" | "type_mismatch" | "unresolved". */
code: string;
/** @description The flexible-field key that was rejected. */
field: string;
};
LabelInput: { LabelInput: {
label: string; label: string;
lang: string; lang: string;
@@ -513,7 +520,7 @@ export interface components {
object_name: string; object_name: string;
object_number: string; object_number: string;
snippet?: string | null; snippet?: string | null;
visibility: string; visibility: components["schemas"]["Visibility"];
}; };
SearchResultsView: { SearchResultsView: {
/** @description Meilisearch's estimate of the total number of matches. */ /** @description Meilisearch's estimate of the total number of matches. */
@@ -1038,12 +1045,14 @@ export interface operations {
}; };
content?: never; content?: never;
}; };
/** @description Unknown field, type mismatch, or unresolved reference */ /** @description A field was rejected */
422: { 422: {
headers: { headers: {
[name: string]: unknown; [name: string]: unknown;
}; };
content?: never; content: {
"application/json": components["schemas"]["FieldErrorView"];
};
}; };
}; };
}; };
+1 -1
View File
@@ -5,7 +5,7 @@
"objects": { "title": "Objects", "empty": "No objects yet", "loadError": "Could not load objects", "selectPrompt": "Select an object to view its details", "notFound": "Object not found", "prev": "Previous", "next": "Next", "of": "of", "new": "New object" }, "objects": { "title": "Objects", "empty": "No objects yet", "loadError": "Could not load objects", "selectPrompt": "Select an object to view its details", "notFound": "Object not found", "prev": "Previous", "next": "Next", "of": "of", "new": "New object" },
"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", "flexible": "Catalogue fields" }, "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", "flexible": "Catalogue fields" },
"visibility": { "draft": "Draft", "internal": "Internal", "public": "Public" }, "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", "flexibleHeading": "Catalogue fields" }, "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", "flexibleHeading": "Catalogue fields" },
"actions": { "edit": "Edit", "delete": "Delete", "confirmDelete": "Delete this object? This cannot be undone." }, "actions": { "edit": "Edit", "delete": "Delete", "confirmDelete": "Delete this object? This cannot be undone." },
"labels": { "label": "Label", "externalUri": "External URI (optional)" }, "labels": { "label": "Label", "externalUri": "External URI (optional)" },
"vocab": { "vocab": {
+1 -1
View File
@@ -5,7 +5,7 @@
"objects": { "title": "Föremål", "empty": "Inga föremål ännu", "loadError": "Kunde inte ladda föremål", "selectPrompt": "Välj ett föremål för att se detaljer", "notFound": "Föremålet hittades inte", "prev": "Föregående", "next": "Nästa", "of": "av", "new": "Nytt föremål" }, "objects": { "title": "Föremål", "empty": "Inga föremål ännu", "loadError": "Kunde inte ladda föremål", "selectPrompt": "Välj ett föremål för att se detaljer", "notFound": "Föremålet hittades inte", "prev": "Föregående", "next": "Nästa", "of": "av", "new": "Nytt föremål" },
"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", "flexible": "Katalogfält" }, "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", "flexible": "Katalogfält" },
"visibility": { "draft": "Utkast", "internal": "Intern", "public": "Publik" }, "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", "flexibleHeading": "Katalogfält" }, "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", "flexibleHeading": "Katalogfält" },
"actions": { "edit": "Redigera", "delete": "Ta bort", "confirmDelete": "Ta bort detta föremål? Detta kan inte ångras." }, "actions": { "edit": "Redigera", "delete": "Ta bort", "confirmDelete": "Ta bort detta föremål? Detta kan inte ångras." },
"labels": { "label": "Etikett", "externalUri": "Extern URI (valfritt)" }, "labels": { "label": "Etikett", "externalUri": "Extern URI (valfritt)" },
"vocab": { "vocab": {
+20
View File
@@ -17,6 +17,26 @@ function tree() {
); );
} }
test("edit: fields PUT 422 with field body -> field error message shown and field marked invalid", async () => {
server.use(
http.get("/api/admin/objects/:id", () =>
HttpResponse.json({ ...amphora, fields: { inscription: "old" } }),
),
http.put("/api/admin/objects/:id", () => new HttpResponse(null, { status: 204 })),
http.put("/api/admin/objects/:id/fields", () =>
HttpResponse.json({ field: "inscription", code: "type_mismatch" }, { status: 422 }),
),
);
renderApp(tree(), { route: `/objects/${amphora.id}/edit` });
await screen.findByDisplayValue("Amphora");
await userEvent.click(screen.getByRole("button", { name: /save/i }));
const alerts = await screen.findAllByText(/inscription.*rejected/i);
expect(alerts.length).toBeGreaterThanOrEqual(2);
});
test("edit: prefilled, save -> PUT core + PUT fields -> back to detail", async () => { test("edit: prefilled, save -> PUT core + PUT fields -> back to detail", async () => {
let putCore: unknown; let putCore: unknown;
let putFields: unknown; let putFields: unknown;
+21 -5
View File
@@ -2,7 +2,7 @@ import { useState } from "react";
import { useLocation, useNavigate, useParams } from "react-router-dom"; import { useLocation, useNavigate, useParams } from "react-router-dom";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { useObject, useUpdateObject, useSetFields } from "../api/queries"; import { useObject, useUpdateObject, useSetFields, FieldRejection } from "../api/queries";
import { ObjectForm, type ObjectCore, type ObjectFormValues } from "./object-form"; import { ObjectForm, type ObjectCore, type ObjectFormValues } from "./object-form";
export function ObjectEditForm() { export function ObjectEditForm() {
@@ -15,8 +15,16 @@ export function ObjectEditForm() {
const update = useUpdateObject(); const update = useUpdateObject();
const setFields = useSetFields(); const setFields = useSetFields();
const [error, setError] = useState<string | null>( const locationState = location.state as { fieldsError?: boolean; fieldErrorKey?: string } | null;
(location.state as { fieldsError?: boolean } | null)?.fieldsError ? t("form.rejected") : null,
const [error, setError] = useState<string | null>(() => {
if (locationState?.fieldErrorKey) return t("form.fieldRejected", { field: locationState.fieldErrorKey });
if (locationState?.fieldsError) return t("form.rejected");
return null;
});
const [fieldErrorKey, setFieldErrorKey] = useState<string | null>(
locationState?.fieldErrorKey ?? null,
); );
if (isLoading) return <div className="p-4" role="status" aria-label="loading" />; if (isLoading) return <div className="p-4" role="status" aria-label="loading" />;
@@ -38,12 +46,19 @@ export function ObjectEditForm() {
const onSubmit = async (values: ObjectFormValues) => { const onSubmit = async (values: ObjectFormValues) => {
setError(null); setError(null);
setFieldErrorKey(null);
try { try {
await update.mutateAsync({ id: id!, body: values.core }); await update.mutateAsync({ id: id!, body: values.core });
await setFields.mutateAsync({ id: id!, fields: values.fields }); await setFields.mutateAsync({ id: id!, fields: values.fields });
} catch { } catch (e) {
setError(t("form.rejected")); if (e instanceof FieldRejection) {
setFieldErrorKey(e.field);
setError(t("form.fieldRejected", { field: e.field }));
} else {
setError(t("form.rejected"));
}
return; return;
} }
@@ -55,6 +70,7 @@ export function ObjectEditForm() {
mode="edit" mode="edit"
defaults={defaults} defaults={defaults}
formError={error} formError={error}
fieldErrorKey={fieldErrorKey}
onSubmit={onSubmit} onSubmit={onSubmit}
onCancel={() => navigate(`/objects/${id}`)} onCancel={() => navigate(`/objects/${id}`)}
/> />
+38
View File
@@ -3,6 +3,7 @@ import { screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event"; import userEvent from "@testing-library/user-event";
import { renderApp } from "../test/render"; import { renderApp } from "../test/render";
import { ObjectForm } from "./object-form"; import { ObjectForm } from "./object-form";
import { pruneFields } from "./prune-fields";
test("create mode: shows visibility (draft/internal only) and submits assembled values", async () => { test("create mode: shows visibility (draft/internal only) and submits assembled values", async () => {
const onSubmit = vi.fn(); const onSubmit = vi.fn();
@@ -47,3 +48,40 @@ test("edit mode: no visibility control, save button, prefilled values", async ()
expect(screen.queryByLabelText(/visibility/i)).not.toBeInTheDocument(); expect(screen.queryByLabelText(/visibility/i)).not.toBeInTheDocument();
expect(screen.getByRole("button", { name: /save/i })).toBeInTheDocument(); expect(screen.getByRole("button", { name: /save/i })).toBeInTheDocument();
}); });
test("pruneFields: localized_text keeps only the default-language key, other object fields unaffected", () => {
const localizedTextKeys = new Set(["title_ml"]);
const result = pruneFields(
{ title_ml: { en: "Old", sv: "Ny" }, other: "x" },
localizedTextKeys,
"sv",
);
expect(result).toEqual({ title_ml: { sv: "Ny" }, other: "x" });
expect(Object.keys(result.title_ml as Record<string, unknown>)).not.toContain("en");
});
test("pruneFields: localized_text with only non-default lang produces empty object (key omitted)", () => {
const localizedTextKeys = new Set(["title_ml"]);
const result = pruneFields(
{ title_ml: { en: "English only" } },
localizedTextKeys,
"sv",
);
expect(result).toEqual({});
});
test("pruneFields: non-localized_text object fields are preserved as-is", () => {
const localizedTextKeys = new Set(["title_ml"]);
const result = pruneFields(
{ nested_obj: { a: "1", b: "2" } },
localizedTextKeys,
"sv",
);
expect(result).toEqual({ nested_obj: { a: "1", b: "2" } });
});
+21 -25
View File
@@ -1,8 +1,11 @@
import { useEffect } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { useFieldDefinitions } from "../api/queries"; import { useFieldDefinitions } from "../api/queries";
import { useConfig } from "../config/config-context";
import { FieldInput } from "./field-input"; import { FieldInput } from "./field-input";
import { pruneFields } from "./prune-fields";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label"; import { Label } from "@/components/ui/label";
@@ -47,17 +50,24 @@ export function ObjectForm({
onSubmit, onSubmit,
onCancel, onCancel,
formError, formError,
fieldErrorKey,
}: { }: {
mode: "create" | "edit"; mode: "create" | "edit";
defaults?: { core: ObjectCore; fields: Record<string, unknown> }; defaults?: { core: ObjectCore; fields: Record<string, unknown> };
onSubmit: (values: ObjectFormValues) => void; onSubmit: (values: ObjectFormValues) => void;
onCancel: () => void; onCancel: () => void;
formError?: string | null; formError?: string | null;
fieldErrorKey?: string | null;
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { default_language } = useConfig();
const { data: definitions } = useFieldDefinitions(); const { data: definitions } = useFieldDefinitions();
const localizedTextKeys = new Set(
(definitions ?? []).filter((d) => d.data_type === "localized_text").map((d) => d.key),
);
const form = useForm<FormShape>({ const form = useForm<FormShape>({
defaultValues: { defaultValues: {
core: defaults?.core ?? EMPTY_CORE, core: defaults?.core ?? EMPTY_CORE,
@@ -68,8 +78,17 @@ export function ObjectForm({
const { register, handleSubmit, formState: { errors } } = form; const { register, handleSubmit, formState: { errors } } = form;
useEffect(() => {
if (fieldErrorKey) {
form.setError(`fields.${fieldErrorKey}` as never, {
type: "server",
message: t("form.fieldRejected", { field: fieldErrorKey }),
});
}
}, [fieldErrorKey, form, t]);
const submit = handleSubmit((data) => { const submit = handleSubmit((data) => {
const fields = pruneFields(data.fields); const fields = pruneFields(data.fields, localizedTextKeys, default_language);
onSubmit( onSubmit(
mode === "create" mode === "create"
@@ -149,7 +168,7 @@ export function ObjectForm({
{errors.fields?.[def.key] && ( {errors.fields?.[def.key] && (
<p role="alert" className="text-xs text-red-600"> <p role="alert" className="text-xs text-red-600">
{t("form.required")} {errors.fields[def.key]?.message ?? t("form.required")}
</p> </p>
)} )}
</div> </div>
@@ -170,26 +189,3 @@ export function ObjectForm({
); );
} }
function pruneFields(fields: Record<string, unknown>): Record<string, unknown> {
const out: Record<string, unknown> = {};
for (const [key, value] of Object.entries(fields)) {
if (value === undefined || value === null || value === "") continue;
if (typeof value === "object" && !Array.isArray(value)) {
const inner = Object.fromEntries(
Object.entries(value as Record<string, unknown>).filter(
([, v]) => v !== undefined && v !== null && v !== "",
),
);
if (Object.keys(inner).length > 0) out[key] = inner;
continue;
}
out[key] = value;
}
return out;
}
+4 -3
View File
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ObjectForm, type ObjectFormValues } from "./object-form"; import { ObjectForm, type ObjectFormValues } from "./object-form";
import { useCreateObject, useSetFields } from "../api/queries"; import { useCreateObject, useSetFields, FieldRejection } from "../api/queries";
export function ObjectNewPage() { export function ObjectNewPage() {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -32,8 +32,9 @@ export function ObjectNewPage() {
if (Object.keys(values.fields).length > 0) { if (Object.keys(values.fields).length > 0) {
try { try {
await setFields.mutateAsync({ id, fields: values.fields }); await setFields.mutateAsync({ id, fields: values.fields });
} catch { } catch (e) {
navigate(`/objects/${id}/edit`, { state: { fieldsError: true } }); const fieldErrorKey = e instanceof FieldRejection ? e.field : undefined;
navigate(`/objects/${id}/edit`, { state: { fieldsError: true, fieldErrorKey } });
return; return;
} }
} }
+31
View File
@@ -0,0 +1,31 @@
export function pruneFields(
fields: Record<string, unknown>,
localizedTextKeys: Set<string>,
defaultLang: string,
): Record<string, unknown> {
const out: Record<string, unknown> = {};
for (const [key, value] of Object.entries(fields)) {
if (value === undefined || value === null || value === "") continue;
if (typeof value === "object" && !Array.isArray(value)) {
const map = value as Record<string, unknown>;
// Single-language authoring: a localized_text value keeps only the default lang.
const entries = localizedTextKeys.has(key)
? Object.entries(map).filter(([lang]) => lang === defaultLang)
: Object.entries(map);
const inner = Object.fromEntries(
entries.filter(([, v]) => v !== undefined && v !== null && v !== ""),
);
if (Object.keys(inner).length > 0) out[key] = inner;
continue;
}
out[key] = value;
}
return out;
}
+6 -3
View File
@@ -1,18 +1,21 @@
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import type { components } from "../api/schema";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
const STYLES: Record<string, string> = { type Visibility = components["schemas"]["Visibility"];
const STYLES: Record<Visibility, string> = {
draft: "bg-neutral-100 text-neutral-600", draft: "bg-neutral-100 text-neutral-600",
internal: "bg-amber-100 text-amber-800", internal: "bg-amber-100 text-amber-800",
public: "bg-green-100 text-green-800", public: "bg-green-100 text-green-800",
}; };
export function VisibilityBadge({ visibility }: { visibility: string }) { export function VisibilityBadge({ visibility }: { visibility: Visibility }) {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<Badge variant="outline" className={STYLES[visibility] ?? ""}> <Badge variant="outline" className={STYLES[visibility]}>
{t(`visibility.${visibility}`)} {t(`visibility.${visibility}`)}
</Badge> </Badge>
); );
+1 -1
View File
@@ -79,7 +79,7 @@ export const searchHits: SearchHitView[] = [
object_number: `N-${i + 2}`, object_number: `N-${i + 2}`,
object_name: `Object ${i + 2}`, object_name: `Object ${i + 2}`,
brief_description: null, brief_description: null,
visibility: "internal", visibility: "internal" as const,
snippet: null, snippet: null,
})), })),
]; ];