Skip to content

Open-source status page, incident response and uptime monitoring

chore: include addon in upgrade dialog (#1749)

Maximilian Kaske90caca33c417
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/(list)/nav-actions.tsx b/apps/dashboard/src/app/(dashboard)/monitors/(list)/nav-actions.tsx
index f20ad743f..d9e22d3b8 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/(list)/nav-actions.tsx
+++ b/apps/dashboard/src/app/(dashboard)/monitors/(list)/nav-actions.tsx
@@ -24,8 +24,8 @@ export function NavActions() {
{limitReached ? (
<Button
size="sm"
- data-disabled={limitReached}
- className="data-[disabled=true]:opacity-50"
+ data-limited={limitReached}
+ className="data-[limited=true]:opacity-80"
onClick={() => setOpenDialog(true)}
>
Create Monitor
diff --git a/apps/dashboard/src/app/(dashboard)/settings/billing/client.tsx b/apps/dashboard/src/app/(dashboard)/settings/billing/client.tsx
index 8537e82b1..a4791a1c6 100644
--- a/apps/dashboard/src/app/(dashboard)/settings/billing/client.tsx
+++ b/apps/dashboard/src/app/(dashboard)/settings/billing/client.tsx
@@ -181,24 +181,26 @@ export function Client() {
<div className="flex flex-col gap-2 pt-4">
{planAddons["email-domain-protection"] ? (
<BillingAddons
- label="Magic Link (Auth)"
- description="Only allow user with a given email domain to access the status page."
+ label={planAddons["email-domain-protection"].title}
+ description={
+ planAddons["email-domain-protection"].description
+ }
addon="email-domain-protection"
workspace={workspace}
/>
) : null}
{planAddons["white-label"] ? (
<BillingAddons
- label="White Label"
- description="Remove the 'powered by openstatus.dev' footer from your status pages."
+ label={planAddons["white-label"].title}
+ description={planAddons["white-label"].description}
addon="white-label"
workspace={workspace}
/>
) : null}
{planAddons["status-pages"] ? (
<BillingAddons
- label="Status Pages"
- description="Create and manage status pages for your workspace."
+ label={planAddons["status-pages"].title}
+ description={planAddons["status-pages"].description}
addon="status-pages"
workspace={workspace}
/>
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/(list)/nav-actions.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/(list)/nav-actions.tsx
index 1562d6285..608a47f29 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/(list)/nav-actions.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/(list)/nav-actions.tsx
@@ -24,8 +24,8 @@ export function NavActions() {
{limitReached ? (
<Button
size="sm"
- data-disabled={limitReached}
- className="data-[disabled=true]:opacity-50"
+ data-limited={limitReached}
+ className="data-[limited=true]:opacity-80"
onClick={() => setOpenDialog(true)}
>
Create Status Page
@@ -35,7 +35,11 @@ export function NavActions() {
<Link href="/status-pages/create">Create Status Page</Link>
</Button>
)}
- <UpgradeDialog open={openDialog} onOpenChange={setOpenDialog} />
+ <UpgradeDialog
+ open={openDialog}
+ onOpenChange={setOpenDialog}
+ limit="status-pages"
+ />
</div>
);
}
diff --git a/apps/dashboard/src/components/dialogs/upgrade.tsx b/apps/dashboard/src/components/dialogs/upgrade.tsx
index bf1fad460..ea1a92feb 100644
--- a/apps/dashboard/src/components/dialogs/upgrade.tsx
+++ b/apps/dashboard/src/components/dialogs/upgrade.tsx
@@ -1,4 +1,6 @@
+import { Link } from "@/components/common/link";
import { Note, NoteButton } from "@/components/common/note";
+import { BillingAddons } from "@/components/content/billing-addons";
import { DataTable } from "@/components/data-table/billing/data-table";
import {
Dialog,
@@ -7,9 +9,11 @@ import {
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
+import { Separator } from "@/components/ui/separator";
import { useTRPC } from "@/lib/trpc/client";
import type { WorkspacePlan } from "@openstatus/db/src/schema";
-import type { Limits } from "@openstatus/db/src/schema/plan/schema";
+import { allPlans } from "@openstatus/db/src/schema/plan/config";
+import type { Addons, Limits } from "@openstatus/db/src/schema/plan/schema";
import { getPlansForLimit } from "@openstatus/db/src/schema/plan/utils";
import type { DialogProps } from "@radix-ui/react-dialog";
import { useQuery } from "@tanstack/react-query";
@@ -32,6 +36,8 @@ export function UpgradeDialog(
if (!workspace) return null;
+ const planAddons = allPlans[workspace.plan].addons;
+
const getRestrictTo = () => {
if (props.restrictTo) return props.restrictTo;
if (props.limit) return getPlansForLimit(workspace.plan, props.limit);
@@ -40,16 +46,39 @@ export function UpgradeDialog(
const restrictTo = getRestrictTo();
+ const addon =
+ props.limit && Object.prototype.hasOwnProperty.call(planAddons, props.limit)
+ ? (props.limit as keyof Addons)
+ : null;
+
return (
<Dialog {...props}>
- <DialogContent className="max-h-[80vh] overflow-y-auto">
+ <DialogContent className="max-h-[80vh] overflow-y-auto sm:max-w-2xl">
<DialogHeader>
<DialogTitle>Upgrade Workspace</DialogTitle>
<DialogDescription>
Upgrade your workspace to support more monitors, status pages,
- regions, and much more.
+ regions, and much more. Get an overview within your{" "}
+ <Link
+ onClick={() => props.onOpenChange?.(false)}
+ href="/settings/billing"
+ >
+ billing settings
+ </Link>
+ .
</DialogDescription>
</DialogHeader>
+ {addon && planAddons[addon] ? (
+ <>
+ <BillingAddons
+ label={planAddons[addon].title}
+ description={planAddons[addon].description}
+ addon={addon}
+ workspace={workspace}
+ />
+ <Separator />
+ </>
+ ) : null}
{restrictTo.length === 0 ? (
<Note>
<CalendarClock />
diff --git a/apps/dashboard/src/components/nav/nav-monitors.tsx b/apps/dashboard/src/components/nav/nav-monitors.tsx
index 6ddc4a995..09a310bc0 100644
--- a/apps/dashboard/src/components/nav/nav-monitors.tsx
+++ b/apps/dashboard/src/components/nav/nav-monitors.tsx
@@ -99,8 +99,8 @@ export function NavMonitors() {
<Tooltip>
<TooltipTrigger asChild>
<SidebarMenuAction
- data-disabled={limitReached}
- className="relative top-0 right-0 border data-[disabled=true]:opacity-50"
+ data-limited={limitReached}
+ className="relative top-0 right-0 border data-[limited=true]:opacity-80"
onClick={() => {
if (limitReached) {
setOpenUpgradeDialog(true);
diff --git a/apps/dashboard/src/components/nav/nav-status-pages.tsx b/apps/dashboard/src/components/nav/nav-status-pages.tsx
index 50937c093..513240327 100644
--- a/apps/dashboard/src/components/nav/nav-status-pages.tsx
+++ b/apps/dashboard/src/components/nav/nav-status-pages.tsx
@@ -83,8 +83,8 @@ export function NavStatusPages() {
<Tooltip>
<TooltipTrigger asChild>
<SidebarMenuAction
- data-disabled={limitReached}
- className="relative top-0 right-0 border data-[disabled=true]:opacity-50"
+ data-limited={limitReached}
+ className="relative top-0 right-0 border data-[limited=true]:opacity-80"
onClick={() => {
if (limitReached) {
setOpenUpgradeDialog(true);
@@ -190,6 +190,7 @@ export function NavStatusPages() {
<UpgradeDialog
open={openUpgradeDialog}
onOpenChange={setOpenUpgradeDialog}
+ limit="status-pages"
/>
</SidebarGroup>
);
diff --git a/packages/db/src/schema/plan/config.ts b/packages/db/src/schema/plan/config.ts
index 1d0c76d64..91c534e6c 100644
--- a/packages/db/src/schema/plan/config.ts
+++ b/packages/db/src/schema/plan/config.ts
@@ -7,7 +7,13 @@ type PlanConfig = {
id: WorkspacePlan;
description: string;
price: Price;
- addons: Partial<Addons>;
+ addons: Partial<{
+ [K in keyof Addons]: {
+ title: string;
+ description: string;
+ price: Price;
+ };
+ }>;
limits: PlanLimits;
};
@@ -66,6 +72,9 @@ export const allPlans: Record<WorkspacePlan, PlanConfig> = {
},
addons: {
"email-domain-protection": {
+ title: "Magic Link (Auth)",
+ description:
+ "Only allow user with a given email domain to access the status page.",
price: {
USD: 100,
EUR: 100,
@@ -73,6 +82,9 @@ export const allPlans: Record<WorkspacePlan, PlanConfig> = {
},
},
"white-label": {
+ title: "White Label",
+ description:
+ "Remove the 'powered by openstatus.dev' footer from your status pages.",
price: {
USD: 300,
EUR: 300,
@@ -80,6 +92,8 @@ export const allPlans: Record<WorkspacePlan, PlanConfig> = {
},
},
"status-pages": {
+ title: "Status Pages",
+ description: "Create and manage status pages for your workspace.",
price: {
USD: 20,
EUR: 20,
@@ -130,6 +144,9 @@ export const allPlans: Record<WorkspacePlan, PlanConfig> = {
},
addons: {
"email-domain-protection": {
+ title: "Magic Link (Auth)",
+ description:
+ "Only allow user with a given email domain to access the status page.",
price: {
USD: 100,
EUR: 100,
@@ -137,6 +154,9 @@ export const allPlans: Record<WorkspacePlan, PlanConfig> = {
},
},
"white-label": {
+ title: "White Label",
+ description:
+ "Remove the 'powered by openstatus.dev' footer from your status pages.",
price: {
USD: 300,
EUR: 300,
@@ -144,6 +164,8 @@ export const allPlans: Record<WorkspacePlan, PlanConfig> = {
},
},
"status-pages": {
+ title: "Status Pages",
+ description: "Create and manage status pages for your workspace.",
price: {
USD: 20,
EUR: 20,