TalexDreamSoul/teatea-pension
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use real settings data boundaries

Browse Source
This commit is contained in:
admin
2026-07-02 19:53:41 -07:00
parent 1cdf89c608
commit 5412bbb143
14 changed files with 414 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/(app)/app/settings/audit/page.tsx
View File

@@ -2,9 +2,9 @@ import { redirect } from "next/navigation";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Table } from "@/components/ui/table";
import { listAuditLogs } from "@/modules/core/server/audit";
import { getCurrentAuthContext } from "@/modules/core/server/auth";
import { hasPermission } from "@/modules/core/server/permissions";
import { readData } from "@/modules/core/server/store";
import { TablePagination, TableToolbar } from "@/modules/settings/components/TableToolbar";
import { getPage, getPageCount, getSearchParam, paginate, type SearchParams } from "@/modules/settings/lib/pagination";
@@ -25,9 +25,12 @@ export default async function AuditPage({ searchParams }: AuditPageProps): Promi
const params = (await searchParams) ?? {};
const query = getSearchParam(params, "q");
const page = getPage(params);
const data = await readData();
const logs = await listAuditLogs({
organizationId: context.account.platformRoleId ? undefined : context.organization?.id,
limit: 100,
});
const normalizedQuery = query.trim().toLowerCase();
const filteredLogs = data.auditLogs.filter((log) =>
const filteredLogs = logs.filter((log) =>
[log.actorEmail ?? "系统", log.action, log.targetType, log.targetId ?? "", log.result, log.reason]
.join(" ")
.toLowerCase()
@@ -38,10 +41,6 @@ export default async function AuditPage({ searchParams }: AuditPageProps): Promi
return (
<div className="flex flex-col gap-5">
<section className="border-b pb-4">
<h2 className="text-xl font-semibold">审计日志</h2>
</section>
<Card>
<CardHeader>
<CardTitle>审计列表</CardTitle>

9
app/(app)/app/settings/layout.tsx
View File

@@ -3,12 +3,5 @@ type SettingsLayoutProps = {
};
export default function SettingsLayout({ children }: SettingsLayoutProps): React.ReactElement {
return (
<div className="mx-auto flex w-full max-w-7xl flex-col gap-5">
<section className="border-b pb-4">
<h1 className="text-2xl font-semibold tracking-normal">系统设置</h1>
</section>
{children}
</div>
);
return <div className="mx-auto flex w-full max-w-7xl flex-col gap-5">{children}</div>;
}

30
app/(app)/app/settings/organizations/[id]/page.tsx
View File

@@ -7,7 +7,13 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Table } from "@/components/ui/table";
import { getCurrentAuthContext, toPublicAccount } from "@/modules/core/server/auth";
import { getRoleDefinitions, hasPermission } from "@/modules/core/server/permissions";
import { readData } from "@/modules/core/server/store";
import {
listSettingsAccounts,
listSettingsJoinRequests,
listSettingsMemberships,
listSettingsOrganizationInvitations,
listSettingsOrganizations,
} from "@/modules/core/server/settings";
import { OrganizationDetailClient } from "@/modules/settings/components/OrganizationDetailClient";
type OrganizationDetailPageProps = {
@@ -29,19 +35,24 @@ export default async function OrganizationDetailPage({
}
const { id } = await params;
const data = await readData();
const organization = data.organizations.find((item) => item.id === id);
const organizations = await listSettingsOrganizations({ organizationId: id });
const organization = organizations[0];
if (!organization) {
notFound();
}
if (context.organization?.id && context.organization.id !== organization.id) {
if (!context.account.platformRoleId && context.organization?.id && context.organization.id !== organization.id) {
redirect("/app/settings/organizations");
}
const roles = await getRoleDefinitions(organization.id);
const organizationMemberships = data.memberships.filter((membership) => membership.organizationId === organization.id);
const accountById = new Map(data.accounts.map((account) => [account.id, account]));
const [roles, organizationMemberships, organizationAccounts, invitations, joinRequests] = await Promise.all([
getRoleDefinitions(organization.id),
listSettingsMemberships({ organizationId: organization.id }),
listSettingsAccounts({ organizationId: organization.id }),
listSettingsOrganizationInvitations({ organizationId: organization.id }),
listSettingsJoinRequests({ organizationId: organization.id }),
]);
const accountById = new Map(organizationAccounts.map((account) => [account.id, account]));
const members = organizationMemberships
.map((membership) => {
const account = accountById.get(membership.accountId);
@@ -55,10 +66,7 @@ export default async function OrganizationDetailPage({
};
})
.filter((item): item is NonNullable<typeof item> => item !== null);
const invitations = data.organizationInvitations.filter((invitation) => invitation.organizationId === organization.id);
const pendingRequests = data.joinRequests.filter(
(request) => request.organizationId === organization.id && request.status === "pending",
);
const pendingRequests = joinRequests.filter((request) => request.status === "pending");
return (
<div className="flex flex-col gap-5">

16
app/(app)/app/settings/organizations/page.tsx
View File

@@ -5,7 +5,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Table } from "@/components/ui/table";
import { getCurrentAuthContext } from "@/modules/core/server/auth";
import { getRoleDefinitions, hasPermission } from "@/modules/core/server/permissions";
import { readData } from "@/modules/core/server/store";
import { listSettingsOrganizations } from "@/modules/core/server/settings";
import {
OrganizationManagementClient,
OrganizationRowActions,
@@ -30,9 +30,10 @@ export default async function OrganizationsPage({ searchParams }: OrganizationsP
const params = (await searchParams) ?? {};
const query = getSearchParam(params, "q");
const page = getPage(params);
const data = await readData();
const organizationScopeId = context.account.platformRoleId ? undefined : context.organization?.id;
const organizations = await listSettingsOrganizations(organizationScopeId ? { organizationId: organizationScopeId } : {});
const normalizedQuery = query.trim().toLowerCase();
const filteredOrganizations = data.organizations.filter((organization) =>
const filteredOrganizations = organizations.filter((organization) =>
[organization.name, organization.slug, organization.status].join(" ").toLowerCase().includes(normalizedQuery),
);
const pageCount = getPageCount(filteredOrganizations.length);
@@ -51,10 +52,11 @@ export default async function OrganizationsPage({ searchParams }: OrganizationsP
return (
<div className="flex flex-col gap-5">
<section className="flex flex-col gap-3 border-b pb-4 lg:flex-row lg:items-center lg:justify-between">
<h2 className="text-xl font-semibold">机构管理</h2>
{canManageOrganizations ? <OrganizationManagementClient /> : null}
</section>
{canManageOrganizations ? (
<div className="flex justify-end">
<OrganizationManagementClient />
</div>
) : null}
<Card>
<CardHeader>

9
app/(app)/app/settings/roles/page.tsx
View File

@@ -36,10 +36,11 @@ export default async function RolesPage({ searchParams }: RolesPageProps): Promi
return (
<div className="flex flex-col gap-5">
<section className="flex flex-col gap-3 border-b pb-4 lg:flex-row lg:items-center lg:justify-between">
<h2 className="text-xl font-semibold">角色权限</h2>
{canManageRoles ? <RoleManagementClient permissions={PERMISSION_DEFINITIONS} /> : null}
</section>
{canManageRoles ? (
<div className="flex justify-end">
<RoleManagementClient permissions={PERMISSION_DEFINITIONS} />
</div>
) : null}
<Card>
<CardHeader>

34
app/(app)/app/settings/status/page.tsx
View File

@@ -6,7 +6,12 @@ import { Table } from "@/components/ui/table";
import { checkDatabaseConnection } from "@/modules/core/server/db";
import { getCurrentAuthContext } from "@/modules/core/server/auth";
import { hasPermission } from "@/modules/core/server/permissions";
import { readData } from "@/modules/core/server/store";
import {
countSettingsBeds,
listSettingsAccounts,
listSettingsIncidents,
listSettingsOrganizations,
} from "@/modules/core/server/settings";
import { IncidentStatusActions } from "@/modules/settings/components/IncidentStatusActions";
import { TablePagination, TableToolbar } from "@/modules/settings/components/TableToolbar";
import { getPage, getPageCount, getSearchParam, paginate, type SearchParams } from "@/modules/settings/lib/pagination";
@@ -28,10 +33,18 @@ export default async function StatusPage({ searchParams }: StatusPageProps): Pro
const params = (await searchParams) ?? {};
const query = getSearchParam(params, "q");
const page = getPage(params);
const [data, databaseHealth] = await Promise.all([readData(), checkDatabaseConnection()]);
const organizationScopeId = context.account.platformRoleId ? undefined : context.organization?.id;
const scopeParams = organizationScopeId ? { organizationId: organizationScopeId } : {};
const [organizations, accounts, bedCount, incidents, databaseHealth] = await Promise.all([
listSettingsOrganizations(scopeParams),
listSettingsAccounts(scopeParams),
countSettingsBeds(scopeParams),
listSettingsIncidents(scopeParams),
checkDatabaseConnection(),
]);
const canManageIncidents = hasPermission(context.permissions, "incident:manage");
const normalizedQuery = query.trim().toLowerCase();
const filteredIncidents = data.incidents.filter((incident) =>
const filteredIncidents = incidents.filter((incident) =>
[incident.title, incident.description, incident.source, incident.severity, incident.status]
.join(" ")
.toLowerCase()
@@ -42,36 +55,33 @@ export default async function StatusPage({ searchParams }: StatusPageProps): Pro
return (
<div className="flex flex-col gap-5">
<section className="flex flex-col gap-3 border-b pb-4 sm:flex-row sm:items-center sm:justify-between">
<div>
<h2 className="text-xl font-semibold">运行状态</h2>
<p className="mt-1 text-sm text-muted-foreground">{databaseHealth.reason}</p>
</div>
<section className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<p className="text-sm text-muted-foreground">{databaseHealth.reason}</p>
<Badge variant={databaseHealth.ok ? "success" : "danger"}>{databaseHealth.ok ? "Healthy" : "Degraded"}</Badge>
</section>
<section className="grid gap-4 md:grid-cols-4">
<Card>
<CardHeader>
<CardTitle className="text-3xl">{data.organizations.length}</CardTitle>
<CardTitle className="text-3xl">{organizations.length}</CardTitle>
</CardHeader>
<CardContent className="pt-0 text-sm text-muted-foreground">机构</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle className="text-3xl">{data.accounts.length}</CardTitle>
<CardTitle className="text-3xl">{accounts.length}</CardTitle>
</CardHeader>
<CardContent className="pt-0 text-sm text-muted-foreground">账号</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle className="text-3xl">{data.beds.length}</CardTitle>
<CardTitle className="text-3xl">{bedCount}</CardTitle>
</CardHeader>
<CardContent className="pt-0 text-sm text-muted-foreground">床位</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle className="text-3xl">{data.incidents.length}</CardTitle>
<CardTitle className="text-3xl">{incidents.length}</CardTitle>
</CardHeader>
<CardContent className="pt-0 text-sm text-muted-foreground">故障事件</CardContent>
</Card>

36
app/(app)/app/settings/users/page.tsx
View File

@@ -5,7 +5,12 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Table } from "@/components/ui/table";
import { getCurrentAuthContext, toPublicAccount } from "@/modules/core/server/auth";
import { getRoleDefinitions, hasPermission } from "@/modules/core/server/permissions";
import { readData } from "@/modules/core/server/store";
import {
listSettingsAccounts,
listSettingsJoinRequests,
listSettingsMemberships,
listSettingsOrganizations,
} from "@/modules/core/server/settings";
import { ROLE_LABELS } from "@/modules/core/types";
import type { RoleId } from "@/modules/core/types";
import { TablePagination, TableToolbar } from "@/modules/settings/components/TableToolbar";
@@ -38,16 +43,23 @@ export default async function UsersPage({ searchParams }: UsersPageProps): Promi
const params = (await searchParams) ?? {};
const query = getSearchParam(params, "q");
const page = getPage(params);
const data = await readData();
const roles = await getRoleDefinitions(context.organization?.id);
const canReadAllAccounts = Boolean(context.account.platformRoleId);
const organizationScopeId = canReadAllAccounts ? undefined : context.organization?.id;
const [organizations, accountsData, memberships, joinRequests, roles] = await Promise.all([
listSettingsOrganizations(organizationScopeId ? { organizationId: organizationScopeId } : {}),
listSettingsAccounts(organizationScopeId ? { organizationId: organizationScopeId } : {}),
listSettingsMemberships(organizationScopeId ? { organizationId: organizationScopeId } : {}),
listSettingsJoinRequests(organizationScopeId ? { organizationId: organizationScopeId } : {}),
getRoleDefinitions(context.organization?.id),
]);
const roleById = new Map(roles.map((role) => [role.id, role]));
const organizationById = new Map(data.organizations.map((organization) => [organization.id, organization]));
const accounts = data.accounts.map((account) => {
const organizationById = new Map(organizations.map((organization) => [organization.id, organization]));
const accounts = accountsData.map((account) => {
const membership = context.organization?.id
? data.memberships.find(
? memberships.find(
(item) => item.accountId === account.id && item.organizationId === context.organization?.id && item.status === "active",
)
: data.memberships.find((item) => item.accountId === account.id && item.status === "active");
: memberships.find((item) => item.accountId === account.id && item.status === "active");
const organization = membership ? organizationById.get(membership.organizationId) : undefined;
const platformRole = account.platformRoleId ? roleById.get(account.platformRoleId) : undefined;
@@ -65,15 +77,11 @@ export default async function UsersPage({ searchParams }: UsersPageProps): Promi
return (
<div className="flex flex-col gap-5">
<section className="border-b pb-4">
<h2 className="text-xl font-semibold">用户管理</h2>
</section>
<UserManagementClient
canManageAccounts={hasPermission(context.permissions, "account:manage")}
organizations={data.organizations}
organizations={organizations}
roles={roles}
joinRequests={data.joinRequests}
joinRequests={joinRequests}
/>
<Card>
@@ -125,7 +133,7 @@ export default async function UsersPage({ searchParams }: UsersPageProps): Promi
<UserAccountActions
account={account}
currentAccountId={context.account.id}
organizations={data.organizations}
organizations={organizations}
roles={roles}
/>
</Table.Cell>

12
app/api/organizations/[id]/route.ts
View File

@@ -37,6 +37,10 @@ function readStatus(value: unknown): OrganizationStatus | null {
return ORGANIZATION_STATUSES.find((status) => status === value) ?? null;
}
function isValidSlug(value: string): boolean {
return /^[a-z0-9][a-z0-9-]{1,47}$/.test(value) && !value.endsWith("-");
}
export async function PATCH(request: Request, context: RouteContext): Promise<Response> {
const { id } = await context.params;
const auth = await requirePermission("organization:manage", {
@@ -55,7 +59,7 @@ export async function PATCH(request: Request, context: RouteContext): Promise<Re
}
const name = readString(body, "name");
const slug = readString(body, "slug");
const slug = readString(body, "slug").toLowerCase();
const oidcIssuerUrl = readString(body, "oidcIssuerUrl");
const oidcClientId = readString(body, "oidcClientId");
const oidcClientSecret = readString(body, "oidcClientSecret");
@@ -66,6 +70,12 @@ export async function PATCH(request: Request, context: RouteContext): Promise<Re
if ("status" in body && !status) {
return jsonFailure("机构状态无效");
}
if ("slug" in body && !slug) {
return jsonFailure("机构标识不能为空");
}
if (slug && !isValidSlug(slug)) {
return jsonFailure("机构标识仅支持小写字母、数字和连字符，长度 2-48 位，且不能以连字符结尾");
}
const registrationEnabled = "registrationEnabled" in body ? readBoolean(body, "registrationEnabled") : null;
const oidcEnabled = "oidcEnabled" in body ? readBoolean(body, "oidcEnabled") : null;
const oidcAutoProvision = "oidcAutoProvision" in body ? readBoolean(body, "oidcAutoProvision") : null;

74
app/api/organizations/route.ts
View File

@@ -17,14 +17,8 @@ function readString(source: Record<string, unknown>, key: string): string {
return typeof value === "string" ? value.trim() : "";
}
function createSlug(name: string): string {
const base = name
.trim()
.toLowerCase()
.replace(/[^a-z0-9]+/g, "-")
.replace(/^-|-$/g, "");
return base.length > 0 ? base : `org-${Date.now()}`;
function isValidSlug(value: string): boolean {
return /^[a-z0-9][a-z0-9-]{1,47}$/.test(value) && !value.endsWith("-");
}
export async function GET(): Promise<Response> {
@@ -76,31 +70,47 @@ export async function POST(request: Request): Promise<Response> {
if (!name) {
return jsonFailure("机构名称不能为空");
}
const database = getDatabase();
const rows = await database
.insert(organizations)
.values({
name,
slug: readString(body, "slug") || createSlug(name),
status: "active",
})
.returning();
const organization = rows[0];
if (!organization) {
return jsonFailure("机构创建失败", 500);
const slug = readString(body, "slug").toLowerCase();
if (!slug) {
return jsonFailure("机构标识不能为空");
}
if (!isValidSlug(slug)) {
return jsonFailure("机构标识仅支持小写字母、数字和连字符，长度 2-48 位，且不能以连字符结尾");
}
await seedOrganizationRoles(organization.id);
await recordAuditLog({
actor: auth.context.account,
organizationId: organization.id,
action: "organization.create",
targetType: "organization",
targetId: organization.id,
result: "success",
reason: `创建机构：${organization.name}`,
});
const database = getDatabase();
try {
const rows = await database
.insert(organizations)
.values({
name,
slug,
status: "active",
})
.returning();
const organization = rows[0];
if (!organization) {
return jsonFailure("机构创建失败", 500);
}
return jsonSuccess("机构已创建", { organization }, 201);
await seedOrganizationRoles(organization.id);
await recordAuditLog({
actor: auth.context.account,
organizationId: organization.id,
action: "organization.create",
targetType: "organization",
targetId: organization.id,
result: "success",
reason: `创建机构：${organization.name}`,
});
return jsonSuccess("机构已创建", { organization }, 201);
} catch (error) {
const message = error instanceof Error ? error.message : "";
if (message.includes("organizations_slug_unique")) {
return jsonFailure("机构标识已存在", 409);
}
return jsonFailure("机构创建失败", 500);
}
}

49
app/api/settings/accounts/route.ts
View File

@@ -6,7 +6,11 @@ import { recordAuditLog } from "@/modules/core/server/audit";
import { getDatabase } from "@/modules/core/server/db";
import { getRoleDefinitions, hasPermission } from "@/modules/core/server/permissions";
import { accounts, memberships, organizations, roles } from "@/modules/core/server/schema";
import { readData } from "@/modules/core/server/store";
import {
listSettingsAccounts,
listSettingsMemberships,
listSettingsOrganizations,
} from "@/modules/core/server/settings";
function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -27,35 +31,30 @@ export async function GET(): Promise<Response> {
return auth.response;
}
const data = await readData();
const canReadAllAccounts = hasPermission(auth.context.permissions, "platform:manage");
const organizationId = auth.context.organization?.id;
const roleDefinitions = await getRoleDefinitions(organizationId);
const canReadAllAccounts = Boolean(auth.context.account.platformRoleId) || hasPermission(auth.context.permissions, "platform:manage");
const organizationId = canReadAllAccounts ? undefined : auth.context.organization?.id;
const [accountRows, membershipRows, organizationRows, roleDefinitions] = await Promise.all([
listSettingsAccounts(organizationId ? { organizationId } : {}),
listSettingsMemberships(organizationId ? { organizationId } : {}),
listSettingsOrganizations(organizationId ? { organizationId } : {}),
getRoleDefinitions(auth.context.organization?.id),
]);
const roleById = new Map(roleDefinitions.map((role) => [role.id, role]));
const organizationById = new Map(data.organizations.map((organization) => [organization.id, organization]));
const scopedAccountIds =
organizationId && !canReadAllAccounts
? new Set(
data.memberships
.filter((membership) => membership.organizationId === organizationId)
.map((membership) => membership.accountId),
)
: null;
const organizationById = new Map(organizationRows.map((organization) => [organization.id, organization]));
return jsonSuccess("账号列表已加载", {
accounts: data.accounts
.filter((account) => !scopedAccountIds || scopedAccountIds.has(account.id))
.map((account) => {
const membership = organizationId
? data.memberships.find(
(item) => item.accountId === account.id && item.organizationId === organizationId && item.status === "active",
accounts: accountRows.map((account) => {
const membership = auth.context.organization?.id
? membershipRows.find(
(item) =>
item.accountId === account.id && item.organizationId === auth.context.organization?.id && item.status === "active",
)
: data.memberships.find((item) => item.accountId === account.id && item.status === "active");
const organization = membership ? organizationById.get(membership.organizationId) : undefined;
const platformRole = account.platformRoleId ? roleById.get(account.platformRoleId) : undefined;
: membershipRows.find((item) => item.accountId === account.id && item.status === "active");
const organization = membership ? organizationById.get(membership.organizationId) : undefined;
const platformRole = account.platformRoleId ? roleById.get(account.platformRoleId) : undefined;
return toPublicAccount(account, platformRole?.key ?? membership?.roleKey, organization);
}),
return toPublicAccount(account, platformRole?.key ?? membership?.roleKey, organization);
}),
});
}

9
app/api/settings/join-requests/route.ts
View File

@@ -1,6 +1,6 @@
import { jsonSuccess } from "@/modules/core/server/api";
import { requirePermission } from "@/modules/core/server/auth";
import { readData } from "@/modules/core/server/store";
import { listSettingsJoinRequests } from "@/modules/core/server/settings";
export async function GET(): Promise<Response> {
const auth = await requirePermission("account:read", {
@@ -12,12 +12,9 @@ export async function GET(): Promise<Response> {
return auth.response;
}
const data = await readData();
const organizationId = auth.context.organization?.id;
const organizationId = auth.context.account.platformRoleId ? undefined : auth.context.organization?.id;
return jsonSuccess("加入申请已加载", {
joinRequests: organizationId
? data.joinRequests.filter((request) => request.organizationId === organizationId)
: data.joinRequests,
joinRequests: await listSettingsJoinRequests(organizationId ? { organizationId } : {}),
});
}