Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions api/members.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { Hono } from "hono";
import z from "zod";
import { zValidator } from "@hono/zod-validator";
import { requireAdmin } from "@/lib/authUtils";
import { MembersService } from "@/lib/services/MemberService";
import { paginationQuerySchema } from "@/lib/apiUtils";

const activityQuerySchema = z.object({
userIds: z
.union([z.string(), z.array(z.string())])
.transform((val) => (Array.isArray(val) ? val : [val])),
});

const app = new Hono()
.get("/activity", zValidator("query", activityQuerySchema), async (c) => {
const session = await requireAdmin(c);
const organizationId = session.session.activeOrganizationId!;

const { userIds } = c.req.valid("query");
if (userIds.length === 0) {
return c.json({ error: "userIds must not be empty" }, 400);
}

const result = await MembersService.getMemberActivity(
userIds,
organizationId,
);
return c.json(result);
})
.get("/", zValidator("query", paginationQuerySchema), async (c) => {
const session = await requireAdmin(c);
const organizationId = session.session.activeOrganizationId!;

const { page, pageSize } = c.req.valid("query");
const offset = (page - 1) * pageSize;

const [data, total] = await Promise.all([
MembersService.listMembers(organizationId, { limit: pageSize, offset }),
MembersService.countByOrganization(organizationId),
]);

return c.json({ data, total, page, pageSize });
});

export default app;
4 changes: 3 additions & 1 deletion app/api/[[...route]]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import shifts from "@/api/shifts";
import media from "@/api/media";
import notifications from "@/api/notifications";
import organizationConfig from "@/api/organizationConfig";
import members from "@/api/members";
import { Hono } from "hono";
import { handle } from "hono/netlify";

Expand All @@ -18,7 +19,8 @@ const app = new Hono()
.route("/organizationConfig", organizationConfig)
.route("/shifts", shifts)
.route("/notifications", notifications)
.route("/media", media);
.route("/media", media)
.route("/members", members);

export const GET = handle(app);
export const POST = handle(app);
Expand Down
75 changes: 75 additions & 0 deletions app/members/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import { redirect } from "next/navigation";
import { headers } from "next/headers";
import { auth } from "@/lib/auth";
import { MembersService } from "@/lib/services/MemberService";
import { OrganizationConfigService } from "@/lib/services/OrganizationConfigService";
import { OrganizationConfigKey } from "@/lib/schema";
import MembersTable from "@/components/MembersTable";

const DEFAULT_PAGE_SIZE = 20;

interface MembersPageProps {
searchParams: Promise<{ page?: string; pageSize?: string }>;
}

export default async function MembersPage({ searchParams }: MembersPageProps) {
const session = await auth.api.getSession({
headers: await headers(),
});

if (!session?.user) {
redirect("/login");
}

const organizationId = session.session.activeOrganizationId;
if (!organizationId) {
redirect("/");
}

const membership = await MembersService.findByUserAndOrganization(
session.user.id,
organizationId,
);

if (!MembersService.isAdminOrOwner(membership?.role)) {
redirect("/");
}

const config = await OrganizationConfigService.getConfig(organizationId, [
OrganizationConfigKey.MembersPageEnabled,
]);

if (config[OrganizationConfigKey.MembersPageEnabled] === "false") {
redirect("/");
}

const { page: pageParam, pageSize: pageSizeParam } = await searchParams;

const page = Math.max(1, parseInt(pageParam ?? "1") || 1);
const pageSize = Math.min(
100,
Math.max(
1,
parseInt(pageSizeParam ?? String(DEFAULT_PAGE_SIZE)) || DEFAULT_PAGE_SIZE,
),
);
const offset = (page - 1) * pageSize;

const [memberRows, total] = await Promise.all([
MembersService.listMembers(organizationId, { limit: pageSize, offset }),
MembersService.countByOrganization(organizationId),
]);

return (
<div className="max-w-[1300px] mx-auto px-12 py-[60px]">
<MembersTable
members={memberRows}
total={total}
page={page}
pageSize={pageSize}
organizationId={organizationId}
currentUserId={session.user.id}
/>
</div>
);
}
Loading