mirror of
https://github.com/fosrl/pangolin.git
synced 2026-09-04 18:29:21 +02:00
Configurable tab title and disable flag for keys
This commit is contained in:
@@ -112,6 +112,11 @@ export class Config {
|
|||||||
? "true"
|
? "true"
|
||||||
: "false";
|
: "false";
|
||||||
|
|
||||||
|
process.env.FLAGS_DISABLE_VIRTUAL_API_KEYS_UI = parsedConfig.flags
|
||||||
|
?.disable_virtual_api_keys_ui
|
||||||
|
? "true"
|
||||||
|
: "false";
|
||||||
|
|
||||||
this.rawConfig = parsedConfig;
|
this.rawConfig = parsedConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -442,6 +442,7 @@ export const configSchema = z
|
|||||||
disable_config_managed_domains: z.boolean().optional(),
|
disable_config_managed_domains: z.boolean().optional(),
|
||||||
disable_product_help_banners: z.boolean().optional(),
|
disable_product_help_banners: z.boolean().optional(),
|
||||||
disable_enterprise_features: z.boolean().optional(),
|
disable_enterprise_features: z.boolean().optional(),
|
||||||
|
disable_virtual_api_keys_ui: z.boolean().optional(),
|
||||||
enable_acme_cert_sync: z.boolean().optional().default(true),
|
enable_acme_cert_sync: z.boolean().optional().default(true),
|
||||||
disable_private_http_placeholder: z
|
disable_private_http_placeholder: z
|
||||||
.boolean()
|
.boolean()
|
||||||
|
|||||||
@@ -76,6 +76,11 @@ export default async function KeysPage(props: KeysPageProps) {
|
|||||||
redirect("/");
|
redirect("/");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const env = pullEnv();
|
||||||
|
if (env.flags.disableVirtualApiKeysUi) {
|
||||||
|
redirect(`/${orgId}`);
|
||||||
|
}
|
||||||
|
|
||||||
let keysData: ListMyVirtualApiKeysResponse | null = null;
|
let keysData: ListMyVirtualApiKeysResponse | null = null;
|
||||||
try {
|
try {
|
||||||
const res = await internal.get<
|
const res = await internal.get<
|
||||||
@@ -90,7 +95,6 @@ export default async function KeysPage(props: KeysPageProps) {
|
|||||||
redirect(`/${orgId}`);
|
redirect(`/${orgId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const env = pullEnv();
|
|
||||||
const primaryOrg = orgs.find((o) => o.orgId === orgId)?.isPrimaryOrg;
|
const primaryOrg = orgs.find((o) => o.orgId === orgId)?.isPrimaryOrg;
|
||||||
const isAdminOrOwner = Boolean(overview?.isAdmin || overview?.isOwner);
|
const isAdminOrOwner = Boolean(overview?.isAdmin || overview?.isOwner);
|
||||||
|
|
||||||
@@ -106,6 +110,7 @@ export default async function KeysPage(props: KeysPageProps) {
|
|||||||
showSidebar={false}
|
showSidebar={false}
|
||||||
launcherMode
|
launcherMode
|
||||||
showViewAsAdmin={isAdminOrOwner}
|
showViewAsAdmin={isAdminOrOwner}
|
||||||
|
env={env}
|
||||||
>
|
>
|
||||||
<UserVirtualApiKeys orgId={orgId} initialData={keysData} />
|
<UserVirtualApiKeys orgId={orgId} initialData={keysData} />
|
||||||
</Layout>
|
</Layout>
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ export default async function OrgPage(props: OrgPageProps) {
|
|||||||
showSidebar={false}
|
showSidebar={false}
|
||||||
launcherMode
|
launcherMode
|
||||||
showViewAsAdmin={isAdminOrOwner}
|
showViewAsAdmin={isAdminOrOwner}
|
||||||
|
env={env}
|
||||||
>
|
>
|
||||||
{overview && launcherData ? (
|
{overview && launcherData ? (
|
||||||
<ResourceLauncher
|
<ResourceLauncher
|
||||||
|
|||||||
@@ -30,9 +30,15 @@ import { normalizePostAuthPath } from "@server/lib/normalizePostAuthPath";
|
|||||||
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export async function generateMetadata(): Promise<Metadata> {
|
||||||
title: "Resource Access"
|
const env = pullEnv();
|
||||||
};
|
const title =
|
||||||
|
env.branding.resourceAuthPage?.titleText ||
|
||||||
|
env.branding.appName ||
|
||||||
|
"Resource Access";
|
||||||
|
|
||||||
|
return { title };
|
||||||
|
}
|
||||||
|
|
||||||
export const dynamic = "force-dynamic";
|
export const dynamic = "force-dynamic";
|
||||||
|
|
||||||
|
|||||||
+10
-6
@@ -53,17 +53,21 @@ export type OrgNavSectionsOptions = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Merged from 'user-management-and-resources' branch
|
// Merged from 'user-management-and-resources' branch
|
||||||
export const orgLangingNavItems: SidebarNavItem[] = [
|
export const orgLangingNavItems = (env?: Env): SidebarNavItem[] => [
|
||||||
{
|
{
|
||||||
title: "sidebarAccount",
|
title: "sidebarAccount",
|
||||||
href: "/{orgId}",
|
href: "/{orgId}",
|
||||||
icon: <LayoutGrid className="size-4 flex-none" />
|
icon: <LayoutGrid className="size-4 flex-none" />
|
||||||
},
|
},
|
||||||
{
|
...(!env?.flags.disableVirtualApiKeysUi
|
||||||
title: "sidebarMyApiKeys",
|
? [
|
||||||
href: "/{orgId}/keys",
|
{
|
||||||
icon: <KeyRound className="size-4 flex-none" />
|
title: "sidebarMyApiKeys",
|
||||||
}
|
href: "/{orgId}/keys",
|
||||||
|
icon: <KeyRound className="size-4 flex-none" />
|
||||||
|
}
|
||||||
|
]
|
||||||
|
: [])
|
||||||
];
|
];
|
||||||
|
|
||||||
export const orgNavSections = (
|
export const orgNavSections = (
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { cn } from "@app/lib/cn";
|
import { cn } from "@app/lib/cn";
|
||||||
import { ListUserOrgsResponse } from "@server/routers/org";
|
import { ListUserOrgsResponse } from "@server/routers/org";
|
||||||
|
import { Env } from "@app/lib/types/env";
|
||||||
import {
|
import {
|
||||||
orgLangingNavItems,
|
orgLangingNavItems,
|
||||||
type CommandBarNavSection,
|
type CommandBarNavSection,
|
||||||
@@ -25,6 +26,7 @@ interface LayoutProps {
|
|||||||
defaultSidebarCollapsed?: boolean;
|
defaultSidebarCollapsed?: boolean;
|
||||||
launcherMode?: boolean;
|
launcherMode?: boolean;
|
||||||
showViewAsAdmin?: boolean;
|
showViewAsAdmin?: boolean;
|
||||||
|
env?: Env;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function Layout({
|
export async function Layout({
|
||||||
@@ -38,7 +40,8 @@ export async function Layout({
|
|||||||
showTopBar = true,
|
showTopBar = true,
|
||||||
defaultSidebarCollapsed = false,
|
defaultSidebarCollapsed = false,
|
||||||
launcherMode = false,
|
launcherMode = false,
|
||||||
showViewAsAdmin = false
|
showViewAsAdmin = false,
|
||||||
|
env
|
||||||
}: LayoutProps) {
|
}: LayoutProps) {
|
||||||
const allCookies = await cookies();
|
const allCookies = await cookies();
|
||||||
const sidebarStateCookie = allCookies.get("pangolin-sidebar-state")?.value;
|
const sidebarStateCookie = allCookies.get("pangolin-sidebar-state")?.value;
|
||||||
@@ -49,7 +52,7 @@ export async function Layout({
|
|||||||
(sidebarStateCookie !== "expanded" && defaultSidebarCollapsed);
|
(sidebarStateCookie !== "expanded" && defaultSidebarCollapsed);
|
||||||
|
|
||||||
const launcherNavItems: SidebarNavItem[] = launcherMode
|
const launcherNavItems: SidebarNavItem[] = launcherMode
|
||||||
? orgLangingNavItems
|
? orgLangingNavItems(env)
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -70,6 +70,10 @@ export function pullEnv(): Env {
|
|||||||
: false,
|
: false,
|
||||||
disableEnterpriseFeatures:
|
disableEnterpriseFeatures:
|
||||||
process.env.DISABLE_ENTERPRISE_FEATURES === "true"
|
process.env.DISABLE_ENTERPRISE_FEATURES === "true"
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
|
disableVirtualApiKeysUi:
|
||||||
|
process.env.FLAGS_DISABLE_VIRTUAL_API_KEYS_UI === "true"
|
||||||
? true
|
? true
|
||||||
: false
|
: false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ export type Env = {
|
|||||||
usePangolinDns: boolean;
|
usePangolinDns: boolean;
|
||||||
disableProductHelpBanners: boolean;
|
disableProductHelpBanners: boolean;
|
||||||
disableEnterpriseFeatures: boolean;
|
disableEnterpriseFeatures: boolean;
|
||||||
|
disableVirtualApiKeysUi: boolean;
|
||||||
};
|
};
|
||||||
branding: {
|
branding: {
|
||||||
appName?: string;
|
appName?: string;
|
||||||
|
|||||||
Reference in New Issue
Block a user