Merge branch 'dev' into alerting-rules

src/app/[orgId]/settings/(private)/access/approvals/page.tsx

@@ -12,6 +12,11 @@ import type { ListRolesResponse } from "@server/routers/role";
 import type { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Approvals"
+};
 
 export interface ApprovalFeedPageProps {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/(private)/billing/layout.tsx

@@ -7,6 +7,11 @@ import { getTranslations } from "next-intl/server";
 import { getCachedOrgUser } from "@app/lib/api/getCachedOrgUser";
 import { getCachedOrg } from "@app/lib/api/getCachedOrg";
 import { build } from "@server/build";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Billing"
+};
 
 type BillingSettingsProps = {
     children: React.ReactNode;

src/app/[orgId]/settings/(private)/idp/[idpId]/general/page.tsx

@@ -97,7 +97,8 @@ export default function GeneralPage() {
         emailPath: z.string().nullable().optional(),
         namePath: z.string().nullable().optional(),
         scopes: z.string().min(1, { message: t("idpScopeRequired") }),
-        autoProvision: z.boolean().default(false)
+        autoProvision: z.boolean().default(false),
+        orgMapping: z.string().optional()
     });
 
     // Google form schema (simplified)
@@ -109,7 +110,8 @@ export default function GeneralPage() {
             .min(1, { message: t("idpClientSecretRequired") }),
         roleMapping: z.string().nullable().optional(),
         roleId: z.number().nullable().optional(),
-        autoProvision: z.boolean().default(false)
+        autoProvision: z.boolean().default(false),
+        orgMapping: z.string().optional()
     });
 
     // Azure form schema (simplified with tenant ID)
@@ -122,7 +124,8 @@ export default function GeneralPage() {
         tenantId: z.string().min(1, { message: t("idpTenantIdRequired") }),
         roleMapping: z.string().nullable().optional(),
         roleId: z.number().nullable().optional(),
-        autoProvision: z.boolean().default(false)
+        autoProvision: z.boolean().default(false),
+        orgMapping: z.string().optional()
     });
 
     type OidcFormValues = z.infer<typeof OidcFormSchema>;
@@ -160,7 +163,8 @@ export default function GeneralPage() {
             autoProvision: true,
             roleMapping: null,
             roleId: null,
-            tenantId: ""
+            tenantId: "",
+            orgMapping: ""
         }
     });
 
@@ -227,7 +231,8 @@ export default function GeneralPage() {
                         clientSecret: data.idpOidcConfig.clientSecret,
                         autoProvision: data.idp.autoProvision,
                         roleMapping: roleMapping || null,
-                        roleId: null
+                        roleId: null,
+                        orgMapping: data.idpOrg?.orgMapping ?? ""
                     };
 
                     // Add variant-specific fields
@@ -344,12 +349,14 @@ export default function GeneralPage() {
             }
 
             // Build payload based on variant
+            const orgMappingTrimmed = data.orgMapping?.trim() ?? "";
             let payload: any = {
                 name: data.name,
                 clientId: data.clientId,
                 clientSecret: data.clientSecret,
                 autoProvision: data.autoProvision,
-                roleMapping: roleMappingExpression
+                roleMapping: roleMappingExpression,
+                orgMapping: orgMappingTrimmed === "" ? null : orgMappingTrimmed
             };
 
             // Add variant-specific fields
@@ -532,6 +539,10 @@ export default function GeneralPage() {
                                     }
                                     rawExpression={rawRoleExpression}
                                     onRawExpressionChange={setRawRoleExpression}
+                                    orgMappingField={{
+                                        control: form.control,
+                                        name: "orgMapping"
+                                    }}
                                 />
                             </form>
                         </Form>

src/app/[orgId]/settings/(private)/idp/[idpId]/layout.tsx

@@ -6,6 +6,11 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { HorizontalTabs, TabItem } from "@app/components/HorizontalTabs";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Identity Provider"
+};
 
 interface SettingsLayoutProps {
     children: React.ReactNode;

src/app/[orgId]/settings/(private)/idp/[idpId]/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Identity Provider"
+};
+
 export default async function IdpPage(props: {
     params: Promise<{ orgId: string; idpId: string }>;
 }) {

src/app/[orgId]/settings/(private)/idp/create/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Create Identity Provider"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/(private)/idp/create/page.tsx

@@ -91,7 +91,8 @@ export default function Page() {
         tenantId: z.string().optional(),
         autoProvision: z.boolean().default(false),
         roleMapping: z.string().nullable().optional(),
-        roleId: z.number().nullable().optional()
+        roleId: z.number().nullable().optional(),
+        orgMapping: z.string().optional()
     });
 
     type CreateIdpFormValues = z.infer<typeof createIdpFormSchema>;
@@ -112,7 +113,8 @@ export default function Page() {
             tenantId: "",
             autoProvision: false,
             roleMapping: null,
-            roleId: null
+            roleId: null,
+            orgMapping: ""
         }
     });
 
@@ -177,7 +179,7 @@ export default function Page() {
                 return;
             }
 
-            const payload = {
+            const payload: Record<string, unknown> = {
                 name: data.name,
                 clientId: data.clientId,
                 clientSecret: data.clientSecret,
@@ -191,6 +193,10 @@ export default function Page() {
                 scopes: data.scopes,
                 variant: data.type
             };
+            const trimmedOrgMapping = data.orgMapping?.trim();
+            if (trimmedOrgMapping) {
+                payload.orgMapping = trimmedOrgMapping;
+            }
 
             // Use the appropriate endpoint based on provider type
             const endpoint = "oidc";
@@ -336,6 +342,10 @@ export default function Page() {
                                     }
                                     rawExpression={rawRoleExpression}
                                     onRawExpressionChange={setRawRoleExpression}
+                                    orgMappingField={{
+                                        control: form.control,
+                                        name: "orgMapping"
+                                    }}
                                 />
                             </form>
                         </Form>

src/app/[orgId]/settings/(private)/idp/page.tsx

@@ -7,6 +7,11 @@ import { getTranslations } from "next-intl/server";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { IdpGlobalModeBanner } from "@app/components/IdpGlobalModeBanner";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Identity Providers"
+};
 
 type OrgIdpPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/(private)/license/page.tsx

@@ -3,6 +3,11 @@ import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
 import { ListGeneratedLicenseKeysResponse } from "@server/routers/generatedLicense/types";
 import { AxiosResponse } from "axios";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Enterprise Licenses"
+};
 
 type Props = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Remote Exit Node"
+};
+
 export default async function RemoteExitNodePage(props: {
     params: Promise<{ orgId: string; remoteExitNodeId: string }>;
 }) {

src/app/[orgId]/settings/(private)/remote-exit-nodes/create/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Create Remote Exit Node"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/(private)/remote-exit-nodes/page.tsx

@@ -7,6 +7,11 @@ import ExitNodesTable, {
 } from "@app/components/ExitNodesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Remote Exit Nodes"
+};
 
 type RemoteExitNodesPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/access/invitations/page.tsx

@@ -11,6 +11,11 @@ import UserProvider from "@app/providers/UserProvider";
 import { verifySession } from "@app/lib/auth/verifySession";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Invitations"
+};
 
 type InvitationsPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/access/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Access"
+};
+
 type AccessPageProps = {
     params: Promise<{ orgId: string }>;
 };

src/app/[orgId]/settings/access/roles/page.tsx

@@ -8,6 +8,11 @@ import RolesTable, { type RoleRow } from "@app/components/RolesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { getTranslations } from "next-intl/server";
 import { getCachedOrg } from "@app/lib/api/getCachedOrg";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Roles"
+};
 
 type RolesPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/access/users/[userId]/layout.tsx

@@ -8,6 +8,11 @@ import { HorizontalTabs } from "@app/components/HorizontalTabs";
 import { cache } from "react";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "User"
+};
 
 interface UserLayoutProps {
     children: React.ReactNode;

src/app/[orgId]/settings/access/users/[userId]/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "User"
+};
+
 export default async function UserPage(props: {
     params: Promise<{ orgId: string; userId: string }>;
 }) {

src/app/[orgId]/settings/access/users/create/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Create User"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/access/users/create/page.tsx

@@ -46,7 +46,7 @@ import { Checkbox } from "@app/components/ui/checkbox";
 import { ListIdpsResponse } from "@server/routers/idp";
 import { useTranslations } from "next-intl";
 import { build } from "@server/build";
-import Image from "next/image";
+import IdpTypeIcon from "@app/components/IdpTypeIcon";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import OrgRolesTagField from "@app/components/OrgRolesTagField";
@@ -152,31 +152,8 @@ export default function Page() {
 
     const getIdpIcon = (variant: string | null) => {
         if (!variant) return null;
-
-        switch (variant.toLowerCase()) {
-            case "google":
-                return (
-                    <Image
-                        src="/idp/google.png"
-                        alt={t("idpGoogleAlt")}
-                        width={24}
-                        height={24}
-                        className="rounded"
-                    />
-                );
-            case "azure":
-                return (
-                    <Image
-                        src="/idp/azure.png"
-                        alt={t("idpAzureAlt")}
-                        width={24}
-                        height={24}
-                        className="rounded"
-                    />
-                );
-            default:
-                return null;
-        }
+        const type = variant.toLowerCase();
+        return <IdpTypeIcon type={type} size={24} />;
     };
 
     const validFor = [

src/app/[orgId]/settings/access/users/page.tsx

@@ -11,6 +11,11 @@ import UserProvider from "@app/providers/UserProvider";
 import { verifySession } from "@app/lib/auth/verifySession";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Users"
+};
 
 type UsersPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/api-keys/[apiKeyId]/layout.tsx

@@ -7,6 +7,11 @@ import { GetApiKeyResponse } from "@server/routers/apiKeys";
 import ApiKeyProvider from "@app/providers/ApiKeyProvider";
 import { HorizontalTabs } from "@app/components/HorizontalTabs";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "API Key"
+};
 
 interface SettingsLayoutProps {
     children: React.ReactNode;

src/app/[orgId]/settings/api-keys/[apiKeyId]/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "API Key"
+};
+
 export default async function ApiKeysPage(props: {
     params: Promise<{ orgId: string; apiKeyId: string }>;
 }) {

src/app/[orgId]/settings/api-keys/create/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Create API Key"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/api-keys/page.tsx

@@ -2,11 +2,14 @@ import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
 import { AxiosResponse } from "axios";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import OrgApiKeysTable, {
-    OrgApiKeyRow
-} from "@app/components/OrgApiKeysTable";
+import OrgApiKeysTable, { OrgApiKeyRow } from "@app/components/OrgApiKeysTable";
 import { ListOrgApiKeysResponse } from "@server/routers/apiKeys";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "API Keys"
+};
 
 type ApiKeyPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/blueprints/[blueprintId]/page.tsx

@@ -17,7 +17,7 @@ type BluePrintsPageProps = {
 };
 
 export const metadata: Metadata = {
-    title: "Blueprint Detail"
+    title: "Edit Blueprint"
 };
 
 export default async function BluePrintDetailPage(props: BluePrintsPageProps) {

src/app/[orgId]/settings/blueprints/create/page.tsx

@@ -12,7 +12,7 @@ export interface CreateBlueprintPageProps {
 }
 
 export const metadata: Metadata = {
-    title: "Create blueprint"
+    title: "Create Blueprint"
 };
 
 export default async function CreateBlueprintPage(

src/app/[orgId]/settings/clients/machine/[niceId]/layout.tsx

@@ -8,6 +8,11 @@ import { GetClientResponse } from "@server/routers/client";
 import { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
 import { redirect } from "next/navigation";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Machine Client"
+};
 
 type SettingsLayoutProps = {
     children: React.ReactNode;

src/app/[orgId]/settings/clients/machine/[niceId]/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Machine Client"
+};
+
 export default async function ClientPage(props: {
     params: Promise<{ orgId: string; niceId: number | string }>;
 }) {

src/app/[orgId]/settings/clients/machine/create/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Create Machine Client"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/clients/machine/page.tsx

@@ -8,6 +8,11 @@ import { ListClientsResponse } from "@server/routers/client";
 import { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
 import type { Pagination } from "@server/types/Pagination";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Machine Clients"
+};
 
 type ClientsPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/clients/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Clients"
+};
+
 type ClientsPageProps = {
     params: Promise<{ orgId: string }>;
     searchParams: Promise<{ view?: string }>;

src/app/[orgId]/settings/clients/user/[niceId]/layout.tsx

@@ -8,6 +8,11 @@ import { GetClientResponse } from "@server/routers/client";
 import { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
 import { redirect } from "next/navigation";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "User Device"
+};
 
 type SettingsLayoutProps = {
     children: React.ReactNode;

src/app/[orgId]/settings/clients/user/[niceId]/page.tsx

@@ -1,10 +1,13 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "User Device"
+};
+
 export default async function ClientPage(props: {
     params: Promise<{ orgId: string; niceId: number | string }>;
 }) {
     const params = await props.params;
-    redirect(
-        `/${params.orgId}/settings/clients/user/${params.niceId}/general`
-    );
+    redirect(`/${params.orgId}/settings/clients/user/${params.niceId}/general`);
 }

src/app/[orgId]/settings/clients/user/page.tsx

@@ -7,6 +7,11 @@ import { type ListUserDevicesResponse } from "@server/routers/client";
 import type { Pagination } from "@server/types/Pagination";
 import { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "User Devices"
+};
 
 type ClientsPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/domains/[domainId]/page.tsx

@@ -1,16 +1,13 @@
-import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import DomainInfoCard from "@app/components/DomainInfoCard";
-import RestartDomainButton from "@app/components/RestartDomainButton";
+import DomainPageClient from "@app/components/DomainPageClient";
 import { GetDomainResponse } from "@server/routers/domain/getDomain";
-import { pullEnv } from "@app/lib/pullEnv";
-import { getTranslations } from "next-intl/server";
-import RefreshButton from "@app/components/RefreshButton";
 import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
 import { GetDNSRecordsResponse } from "@server/routers/domain";
-import DNSRecordsTable from "@app/components/DNSRecordTable";
-import DomainCertForm from "@app/components/DomainCertForm";
-import { build } from "@server/build";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Domain"
+};
 
 interface DomainSettingsPageProps {
     params: Promise<{ domainId: string; orgId: string }>;
@@ -20,8 +17,6 @@ export default async function DomainSettingsPage({
     params
 }: DomainSettingsPageProps) {
     const { domainId, orgId } = await params;
-    const t = await getTranslations();
-    const env = pullEnv();
 
     let domain: GetDomainResponse | null = null;
     try {
@@ -34,57 +29,27 @@ export default async function DomainSettingsPage({
         return null;
     }
 
-    let dnsRecords;
+    let dnsRecords: GetDNSRecordsResponse | null = null;
     try {
         const response = await internal.get(
             `/org/${orgId}/domain/${domainId}/dns-records`,
             await authCookieHeader()
         );
         dnsRecords = response.data.data;
-    } catch (error) {
+    } catch {
         return null;
     }
 
-    if (!domain) {
+    if (!domain || !dnsRecords) {
         return null;
     }
 
     return (
-        <>
-            <div className="flex justify-between">
-                <SettingsSectionTitle
-                    title={domain.baseDomain}
-                    description={t("domainSettingDescription")}
-                />
-                {env.flags.usePangolinDns && domain.failed ? (
-                    <RestartDomainButton
-                        orgId={orgId}
-                        domainId={domain.domainId}
-                    />
-                ) : (
-                    <RefreshButton />
-                )}
-            </div>
-            <div className="space-y-6">
-                {build != "oss" && env.flags.usePangolinDns ? (
-                    <DomainInfoCard
-                        failed={domain.failed}
-                        verified={domain.verified}
-                        type={domain.type}
-                        errorMessage={domain.errorMessage}
-                    />
-                ) : null}
-
-                <DNSRecordsTable records={dnsRecords} type={domain.type} />
-
-                {domain.type == "wildcard" && !domain.configManaged && (
-                    <DomainCertForm
-                        orgId={orgId}
-                        domainId={domain.domainId}
-                        domain={domain}
-                    />
-                )}
-            </div>
-        </>
+        <DomainPageClient
+            initialDomain={domain}
+            initialDnsRecords={dnsRecords}
+            orgId={orgId}
+            domainId={domainId}
+        />
     );
-}
+}

src/app/[orgId]/settings/domains/page.tsx

@@ -11,6 +11,11 @@ import OrgProvider from "@app/providers/OrgProvider";
 import { ListDomainsResponse } from "@server/routers/domain";
 import { toUnicode } from "punycode";
 import { getCachedOrg } from "@app/lib/api/getCachedOrg";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Domains"
+};
 
 type Props = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/general/auth-page/page.tsx

@@ -11,6 +11,7 @@ import {
     GetLoginPageResponse
 } from "@server/routers/loginPage/types";
 import { AxiosResponse } from "axios";
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
 export interface AuthPageProps {

src/app/[orgId]/settings/general/layout.tsx

@@ -11,6 +11,11 @@ import { getCachedOrg } from "@app/lib/api/getCachedOrg";
 import { getCachedOrgUser } from "@app/lib/api/getCachedOrgUser";
 import { build } from "@server/build";
 import { pullEnv } from "@app/lib/pullEnv";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Organization"
+};
 
 type GeneralSettingsProps = {
     children: React.ReactNode;

src/app/[orgId]/settings/logs/access/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Access Logs"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/logs/action/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Action Logs"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/logs/analytics/page.tsx

@@ -2,6 +2,11 @@ import { LogAnalyticsData } from "@app/components/LogAnalyticsData";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { getTranslations } from "next-intl/server";
 import { Suspense } from "react";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Log Analytics"
+};
 
 export interface AnalyticsPageProps {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/logs/connection/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Connection Logs"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/logs/page.tsx

@@ -1,3 +1,9 @@
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Logs"
+};
+
 export default function GeneralPage() {
     return null;
 }

src/app/[orgId]/settings/logs/request/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Request Logs"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/logs/streaming/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Streaming Logs"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Settings"
+};
+
 type OrgPageProps = {
     params: Promise<{ orgId: string }>;
 };

src/app/[orgId]/settings/provisioning/keys/page.tsx

@@ -12,6 +12,11 @@ import DismissableBanner from "@app/components/DismissableBanner";
 import Link from "next/link";
 import { Button } from "@app/components/ui/button";
 import { ArrowRight, Plug } from "lucide-react";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Provisioning Keys"
+};
 
 type ProvisioningKeysPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/provisioning/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Provisioning"
+};
+
 type ProvisioningPageProps = {
     params: Promise<{ orgId: string }>;
 };
@@ -7,4 +12,4 @@ type ProvisioningPageProps = {
 export default async function ProvisioningPage(props: ProvisioningPageProps) {
     const params = await props.params;
     redirect(`/${params.orgId}/settings/provisioning/keys`);
-}
+}

src/app/[orgId]/settings/provisioning/pending/page.tsx

@@ -11,6 +11,11 @@ import { Button } from "@app/components/ui/button";
 import { ArrowRight, Plug } from "lucide-react";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { TierFeature, tierMatrix } from "@server/lib/billing/tierMatrix";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Pending Sites"
+};
 
 type PendingSitesPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/resources/client/page.tsx

@@ -10,8 +10,13 @@ import type { ListResourcesResponse } from "@server/routers/resource";
 import type { ListAllSiteResourcesByOrgResponse } from "@server/routers/siteResource";
 import type { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Private Resources"
+};
+
 export interface ClientResourcesPageProps {
     params: Promise<{ orgId: string }>;
     searchParams: Promise<Record<string, string>>;

src/app/[orgId]/settings/resources/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Public Resources"
+};
+
 export interface ResourcesPageProps {
     params: Promise<{ orgId: string }>;
 }

src/app/[orgId]/settings/resources/proxy/[niceId]/layout.tsx

@@ -14,6 +14,11 @@ import OrgProvider from "@app/providers/OrgProvider";
 import { cache } from "react";
 import ResourceInfoBox from "@app/components/ResourceInfoBox";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Public Resource"
+};
 
 export const dynamic = "force-dynamic";
 

src/app/[orgId]/settings/resources/proxy/[niceId]/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Public Resource"
+};
+
 export default async function ResourcePage(props: {
     params: Promise<{ niceId: string; orgId: string }>;
 }) {

src/app/[orgId]/settings/resources/proxy/create/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Create Public Resource"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/resources/proxy/page.tsx

@@ -13,6 +13,11 @@ import { getTranslations } from "next-intl/server";
 import { redirect } from "next/navigation";
 import { toUnicode } from "punycode";
 import { cache } from "react";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Public Resources"
+};
 
 export interface ProxyResourcesPageProps {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/share-links/page.tsx

@@ -7,10 +7,13 @@ import { cache } from "react";
 import { GetOrgResponse } from "@server/routers/org";
 import OrgProvider from "@app/providers/OrgProvider";
 import { ListAccessTokensResponse } from "@server/routers/accessToken";
-import ShareLinksTable, {
-    ShareLinkRow
-} from "@app/components/ShareLinksTable";
+import ShareLinksTable, { ShareLinkRow } from "@app/components/ShareLinksTable";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+    title: "Shareable Links"
+};
 
 type ShareLinksPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/sites/[niceId]/layout.tsx

@@ -8,7 +8,11 @@ import { HorizontalTabs } from "@app/components/HorizontalTabs";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import SiteInfoCard from "@app/components/SiteInfoCard";
 import { getTranslations } from "next-intl/server";
+import type { Metadata } from "next";
 
+export const metadata: Metadata = {
+    title: "Site"
+};
 
 interface SettingsLayoutProps {
     children: React.ReactNode;

src/app/[orgId]/settings/sites/[niceId]/page.tsx

@@ -1,5 +1,10 @@
+import type { Metadata } from "next";
 import { redirect } from "next/navigation";
 
+export const metadata: Metadata = {
+    title: "Site"
+};
+
 export default async function SitePage(props: {
     params: Promise<{ orgId: string; niceId: string }>;
 }) {

src/app/[orgId]/settings/sites/create/layout.tsx

@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import type { ReactNode } from "react";
+
+export const metadata: Metadata = {
+    title: "Create Site"
+};
+
+export default function Layout({ children }: { children: ReactNode }) {
+    return children;
+}

src/app/[orgId]/settings/sites/page.tsx

@@ -5,8 +5,13 @@ import { AxiosResponse } from "axios";
 import SitesTable, { SiteRow } from "@app/components/SitesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import SitesBanner from "@app/components/SitesBanner";
+import type { Metadata } from "next";
 import { getTranslations } from "next-intl/server";
 
+export const metadata: Metadata = {
+    title: "Sites"
+};
+
 type SitesPageProps = {
     params: Promise<{ orgId: string }>;
     searchParams: Promise<Record<string, string>>;