Skip to content

Open-source status page, incident response and uptime monitoring

fix: limits (#197)

Maximilian Kaskeabb9ebc23407
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
index 14284fbc7..f0faad608 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
@@ -33,7 +33,7 @@ export default async function Page({
});
const isLimit =
- (monitors?.length || 0) >=
+ (pages?.length || 0) >=
allPlans[workspace?.plan || "free"].limits["status-pages"];
const disableButton = isLimit || !Boolean(monitors);
diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.ts
index 21557c977..9df6b911d 100644
--- a/packages/api/src/router/monitor.ts
+++ b/packages/api/src/router/monitor.ts
@@ -10,15 +10,13 @@ import {
selectMonitorSchema,
user,
usersToWorkspaces,
+ workspace,
} from "@openstatus/db/src/schema";
import { allPlans } from "@openstatus/plans";
import { createTRPCRouter, protectedProcedure } from "../trpc";
import { hasUserAccessToWorkspace } from "./utils";
-const monitorLimit = allPlans.free.limits.monitors;
-const periodicityLimit = allPlans.free.limits.periodicity;
-
export const monitorRouter = createTRPCRouter({
createMonitor: protectedProcedure
.input(z.object({ data: insertMonitorSchema, workspaceSlug: z.string() }))
@@ -27,8 +25,12 @@ export const monitorRouter = createTRPCRouter({
workspaceSlug: opts.input.workspaceSlug,
ctx: opts.ctx,
});
+
if (!result) return;
+ const monitorLimit = result.plan.limits.monitors;
+ const periodicityLimit = result.plan.limits.periodicity;
+
const monitorNumbers = (
await opts.ctx.db.query.monitor.findMany({
where: eq(monitor.workspaceId, result.workspace.id),
@@ -101,6 +103,7 @@ export const monitorRouter = createTRPCRouter({
return _monitor;
}),
+ // TODO: delete
updateMonitorDescription: protectedProcedure
.input(
z.object({
@@ -149,11 +152,13 @@ export const monitorRouter = createTRPCRouter({
.get();
if (!currentMonitor || !currentMonitor.workspaceId) return;
+ // TODO: we should use hasUserAccess and pass `workspaceId` instead of `workspaceSlug`
const currentUser = opts.ctx.db
.select()
.from(user)
.where(eq(user.tenantId, opts.ctx.auth.userId))
.as("currentUser");
+
const result = await opts.ctx.db
.select()
.from(usersToWorkspaces)
@@ -163,6 +168,16 @@ export const monitorRouter = createTRPCRouter({
if (!result || !result.users_to_workspaces) return;
+ const currentWorkspace = await opts.ctx.db.query.workspace.findFirst({
+ where: eq(workspace.id, result.users_to_workspaces.workspaceId),
+ });
+
+ if (!currentWorkspace) return;
+
+ const plan = (currentWorkspace?.plan || "free") as "free" | "pro";
+
+ const periodicityLimit = allPlans[plan].limits.periodicity;
+
// the user is not allowed to use the cron job
if (
opts.input?.periodicity &&
@@ -182,6 +197,7 @@ export const monitorRouter = createTRPCRouter({
.returning()
.get();
}),
+ // TODO: delete
updateMonitorPeriodicity: protectedProcedure
.input(
z.object({
diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.ts
index 5aecde4fa..d229ba5bc 100644
--- a/packages/api/src/router/page.ts
+++ b/packages/api/src/router/page.ts
@@ -20,8 +20,6 @@ import { allPlans } from "@openstatus/plans";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
import { hasUserAccessToWorkspace } from "./utils";
-const limit = allPlans.free.limits["status-pages"];
-
// TODO: deletePageById - updatePageById
export const pageRouter = createTRPCRouter({
createPage: protectedProcedure
@@ -43,6 +41,8 @@ export const pageRouter = createTRPCRouter({
})
).length;
+ const limit = data.plan.limits["status-pages"];
+
// the user has reached the limits
if (pageNumbers >= limit) {
throw new TRPCError({
diff --git a/packages/api/src/router/utils.ts b/packages/api/src/router/utils.ts
index 9325a4ce3..9421aec7c 100644
--- a/packages/api/src/router/utils.ts
+++ b/packages/api/src/router/utils.ts
@@ -1,5 +1,6 @@
import { eq } from "@openstatus/db";
import { user, usersToWorkspaces, workspace } from "@openstatus/db/src/schema";
+import { allPlans } from "@openstatus/plans";
import { Context } from "../trpc";
@@ -39,5 +40,11 @@ export const hasUserAccessToWorkspace = async ({
// the user doesn't have access to this workspace
if (!result || !result.users_to_workspaces) return;
- return { workspace: currentWorkspace, user: result.currentUser };
+ const plan = (currentWorkspace.plan || "free") as "free" | "pro"; // FIXME: that is a hotfix
+
+ return {
+ workspace: currentWorkspace,
+ user: result.currentUser,
+ plan: allPlans[plan],
+ };
};