Delning av böcker, skydd mot kolliderande ändringar och import från Word

Böcker kan delas med roller (läsare, redaktör, administratör), och
behörigheten kontrolleras på servern. Formulär för poster, relationer och
händelser skickar med version, och en krock visar vad som skiljer och låter
användaren spara ändå eller ladda om. Ifyllda Word-mallar kan importeras med
förhandsgranskning. Importerade ID flyttar nu räknaren. Migrering 0007.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
bobbanandClaude Sonnet 5.5 committed 2026-11-04 23:53:33 +01:00
1 parent bd269d70a5
commit 86fd435438
64 files changed
+4796 -235

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@ export default async function NewEntityPage({
}) {
const { bookId, kind: slug } = await params;
const { name, error } = await searchParams;
await requireBook(bookId);
await requireBook(bookId, "EDITOR");
const info = KIND_BY_SLUG.get(slug);
if (!info) notFound();
const { t, locale } = await getT();
+4 -3
View File
@@ -7,6 +7,7 @@ import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { fileUrl } from "@/lib/files";
import { KIND_BY_SLUG } from "@/lib/kinds";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
export default async function EntityListPage({
@@ -18,7 +19,7 @@ export default async function EntityListPage({
}) {
const { bookId, kind: slug } = await params;
const { q, tag } = await searchParams;
await requireBook(bookId);
const book = await requireBook(bookId);
const info = KIND_BY_SLUG.get(slug);
if (!info) notFound();
const { t } = await getT();
@@ -49,7 +50,7 @@ export default async function EntityListPage({
<PageHeader
title={t(`kind.${info.kind}.other`)}
actions={
<Link href={`${base}/new`} className="btn btn-primary">
<Link href={`${base}/new`} className="btn btn-primary" hidden={!hasRole(book.role, "EDITOR")}>
<IconPlus size={18} className="me-1" />
{t(`kind.${info.kind}.new`)}
</Link>
@@ -124,7 +125,7 @@ export default async function EntityListPage({
))}
</td>
<td className="text-end w-1">
<Link href={`/books/${bookId}/entity/${entity.id}/edit`} className="btn btn-sm">
<Link href={`/books/${bookId}/entity/${entity.id}/edit`} className="btn btn-sm" hidden={!hasRole(book.role, "EDITOR")}>
{t("common.edit")}
</Link>
</td>
@@ -15,7 +15,7 @@ export default async function EditEntityPage({
}) {
const { bookId, entityId } = await params;
const { error } = await searchParams;
const entity = await requireEntity(bookId, entityId);
const entity = await requireEntity(bookId, entityId, "EDITOR");
const { t, locale } = await getT();
const { fields } = await getTemplate(bookId, entity.kind, locale);
const refEntities = await prisma.entity.findMany({
@@ -6,7 +6,8 @@ import { EmptyState, PageBody, PageHeader } from "@/components/page";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { diffSnapshots, MAX_VERSIONS, snapshotOf, type Snapshot } from "@/lib/history";
import { requireEntity } from "@/lib/session";
import { hasRole } from "@/lib/access";
import { requireBook, requireEntity } from "@/lib/session";
import { getTemplate } from "@/lib/templates";
export const metadata = { title: "Historik" };
@@ -14,6 +15,7 @@ export const metadata = { title: "Historik" };
export default async function HistoryPage({ params }: { params: Promise<{ bookId: string; entityId: string }> }) {
const { bookId, entityId } = await params;
const entity = await requireEntity(bookId, entityId);
const canEdit = hasRole((await requireBook(bookId)).role, "EDITOR");
const { t, locale } = await getT();
const { fields } = await getTemplate(bookId, entity.kind, locale);
@@ -63,15 +65,17 @@ export default async function HistoryPage({ params }: { params: Promise<{ bookId
) : null}
</h3>
<div className="card-actions">
<form action={restoreVersion}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="entityId" value={entityId} />
<input type="hidden" name="versionId" value={version.id} />
<ConfirmSubmit className="btn btn-sm" message={t("history.restoreConfirm")}>
<IconArrowBackUp size={16} className="me-1" />
{t("history.restore")}
</ConfirmSubmit>
</form>
{canEdit ? (
<form action={restoreVersion}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="entityId" value={entityId} />
<input type="hidden" name="versionId" value={version.id} />
<ConfirmSubmit className="btn btn-sm" message={t("history.restoreConfirm")}>
<IconArrowBackUp size={16} className="me-1" />
{t("history.restore")}
</ConfirmSubmit>
</form>
) : null}
</div>
</div>
<div className="list-group list-group-flush">
@@ -10,7 +10,8 @@ import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { fileUrl } from "@/lib/files";
import { KIND_INFO, WORKPLACE_KINDS } from "@/lib/kinds";
import { requireEntity } from "@/lib/session";
import { hasRole } from "@/lib/access";
import { requireBook, requireEntity } from "@/lib/session";
import { formatFieldValue, getTemplate, type FieldDef } from "@/lib/templates";
type RefTarget = { id: string; name: string; code: string | null };
@@ -39,6 +40,7 @@ function groupFields(fields: FieldDef[], data: Record<string, unknown>, byId: Ma
export default async function EntityPage({ params }: { params: Promise<{ bookId: string; entityId: string }> }) {
const { bookId, entityId } = await params;
const base = await requireEntity(bookId, entityId);
const canEdit = hasRole((await requireBook(bookId)).role, "EDITOR");
const { t, locale } = await getT();
const [entity, template, bookEntities, maps] = await Promise.all([
@@ -152,24 +154,28 @@ export default async function EntityPage({ params }: { params: Promise<{ bookId:
}
actions={
<>
<Link href={`${entityHref(entity.id)}/edit`} className="btn">
<IconPencil size={18} className="me-1" />
{t("common.edit")}
</Link>
{canEdit ? (
<Link href={`${entityHref(entity.id)}/edit`} className="btn">
<IconPencil size={18} className="me-1" />
{t("common.edit")}
</Link>
) : null}
{versionCount > 0 ? (
<Link href={`${entityHref(entity.id)}/history`} className="btn">
<IconHistory size={18} className="me-1" />
{t("history.button", { n: versionCount })}
</Link>
) : null}
<form action={deleteEntity}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={entity.id} />
<ConfirmSubmit className="btn btn-outline-danger" message={t("trash.moveConfirm")}>
<IconTrash size={18} className="me-1" />
{t("common.delete")}
</ConfirmSubmit>
</form>
{canEdit ? (
<form action={deleteEntity}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={entity.id} />
<ConfirmSubmit className="btn btn-outline-danger" message={t("trash.moveConfirm")}>
<IconTrash size={18} className="me-1" />
{t("common.delete")}
</ConfirmSubmit>
</form>
) : null}
</>
}
/>
@@ -297,13 +303,15 @@ export default async function EntityPage({ params }: { params: Promise<{ bookId:
)}
{item.description ? <div className="text-secondary small">{item.description}</div> : null}
</div>
<RemoveRelation bookId={bookId} id={item.id} label={t("common.delete")} />
{canEdit ? <RemoveRelation bookId={bookId} id={item.id} label={t("common.delete")} /> : null}
</div>
))}
</div>
<div className="card-body border-top">
<RelationForm bookId={bookId} entities={allEntities} fixedFromId={entity.id} t={t} />
</div>
{canEdit ? (
<div className="card-body border-top">
<RelationForm bookId={bookId} entities={allEntities} fixedFromId={entity.id} t={t} />
</div>
) : null}
</div>
{entity.kind === "CHARACTER" ? (
@@ -0,0 +1,21 @@
import { PageBody, PageHeader } from "@/components/page";
import { WordImport } from "@/components/word-import";
import { getT } from "@/i18n/server";
import { requireBook } from "@/lib/session";
export const metadata = { title: "Importera från Word" };
export default async function ImportWordPage({ params }: { params: Promise<{ bookId: string }> }) {
const { bookId } = await params;
await requireBook(bookId, "EDITOR");
const { t } = await getT();
return (
<>
<PageHeader title={t("wordimport.title")} />
<PageBody>
<WordImport bookId={bookId} />
</PageBody>
</>
);
}
+10 -1
View File
@@ -1,4 +1,5 @@
import { Shell } from "@/components/shell";
import { getT } from "@/i18n/server";
import { requireBook, requireUser } from "@/lib/session";
export default async function BookLayout({
@@ -11,8 +12,16 @@ export default async function BookLayout({
const { bookId } = await params;
const user = await requireUser();
const book = await requireBook(bookId);
const { t } = await getT();
return (
<Shell user={user} book={{ id: book.id, title: book.title }}>
<Shell user={user} book={{ id: book.id, title: book.title, role: book.role }}>
{book.role === "VIEWER" ? (
<div className="page-body pb-0 mt-3 d-print-none">
<div className="container-xl">
<div className="alert alert-info mb-0">{t("share.viewerNotice")}</div>
</div>
</div>
) : null}
{children}
</Shell>
);
+4 -2
View File
@@ -6,6 +6,7 @@ import { PageBody, PageHeader } from "@/components/page";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { fileUrl } from "@/lib/files";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
// Standard är OpenStreetMaps publika tjänster. Byt via miljövariabler vid tyngre användning.
@@ -22,7 +23,7 @@ export default async function MapPage({
}) {
const { bookId, mapId } = await params;
const { place, marker } = await searchParams;
await requireBook(bookId);
const canEdit = hasRole((await requireBook(bookId)).role, "EDITOR");
const { t } = await getT();
const [map, entities] = await Promise.all([
@@ -47,6 +48,7 @@ export default async function MapPage({
/>
<PageBody>
<MapLoader
readOnly={!canEdit}
bookId={bookId}
mapId={map.id}
kind={map.kind}
@@ -71,7 +73,7 @@ export default async function MapPage({
initialMarkerId={marker ?? null}
/>
<div className="card mt-4">
<div className="card mt-4" hidden={!canEdit}>
<div className="card-header">
<h3 className="card-title">{t("map.settings")}</h3>
</div>
+3 -2
View File
@@ -4,6 +4,7 @@ import { createMap } from "@/actions/maps";
import { EmptyState, PageBody, PageHeader } from "@/components/page";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
export const metadata = { title: "Kartor" };
@@ -17,7 +18,7 @@ export default async function MapsPage({
}) {
const { bookId } = await params;
const { error } = await searchParams;
await requireBook(bookId);
const canEdit = hasRole((await requireBook(bookId)).role, "EDITOR");
const { t } = await getT();
const maps = await prisma.bookMap.findMany({
where: { bookId },
@@ -60,7 +61,7 @@ export default async function MapsPage({
)}
</div>
<div className="col-lg-4">
<div className="col-lg-4" hidden={!canEdit}>
<form action={createMap} className="card">
<input type="hidden" name="bookId" value={bookId} />
<div className="card-header">
+3 -2
View File
@@ -5,6 +5,7 @@ import { EmptyState, PageBody, PageHeader } from "@/components/page";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { KIND_INFO, KINDS } from "@/lib/kinds";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
export default async function BookDashboard({
@@ -59,7 +60,7 @@ export default async function BookDashboard({
</Link>
<div className="text-secondary">{countOf[kind] ?? 0}</div>
</div>
<div className="col-auto position-relative" style={{ zIndex: 2 }}>
<div className="col-auto position-relative" style={{ zIndex: 2 }} hidden={!hasRole(book.role, "EDITOR")}>
<Link
href={`/books/${bookId}/e/${slug}/new`}
className="btn btn-icon btn-sm btn-ghost-secondary"
@@ -97,7 +98,7 @@ export default async function BookDashboard({
</Link>
<div className="text-secondary">{countOf[kind] ?? 0}</div>
</div>
<div className="col-auto position-relative" style={{ zIndex: 2 }}>
<div className="col-auto position-relative" style={{ zIndex: 2 }} hidden={!hasRole(book.role, "EDITOR")}>
<Link
href={`/books/${bookId}/e/${slug}/new`}
className="btn btn-icon btn-sm btn-ghost-secondary"
@@ -4,11 +4,13 @@ import { Fragment } from "react";
import { IconTrash } from "@tabler/icons-react";
import { deleteRelation, saveRelation } from "@/actions/relations";
import { ConfirmSubmit } from "@/components/confirm-submit";
import { ConflictForm } from "@/components/conflict-form";
import { EntitySelect } from "@/components/entity-select";
import { FieldInput } from "@/components/entity-form";
import { RelationBondFields } from "@/components/relation-bond-fields";
import { PageBody, PageHeader } from "@/components/page";
import { getT } from "@/i18n/server";
import { versionOf } from "@/lib/conflict";
import { prisma } from "@/lib/db";
import { requireBook } from "@/lib/session";
import { getTemplate } from "@/lib/templates";
@@ -22,7 +24,7 @@ export default async function RelationPage({
}) {
const { bookId, relationId } = await params;
const { saved } = await searchParams;
await requireBook(bookId);
await requireBook(bookId, "EDITOR");
const { t, locale } = await getT();
const relation = await prisma.relation.findFirst({
@@ -95,7 +97,7 @@ export default async function RelationPage({
/>
<PageBody>
{saved ? <div className="alert alert-success">{t("common.saved")}</div> : null}
<form action={saveRelation}>
<ConflictForm action={saveRelation} version={versionOf(relation.updatedAt)}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={relation.id} />
<div className="card mb-3">
@@ -163,7 +165,7 @@ export default async function RelationPage({
{t("common.save")}
</button>
</div>
</form>
</ConflictForm>
</PageBody>
</>
);
+4 -3
View File
@@ -7,6 +7,7 @@ import { RelationForm } from "@/components/relation-form";
import { RelationGraph } from "@/components/relation-graph";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
export const metadata = { title: "Relationer" };
@@ -20,7 +21,7 @@ export default async function RelationsPage({
}) {
const { bookId } = await params;
const { entity: entityFilter } = await searchParams;
await requireBook(bookId);
const canEdit = hasRole((await requireBook(bookId)).role, "EDITOR");
const { t } = await getT();
const [entities, relations] = await Promise.all([
@@ -124,7 +125,7 @@ export default async function RelationsPage({
))}
</td>
<td className="text-secondary">{r.description}</td>
<td className="w-1">
<td className="w-1" hidden={!canEdit}>
<form action={deleteRelation}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={r.id} />
@@ -142,7 +143,7 @@ export default async function RelationsPage({
</div>
</div>
<div className="col-lg-4">
<div className="col-lg-4" hidden={!canEdit}>
<div className="card">
<div className="card-header">
<h3 className="card-title">{t("relation.add")}</h3>
+16 -11
View File
@@ -7,6 +7,7 @@ import type { TFunction } from "@/i18n/core";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { WORKPLACE_KINDS } from "@/lib/kinds";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
export const metadata = { title: "Scheman" };
@@ -28,11 +29,13 @@ function ShiftChip({
shift,
bookId,
t,
canEdit,
showPerson,
}: {
shift: ShiftRow;
bookId: string;
t: TFunction;
canEdit: boolean;
showPerson?: boolean;
}) {
return (
@@ -65,13 +68,15 @@ function ShiftChip({
))}
</div>
</div>
<form action={deleteShift}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={shift.id} />
<button type="submit" className="btn btn-icon btn-sm btn-ghost-secondary" title={t("common.delete")} aria-label={t("common.delete")}>
<IconX size={14} />
</button>
</form>
{canEdit ? (
<form action={deleteShift}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={shift.id} />
<button type="submit" className="btn btn-icon btn-sm btn-ghost-secondary" title={t("common.delete")} aria-label={t("common.delete")}>
<IconX size={14} />
</button>
</form>
) : null}
</div>
);
}
@@ -86,7 +91,7 @@ export default async function SchedulesPage({
const { bookId } = await params;
const { view = "person", range: rangeParam, person, workplace } = await searchParams;
const range = rangeParam === "night" ? "night" : "day";
await requireBook(bookId);
const canEdit = hasRole((await requireBook(bookId)).role, "EDITOR");
const { t } = await getT();
const [people, workplaces, shifts] = await Promise.all([
@@ -275,7 +280,7 @@ export default async function SchedulesPage({
{shifts
.filter((s) => s.weekday === d)
.map((s) => (
<ShiftChip key={s.id} shift={s} bookId={bookId} t={t} showPerson />
<ShiftChip key={s.id} shift={s} bookId={bookId} t={t} canEdit={canEdit} showPerson />
))}
</td>
))}
@@ -314,7 +319,7 @@ export default async function SchedulesPage({
{rowShifts
.filter((s) => s.weekday === d)
.map((s) => (
<ShiftChip key={s.id} shift={s} bookId={bookId} t={t} />
<ShiftChip key={s.id} shift={s} bookId={bookId} t={t} canEdit={canEdit} />
))}
</td>
))}
@@ -332,7 +337,7 @@ export default async function SchedulesPage({
<div className="card-header">
<h3 className="card-title">{t("schedule.add")}</h3>
</div>
{people.length === 0 ? (
{!canEdit ? null : people.length === 0 ? (
<div className="card-body text-secondary">{t("schedule.noPeople")}</div>
) : (
<form action={addShifts}>
+173 -34
View File
@@ -1,16 +1,32 @@
import { IconDownload } from "@tabler/icons-react";
import { deleteBook, updateBook } from "@/actions/books";
import { changeMemberRole, leaveSharedBook, removeBookMember, shareBook } from "@/actions/sharing";
import { ConfirmSubmit } from "@/components/confirm-submit";
import { PageBody, PageHeader } from "@/components/page";
import { getT } from "@/i18n/server";
import { MEMBER_ROLES, canChangeMember, hasRole, manageableRoles } from "@/lib/access";
import { requireBook } from "@/lib/session";
import { SHARE_RESULTS, listMembers, type ShareResult } from "@/lib/sharing";
export const metadata = { title: "Bokinställningar" };
export default async function SettingsPage({ params }: { params: Promise<{ bookId: string }> }) {
export default async function SettingsPage({
params,
searchParams,
}: {
params: Promise<{ bookId: string }>;
searchParams: Promise<{ share?: string }>;
}) {
const { bookId } = await params;
const { share } = await searchParams;
const book = await requireBook(bookId);
const { t } = await getT();
const isAdmin = hasRole(book.role, "ADMIN");
const isOwner = book.role === "OWNER";
const { owner, members } = await listMembers(book.id);
const result = SHARE_RESULTS.includes(share as ShareResult) ? (share as ShareResult) : null;
const grantable = manageableRoles(book.role);
const person = (u: { name: string | null; email: string | null }) => u.name ?? u.email ?? "?";
return (
<>
@@ -18,34 +34,145 @@ export default async function SettingsPage({ params }: { params: Promise<{ bookI
<PageBody>
<div className="row row-cards">
<div className="col-lg-8">
<form action={updateBook} className="card">
<form action={updateBook} className="card mb-3">
<input type="hidden" name="bookId" value={book.id} />
<div className="card-body">
<div className="row g-3">
<div className="col-md-6">
<label className="form-label required">{t("common.title")}</label>
<input name="title" className="form-control" required maxLength={200} defaultValue={book.title} />
</div>
<div className="col-md-6">
<label className="form-label">{t("books.subtitle")}</label>
<input name="subtitle" className="form-control" maxLength={200} defaultValue={book.subtitle ?? ""} />
</div>
<div className="col-md-6">
<label className="form-label">{t("books.genre")}</label>
<input name="genre" className="form-control" maxLength={100} defaultValue={book.genre ?? ""} />
</div>
<div className="col-12">
<label className="form-label">{t("common.description")}</label>
<textarea name="description" className="form-control" rows={4} defaultValue={book.description ?? ""} />
<fieldset disabled={!isAdmin}>
<div className="card-body">
{isAdmin ? null : <p className="text-secondary">{t("settings.readOnly")}</p>}
<div className="row g-3">
<div className="col-md-6">
<label className="form-label required">{t("common.title")}</label>
<input name="title" className="form-control" required maxLength={200} defaultValue={book.title} />
</div>
<div className="col-md-6">
<label className="form-label">{t("books.subtitle")}</label>
<input name="subtitle" className="form-control" maxLength={200} defaultValue={book.subtitle ?? ""} />
</div>
<div className="col-md-6">
<label className="form-label">{t("books.genre")}</label>
<input name="genre" className="form-control" maxLength={100} defaultValue={book.genre ?? ""} />
</div>
<div className="col-12">
<label className="form-label">{t("common.description")}</label>
<textarea name="description" className="form-control" rows={4} defaultValue={book.description ?? ""} />
</div>
</div>
</div>
</div>
<div className="card-footer text-end">
<button type="submit" className="btn btn-primary">
{t("common.save")}
</button>
</div>
{isAdmin ? (
<div className="card-footer text-end">
<button type="submit" className="btn btn-primary">
{t("common.save")}
</button>
</div>
) : null}
</fieldset>
</form>
<div className="card">
<div className="card-header">
<h3 className="card-title">{t("share.title")}</h3>
</div>
<div className="card-body">
<p className="text-secondary">{t("share.help")}</p>
<p className="text-secondary small">{t("share.roles")}</p>
{result ? <div className={`alert alert-${result === "ok" ? "success" : "warning"}`}>{t(`share.result.${result}`)}</div> : null}
</div>
<div className="table-responsive">
<table className="table table-vcenter card-table">
<tbody>
<tr>
<td>
<div className="fw-bold">{person(owner)}</div>
{owner.email && owner.name ? <div className="text-secondary small">{owner.email}</div> : null}
</td>
<td>
<span className="badge bg-primary-lt">{t("share.role.OWNER")}</span>
</td>
<td className="w-1" />
</tr>
{members.map((m) => {
const manageable = isAdmin && canChangeMember(book.role, m.role, null);
return (
<tr key={m.id}>
<td>
<div className="fw-bold">
{person(m.user)}
{m.userId === book.userId ? <span className="text-secondary fw-normal"> ({t("share.you")})</span> : null}
</div>
{m.user.email && m.user.name ? <div className="text-secondary small">{m.user.email}</div> : null}
</td>
<td>
{manageable ? (
<form action={changeMemberRole} className="d-flex gap-2">
<input type="hidden" name="bookId" value={book.id} />
<input type="hidden" name="userId" value={m.userId} />
<select name="role" className="form-select form-select-sm" defaultValue={m.role}>
{MEMBER_ROLES.filter((r) => grantable.includes(r)).map((r) => (
<option key={r} value={r}>
{t(`share.role.${r}`)}
</option>
))}
</select>
<button type="submit" className="btn btn-sm">
{t("common.save")}
</button>
</form>
) : (
<span className="badge">{t(`share.role.${m.role}`)}</span>
)}
</td>
<td className="w-1">
{manageable ? (
<form action={removeBookMember}>
<input type="hidden" name="bookId" value={book.id} />
<input type="hidden" name="userId" value={m.userId} />
<ConfirmSubmit className="btn btn-sm btn-outline-danger" message={t("share.removeConfirm")}>
{t("share.remove")}
</ConfirmSubmit>
</form>
) : null}
</td>
</tr>
);
})}
{members.length === 0 ? (
<tr>
<td colSpan={3} className="text-secondary">
{t("share.nobody")}
</td>
</tr>
) : null}
</tbody>
</table>
</div>
{isAdmin ? (
<form action={shareBook} className="card-body border-top">
<input type="hidden" name="bookId" value={book.id} />
<div className="row g-2 align-items-end">
<div className="col-md-6">
<label className="form-label">{t("share.email")}</label>
<input type="email" name="email" className="form-control" required maxLength={200} />
<div className="form-hint">{t("share.emailHelp")}</div>
</div>
<div className="col-md-4">
<label className="form-label">{t("share.role")}</label>
<select name="role" className="form-select" defaultValue="EDITOR">
{MEMBER_ROLES.filter((r) => grantable.includes(r)).map((r) => (
<option key={r} value={r}>
{t(`share.role.${r}`)}
</option>
))}
</select>
</div>
<div className="col-md-2 text-end">
<button type="submit" className="btn btn-primary w-100">
{t("share.add")}
</button>
</div>
</div>
</form>
) : null}
</div>
</div>
<div className="col-lg-4">
@@ -64,16 +191,28 @@ export default async function SettingsPage({ params }: { params: Promise<{ bookI
</div>
</div>
</div>
<div className="card border-danger">
<div className="card-header">
<h3 className="card-title text-danger">{t("settings.danger")}</h3>
{isOwner ? (
<div className="card border-danger">
<div className="card-header">
<h3 className="card-title text-danger">{t("settings.danger")}</h3>
</div>
<form action={deleteBook} className="card-body">
<input type="hidden" name="bookId" value={book.id} />
<p className="text-secondary">{t("settings.deleteBookHelp")}</p>
<ConfirmSubmit>{t("settings.deleteBook")}</ConfirmSubmit>
</form>
</div>
<form action={deleteBook} className="card-body">
<input type="hidden" name="bookId" value={book.id} />
<p className="text-secondary">{t("settings.deleteBookHelp")}</p>
<ConfirmSubmit>{t("settings.deleteBook")}</ConfirmSubmit>
</form>
</div>
) : (
<div className="card">
<form action={leaveSharedBook} className="card-body">
<input type="hidden" name="bookId" value={book.id} />
<p className="text-secondary">{t("share.leaveHelp", { owner: person(owner) })}</p>
<ConfirmSubmit className="btn btn-outline-danger" message={t("share.leaveConfirm")}>
{t("share.leave")}
</ConfirmSubmit>
</form>
</div>
)}
</div>
</div>
</PageBody>
@@ -15,7 +15,7 @@ export default async function TemplateEditPage({
}) {
const { bookId, kind: slug } = await params;
const { error, saved } = await searchParams;
await requireBook(bookId);
await requireBook(bookId, "ADMIN");
const kind = templateKindFromSlug(slug);
if (!kind) notFound();
const { t, locale } = await getT();
+1 -1
View File
@@ -11,7 +11,7 @@ export const metadata = { title: "Mallar" };
export default async function TemplatesPage({ params }: { params: Promise<{ bookId: string }> }) {
const { bookId } = await params;
await requireBook(bookId);
await requireBook(bookId, "ADMIN");
const { t, locale } = await getT();
const kinds: { kind: TemplateKind; color: string }[] = [
@@ -3,10 +3,12 @@ import { notFound } from "next/navigation";
import { IconTrash } from "@tabler/icons-react";
import { deleteEvent, saveEvent } from "@/actions/events";
import { ConfirmSubmit } from "@/components/confirm-submit";
import { ConflictForm } from "@/components/conflict-form";
import { EntitySelect } from "@/components/entity-select";
import { PageBody, PageHeader } from "@/components/page";
import { StoryDateInput } from "@/components/story-date-input";
import { getT } from "@/i18n/server";
import { versionOf } from "@/lib/conflict";
import { prisma } from "@/lib/db";
import { requireBook } from "@/lib/session";
@@ -19,7 +21,7 @@ export default async function EventPage({
}) {
const { bookId, eventId } = await params;
const { saved, error } = await searchParams;
await requireBook(bookId);
await requireBook(bookId, "EDITOR");
const { t } = await getT();
const event = await prisma.storyEvent.findFirst({ where: { id: eventId, bookId }, include: { participants: true } });
@@ -49,7 +51,7 @@ export default async function EventPage({
<PageBody>
{saved ? <div className="alert alert-success">{t("common.saved")}</div> : null}
{error === "date" ? <div className="alert alert-danger">{t("timeline.invalidDate")}</div> : null}
<form action={saveEvent}>
<ConflictForm action={saveEvent} version={versionOf(event.updatedAt)}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={event.id} />
<div className="card mb-3">
@@ -88,7 +90,7 @@ export default async function EventPage({
{t("common.save")}
</button>
</div>
</form>
</ConflictForm>
</PageBody>
</>
);
+3 -2
View File
@@ -5,6 +5,7 @@ import { EmptyState, PageBody, PageHeader } from "@/components/page";
import { StoryDateInput } from "@/components/story-date-input";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
import { storyYear } from "@/lib/story-date";
import { loadTimeline, TIMELINE_KINDS, type TimelineItem, type TimelineKind } from "@/lib/timeline";
@@ -28,7 +29,7 @@ export default async function TimelinePage({
}) {
const { bookId } = await params;
const { person, kind, error } = await searchParams;
await requireBook(bookId);
const canEdit = hasRole((await requireBook(bookId)).role, "EDITOR");
const { t } = await getT();
const wanted = (Array.isArray(kind) ? kind : kind ? [kind] : []).filter((k): k is TimelineKind => (TIMELINE_KINDS as string[]).includes(k));
@@ -184,7 +185,7 @@ export default async function TimelinePage({
) : null}
</div>
<div className="col-lg-4">
<div className="col-lg-4" hidden={!canEdit}>
<div className="card">
<div className="card-header">
<h3 className="card-title">{t("timeline.addEvent")}</h3>
+6 -3
View File
@@ -7,6 +7,7 @@ import { EmptyState, PageBody, PageHeader } from "@/components/page";
import { getT } from "@/i18n/server";
import { prisma } from "@/lib/db";
import { KIND_INFO, parseKind } from "@/lib/kinds";
import { hasRole } from "@/lib/access";
import { requireBook } from "@/lib/session";
import { TRASH_DAYS } from "@/lib/trash";
@@ -22,6 +23,8 @@ export default async function TrashPage({
const { bookId } = await params;
const { restore } = await searchParams;
const book = await requireBook(bookId);
const canRestore = hasRole(book.role, "EDITOR");
const canPurge = hasRole(book.role, "ADMIN");
const { t } = await getT();
const items = await prisma.trashItem.findMany({
where: { ownerId: book.ownerId, bookId, kind: "entity" },
@@ -33,7 +36,7 @@ export default async function TrashPage({
<PageHeader
title={t("trash.title")}
actions={
items.length > 0 ? (
items.length > 0 && canPurge ? (
<form action={emptyTrash}>
<input type="hidden" name="bookId" value={bookId} />
<ConfirmSubmit className="btn btn-outline-danger" message={t("trash.emptyConfirm")}>
@@ -72,7 +75,7 @@ export default async function TrashPage({
{t("trash.daysLeft", { n: daysLeft })}
</div>
</div>
<form action={restoreTrashEntity}>
<form action={restoreTrashEntity} hidden={!canRestore}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={item.id} />
<button type="submit" className="btn btn-sm">
@@ -80,7 +83,7 @@ export default async function TrashPage({
{t("trash.restore")}
</button>
</form>
<form action={purgeTrash}>
<form action={purgeTrash} hidden={!canPurge}>
<input type="hidden" name="bookId" value={bookId} />
<input type="hidden" name="id" value={item.id} />
<ConfirmSubmit className="btn btn-sm btn-outline-danger" message={t("trash.purgeConfirm")}>