fix: use real settings data boundaries

2026-07-02 19:53:41 -07:00
parent 1cdf89c608
commit 5412bbb143
14 changed files with 414 additions and 170 deletions
--- a/app/(app)/app/settings/audit/page.tsx
+++ b/app/(app)/app/settings/audit/page.tsx
@@ -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>
--- a/app/(app)/app/settings/layout.tsx
+++ b/app/(app)/app/settings/layout.tsx
@@ -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>;
 }
--- a/app/(app)/app/settings/organizations/[id]/page.tsx
+++ b/app/(app)/app/settings/organizations/[id]/page.tsx
@@ -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">
--- a/app/(app)/app/settings/organizations/page.tsx
+++ b/app/(app)/app/settings/organizations/page.tsx
@@ -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>
--- a/app/(app)/app/settings/roles/page.tsx
+++ b/app/(app)/app/settings/roles/page.tsx
@@ -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>
--- a/app/(app)/app/settings/status/page.tsx
+++ b/app/(app)/app/settings/status/page.tsx
@@ -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>
--- a/app/(app)/app/settings/users/page.tsx
+++ b/app/(app)/app/settings/users/page.tsx
@@ -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>