Skip to content

Open-source status page, incident response and uptime monitoring

fix: prefix navigation value (#1357)

Maximilian Kaskeb66b3df431c6
diff --git a/apps/status-page/src/components/nav/header.tsx b/apps/status-page/src/components/nav/header.tsx
index 32de7694d..6702090d9 100644
--- a/apps/status-page/src/components/nav/header.tsx
+++ b/apps/status-page/src/components/nav/header.tsx
@@ -26,17 +26,17 @@ function useNav() {
return [
{
label: "Status",
- href: `/${prefix}`,
+ href: `${prefix ? `/${prefix}` : ""}`,
isActive: pathname === `/${prefix}`,
},
{
label: "Events",
- href: `/${prefix}/events`,
+ href: `${prefix ? `/${prefix}` : ""}/events`,
isActive: pathname.startsWith(`/${prefix}/events`),
},
{
label: "Monitors",
- href: `/${prefix}/monitors`,
+ href: `${prefix ? `/${prefix}` : ""}/monitors`,
isActive: pathname.startsWith(`/${prefix}/monitors`),
},
];
@@ -88,6 +88,7 @@ export function Header(props: React.ComponentProps<"header">) {
onSubscribe={async (email) => {
await subscribeMutation.mutateAsync({ slug: domain, email });
}}
+ slug={page?.slug}
/>
<div className="flex gap-3 md:hidden">
<NavMobile />
@@ -96,6 +97,7 @@ export function Header(props: React.ComponentProps<"header">) {
onSubscribe={async (email) => {
await subscribeMutation.mutateAsync({ slug: domain, email });
}}
+ slug={page?.slug}
/>
</div>
</nav>
diff --git a/apps/status-page/src/components/status-page/status-feed.tsx b/apps/status-page/src/components/status-page/status-feed.tsx
index 33b83876e..2eb3fe2d1 100644
--- a/apps/status-page/src/components/status-page/status-feed.tsx
+++ b/apps/status-page/src/components/status-page/status-feed.tsx
@@ -103,7 +103,9 @@ export function StatusFeed({
</span>
</StatusEventAside>
<Link
- href={`${prefix}/events/report/${report.id}`}
+ href={`${prefix ? `/${prefix}` : ""}/events/report/${
+ report.id
+ }`}
className="rounded-lg"
>
<StatusEventContent>
@@ -142,7 +144,9 @@ export function StatusFeed({
) : null}
</StatusEventAside>
<Link
- href={`${prefix}/events/maintenance/${maintenance.id}`}
+ href={`${prefix ? `/${prefix}` : ""}/events/maintenance/${
+ maintenance.id
+ }`}
className="rounded-lg"
>
<StatusEventContent>
diff --git a/apps/status-page/src/components/status-page/status-tracker.tsx b/apps/status-page/src/components/status-page/status-tracker.tsx
index d22ea531d..36e830a2d 100644
--- a/apps/status-page/src/components/status-page/status-tracker.tsx
+++ b/apps/status-page/src/components/status-page/status-tracker.tsx
@@ -273,7 +273,9 @@ export function StatusTracker({ data }: { data: UptimeData }) {
return (
<Link
key={event.id}
- href={`/${prefix}/events/report/${event.id}`}
+ href={`${
+ prefix ? `/${prefix}` : ""
+ }/events/report/${event.id}`}
>
{content}
</Link>
diff --git a/apps/status-page/src/components/status-page/status-updates.tsx b/apps/status-page/src/components/status-page/status-updates.tsx
index 2036ee3ef..9e403c041 100644
--- a/apps/status-page/src/components/status-page/status-updates.tsx
+++ b/apps/status-page/src/components/status-page/status-updates.tsx
@@ -10,7 +10,6 @@ import {
} from "@/components/ui/popover";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { useCopyToClipboard } from "@/hooks/use-copy-to-clipboard";
-import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";
import { cn } from "@/lib/utils";
import { Inbox } from "lucide-react";
import { useState } from "react";
@@ -19,17 +18,18 @@ type StatusUpdateType = "email" | "rss" | "atom";
interface StatusUpdatesProps extends React.ComponentProps<typeof Button> {
types?: StatusUpdateType[];
+ slug?: string;
onSubscribe?: (value: string) => Promise<void> | void;
}
export function StatusUpdates({
className,
types = ["rss", "atom"],
+ slug,
onSubscribe,
...props
}: StatusUpdatesProps) {
const [success, setSuccess] = useState(false);
- const prefix = usePathnamePrefix();
return (
<Popover>
@@ -85,7 +85,7 @@ export function StatusUpdates({
<TabsContent value="rss" className="flex flex-col gap-2">
<div className="border-b px-2 pb-2">
<Input
- placeholder={`https://${prefix}.openstatus.dev/feed/rss`}
+ placeholder={`https://${slug}.openstatus.dev/feed/rss`}
className="disabled:opacity-90"
disabled
/>
@@ -93,14 +93,14 @@ export function StatusUpdates({
<div className="px-2 pb-2">
<CopyButton
className="w-full"
- value={`https://${prefix}.openstatus.dev/feed/rss`}
+ value={`https://${slug}.openstatus.dev/feed/rss`}
/>
</div>
</TabsContent>
<TabsContent value="atom" className="flex flex-col gap-2">
<div className="border-b px-2 pb-2">
<Input
- placeholder={`https://${prefix}.openstatus.dev/feed/atom`}
+ placeholder={`https://${slug}.openstatus.dev/feed/atom`}
className="disabled:opacity-90"
disabled
/>
@@ -108,7 +108,7 @@ export function StatusUpdates({
<div className="px-2 pb-2">
<CopyButton
className="w-full"
- value={`https://${prefix}.openstatus.dev/feed/atom`}
+ value={`https://${slug}.openstatus.dev/feed/atom`}
/>
</div>
</TabsContent>
diff --git a/apps/status-page/src/hooks/use-pathname-prefix.ts b/apps/status-page/src/hooks/use-pathname-prefix.ts
index 81efeafde..4bb79a526 100644
--- a/apps/status-page/src/hooks/use-pathname-prefix.ts
+++ b/apps/status-page/src/hooks/use-pathname-prefix.ts
@@ -14,7 +14,7 @@ export function usePathnamePrefix() {
hostnames[0] !== "www" &&
!window.location.hostname.endsWith(".vercel.app")
) {
- setPrefix(hostnames[0]);
+ setPrefix("");
} else {
setPrefix(pathnames[1]);
}