fix(web): authorities unknown-kind redirect, extract labelText util, EN-required test
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,37 +1,32 @@
|
|||||||
import { useState, type FormEvent } from "react";
|
import { useState, type FormEvent } from "react";
|
||||||
import { NavLink, useParams } from "react-router-dom";
|
import { NavLink, Navigate, useParams } from "react-router-dom";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
import type { components } from "../api/schema";
|
import type { components } from "../api/schema";
|
||||||
import { useAuthorities, useCreateAuthority } from "../api/queries";
|
import { useAuthorities, useCreateAuthority } from "../api/queries";
|
||||||
import { LabelEditor } from "../components/label-editor";
|
import { LabelEditor } from "../components/label-editor";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { labelText } from "../lib/labels";
|
||||||
|
|
||||||
type LabelInput = components["schemas"]["LabelInput"];
|
type LabelInput = components["schemas"]["LabelInput"];
|
||||||
type LabelView = components["schemas"]["LabelView"];
|
|
||||||
|
|
||||||
const KINDS = ["person", "organisation", "place"] as const;
|
const KINDS = ["person", "organisation", "place"] as const;
|
||||||
|
|
||||||
function labelText(labels: LabelView[], lang: string): string {
|
|
||||||
return (
|
|
||||||
labels.find((l) => l.lang === lang)?.label ??
|
|
||||||
labels.find((l) => l.lang === "en")?.label ??
|
|
||||||
labels[0]?.label ??
|
|
||||||
""
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function AuthoritiesPage() {
|
export function AuthoritiesPage() {
|
||||||
const { t, i18n } = useTranslation();
|
const { t, i18n } = useTranslation();
|
||||||
const { kind = "person" } = useParams();
|
const { kind } = useParams();
|
||||||
const lang = i18n.language.startsWith("sv") ? "sv" : "en";
|
const lang = i18n.language.startsWith("sv") ? "sv" : "en";
|
||||||
|
|
||||||
const { data: authorities } = useAuthorities(kind);
|
const isValidKind = (KINDS as readonly string[]).includes(kind ?? "");
|
||||||
|
|
||||||
|
const { data: authorities } = useAuthorities(isValidKind ? (kind as string) : "person");
|
||||||
const create = useCreateAuthority();
|
const create = useCreateAuthority();
|
||||||
|
|
||||||
const [labels, setLabels] = useState<LabelInput[]>([]);
|
const [labels, setLabels] = useState<LabelInput[]>([]);
|
||||||
const [error, setError] = useState(false);
|
const [error, setError] = useState(false);
|
||||||
|
|
||||||
|
if (!isValidKind) return <Navigate to="/authorities/person" replace />;
|
||||||
|
|
||||||
const onCreate = (event: FormEvent) => {
|
const onCreate = (event: FormEvent) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
@@ -42,7 +37,7 @@ export function AuthoritiesPage() {
|
|||||||
|
|
||||||
setError(false);
|
setError(false);
|
||||||
create.mutate(
|
create.mutate(
|
||||||
{ kind, external_uri: null, labels },
|
{ kind: kind as string, external_uri: null, labels },
|
||||||
{ onSuccess: () => setLabels([]) },
|
{ onSuccess: () => setLabels([]) },
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -35,3 +35,23 @@ test("kind tabs link to the other kinds", async () => {
|
|||||||
renderApp(tree(), { route: "/authorities/person" });
|
renderApp(tree(), { route: "/authorities/person" });
|
||||||
expect(await screen.findByRole("link", { name: /place/i })).toHaveAttribute("href", "/authorities/place");
|
expect(await screen.findByRole("link", { name: /place/i })).toHaveAttribute("href", "/authorities/place");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("create without EN label shows required alert and does not POST", async () => {
|
||||||
|
let posted = false;
|
||||||
|
server.use(
|
||||||
|
http.post("/api/admin/authorities", () => {
|
||||||
|
posted = true;
|
||||||
|
return HttpResponse.json({ id: "a-x" }, { status: 201 });
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
renderApp(tree(), { route: "/authorities/person" });
|
||||||
|
expect(await screen.findByText("Ada Lovelace")).toBeInTheDocument();
|
||||||
|
await userEvent.click(screen.getByRole("button", { name: /create/i }));
|
||||||
|
expect(screen.getByRole("alert")).toBeInTheDocument();
|
||||||
|
expect(posted).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("unknown kind redirects to person list", async () => {
|
||||||
|
renderApp(tree(), { route: "/authorities/banana" });
|
||||||
|
expect(await screen.findByText("Ada Lovelace")).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import type { components } from "../api/schema";
|
||||||
|
|
||||||
|
type LabelView = components["schemas"]["LabelView"];
|
||||||
|
|
||||||
|
export function labelText(labels: LabelView[], lang: string): string {
|
||||||
|
return (
|
||||||
|
labels.find((l) => l.lang === lang)?.label ??
|
||||||
|
labels.find((l) => l.lang === "en")?.label ??
|
||||||
|
labels[0]?.label ??
|
||||||
|
""
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,18 +8,9 @@ import { LabelEditor } from "../components/label-editor";
|
|||||||
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";
|
||||||
|
import { labelText } from "../lib/labels";
|
||||||
|
|
||||||
type LabelInput = components["schemas"]["LabelInput"];
|
type LabelInput = components["schemas"]["LabelInput"];
|
||||||
type LabelView = components["schemas"]["LabelView"];
|
|
||||||
|
|
||||||
function labelText(labels: LabelView[], lang: string): string {
|
|
||||||
return (
|
|
||||||
labels.find((l) => l.lang === lang)?.label ??
|
|
||||||
labels.find((l) => l.lang === "en")?.label ??
|
|
||||||
labels[0]?.label ??
|
|
||||||
""
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function VocabularyTerms() {
|
export function VocabularyTerms() {
|
||||||
const { t, i18n } = useTranslation();
|
const { t, i18n } = useTranslation();
|
||||||
|
|||||||
Reference in New Issue
Block a user