Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .env.docker-lightweight.example
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ AUTH_SECRET=your-random-secret-here-min-32-chars
# Set to "true" to allow email login without OAuth
SELF_HOST="true"

# [OPTIONAL] Base domain of the status pages (runtime, server-side).
# A page with slug "acme" is served at acme.<STATUS_PAGE_BASE_DOMAIN>; the
# status-page app resolves such hosts by slug and the dashboard shows these
# URLs. Point a wildcard DNS record and TLS certificate at the status-page app.
# Default: openstatus.dev
STATUS_PAGE_BASE_DOMAIN=

# GitHub OAuth (optional)
# Get from: https://github.com/settings/developers
AUTH_GITHUB_ID=
Expand Down
7 changes: 7 additions & 0 deletions .env.docker.example
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ AUTH_SECRET=your-random-secret-here-min-32-chars
# and cannot be changed via this runtime config file.
SELF_HOST="true"

# [OPTIONAL] Base domain of the status pages (runtime, server-side).
# A page with slug "acme" is served at acme.<STATUS_PAGE_BASE_DOMAIN>; the
# status-page app resolves such hosts by slug and the dashboard shows these
# URLs. Point a wildcard DNS record and TLS certificate at the status-page app.
# Default: openstatus.dev
STATUS_PAGE_BASE_DOMAIN=

# GitHub OAuth (optional)
# Get from: https://github.com/settings/developers
AUTH_GITHUB_ID=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ import {
EmptyStateMedia,
EmptyStateTitle,
} from "@/components/content/empty-state";
import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { getPageUrl } from "@/data/status-pages.client";
import { useTRPC } from "@/lib/trpc/client";

export function Client() {
const trpc = useTRPC();
const statusPageBaseDomain = useStatusPageBaseDomain();
const {
data: statusPages,
errorUpdateCount,
Expand All @@ -38,7 +40,10 @@ export function Client() {
items={statusPages?.map((page) => ({
id: page.id,
name: page.title,
description: getPageUrl(page).replace("https://", ""),
description: getPageUrl(page, statusPageBaseDomain).replace(
"https://",
"",
),
}))}
empty={
<EmptyStateContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
} from "@/components/content/detail";
import { SectionGroup } from "@/components/content/section";
import { Timeline } from "@/components/content/timeline";
import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { MaintenanceActions } from "@/components/maintenances/maintenance-actions";
import { MaintenanceComponents } from "@/components/maintenances/maintenance-components";
import { MaintenanceProperties } from "@/components/maintenances/maintenance-properties";
Expand All @@ -36,6 +37,7 @@ import { useTRPC } from "@/lib/trpc/client";

export function Client({ id, pageId }: { id: number; pageId: number }) {
const trpc = useTRPC();
const statusPageBaseDomain = useStatusPageBaseDomain();
const { data: maintenance } = useQuery(
trpc.maintenance.get.queryOptions({ id }),
);
Expand All @@ -48,7 +50,7 @@ export function Client({ id, pageId }: { id: number; pageId: number }) {

if (!maintenance || !page) return null;

const publicUrl = `${getPageUrl(page)}/events/maintenance/${maintenance.id}`;
const publicUrl = `${getPageUrl(page, statusPageBaseDomain)}/events/maintenance/${maintenance.id}`;
const canNotify = workspace?.limits["status-subscribers"] === true;
// service returns updates newest first
const updates = maintenance.updates;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { useQuery } from "@tanstack/react-query";
import { useParams, useRouter } from "next/navigation";
import { toast } from "sonner";

import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { QuickActions } from "@/components/dropdowns/quick-actions";
import { NavFeedback } from "@/components/nav/nav-feedback";
import { getActions, getPageUrl } from "@/data/status-pages.client";
Expand All @@ -21,6 +22,7 @@ export function NavActions() {
const { id } = useParams<{ id: string }>();
const router = useRouter();
const trpc = useTRPC();
const statusPageBaseDomain = useStatusPageBaseDomain();

const { data: statusPage } = useQuery(
trpc.page.get.queryOptions({ id: Number.parseInt(id) }),
Expand All @@ -43,7 +45,11 @@ export function NavActions() {
<Tooltip>
<TooltipTrigger asChild>
<Button variant="ghost" size="sm" className="group h-7 w-7" asChild>
<a href={getPageUrl(statusPage)} target="_blank" rel="noreferrer">
<a
href={getPageUrl(statusPage, statusPageBaseDomain)}
target="_blank"
rel="noreferrer"
>
<Globe className="text-muted-foreground group-hover:text-foreground h-4 w-4" />
</a>
</Button>
Expand Down
11 changes: 8 additions & 3 deletions apps/dashboard/src/app/(dashboard)/status-pages/[id]/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { useParams } from "next/navigation";
import { Link } from "@/components/common/link";
import { TableCellEmpty } from "@/components/data-table/table-cell-empty";
import { TableCellLink } from "@/components/data-table/table-cell-link";
import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { configurationLabels } from "@/components/forms/status-page/form-configuration";
import { SidebarRight } from "@/components/nav/sidebar-right";
import { getPageUrl } from "@/data/status-pages.client";
Expand All @@ -22,14 +23,15 @@ import { useTRPC } from "@/lib/trpc/client";
export function Sidebar() {
const { id } = useParams<{ id: string }>();
const trpc = useTRPC();
const statusPageBaseDomain = useStatusPageBaseDomain();
const { data: statusPage } = useQuery(
trpc.page.get.queryOptions({ id: Number.parseInt(id) }),
);
const { copy } = useCopyToClipboard();

if (!statusPage) return null;

const BADGE_URL = `${getPageUrl(statusPage)}/badge/v2`;
const BADGE_URL = `${getPageUrl(statusPage, statusPageBaseDomain)}/badge/v2`;

return (
<SidebarRight
Expand All @@ -41,7 +43,10 @@ export function Sidebar() {
{
label: "Slug",
value: (
<Link href={getPageUrl(statusPage)} target="_blank">
<Link
href={getPageUrl(statusPage, statusPageBaseDomain)}
target="_blank"
>
{statusPage.slug}
</Link>
),
Expand Down Expand Up @@ -148,7 +153,7 @@ export function Sidebar() {
footerButton={{
onClick: () =>
typeof window !== "undefined" &&
window.open(getPageUrl(statusPage), "_blank"),
window.open(getPageUrl(statusPage, statusPageBaseDomain), "_blank"),
children: (
<>
<ExternalLink />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import {
SectionHeaderRow,
SectionTitle,
} from "@/components/content/section";
import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { FormSheetStatusReport } from "@/components/forms/status-report/sheet";
import { StatusReportRow } from "@/components/status-reports/status-report-row";
import { toCheckboxTreeItems } from "@/components/ui/checkbox-tree";
Expand All @@ -72,6 +73,7 @@ import { useTRPC } from "@/lib/trpc/client";
export default function Page() {
const { id } = useParams<{ id: string }>();
const trpc = useTRPC();
const statusPageBaseDomain = useStatusPageBaseDomain();
const queryClient = useQueryClient();
const [openCreate, setOpenCreate] = useState(false);
const { data: page } = useQuery(
Expand Down Expand Up @@ -304,7 +306,7 @@ export default function Page() {
</Button>
<Button size="sm" variant="outline" asChild>
<NextLink
href={getPageUrl(page)}
href={getPageUrl(page, statusPageBaseDomain)}
target="_blank"
rel="noreferrer"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
} from "@/components/content/detail";
import { SectionGroup } from "@/components/content/section";
import { Timeline } from "@/components/content/timeline";
import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { Notifications } from "@/components/status-pages/notifications";
import { StatusReportActions } from "@/components/status-reports/status-report-actions";
import { StatusReportComposer } from "@/components/status-reports/status-report-composer";
Expand All @@ -49,6 +50,7 @@ import { errorMessage } from "@/lib/trpc/error";

export function Client({ id, pageId }: { id: number; pageId: number }) {
const trpc = useTRPC();
const statusPageBaseDomain = useStatusPageBaseDomain();
const { data: report } = useQuery(trpc.statusReport.get.queryOptions({ id }));
const { data: page } = useQuery(trpc.page.get.queryOptions({ id: pageId }));
const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());
Expand All @@ -65,7 +67,7 @@ export function Client({ id, pageId }: { id: number; pageId: number }) {

if (!report) return null;

const publicUrl = `${getPageUrl(report.page)}/events/report/${report.id}`;
const publicUrl = `${getPageUrl(report.page, statusPageBaseDomain)}/events/report/${report.id}`;
const canNotify = workspace?.limits["status-subscribers"] === true;
const updates = [...report.updates].sort(
(a, b) => b.date.getTime() - a.date.getTime() || b.id - a.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
import { Section } from "@/components/content/section";
import { columns } from "@/components/data-table/subscribers/columns";
import { SubscribersDataTableToolbar } from "@/components/data-table/subscribers/data-table-toolbar";
import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { UpgradeDialog } from "@/components/dialogs/upgrade";
import { FormSheetSubscriber } from "@/components/forms/subscriber/sheet";
import { toCheckboxTreeItems } from "@/components/ui/checkbox-tree";
Expand Down Expand Up @@ -82,6 +83,7 @@ export default function Page() {
const [openDialog, setOpenDialog] = useState(false);
const [openAdd, setOpenAdd] = useState(false);
const trpc = useTRPC();
const statusPageBaseDomain = useStatusPageBaseDomain();
const { data: page } = useQuery(trpc.page.get.queryOptions({ id: pageId }));
const { data: subscribers, refetch } = useQuery(
trpc.pageSubscriber.list.queryOptions({ pageId }),
Expand Down Expand Up @@ -217,7 +219,7 @@ export default function Page() {
{page ? (
<Button size="sm" variant="outline" asChild>
<NextLink
href={getPageUrl(page)}
href={getPageUrl(page, statusPageBaseDomain)}
target="_blank"
rel="noreferrer"
>
Expand Down
56 changes: 30 additions & 26 deletions apps/dashboard/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ import { Geist, Geist_Mono, Inter } from "next/font/google";
import LocalFont from "next/font/local";
import { NuqsAdapter } from "nuqs/adapters/next/app";

import { DeploymentConfigProvider } from "@/components/deployment-config-provider";
import { TailwindIndicator } from "@/components/tailwind-indicator";
import { ThemeProvider } from "@/components/theme-provider";
import { ScrollToHash } from "@/hooks/use-scroll-to-hash";
import { auth } from "@/lib/auth";
import { getDeploymentConfig } from "@/lib/deployment-config";
import { TRPCReactProvider } from "@/lib/trpc/client";

import { ogMetadata, twitterMetadata } from "./metadata";
Expand Down Expand Up @@ -96,32 +98,34 @@ export default async function RootLayout({
)}
>
<SessionProvider session={session}>
<TRPCReactProvider>
<NuqsAdapter>
<ThemeProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
>
{children}
<ScrollToHash />
<TailwindIndicator />
<Toaster richColors expand />
{process.env.NEXT_PUBLIC_OPENPANEL_CLIENT_ID && (
<OpenPanelComponent
clientId={process.env.NEXT_PUBLIC_OPENPANEL_CLIENT_ID}
profileId={
session?.user?.id ? `usr_${session.user.id}` : undefined
}
trackScreenViews
trackOutgoingLinks
trackAttributes
/>
)}
</ThemeProvider>
</NuqsAdapter>
</TRPCReactProvider>
<DeploymentConfigProvider value={getDeploymentConfig()}>
<TRPCReactProvider>
<NuqsAdapter>
<ThemeProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
>
{children}
<ScrollToHash />
<TailwindIndicator />
<Toaster richColors expand />
{process.env.NEXT_PUBLIC_OPENPANEL_CLIENT_ID && (
<OpenPanelComponent
clientId={process.env.NEXT_PUBLIC_OPENPANEL_CLIENT_ID}
profileId={
session?.user?.id ? `usr_${session.user.id}` : undefined
}
trackScreenViews
trackOutgoingLinks
trackAttributes
/>
)}
</ThemeProvider>
</NuqsAdapter>
</TRPCReactProvider>
</DeploymentConfigProvider>
</SessionProvider>
</body>
</html>
Expand Down
6 changes: 4 additions & 2 deletions apps/dashboard/src/app/onboarding/_steps/step-2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { ThemeKey } from "@openstatus/theme-store";
import { Button } from "@openstatus/ui/components/ui/button";
import { useState } from "react";

import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import {
CreatePageForm,
type FormValues as CreatePageFormValues,
Expand Down Expand Up @@ -48,6 +49,7 @@ export function Step2({
onSkip: () => void;
onContinue: () => void;
}) {
const statusPageBaseDomain = useStatusPageBaseDomain();
const isLocked = pageStatus === "completed" && !!createdPageData;

// Live preview tracks the form values via `onValuesChange` below. Defaults
Expand Down Expand Up @@ -78,8 +80,8 @@ export function Step2({
</OnboardingStepHeader>
{isLocked ? (
<OnboardingLockedSummary
value={`${createdPageData?.slug}.openstatus.dev`}
href={`https://${createdPageData?.slug}.openstatus.dev`}
value={`${createdPageData?.slug}.${statusPageBaseDomain}`}
href={`https://${createdPageData?.slug}.${statusPageBaseDomain}`}
helper="Theme, components, and visibility are editable later from page settings."
/>
) : (
Expand Down
4 changes: 3 additions & 1 deletion apps/dashboard/src/components/chat/chat-tool-part.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import { type KeyboardEvent, useEffect, useRef, useState } from "react";

import { ChangesTable } from "@/components/common/changes-table";
import { useStatusPageBaseDomain } from "@/components/deployment-config-provider";
import { useModifierKey } from "@/lib/keyboard";
import { useTRPC } from "@/lib/trpc/client";

Expand Down Expand Up @@ -236,9 +237,10 @@ function ToolDisclosure({
toolName: string;
}) {
const state: ToolState = part.state ?? "output-available";
const statusPageBaseDomain = useStatusPageBaseDomain();
const rich = renderToolResult(toolName, part.input, part.output);
const summary =
summarizeToolOutput(toolName, part.output) ??
summarizeToolOutput(toolName, part.output, { statusPageBaseDomain }) ??
(state === "output-denied" ? "Cancelled" : undefined);
const [open, setOpen] = useState(false);
// Gate the height animation behind a post-mount flag so a tool that mounts
Expand Down
Loading
Loading