Add entry relations and tags

Show relations and tag membership sections on entry detail.

Signed-off-by: codex@lucy.xalior.com
This commit is contained in:
2026-01-10 18:23:58 +00:00
parent 06ddeba9bb
commit d9f55c3eb6
2 changed files with 206 additions and 0 deletions

View File

@@ -22,6 +22,20 @@ export type EntryDetailData = {
linkSite?: string | null; linkSite?: string | null;
comments?: string | null; comments?: string | null;
}[]; }[];
relations?: {
direction: "from" | "to";
type: { id: string; name: string | null };
entry: { id: number; title: string | null };
}[];
tags?: {
id: number;
name: string;
type: { id: string; name: string | null };
category: { id: number | null; name: string | null };
memberSeq: number | null;
link: string | null;
comments: string | null;
}[];
origins?: { origins?: {
type: { id: string; name: string | null }; type: { id: string; name: string | null };
libraryTitle: string; libraryTitle: string;
@@ -403,6 +417,80 @@ export default function EntryDetailClient({ data }: { data: EntryDetailData | nu
<hr /> <hr />
<div>
<h5>Relations</h5>
{(!data.relations || data.relations.length === 0) && <div className="text-secondary">No relations recorded</div>}
{data.relations && data.relations.length > 0 && (
<div className="table-responsive">
<table className="table table-sm table-striped align-middle">
<thead>
<tr>
<th style={{ width: 90 }}>Direction</th>
<th style={{ width: 160 }}>Type</th>
<th>Entry</th>
</tr>
</thead>
<tbody>
{data.relations.map((r, idx) => (
<tr key={`${r.entry.id}-${r.type.id}-${idx}`}>
<td>{r.direction === "from" ? "From" : "To"}</td>
<td>{r.type.name ?? r.type.id}</td>
<td>
<Link href={`/zxdb/entries/${r.entry.id}`}>
{r.entry.title ?? `Entry #${r.entry.id}`}
</Link>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
</div>
<hr />
<div>
<h5>Tags / Members</h5>
{(!data.tags || data.tags.length === 0) && <div className="text-secondary">No tags recorded</div>}
{data.tags && data.tags.length > 0 && (
<div className="table-responsive">
<table className="table table-sm table-striped align-middle">
<thead>
<tr>
<th>Tag</th>
<th style={{ width: 140 }}>Type</th>
<th style={{ width: 140 }}>Category</th>
<th style={{ width: 120 }}>Member Seq</th>
<th>Links</th>
</tr>
</thead>
<tbody>
{data.tags.map((t) => (
<tr key={`${t.id}-${t.category.id ?? "none"}`}>
<td>{t.name}</td>
<td>{t.type.name ?? t.type.id}</td>
<td>{t.category.name ?? (t.category.id != null ? `#${t.category.id}` : "-")}</td>
<td>{t.memberSeq ?? <span className="text-secondary">-</span>}</td>
<td>
<div className="d-flex gap-2 flex-wrap">
{t.link && (
<a href={t.link} target="_blank" rel="noreferrer">Link</a>
)}
{t.comments && <span className="text-secondary">{t.comments}</span>}
{!t.link && !t.comments && <span className="text-secondary">-</span>}
</div>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
</div>
<hr />
{/* Aliases (alternative titles) */} {/* Aliases (alternative titles) */}
<div> <div>
<h5>Aliases</h5> <h5>Aliases</h5>

View File

@@ -14,6 +14,7 @@ import {
languages, languages,
machinetypes, machinetypes,
genretypes, genretypes,
categories,
files, files,
filetypes, filetypes,
releases, releases,
@@ -33,6 +34,11 @@ import {
permissions, permissions,
permissiontypes, permissiontypes,
origintypes, origintypes,
relations,
relationtypes,
tags,
tagtypes,
members,
webrefs, webrefs,
websites, websites,
magazines, magazines,
@@ -299,6 +305,20 @@ export interface EntryDetail {
linkSite?: string | null; linkSite?: string | null;
comments?: string | null; comments?: string | null;
}[]; }[];
relations?: {
direction: "from" | "to";
type: { id: string; name: string | null };
entry: { id: number; title: string | null };
}[];
tags?: {
id: number;
name: string;
type: { id: string; name: string | null };
category: { id: number | null; name: string | null };
memberSeq: number | null;
link: string | null;
comments: string | null;
}[];
origins?: { origins?: {
type: { id: string; name: string | null }; type: { id: string; name: string | null };
libraryTitle: string; libraryTitle: string;
@@ -583,6 +603,30 @@ export async function getEntryById(id: number): Promise<EntryDetail | null> {
dateDay: number | string | null; dateDay: number | string | null;
publication: string | null; publication: string | null;
}[] = []; }[] = [];
let relationOutRows: {
relationtypeId: string;
relationtypeName: string | null;
relatedId: number | string;
relatedTitle: string | null;
}[] = [];
let relationInRows: {
relationtypeId: string;
relationtypeName: string | null;
relationtypeReciprocal: string | null;
relatedId: number | string;
relatedTitle: string | null;
}[] = [];
let tagRows: {
id: number | string;
name: string;
tagtypeId: string;
tagtypeName: string | null;
categoryId: number | string | null;
categoryName: string | null;
memberSeq: number | string | null;
link: string | null;
comments: string | null;
}[] = [];
try { try {
aliasRows = await db aliasRows = await db
.select({ releaseSeq: aliases.releaseSeq, languageId: aliases.languageId, title: aliases.title }) .select({ releaseSeq: aliases.releaseSeq, languageId: aliases.languageId, title: aliases.title })
@@ -644,6 +688,59 @@ export async function getEntryById(id: number): Promise<EntryDetail | null> {
); );
originRows = rows as typeof originRows; originRows = rows as typeof originRows;
} catch {} } catch {}
try {
const rows = await db
.select({
relationtypeId: relations.relationtypeId,
relationtypeName: relationtypes.name,
relatedId: relations.originalId,
relatedTitle: entries.title,
})
.from(relations)
.innerJoin(relationtypes, eq(relationtypes.id, relations.relationtypeId))
.leftJoin(entries, eq(entries.id, relations.originalId))
.where(eq(relations.entryId, id));
relationOutRows = rows as typeof relationOutRows;
} catch {}
try {
const rows = await db
.select({
relationtypeId: relations.relationtypeId,
relationtypeName: relationtypes.name,
relationtypeReciprocal: relationtypes.reciprocal,
relatedId: relations.entryId,
relatedTitle: entries.title,
})
.from(relations)
.innerJoin(relationtypes, eq(relationtypes.id, relations.relationtypeId))
.leftJoin(entries, eq(entries.id, relations.entryId))
.where(eq(relations.originalId, id));
relationInRows = rows as typeof relationInRows;
} catch {}
try {
const rows = await db
.select({
id: tags.id,
name: tags.name,
tagtypeId: tags.tagtypeId,
tagtypeName: tagtypes.name,
categoryId: members.categoryId,
categoryName: categories.name,
memberSeq: members.memberSeq,
link: tags.link,
comments: tags.comments,
})
.from(members)
.innerJoin(tags, eq(tags.id, members.tagId))
.leftJoin(tagtypes, eq(tagtypes.id, tags.tagtypeId))
.leftJoin(categories, eq(categories.id, members.categoryId))
.where(eq(members.entryId, id))
.orderBy(
asc(tags.name),
asc(members.memberSeq)
);
tagRows = rows as typeof tagRows;
} catch {}
return { return {
id: base.id, id: base.id,
@@ -663,6 +760,27 @@ export async function getEntryById(id: number): Promise<EntryDetail | null> {
linkSite: l.linkSite ?? null, linkSite: l.linkSite ?? null,
comments: l.comments ?? null, comments: l.comments ?? null,
})), })),
relations: [
...relationOutRows.map((r) => ({
direction: "from" as const,
type: { id: r.relationtypeId, name: r.relationtypeName ?? null },
entry: { id: Number(r.relatedId), title: r.relatedTitle ?? null },
})),
...relationInRows.map((r) => ({
direction: "to" as const,
type: { id: r.relationtypeId, name: r.relationtypeReciprocal ?? r.relationtypeName ?? null },
entry: { id: Number(r.relatedId), title: r.relatedTitle ?? null },
})),
],
tags: tagRows.map((t) => ({
id: Number(t.id),
name: t.name,
type: { id: t.tagtypeId, name: t.tagtypeName ?? null },
category: { id: t.categoryId != null ? Number(t.categoryId) : null, name: t.categoryName ?? null },
memberSeq: t.memberSeq != null ? Number(t.memberSeq) : null,
link: t.link ?? null,
comments: t.comments ?? null,
})),
origins: originRows.map((o) => ({ origins: originRows.map((o) => ({
type: { id: o.origintypeId, name: o.origintypeName ?? null }, type: { id: o.origintypeId, name: o.origintypeName ?? null },
libraryTitle: o.libraryTitle, libraryTitle: o.libraryTitle,