Skip to content

Open-source status page, incident response and uptime monitoring

fix: empty inArray (#831)

Maximilian Kaske2bc0c9056e90
diff --git a/apps/server/src/v1/page.ts b/apps/server/src/v1/page.ts
index aa483ca4a..fa24be78f 100644
--- a/apps/server/src/v1/page.ts
+++ b/apps/server/src/v1/page.ts
@@ -100,7 +100,7 @@ const PageSchema = z.object({
{ monitorId: 1, order: 0 },
{ monitorId: 2, order: 1 },
],
- }),
+ })
)
.optional(),
});
@@ -147,7 +147,7 @@ const CreatePageSchema = z.object({
{ monitorId: 1, order: 0 },
{ monitorId: 2, order: 1 },
],
- }),
+ })
)
.nullish(),
@@ -221,7 +221,7 @@ const UpdatePageSchema = z.object({
{ monitorId: 1, order: 0 },
{ monitorId: 2, order: 1 },
],
- }),
+ })
)
.nullish(),
@@ -311,8 +311,8 @@ pageApi.openapi(postRouteSubscriber, async (c) => {
.where(
and(
eq(pageSubscriber.email, input.email),
- eq(pageSubscriber.pageId, pageId),
- ),
+ eq(pageSubscriber.pageId, pageId)
+ )
)
.get();
if (alreadySubscribed)
@@ -507,7 +507,7 @@ pageApi.openapi(postRoute, async (c) => {
const { monitors, ...rest } = input;
- if (monitors) {
+ if (monitors?.length) {
const monitorIds = isNumberArray(monitors)
? monitors
: monitors.map((m) => m.monitorId);
@@ -518,8 +518,8 @@ pageApi.openapi(postRoute, async (c) => {
.where(
and(
inArray(monitor.id, monitorIds),
- eq(monitor.workspaceId, workspaceId),
- ),
+ eq(monitor.workspaceId, workspaceId)
+ )
)
.all();
if (monitorsData.length !== monitors.length)
@@ -631,15 +631,15 @@ pageApi.openapi(putRoute, async (c) => {
: monitors.map((m) => m.monitorId)
: [];
- if (monitors) {
+ if (monitors?.length) {
const monitorsData = await db
.select()
.from(monitor)
.where(
and(
inArray(monitor.id, monitorIds),
- eq(monitor.workspaceId, workspaceId),
- ),
+ eq(monitor.workspaceId, workspaceId)
+ )
)
.all();
if (monitorsData.length !== monitors.length)
@@ -670,8 +670,8 @@ pageApi.openapi(putRoute, async (c) => {
.where(
and(
inArray(monitorsToPages.monitorId, removedMonitors),
- eq(monitorsToPages.pageId, newPage.id),
- ),
+ eq(monitorsToPages.pageId, newPage.id)
+ )
);
}
diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.ts
index 26d618368..6dda52f16 100644
--- a/packages/api/src/router/page.ts
+++ b/packages/api/src/router/page.ts
@@ -65,7 +65,7 @@ export const pageRouter = createTRPCRouter({
where: and(
inArray(monitor.id, monitorIds),
eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt),
+ isNull(monitor.deletedAt)
),
});
@@ -95,7 +95,7 @@ export const pageRouter = createTRPCRouter({
const firstPage = await opts.ctx.db.query.page.findFirst({
where: and(
eq(page.id, opts.input.id),
- eq(page.workspaceId, opts.ctx.workspace.id),
+ eq(page.workspaceId, opts.ctx.workspace.id)
),
with: {
monitorsToPages: {
@@ -132,26 +132,28 @@ export const pageRouter = createTRPCRouter({
.where(
and(
eq(page.id, pageInput.id),
- eq(page.workspaceId, opts.ctx.workspace.id),
- ),
+ eq(page.workspaceId, opts.ctx.workspace.id)
+ )
)
.returning()
.get();
- // We should make sure the user has access to the monitors
- const allMonitors = await opts.ctx.db.query.monitor.findMany({
- where: and(
- inArray(monitor.id, monitorIds),
- eq(monitor.workspaceId, opts.ctx.workspace.id),
- isNull(monitor.deletedAt),
- ),
- });
-
- if (allMonitors.length !== monitorIds.length) {
- throw new TRPCError({
- code: "FORBIDDEN",
- message: "You don't have access to all the monitors.",
+ if (monitorIds.length) {
+ // We should make sure the user has access to the monitors
+ const allMonitors = await opts.ctx.db.query.monitor.findMany({
+ where: and(
+ inArray(monitor.id, monitorIds),
+ eq(monitor.workspaceId, opts.ctx.workspace.id),
+ isNull(monitor.deletedAt)
+ ),
});
+
+ if (allMonitors.length !== monitorIds.length) {
+ throw new TRPCError({
+ code: "FORBIDDEN",
+ message: "You don't have access to all the monitors.",
+ });
+ }
}
// TODO: check for monitor order!
@@ -171,8 +173,8 @@ export const pageRouter = createTRPCRouter({
.where(
and(
inArray(monitorsToPages.monitorId, removedMonitors),
- eq(monitorsToPages.pageId, currentPage.id),
- ),
+ eq(monitorsToPages.pageId, currentPage.id)
+ )
);
}
@@ -182,13 +184,15 @@ export const pageRouter = createTRPCRouter({
monitorId,
}));
- await opts.ctx.db
- .insert(monitorsToPages)
- .values(values)
- .onConflictDoUpdate({
- target: [monitorsToPages.monitorId, monitorsToPages.pageId],
- set: { order: sql.raw("excluded.`order`") },
- });
+ if (values.length) {
+ await opts.ctx.db
+ .insert(monitorsToPages)
+ .values(values)
+ .onConflictDoUpdate({
+ target: [monitorsToPages.monitorId, monitorsToPages.pageId],
+ set: { order: sql.raw("excluded.`order`") },
+ });
+ }
}),
delete: protectedProcedure
.input(z.object({ id: z.number() }))
@@ -198,8 +202,8 @@ export const pageRouter = createTRPCRouter({
.where(
and(
eq(page.id, opts.input.id),
- eq(page.workspaceId, opts.ctx.workspace.id),
- ),
+ eq(page.workspaceId, opts.ctx.workspace.id)
+ )
)
.run();
}),
@@ -241,12 +245,12 @@ export const pageRouter = createTRPCRouter({
.leftJoin(monitor, eq(monitorsToPages.monitorId, monitor.id))
.where(
// make sur only active monitors are returned!
- and(eq(monitorsToPages.pageId, result.id), eq(monitor.active, true)),
+ and(eq(monitorsToPages.pageId, result.id), eq(monitor.active, true))
)
.all();
const monitorsId = monitorsToPagesResult.map(
- ({ monitors_to_pages }) => monitors_to_pages.monitorId,
+ ({ monitors_to_pages }) => monitors_to_pages.monitorId
);
const monitorsToStatusReportResult =
@@ -265,15 +269,15 @@ export const pageRouter = createTRPCRouter({
.all();
const monitorStatusReportIds = monitorsToStatusReportResult.map(
- ({ statusReportId }) => statusReportId,
+ ({ statusReportId }) => statusReportId
);
const pageStatusReportIds = statusReportsToPagesResult.map(
- ({ statusReportId }) => statusReportId,
+ ({ statusReportId }) => statusReportId
);
const statusReportIds = Array.from(
- new Set([...monitorStatusReportIds, ...pageStatusReportIds]),
+ new Set([...monitorStatusReportIds, ...pageStatusReportIds])
);
const statusReports =
@@ -300,8 +304,8 @@ export const pageRouter = createTRPCRouter({
and(
inArray(monitor.id, monitorsId),
eq(monitor.active, true),
- isNull(monitor.deletedAt),
- ), // REMINDER: this is hardcoded
+ isNull(monitor.deletedAt)
+ ) // REMINDER: this is hardcoded
)
.all()
: [];
@@ -314,8 +318,8 @@ export const pageRouter = createTRPCRouter({
.where(
inArray(
incidentTable.monitorId,
- monitors.map((m) => m.id),
- ),
+ monitors.map((m) => m.id)
+ )
)
.all()
: [];
@@ -344,7 +348,7 @@ export const pageRouter = createTRPCRouter({
// had filter on some words we want to keep for us
if (
["api", "app", "www", "docs", "checker", "time", "help"].includes(
- opts.input.slug,
+ opts.input.slug
)
) {
return false;
@@ -357,7 +361,7 @@ export const pageRouter = createTRPCRouter({
addCustomDomain: protectedProcedure
.input(
- z.object({ customDomain: z.string().toLowerCase(), pageId: z.number() }),
+ z.object({ customDomain: z.string().toLowerCase(), pageId: z.number() })
)
.mutation(async (opts) => {
// TODO Add some check ?