Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: settings server side tabs (#500)
Maximilian Kaskeb33103a39dec
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/actions.ts b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/actions.tssimilarity index 100%rename from apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/actions.tsrename to apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/actions.tsdiff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/card.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/card.tsxsimilarity index 96%rename from apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/card.tsxrename to apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/card.tsxindex ad43ed122..874b5d239 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/card.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/card.tsx@@ -6,7 +6,7 @@ import { Container } from "@/components/dashboard/container";import { env } from "@/env";import { formatDate } from "@/lib/utils";import { CreateForm } from "./create-form";-import { RevokeButton } from "./revoke-button.tsx";+import { RevokeButton } from "./revoke-button";const unkey = new Unkey({ token: env.UNKEY_TOKEN });diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/create-form.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/create-form.tsxsimilarity index 100%rename from apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/create-form.tsxrename to apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/create-form.tsxdiff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/revoke-button.tsx.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/revoke-button.tsxsimilarity index 100%rename from apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/revoke-button.tsx.tsxrename to apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/revoke-button.tsxdiff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/submit-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/submit-button.tsxsimilarity index 100%rename from apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/api-keys/submit-button.tsxrename to apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/_components/submit-button.tsxdiff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/page.tsxnew file mode 100644index 000000000..b3e2d664d--- /dev/null+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/api-token/page.tsx@@ -0,0 +1,8 @@+import { api } from "@/trpc/server";+import { ApiKeys } from "./_components/card";++export default async function ApiTokenPage() {+ const data = await api.workspace.getWorkspace.query();++ return <ApiKeys ownerId={data.id} />;+}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/customer-portal-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/_components/customer-portal-button.tsxsimilarity index 100%rename from apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/customer-portal-button.tsxrename to apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/_components/customer-portal-button.tsxdiff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/plan.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/_components/plan.tsxsimilarity index 83%rename from apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/plan.tsxrename to apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/_components/plan.tsxindex 99d8e8e01..cff0a88ec 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/plan.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/_components/plan.tsx@@ -2,7 +2,6 @@import { useTransition } from "react";import { useRouter } from "next/navigation";-import type { z } from "zod";import type { Workspace } from "@openstatus/db/src/schema";@@ -13,13 +12,7 @@ import { plansConfig } from "@/config/plans";import { getStripe } from "@/lib/stripe/client";import { api } from "@/trpc/client";-export const SettingsPlan = ({- workspaceSlug,- workspaceData,-}: {- workspaceSlug: string;- workspaceData: Workspace;-}) => {+export const SettingsPlan = ({ workspace }: { workspace: Workspace }) => {const router = useRouter();const [isPending, startTransition] = useTransition();const [isPortalPending, startPortalTransition] = useTransition();@@ -27,7 +20,7 @@ export const SettingsPlan = ({const getCheckoutSession = () => {startTransition(async () => {const result = await api.stripeRouter.getCheckoutSession.mutate({- workspaceSlug,+ workspaceSlug: workspace.slug,});if (!result) return;@@ -39,7 +32,7 @@ export const SettingsPlan = ({const getUserCustomerPortal = () => {startPortalTransition(async () => {const url = await api.stripeRouter.getUserCustomerPortal.mutate({- workspaceSlug,+ workspaceSlug: workspace.slug,});if (!url) return;router.push(url);@@ -52,7 +45,7 @@ export const SettingsPlan = ({...plansConfig.free,loading: isPortalPending,action: {- text: workspaceData?.plan === "free" ? "Current plan" : "Downgrade",+ text: workspace?.plan === "free" ? "Current plan" : "Downgrade",onClick: async () => {await getUserCustomerPortal();},@@ -62,7 +55,7 @@ export const SettingsPlan = ({...plansConfig.pro,loading: isPending,action: {- text: workspaceData?.plan === "free" ? "Upgrade" : "Current plan",+ text: workspace?.plan === "free" ? "Upgrade" : "Current plan",onClick: async () => {await getCheckoutSession();},diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/page.tsxnew file mode 100644index 000000000..909dfab87--- /dev/null+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/billing/page.tsx@@ -0,0 +1,24 @@+import { Badge } from "@openstatus/ui";++import { api } from "@/trpc/server";+import { CustomerPortalButton } from "./_components/customer-portal-button";+import { SettingsPlan } from "./_components/plan";++export default async function BillingPage() {+ const data = await api.workspace.getWorkspace.query();+ return (+ <>+ <h3 className="text-lg font-medium">Plans</h3>+ <div className="text-muted-foreground flex items-center space-x-2 text-sm">+ Your current plan is{" "}+ <Badge className="ml-2">{data?.plan || "free"}</Badge>+ </div>+ {data?.plan === "pro" ? (+ <div>+ <CustomerPortalButton workspaceSlug={data.slug} />+ </div>+ ) : null}+ <SettingsPlan workspace={data} />+ </>+ );+}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/general/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/general/page.tsxnew file mode 100644index 000000000..ab24a0900--- /dev/null+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/general/page.tsx@@ -0,0 +1,12 @@+import { api } from "@/trpc/server";++export default async function GeneralPage() {+ const data = await api.workspace.getWorkspace.query();++ return (+ <div className="text-muted-foreground">+ Your workspace slug is:{" "}+ <span className="text-foreground pl-1 font-medium">{data.slug}</span>.+ </div>+ );+}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/layout.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/layout.tsxnew file mode 100644index 000000000..63034e058--- /dev/null+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/layout.tsx@@ -0,0 +1,44 @@+import { Header } from "@/components/dashboard/header";+import { Navbar } from "@/components/dashboard/navbar";++export default function SettingsLayout({+ params,+ children,+}: {+ params: { workspaceSlug: string };+ children: React.ReactNode;+}) {+ const navigation = [+ {+ label: "General",+ href: `/app/${params.workspaceSlug}/settings/general`,+ segment: "general",+ },+ {+ label: "Team",+ href: `/app/${params.workspaceSlug}/settings/team`,+ segment: "team",+ },+ {+ label: "API Token",+ href: `/app/${params.workspaceSlug}/settings/api-token`,+ segment: "api-token",+ },+ {+ label: "Billing",+ href: `/app/${params.workspaceSlug}/settings/billing`,+ segment: "billing",+ },+ ];++ return (+ <div className="grid gap-6 md:grid-cols-2 md:gap-8">+ <Header+ title="Settings"+ description="Your OpenStatus workspace settings."+ />+ <Navbar className="col-span-full" {...{ navigation }} />+ <div className="col-span-full">{children}</div>+ </div>+ );+}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/loading.tsxindex ca0444622..5b2000e22 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/loading.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/loading.tsx@@ -1,14 +1,10 @@import { Skeleton } from "@openstatus/ui";-import { Header } from "@/components/dashboard/header";+// TODO: can be improved...export default function Loading() {return (<div className="grid gap-6 md:grid-cols-1 md:gap-8">- <div className="col-span-full flex w-full justify-between">- <Header.Skeleton />- </div>- <Skeleton className="h-4 w-24" /><Skeleton className="h-72 w-full" /></div>);diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/page.tsxindex 3910a8d4f..e964cbd16 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/page.tsx@@ -1,72 +1,9 @@-import * as React from "react";+import { redirect } from "next/navigation";-import {- Badge,- Tabs,- TabsContent,- TabsList,- TabsTrigger,-} from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";-import { api } from "@/trpc/server";-import { ApiKeys } from "./_components/api-keys/card";-import { CustomerPortalButton } from "./_components/billing/customer-portal-button";-import { SettingsPlan } from "./_components/billing/plan";--export default async function Page({+export default function SettingsPage({params,}: {params: { workspaceSlug: string };}) {- const data = await api.workspace.getWorkspace.query();-- if (!data) {- return <>Workspace not found</>;- }- return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">- <Header- title="Settings"- description="Your OpenStatus workspace settings."- />- <div className="col-span-full">- <Tabs defaultValue="api-key" className="relative mr-auto w-full">- <TabsList className="h-9 w-full justify-start rounded-none border-b bg-transparent p-0">- <TabsTrigger- className="text-muted-foreground data-[state=active]:border-b-primary data-[state=active]:text-foreground relative h-9 rounded-none border-b-2 border-b-transparent bg-transparent px-4 pb-3 pt-2 font-semibold shadow-none transition-none data-[state=active]:shadow-none"- value="api-key"- >- API Token- </TabsTrigger>- <TabsTrigger- className="text-muted-foreground data-[state=active]:border-b-primary data-[state=active]:text-foreground relative h-9 rounded-none border-b-2 border-b-transparent bg-transparent px-4 pb-3 pt-2 font-semibold shadow-none transition-none data-[state=active]:shadow-none"- value="billing"- >- Billing- </TabsTrigger>- </TabsList>- <TabsContent value="api-key" className="pt-3">- <ApiKeys ownerId={data.id} />- </TabsContent>- <TabsContent value="billing" className="grid gap-4 pt-3">- <h3 className="text-lg font-medium">Plans</h3>- <div className="text-muted-foreground flex items-center space-x-2 text-sm">- Your current plan is{" "}- <Badge className="ml-2">{data?.plan || "free"}</Badge>- </div>- {data?.plan === "pro" ? (- <div>- <CustomerPortalButton workspaceSlug={params.workspaceSlug} />- </div>- ) : null}- <SettingsPlan- workspaceSlug={params.workspaceSlug}- workspaceData={data}- />- </TabsContent>- </Tabs>- </div>- </div>- );+ return redirect(`/app/${params.workspaceSlug}/settings/general`);}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/team/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/team/page.tsxnew file mode 100644index 000000000..f79e3bd2d--- /dev/null+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/team/page.tsx@@ -0,0 +1,27 @@+import { AlertTriangle } from "lucide-react";++import { Alert, AlertDescription, AlertTitle } from "@openstatus/ui";++import { columns } from "@/components/data-table/user/columns";+import { DataTable } from "@/components/data-table/user/data-table";+import { api } from "@/trpc/server";++export default async function TeamPage() {+ const workspace = await api.workspace.getWorkspace.query();+ const users = await api.workspace.getWorkspaceUsers.query();++ return (+ <div className="flex flex-col gap-4">+ <Alert>+ <AlertTriangle className="h-4 w-4" />+ <AlertTitle>Team</AlertTitle>+ <AlertDescription>+ {workspace.plan === "free"+ ? "Please upgrade to invite more team members."+ : "Please contact us to invite more team members. We are working on a self-service solution."}+ </AlertDescription>+ </Alert>+ <DataTable data={users} columns={columns} />+ </div>+ );+}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/_components/pro-feature-alert.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/_components/pro-feature-alert.tsxindex 138a71553..aec31b237 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/_components/pro-feature-alert.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/_components/pro-feature-alert.tsx@@ -12,7 +12,7 @@ export function ProFeatureAlert() {If you want to use your own domain, please upgrade to the Pro plan. Goto{" "}<Link- href="../settings"+ href="../settings/billing"className="text-foreground inline-flex items-center font-medium underline underline-offset-4 hover:no-underline">settingsdiff --git a/apps/web/src/components/dashboard/navbar.tsx b/apps/web/src/components/dashboard/navbar.tsxnew file mode 100644index 000000000..11c89e75a--- /dev/null+++ b/apps/web/src/components/dashboard/navbar.tsx@@ -0,0 +1,54 @@+"use client";++import * as React from "react";+import Link from "next/link";+import { useSelectedLayoutSegment } from "next/navigation";++import { Separator } from "@openstatus/ui";++import { cn } from "@/lib/utils";++type Props = {+ navigation: { label: string; href: string; segment: string | null }[];+ className?: string;+};++export const Navbar = ({ navigation, className }: Props) => {+ const selectedSegment = useSelectedLayoutSegment();++ return (+ <nav className={cn(className)}>+ <div className="flex w-full items-center overflow-x-auto">+ <ul className="flex flex-row gap-4">+ {navigation.map(({ label, href, segment }) => {+ const active = segment === selectedSegment;+ return (+ <li+ key={label}+ className={cn(+ "flex shrink-0 list-none border-b-2 border-transparent p-2 ",+ {+ "border-primary ": active,+ },+ )}+ >+ <Link+ href={href}+ className={cn(+ "text-muted-foreground hover:text-primary -mx-3 rounded-md px-3 py-2 text-sm font-medium",+ {+ "text-primary": active,+ },+ )}+ >+ {label}+ </Link>+ </li>+ );+ })}+ </ul>+ </div>+ <Separator />+ </nav>+ );+};diff --git a/apps/web/src/components/data-table/user/columns.tsx b/apps/web/src/components/data-table/user/columns.tsxnew file mode 100644index 000000000..cf9a400c8--- /dev/null+++ b/apps/web/src/components/data-table/user/columns.tsx@@ -0,0 +1,44 @@+"use client";++import type { ColumnDef } from "@tanstack/react-table";++import type { User } from "@openstatus/db/src/schema";++import { formatDate } from "@/lib/utils";+import { DataTableRowActions } from "./data-table-row-actions";++// TODO: add total number of monitors++export const columns: ColumnDef<User>[] = [+ {+ accessorKey: "email",+ header: "Email",+ cell: ({ row }) => {+ return (+ <div>+ <p>+ {row.original.firstName} {row.original.lastName}+ </p>+ <p className="text-muted-foreground">{row.getValue("email")}</p>+ </div>+ );+ },+ },+ {+ accessorKey: "createdAt",+ header: "Created",+ cell: ({ row }) => {+ return <span>{formatDate(row.getValue("createdAt"))}</span>;+ },+ },+ // {+ // id: "actions",+ // cell: ({ row }) => {+ // return (+ // <div className="text-right">+ // <DataTableRowActions row={row} />+ // </div>+ // );+ // },+ // },+];diff --git a/apps/web/src/components/data-table/user/data-table-row-actions.tsx b/apps/web/src/components/data-table/user/data-table-row-actions.tsxnew file mode 100644index 000000000..f2a50ca5d--- /dev/null+++ b/apps/web/src/components/data-table/user/data-table-row-actions.tsx@@ -0,0 +1,117 @@+// TODO: once TeamM=ember is released, use that++"use client";++import * as React from "react";+import Link from "next/link";+import { useRouter } from "next/navigation";+import type { Row } from "@tanstack/react-table";+import { MoreHorizontal } from "lucide-react";++import { selectPageSchema } from "@openstatus/db/src/schema";+import {+ AlertDialog,+ AlertDialogAction,+ AlertDialogCancel,+ AlertDialogContent,+ AlertDialogDescription,+ AlertDialogFooter,+ AlertDialogHeader,+ AlertDialogTitle,+ AlertDialogTrigger,+ Button,+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from "@openstatus/ui";++import { LoadingAnimation } from "@/components/loading-animation";+import { useToastAction } from "@/hooks/use-toast-action";+import { api } from "@/trpc/client";++interface DataTableRowActionsProps<TData> {+ row: Row<TData>;+}++export function DataTableRowActions<TData>({+ row,+}: DataTableRowActionsProps<TData>) {+ const page = selectPageSchema.parse(row.original);+ const router = useRouter();+ const { toast } = useToastAction();+ const [alertOpen, setAlertOpen] = React.useState(false);+ const [isPending, startTransition] = React.useTransition();++ async function onDelete() {+ startTransition(async () => {+ try {+ if (!page.id) return;+ await api.page.delete.mutate({ id: page.id });+ toast("deleted");+ router.refresh();+ setAlertOpen(false);+ } catch {+ toast("error");+ }+ });+ }++ return (+ <AlertDialog open={alertOpen} onOpenChange={(value) => setAlertOpen(value)}>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ variant="ghost"+ className="data-[state=open]:bg-accent h-8 w-8 p-0"+ >+ <span className="sr-only">Open menu</span>+ <MoreHorizontal className="h-4 w-4" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <Link href={`./status-pages/edit?id=${page.id}`}>+ <DropdownMenuItem>Edit</DropdownMenuItem>+ </Link>+ <Link+ href={+ process.env.NODE_ENV === "production"+ ? `https://${page.slug}.openstatus.dev`+ : `/status-page/${page.slug}`+ }+ target="_blank"+ >+ <DropdownMenuItem>Visit</DropdownMenuItem>+ </Link>+ <AlertDialogTrigger asChild>+ <DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">+ Delete+ </DropdownMenuItem>+ </AlertDialogTrigger>+ </DropdownMenuContent>+ </DropdownMenu>+ <AlertDialogContent>+ <AlertDialogHeader>+ <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>+ <AlertDialogDescription>+ This action cannot be undone. This will permanently delete the+ monitor.+ </AlertDialogDescription>+ </AlertDialogHeader>+ <AlertDialogFooter>+ <AlertDialogCancel>Cancel</AlertDialogCancel>+ <AlertDialogAction+ onClick={(e) => {+ e.preventDefault();+ onDelete();+ }}+ disabled={isPending}+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"+ >+ {!isPending ? "Delete" : <LoadingAnimation />}+ </AlertDialogAction>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>+ );+}diff --git a/apps/web/src/components/data-table/user/data-table.tsx b/apps/web/src/components/data-table/user/data-table.tsxnew file mode 100644index 000000000..bbe2814b4--- /dev/null+++ b/apps/web/src/components/data-table/user/data-table.tsx@@ -0,0 +1,81 @@+"use client";++import * as React from "react";+import type { ColumnDef } from "@tanstack/react-table";+import {+ flexRender,+ getCoreRowModel,+ useReactTable,+} from "@tanstack/react-table";++import {+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+} from "@openstatus/ui";++interface DataTableProps<TData, TValue> {+ columns: ColumnDef<TData, TValue>[];+ data: TData[];+}++export function DataTable<TData, TValue>({+ columns,+ data,+}: DataTableProps<TData, TValue>) {+ const table = useReactTable({+ data,+ columns,+ getCoreRowModel: getCoreRowModel(),+ });++ return (+ <div className="rounded-md border">+ <Table>+ <TableHeader className="bg-muted/50">+ {table.getHeaderGroups().map((headerGroup) => (+ <TableRow key={headerGroup.id} className="hover:bg-transparent">+ {headerGroup.headers.map((header) => {+ return (+ <TableHead key={header.id}>+ {header.isPlaceholder+ ? null+ : flexRender(+ header.column.columnDef.header,+ header.getContext(),+ )}+ </TableHead>+ );+ })}+ </TableRow>+ ))}+ </TableHeader>+ <TableBody>+ {table.getRowModel().rows?.length ? (+ table.getRowModel().rows.map((row) => (+ <TableRow+ key={row.id}+ data-state={row.getIsSelected() && "selected"}+ >+ {row.getVisibleCells().map((cell) => (+ <TableCell key={cell.id}>+ {flexRender(cell.column.columnDef.cell, cell.getContext())}+ </TableCell>+ ))}+ </TableRow>+ ))+ ) : (+ <TableRow>+ <TableCell colSpan={columns.length} className="h-24 text-center">+ No results.+ </TableCell>+ </TableRow>+ )}+ </TableBody>+ </Table>+ </div>+ );+}diff --git a/packages/api/src/router/workspace.ts b/packages/api/src/router/workspace.tsindex 344f61151..754ace987 100644--- a/packages/api/src/router/workspace.ts+++ b/packages/api/src/router/workspace.ts@@ -5,6 +5,7 @@ import { eq } from "@openstatus/db";import {selectWorkspaceSchema,user,+ usersToWorkspaces,workspace,} from "@openstatus/db/src/schema";@@ -32,6 +33,24 @@ export const workspaceRouter = createTRPCRouter({return selectWorkspaceSchema.parse(result);}),+ getWorkspaceUsers: protectedProcedure.query(async (opts) => {+ // const result = await opts.ctx.db+ // .select()+ // .from(usersToWorkspaces)+ // .leftJoin(user, eq(user.id, usersToWorkspaces.userId))+ // .where(eq(usersToWorkspaces.workspaceId, opts.ctx.workspace.id))+ // .all();+ // return result.map(({ user }) => user);++ const result = await opts.ctx.db.query.usersToWorkspaces.findMany({+ with: {+ user: true,+ },+ where: eq(usersToWorkspaces.workspaceId, opts.ctx.workspace.id),+ });+ return result.map(({ user }) => user);+ }),+createWorkspace: protectedProcedure.input(z.object({ name: z.string() })).mutation(async (opts) => {