Skip to content

Open-source status page, incident response and uptime monitoring

fix: minor migration issues (#1583)

Maximilian Kaske6029e7fdded0
diff --git a/apps/status-page/src/proxy.ts b/apps/status-page/src/proxy.ts
index 7a7ae7a78..b045a9b69 100644
--- a/apps/status-page/src/proxy.ts
+++ b/apps/status-page/src/proxy.ts
@@ -44,7 +44,7 @@ export default async function _proxy1(req: NextRequest) {
console.log({ pathname: url.pathname, type, prefix, subdomain });
- if (url.pathname === "/" && type !== "hostname") {
+ if (url.pathname === "/" && type !== "hostname" && subdomain !== null) {
return response;
}
diff --git a/packages/api/src/router/statusPage.ts b/packages/api/src/router/statusPage.ts
index bde056303..53cffee86 100644
--- a/packages/api/src/router/statusPage.ts
+++ b/packages/api/src/router/statusPage.ts
@@ -107,7 +107,7 @@ export const statusPageRouter = createTRPCRouter({
const monitors = _page.monitorsToPages
// NOTE: we cannot nested `where` in drizzle to filter active monitors
- .filter((m) => !m.monitor.deletedAt)
+ .filter((m) => !m.monitor.deletedAt && m.monitor.active)
.map((m) => {
const events = getEvents({
maintenances: _page.maintenances,
@@ -388,7 +388,7 @@ export const statusPageRouter = createTRPCRouter({
if (!_page) return null;
const monitors = _page.monitorsToPages.filter(
- (m) => !m.monitor.deletedAt,
+ (m) => !m.monitor.deletedAt && m.monitor.active,
);
if (monitors.length !== opts.input.monitorIds.length) return null;
@@ -754,7 +754,7 @@ export const statusPageRouter = createTRPCRouter({
if (!_page) return null;
const _monitor = _page.monitorsToPages.find(
- (m) => m.monitorId === opts.input.id,
+ (m) => m.monitorId === opts.input.id && m.monitor.active,
)?.monitor;
if (!_monitor) return null;