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

fix: tighten real operations data paths

Browse Source
This commit is contained in:
admin
2026-07-02 19:16:29 -07:00
parent 8b2fb0930e
commit 5fe7e5a1b8
8 changed files with 286 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/(app)/app/beds/page.tsx
View File

@@ -1,8 +1,13 @@
import { redirect } from "next/navigation";
import { getCurrentAuthContext } from "@/modules/core/server/auth";
import {
listOperationalAdmissions,
listOperationalBeds,
listOperationalElders,
listOperationalRooms,
} from "@/modules/core/server/operations";
import { hasPermission } from "@/modules/core/server/permissions";
import { readData } from "@/modules/core/server/store";
import { BedsWorkspace } from "@/modules/facilities/components/BedsWorkspace";
export default async function BedsPage(): Promise<React.ReactElement> {
@@ -15,14 +20,13 @@ export default async function BedsPage(): Promise<React.ReactElement> {
redirect("/app/dashboard");
}
const data = await readData();
const organizationId = context.organization?.id;
const rooms = organizationId ? data.rooms.filter((room) => room.organizationId === organizationId) : data.rooms;
const beds = organizationId ? data.beds.filter((bed) => bed.organizationId === organizationId) : data.beds;
const admissions = organizationId
? data.admissions.filter((admission) => admission.organizationId === organizationId)
: data.admissions;
const elders = organizationId ? data.elders.filter((elder) => elder.organizationId === organizationId) : data.elders;
const [rooms, beds, admissions, elders] = await Promise.all([
listOperationalRooms(organizationId),
listOperationalBeds(organizationId),
listOperationalAdmissions(organizationId),
listOperationalElders(organizationId),
]);
return (
<BedsWorkspace

22
app/(app)/app/dashboard/page.tsx
View File

@@ -1,7 +1,12 @@
import { redirect } from "next/navigation";
import { getCurrentAuthContext } from "@/modules/core/server/auth";
import { readData } from "@/modules/core/server/store";
import {
listOperationalAdmissions,
listOperationalBeds,
listOperationalElders,
listOperationalIncidents,
} from "@/modules/core/server/operations";
import type { BedStatus } from "@/modules/core/types";
import { DashboardHome, type DashboardMetric } from "@/modules/dashboard/components/DashboardHome";
@@ -13,16 +18,13 @@ export default async function DashboardPage(): Promise<React.ReactElement> {
redirect("/login");
}
const data = await readData();
const organizationId = context.organization?.id;
const elders = organizationId ? data.elders.filter((elder) => elder.organizationId === organizationId) : data.elders;
const beds = organizationId ? data.beds.filter((bed) => bed.organizationId === organizationId) : data.beds;
const admissions = organizationId
? data.admissions.filter((admission) => admission.organizationId === organizationId)
: data.admissions;
const incidents = organizationId
? data.incidents.filter((incident) => !incident.organizationId || incident.organizationId === organizationId)
: data.incidents;
const [elders, beds, admissions, incidents] = await Promise.all([
listOperationalElders(organizationId),
listOperationalBeds(organizationId),
listOperationalAdmissions(organizationId),
listOperationalIncidents(organizationId),
]);
const activeElders = elders.filter((elder) => elder.status === "active").length;
const pendingElders = elders.filter((elder) => elder.status === "pending").length;

8
app/(app)/app/elders/page.tsx
View File

@@ -1,7 +1,7 @@
import { redirect } from "next/navigation";
import { getCurrentAuthContext } from "@/modules/core/server/auth";
import { readData } from "@/modules/core/server/store";
import { listOperationalElders } from "@/modules/core/server/operations";
import { EldersClient } from "@/modules/elders/components/EldersClient";
export default async function EldersPage(): Promise<React.ReactElement> {
@@ -10,11 +10,7 @@ export default async function EldersPage(): Promise<React.ReactElement> {
redirect("/login");
}
const data = await readData();
const organizationId = context.organization?.id;
const elders = organizationId
? data.elders.filter((elder) => elder.organizationId === organizationId)
: data.elders;
const elders = await listOperationalElders(context.organization?.id);
return <EldersClient initialElders={elders} permissions={context.permissions} />;
}