Skip to content

Open-source status page, incident response and uptime monitoring

fix: manual validation (#1407)

Maximilian Kaske5017778be46b
diff --git a/apps/dashboard/src/components/forms/status-page/form-configuration.tsx b/apps/dashboard/src/components/forms/status-page/form-configuration.tsx
index e283e837c..a9c90e84f 100644
--- a/apps/dashboard/src/components/forms/status-page/form-configuration.tsx
+++ b/apps/dashboard/src/components/forms/status-page/form-configuration.tsx
@@ -59,20 +59,18 @@ const schema = z.object({
const configurationSchema = z
.object({
type: z.enum(["manual", "absolute"]),
- value: z.enum(["duration", "requests"]).nullish(),
+ value: z.enum(["duration", "requests", "manual"]).nullish(),
uptime: z.boolean().or(z.literal("true").or(z.literal("false"))),
theme: z.enum(THEME_KEYS as [string, ...string[]]),
})
.refine(
(data) => {
- // If type is "manual", value must be null or undefined
- if (data.type === "manual") {
- return data.value === null || data.value === undefined;
- }
+ // If type is "manual", value must be "manual"
+ if (data.type === "manual") return data.value === "manual";
return true;
},
{
- message: "Value must be null when type is manual",
+ message: "Value must be manual when type is manual",
path: ["value"],
},
);
@@ -111,7 +109,7 @@ export function FormConfiguration({
useEffect(() => {
if (watchConfigurationType === "manual") {
- form.setValue("configuration.value", undefined);
+ form.setValue("configuration.value", "manual");
} else {
form.setValue("configuration.value", "duration");
form.setValue("configuration.type", "absolute");
@@ -484,7 +482,7 @@ const message = {
const searchParams = {
type: parseAsStringLiteral(["manual", "absolute"]),
- value: parseAsStringLiteral(["duration", "requests"]),
+ value: parseAsStringLiteral(["duration", "requests", "manual"]),
uptime: parseAsStringLiteral(["true", "false"]),
theme: parseAsStringLiteral(Object.keys(THEMES)),
};
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
index badd89f6e..4e50db8c5 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
@@ -36,6 +36,7 @@ export default function Page() {
const { data: page } = useQuery(
trpc.statusPage.get.queryOptions({ slug: domain }),
);
+
// NOTE: we can prefetch that to avoid loading state
const { data: uptimeData, isLoading } = useQuery(
trpc.statusPage.getUptime.queryOptions({
diff --git a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
index 39d687106..1cdb28379 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
@@ -12,8 +12,8 @@ import { notFound } from "next/navigation";
import { z } from "zod";
export const schema = z.object({
- card: z.enum(["duration", "requests", "manual"]).default("duration"),
- bar: z.enum(["absolute", "manual"]).default("absolute"),
+ value: z.enum(["duration", "requests", "manual"]).default("duration"),
+ type: z.enum(["absolute", "manual"]).default("absolute"),
uptime: z.coerce.boolean().default(true),
theme: z.enum(["default"]).default("default"),
});
@@ -42,8 +42,8 @@ export default async function Layout({
disableTransitionOnChange
>
<StatusPageProvider
- defaultBarType={validation.data?.bar}
- defaultCardType={validation.data?.card}
+ defaultBarType={validation.data?.type}
+ defaultCardType={validation.data?.value}
defaultShowUptime={validation.data?.uptime}
defaultCommunityTheme={validation.data?.theme}
>