feat(web): set breadcrumb trails on all AppShell routes (#54)
This commit is contained in:
@@ -9,6 +9,7 @@ import { Button } from "@/components/ui/button";
|
|||||||
import { PageTitle } from "@/components/ui/page-title";
|
import { PageTitle } from "@/components/ui/page-title";
|
||||||
import { AuthorityRow } from "./authority-row";
|
import { AuthorityRow } from "./authority-row";
|
||||||
import { useDocumentTitle } from "../lib/use-document-title";
|
import { useDocumentTitle } from "../lib/use-document-title";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
|
|
||||||
type LabelInput = components["schemas"]["LabelInput"];
|
type LabelInput = components["schemas"]["LabelInput"];
|
||||||
|
|
||||||
@@ -29,6 +30,7 @@ export function AuthoritiesPage() {
|
|||||||
const [error, setError] = useState(false);
|
const [error, setError] = useState(false);
|
||||||
|
|
||||||
useDocumentTitle(t("nav.authorities"));
|
useDocumentTitle(t("nav.authorities"));
|
||||||
|
useBreadcrumb([{ label: t("nav.authorities") }]);
|
||||||
|
|
||||||
if (!isValidKind) return <Navigate to="/authorities/person" replace />;
|
if (!isValidKind) return <Navigate to="/authorities/person" replace />;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import type { components } from "../api/schema";
|
|||||||
import { FieldList } from "./field-list";
|
import { FieldList } from "./field-list";
|
||||||
import { FieldForm } from "./field-form";
|
import { FieldForm } from "./field-form";
|
||||||
import { useDocumentTitle } from "../lib/use-document-title";
|
import { useDocumentTitle } from "../lib/use-document-title";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
import { PageTitle } from "@/components/ui/page-title";
|
import { PageTitle } from "@/components/ui/page-title";
|
||||||
|
|
||||||
type FieldDefinitionView = components["schemas"]["FieldDefinitionView"];
|
type FieldDefinitionView = components["schemas"]["FieldDefinitionView"];
|
||||||
@@ -14,6 +15,7 @@ export function FieldsPage() {
|
|||||||
const [selected, setSelected] = useState<FieldDefinitionView | null>(null);
|
const [selected, setSelected] = useState<FieldDefinitionView | null>(null);
|
||||||
|
|
||||||
useDocumentTitle(t("fields.title"));
|
useDocumentTitle(t("fields.title"));
|
||||||
|
useBreadcrumb([{ label: t("nav.fields") }]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full flex-col">
|
<div className="flex h-full flex-col">
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import type { components } from "../api/schema";
|
|||||||
import { useObject, useFieldDefinitions } from "../api/queries";
|
import { useObject, useFieldDefinitions } from "../api/queries";
|
||||||
import { formatDate } from "../lib/format-date";
|
import { formatDate } from "../lib/format-date";
|
||||||
import { useDocumentTitle } from "../lib/use-document-title";
|
import { useDocumentTitle } from "../lib/use-document-title";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
import { DeleteObjectDialog } from "./delete-object-dialog";
|
import { DeleteObjectDialog } from "./delete-object-dialog";
|
||||||
import { FlexibleFieldValue } from "./flexible-field-value";
|
import { FlexibleFieldValue } from "./flexible-field-value";
|
||||||
import { PublishControl } from "./publish-control";
|
import { PublishControl } from "./publish-control";
|
||||||
@@ -52,6 +53,7 @@ function ObjectDetailLoaded({ object }: { object: AdminObjectView }) {
|
|||||||
const { data: definitions } = useFieldDefinitions();
|
const { data: definitions } = useFieldDefinitions();
|
||||||
|
|
||||||
useDocumentTitle(object.object_number);
|
useDocumentTitle(object.object_number);
|
||||||
|
useBreadcrumb([{ label: t("nav.objects"), to: "/objects" }, { label: object.object_number }]);
|
||||||
|
|
||||||
// Prefer the active locale's label, then English, then the raw key.
|
// Prefer the active locale's label, then English, then the raw key.
|
||||||
const lang = i18n.language.startsWith("sv") ? "sv" : "en";
|
const lang = i18n.language.startsWith("sv") ? "sv" : "en";
|
||||||
|
|||||||
@@ -2,16 +2,31 @@ 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 type { components } from "../api/schema";
|
||||||
import { useObject, useUpdateObject, useSetFields, FieldRejection } from "../api/queries";
|
import { useObject, useUpdateObject, useSetFields, FieldRejection } from "../api/queries";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
import { ObjectForm, type ObjectCore, type ObjectFormValues } from "./object-form";
|
import { ObjectForm, type ObjectCore, type ObjectFormValues } from "./object-form";
|
||||||
|
|
||||||
|
type AdminObjectView = components["schemas"]["AdminObjectView"];
|
||||||
|
|
||||||
export function ObjectEditForm() {
|
export function ObjectEditForm() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { id } = useParams();
|
const { id } = useParams();
|
||||||
|
|
||||||
|
const { data: object, isLoading } = useObject(id!);
|
||||||
|
|
||||||
|
if (isLoading) return <div className="p-4" role="status" aria-label="loading" />;
|
||||||
|
|
||||||
|
if (!object) return <p className="p-4 text-sm text-muted-foreground">{t("objects.notFound")}</p>;
|
||||||
|
|
||||||
|
return <ObjectEditFormLoaded object={object} id={id!} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
function ObjectEditFormLoaded({ object, id }: { object: AdminObjectView; id: string }) {
|
||||||
|
const { t } = useTranslation();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
|
||||||
const { data: object, isLoading } = useObject(id!);
|
|
||||||
const update = useUpdateObject();
|
const update = useUpdateObject();
|
||||||
const setFields = useSetFields();
|
const setFields = useSetFields();
|
||||||
|
|
||||||
@@ -27,9 +42,11 @@ export function ObjectEditForm() {
|
|||||||
locationState?.fieldErrorKey ?? null,
|
locationState?.fieldErrorKey ?? null,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isLoading) return <div className="p-4" role="status" aria-label="loading" />;
|
useBreadcrumb([
|
||||||
|
{ label: t("nav.objects"), to: "/objects" },
|
||||||
if (!object) return <p className="p-4 text-sm text-muted-foreground">{t("objects.notFound")}</p>;
|
{ label: object.object_number, to: `/objects/${id}` },
|
||||||
|
{ label: t("actions.edit") },
|
||||||
|
]);
|
||||||
|
|
||||||
const core: ObjectCore = {
|
const core: ObjectCore = {
|
||||||
object_number: object.object_number,
|
object_number: object.object_number,
|
||||||
@@ -49,8 +66,8 @@ export function ObjectEditForm() {
|
|||||||
setFieldErrorKey(null);
|
setFieldErrorKey(null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await update.mutateAsync({ id: id!, body: values.core });
|
await update.mutateAsync({ id, body: values.core });
|
||||||
await setFields.mutateAsync({ id: id!, fields: values.fields });
|
await setFields.mutateAsync({ id, fields: values.fields });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e instanceof FieldRejection) {
|
if (e instanceof FieldRejection) {
|
||||||
setFieldErrorKey(e.field);
|
setFieldErrorKey(e.field);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
|
|||||||
import { ObjectForm, type ObjectFormValues } from "./object-form";
|
import { ObjectForm, type ObjectFormValues } from "./object-form";
|
||||||
import { useCreateObject, useSetFields, FieldRejection } from "../api/queries";
|
import { useCreateObject, useSetFields, FieldRejection } from "../api/queries";
|
||||||
import { useDocumentTitle } from "../lib/use-document-title";
|
import { useDocumentTitle } from "../lib/use-document-title";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
import { PageTitle } from "@/components/ui/page-title";
|
import { PageTitle } from "@/components/ui/page-title";
|
||||||
|
|
||||||
export function ObjectNewPage() {
|
export function ObjectNewPage() {
|
||||||
@@ -15,6 +16,7 @@ export function ObjectNewPage() {
|
|||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
useDocumentTitle(t("objects.new"));
|
useDocumentTitle(t("objects.new"));
|
||||||
|
useBreadcrumb([{ label: t("nav.objects"), to: "/objects" }, { label: t("objects.new") }]);
|
||||||
|
|
||||||
const onSubmit = async (values: ObjectFormValues) => {
|
const onSubmit = async (values: ObjectFormValues) => {
|
||||||
setError(null);
|
setError(null);
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ import { useTranslation } from "react-i18next";
|
|||||||
|
|
||||||
import { SearchPanel } from "./search-panel";
|
import { SearchPanel } from "./search-panel";
|
||||||
import { useDocumentTitle } from "../lib/use-document-title";
|
import { useDocumentTitle } from "../lib/use-document-title";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
import { PageTitle } from "@/components/ui/page-title";
|
import { PageTitle } from "@/components/ui/page-title";
|
||||||
|
|
||||||
export function SearchPage() {
|
export function SearchPage() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
useDocumentTitle(t("nav.search"));
|
useDocumentTitle(t("nav.search"));
|
||||||
|
useBreadcrumb([{ label: t("nav.search") }]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full flex-col">
|
<div className="flex h-full flex-col">
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
import { expect, test } from "vitest";
|
import { expect, test } from "vitest";
|
||||||
import { screen } from "@testing-library/react";
|
import { screen, within } from "@testing-library/react";
|
||||||
|
import { Routes, Route } from "react-router-dom";
|
||||||
import { renderApp } from "../test/render";
|
import { renderApp } from "../test/render";
|
||||||
|
import { AppShell } from "./app-shell";
|
||||||
|
import { ObjectNewPage } from "../objects/object-new-page";
|
||||||
import { BreadcrumbProvider } from "./breadcrumb-provider";
|
import { BreadcrumbProvider } from "./breadcrumb-provider";
|
||||||
import { Breadcrumb } from "./breadcrumb";
|
import { Breadcrumb } from "./breadcrumb";
|
||||||
import { useBreadcrumb } from "./use-breadcrumb";
|
import { useBreadcrumb } from "./use-breadcrumb";
|
||||||
@@ -24,3 +27,21 @@ test("renders the trail with a link on non-leaf crumbs", async () => {
|
|||||||
expect(link).toHaveAttribute("href", "/objects");
|
expect(link).toHaveAttribute("href", "/objects");
|
||||||
expect(screen.getByText("LM-0042")).toBeInTheDocument();
|
expect(screen.getByText("LM-0042")).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("a nested route sets the header breadcrumb inside AppShell", async () => {
|
||||||
|
renderApp(
|
||||||
|
<Routes>
|
||||||
|
<Route element={<AppShell />}>
|
||||||
|
<Route path="/objects/new" element={<ObjectNewPage />} />
|
||||||
|
</Route>
|
||||||
|
</Routes>,
|
||||||
|
{ route: "/objects/new" },
|
||||||
|
);
|
||||||
|
|
||||||
|
const nav = await screen.findByRole("navigation", { name: "Breadcrumb" });
|
||||||
|
const within_nav = within(nav);
|
||||||
|
|
||||||
|
const objectsLink = within_nav.getByRole("link", { name: "Objects" });
|
||||||
|
expect(objectsLink).toHaveAttribute("href", "/objects");
|
||||||
|
expect(within_nav.getByText("New object")).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ import { useTranslation } from "react-i18next";
|
|||||||
|
|
||||||
import { VocabularyList } from "./vocabulary-list";
|
import { VocabularyList } from "./vocabulary-list";
|
||||||
import { useDocumentTitle } from "../lib/use-document-title";
|
import { useDocumentTitle } from "../lib/use-document-title";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
import { PageTitle } from "@/components/ui/page-title";
|
import { PageTitle } from "@/components/ui/page-title";
|
||||||
|
|
||||||
export function VocabulariesPage() {
|
export function VocabulariesPage() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
useDocumentTitle(t("nav.vocabularies"));
|
useDocumentTitle(t("nav.vocabularies"));
|
||||||
|
useBreadcrumb([{ label: t("nav.vocabularies") }]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full flex-col">
|
<div className="flex h-full flex-col">
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import { 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 { useTerms, useAddTerm } from "../api/queries";
|
import { useTerms, useAddTerm, useVocabularies } from "../api/queries";
|
||||||
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
import { LabelEditor } from "../components/label-editor";
|
import { LabelEditor } from "../components/label-editor";
|
||||||
import { TermRow } from "./term-row";
|
import { TermRow } from "./term-row";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
@@ -29,6 +30,15 @@ export function VocabularyTerms() {
|
|||||||
|
|
||||||
const [error, setError] = useState(false);
|
const [error, setError] = useState(false);
|
||||||
|
|
||||||
|
const { data: vocabularies } = useVocabularies();
|
||||||
|
const vocabKey = vocabularies?.find((v) => v.id === id)?.key;
|
||||||
|
|
||||||
|
useBreadcrumb(
|
||||||
|
vocabKey
|
||||||
|
? [{ label: t("nav.vocabularies"), to: "/vocabularies" }, { label: vocabKey }]
|
||||||
|
: [{ label: t("nav.vocabularies"), to: "/vocabularies" }],
|
||||||
|
);
|
||||||
|
|
||||||
if (!id) return null;
|
if (!id) return null;
|
||||||
|
|
||||||
const onAdd = (event: FormEvent) => {
|
const onAdd = (event: FormEvent) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user