Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
fix: notify subscribers early return (#2320)
Maximilian Kaske9a4ae2fa571a
diff --git a/apps/dashboard/src/components/forms/maintenance/form.tsx b/apps/dashboard/src/components/forms/maintenance/form.tsxindex c9e59df2f..f23f1671f 100644--- a/apps/dashboard/src/components/forms/maintenance/form.tsx+++ b/apps/dashboard/src/components/forms/maintenance/form.tsx@@ -79,9 +79,7 @@ export function FormMaintenance({onSubmit: (values: FormValues) => Promise<void>;}) {const trpc = useTRPC();- const { data: workspace } = useQuery(- trpc.workspace.getWorkspace.queryOptions(),- );+ const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());const mobile = useIsMobile();const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;const form = useForm<FormValues>({@@ -92,9 +90,10 @@ export function FormMaintenance({startDate: new Date(),endDate: addDays(new Date(), 1),pageComponents: [],- notifySubscribers: true,+ notifySubscribers: !!workspace?.limits["status-subscribers"],},});+const watchEndDate = form.watch("endDate");const watchMessage = form.watch("message");const [isPending, startTransition] = useTransition();diff --git a/apps/dashboard/src/components/forms/settings/form-api-key.tsx b/apps/dashboard/src/components/forms/settings/form-api-key.tsxindex 0873fce9a..83486abdd 100644--- a/apps/dashboard/src/components/forms/settings/form-api-key.tsx+++ b/apps/dashboard/src/components/forms/settings/form-api-key.tsx@@ -114,9 +114,7 @@ export function FormApiKey() {},});- const { data: workspace } = useQuery(- trpc.workspace.getWorkspace.queryOptions(),- );+ const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());const { data: apiKeys = [], refetch } = useQuery(trpc.apiKeyRouter.getAll.queryOptions(),);diff --git a/apps/dashboard/src/components/forms/status-report-update/form-status-report.tsx b/apps/dashboard/src/components/forms/status-report-update/form-status-report.tsxindex dd6312e42..b596c0fe3 100644--- a/apps/dashboard/src/components/forms/status-report-update/form-status-report.tsx+++ b/apps/dashboard/src/components/forms/status-report-update/form-status-report.tsx@@ -100,9 +100,7 @@ export function FormStatusReportUpdateCard({}) {const { reportId } = useParams<{ id: string; reportId: string }>();const trpc = useTRPC();- const { data: workspace } = useQuery(- trpc.workspace.getWorkspace.queryOptions(),- );+ const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());const mobile = useIsMobile();const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;const form = useForm<FormValues>({@@ -112,9 +110,10 @@ export function FormStatusReportUpdateCard({message: "",date: new Date(),componentImpacts: undefined,- notifySubscribers: true,+ notifySubscribers: !!workspace?.limits["status-subscribers"],},});+const watchMessage = form.watch("message");const [isPending, startTransition] = useTransition();const { setIsDirty } = useFormSheetDirty();diff --git a/apps/dashboard/src/components/forms/status-report-update/form.tsx b/apps/dashboard/src/components/forms/status-report-update/form.tsxindex 798728df7..eefef7556 100644--- a/apps/dashboard/src/components/forms/status-report-update/form.tsx+++ b/apps/dashboard/src/components/forms/status-report-update/form.tsx@@ -87,9 +87,7 @@ export function FormStatusReportUpdate({allowUnsetImpacts?: boolean;}) {const trpc = useTRPC();- const { data: workspace } = useQuery(- trpc.workspace.getWorkspace.queryOptions(),- );+ const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());const mobile = useIsMobile();const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;const form = useForm<FormValues>({@@ -99,9 +97,12 @@ export function FormStatusReportUpdate({message: defaultValues?.message ?? "",date: defaultValues?.date ?? new Date(),componentImpacts: defaultValues?.componentImpacts,- notifySubscribers: defaultValues?.notifySubscribers ?? true,+ notifySubscribers:+ defaultValues?.notifySubscribers ??+ !!workspace?.limits["status-subscribers"],},});+const watchMessage = form.watch("message");const [isPending, startTransition] = useTransition();const { setIsDirty } = useFormSheetDirty();diff --git a/apps/dashboard/src/components/forms/status-report/form.tsx b/apps/dashboard/src/components/forms/status-report/form.tsxindex b17eff8b3..a0f89469a 100644--- a/apps/dashboard/src/components/forms/status-report/form.tsx+++ b/apps/dashboard/src/components/forms/status-report/form.tsx@@ -101,9 +101,7 @@ export function FormStatusReport({items: CheckboxTreeItem[];}) {const trpc = useTRPC();- const { data: workspace } = useQuery(- trpc.workspace.getWorkspace.queryOptions(),- );+ const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());const mobile = useIsMobile();const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;const form = useForm<FormValues>({@@ -114,9 +112,10 @@ export function FormStatusReport({message: "",date: new Date(),pageComponents: [],- notifySubscribers: true,+ notifySubscribers: !!workspace?.limits["status-subscribers"],},});+const watchMessage = form.watch("message");const watchPageComponents = form.watch("pageComponents");const [isPending, startTransition] = useTransition();diff --git a/packages/api/src/router/subscriber-notification.ts b/packages/api/src/router/subscriber-notification.tsindex 2f2cffaa4..7b1eb7a2e 100644--- a/packages/api/src/router/subscriber-notification.ts+++ b/packages/api/src/router/subscriber-notification.ts@@ -16,6 +16,9 @@ export const subscriberNotificationRouter = createTRPCRouter({.meta({ track: Events.NotifyReport }).input(z.object({ id: z.number() })).mutation(async ({ ctx, input }) => {+ if (!ctx.workspace.limits["status-subscribers"]) {+ return { success: false };+ }try {await notifyStatusReport({ctx: toServiceCtx(ctx),@@ -31,6 +34,9 @@ export const subscriberNotificationRouter = createTRPCRouter({.meta({ track: Events.NotifyMaintenance }).input(z.object({ id: z.number() })).mutation(async ({ ctx, input }) => {+ if (!ctx.workspace.limits["status-subscribers"]) {+ return { success: false };+ }try {await notifyMaintenance({ctx: toServiceCtx(ctx),diff --git a/packages/api/src/router/workspace.test.ts b/packages/api/src/router/workspace.test.tsindex 9c1eb5ece..02b140020 100644--- a/packages/api/src/router/workspace.test.ts+++ b/packages/api/src/router/workspace.test.ts@@ -18,7 +18,7 @@ test("Get Test Workspace", async () => {});const caller = edgeRouter.createCaller(ctx);- const result = await caller.workspace.getWorkspace();+ const result = await caller.workspace.get();expect(result).toMatchObject({id: 1,@@ -47,7 +47,7 @@ test("by default we get the first workspace", async () => {});const caller = edgeRouter.createCaller(ctx);- const result = await caller.workspace.getWorkspace();+ const result = await caller.workspace.get();expect(result).toMatchObject({id: 1,diff --git a/packages/api/src/router/workspace.ts b/packages/api/src/router/workspace.tsindex feaf1b192..71ac0fa86 100644--- a/packages/api/src/router/workspace.ts+++ b/packages/api/src/router/workspace.ts@@ -1,6 +1,5 @@import { Events } from "@openstatus/analytics";import {- getWorkspace,getWorkspaceWithUsage,listWorkspaces,updateWorkspaceName,@@ -11,14 +10,6 @@ import { toServiceCtx, toTRPCError } from "../service-adapter";import { createTRPCRouter, protectedProcedure } from "../trpc";export const workspaceRouter = createTRPCRouter({- getWorkspace: protectedProcedure.query(async ({ ctx }) => {- try {- return await getWorkspace({ ctx: toServiceCtx(ctx) });- } catch (err) {- toTRPCError(err);- }- }),-get: protectedProcedure.query(async ({ ctx }) => {try {return await getWorkspaceWithUsage({ ctx: toServiceCtx(ctx) });