Skip to content
Merged
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
94 changes: 94 additions & 0 deletions components/ambient-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/ambient-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@radix-ui/react-avatar": "^1.1.10",
"@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.16",
"@radix-ui/react-popover": "^1.1.15",
"@radix-ui/react-select": "^2.2.6",
"@radix-ui/react-separator": "^1.1.4",
"@radix-ui/react-slot": "^1.2.4",
Expand Down
4 changes: 3 additions & 1 deletion components/ambient-ui/src/app/(dashboard)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { usePathname } from 'next/navigation'
import { AppSidebar } from '@/components/app-sidebar'
import { NavHeader } from '@/components/nav-header'
import { StatusBar } from '@/components/status-bar'
import { useProject } from '@/queries/use-projects'
import {
SidebarInset,
Expand Down Expand Up @@ -38,7 +39,8 @@ export default function DashboardLayout({
projectName={project?.name ?? null}
pageName={pageName}
/>
<div className="flex-1 p-6">{children}</div>
<div className="flex-1 p-6 pb-10">{children}</div>
<StatusBar />
</SidebarInset>
</SidebarProvider>
)
Expand Down
19 changes: 15 additions & 4 deletions components/ambient-ui/src/app/api/ambient/v1/[...path]/route.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { resolveAccessToken, buildProxyHeaders } from "@/lib/auth"
import { API_SERVER_URL } from "@/lib/config"
import { getRuntimeConfig } from "@/lib/runtime-config"

export const runtime = "nodejs"
export const dynamic = "force-dynamic"
Expand All @@ -14,11 +14,22 @@ async function proxyRequest(
if (path.some(s => s === ".." || s === ".")) {
return Response.json({ error: "invalid_path" }, { status: 400 })
}

const config = await getRuntimeConfig()
const apiServerUrl = config.apiServerUrl

const pathStr = path.map(s => encodeURIComponent(s)).join("/")
const url = new URL(`/api/ambient/v1/${pathStr}`, API_SERVER_URL)
const url = new URL(`/api/ambient/v1/${pathStr}`, apiServerUrl)
url.search = new URL(request.url).search

const accessToken = await resolveAccessToken(request)
// Auth priority: custom token > SSO/oauth token > dev-mode token
let accessToken: string | undefined
if (config.customToken) {
accessToken = config.customToken
} else {
accessToken = await resolveAccessToken(request)
}

if (!accessToken) {
return Response.json({ error: "Unauthorized" }, { status: 401 })
}
Expand All @@ -28,7 +39,7 @@ async function proxyRequest(
// oauth-proxy provides an OpenShift OAuth token (different auth system).
// Strip the Authorization header until auth systems are unified — the
// BFF's oauth-proxy already authenticates the user.
if (accessToken.startsWith("sha256~")) {
if (!config.customToken && accessToken.startsWith("sha256~")) {
delete headers["Authorization"]
}

Expand Down
86 changes: 86 additions & 0 deletions components/ambient-ui/src/app/api/config/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import { getRuntimeConfig, setCustomContext, resetContext } from '@/lib/runtime-config'

export const runtime = 'nodejs'
export const dynamic = 'force-dynamic'

export async function GET() {
const config = await getRuntimeConfig()
return Response.json({
apiServerUrl: config.apiServerUrl,
customToken: config.customToken !== null,
isCustomContext: config.isCustomContext,
defaultApiServerUrl: config.defaultApiServerUrl,
})
}

export async function PUT(request: Request) {
let body: unknown
try {
body = await request.json()
} catch {
return Response.json({ error: 'Invalid JSON' }, { status: 400 })
}

if (typeof body !== 'object' || body === null) {
return Response.json(
{ error: 'Request body must be a JSON object' },
{ status: 400 },
)
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const parsed = body as Record<string, unknown>
const url = parsed.apiServerUrl
const token = parsed.customToken

if (url !== undefined && typeof url !== 'string') {
return Response.json(
{ error: 'apiServerUrl must be a string' },
{ status: 400 },
)
}

if (token !== undefined && token !== null && typeof token !== 'string') {
return Response.json(
{ error: 'customToken must be a string or null' },
{ status: 400 },
)
}

if (typeof url === 'string' && !url.startsWith('http://') && !url.startsWith('https://')) {
return Response.json(
{ error: 'apiServerUrl must start with http:// or https://' },
{ status: 400 },
)
}

if (url === undefined && token === undefined) {
return Response.json(
{ error: 'Request body must include apiServerUrl or customToken' },
{ status: 400 },
)
}

await setCustomContext(
typeof url === 'string' ? url : undefined,
token === null ? null : typeof token === 'string' ? (token || null) : undefined,
)

const config = await getRuntimeConfig()
return Response.json({
apiServerUrl: config.apiServerUrl,
customToken: config.customToken !== null,
isCustomContext: config.isCustomContext,
defaultApiServerUrl: config.defaultApiServerUrl,
})
}

export async function DELETE() {
await resetContext()
const config = await getRuntimeConfig()
return Response.json({
apiServerUrl: config.apiServerUrl,
customToken: config.customToken !== null,
isCustomContext: config.isCustomContext,
defaultApiServerUrl: config.defaultApiServerUrl,
})
}
91 changes: 42 additions & 49 deletions components/ambient-ui/src/components/nav-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,59 +25,52 @@ export function NavHeader({ projectId, projectName, pageName, sessionName }: Nav
<SidebarTrigger />
<Separator orientation="vertical" className="mx-1 h-5" />

<div className="flex flex-1 items-center justify-between">
<Breadcrumb>
<BreadcrumbList>
<BreadcrumbItem>
<BreadcrumbLink asChild>
<Link href="/">
<span className="font-semibold">Ambient</span>
</Link>
</BreadcrumbLink>
</BreadcrumbItem>
<Breadcrumb>
<BreadcrumbList>
<BreadcrumbItem>
<BreadcrumbLink asChild>
<Link href="/">
<span className="font-semibold">Ambient</span>
</Link>
</BreadcrumbLink>
</BreadcrumbItem>

{projectId && (
<>
<BreadcrumbSeparator />
<BreadcrumbItem>
{projectId && (
<>
<BreadcrumbSeparator />
<BreadcrumbItem>
<BreadcrumbLink asChild>
<Link href={`/${projectId}/fleet`}>{projectName ?? projectId}</Link>
</BreadcrumbLink>
</BreadcrumbItem>
</>
)}

{pageName && (
<>
<BreadcrumbSeparator />
<BreadcrumbItem>
{sessionName ? (
<BreadcrumbLink asChild>
<Link href={`/${projectId}/fleet`}>{projectName ?? projectId}</Link>
<Link href={`/${projectId}/fleet`}>{pageName}</Link>
</BreadcrumbLink>
</BreadcrumbItem>
</>
)}

{pageName && (
<>
<BreadcrumbSeparator />
<BreadcrumbItem>
{sessionName ? (
<BreadcrumbLink asChild>
<Link href={`/${projectId}/fleet`}>{pageName}</Link>
</BreadcrumbLink>
) : (
<BreadcrumbPage>{pageName}</BreadcrumbPage>
)}
</BreadcrumbItem>
</>
)}

{sessionName && (
<>
<BreadcrumbSeparator />
<BreadcrumbItem>
<BreadcrumbPage>{sessionName}</BreadcrumbPage>
</BreadcrumbItem>
</>
)}
</BreadcrumbList>
</Breadcrumb>
) : (
<BreadcrumbPage>{pageName}</BreadcrumbPage>
)}
</BreadcrumbItem>
</>
)}

<div className="flex items-center gap-2">
<span className="inline-block size-2.5 rounded-full bg-status-success-foreground" aria-label="Cluster connected" />
<span className="text-xs text-muted-foreground">Connected</span>
</div>
</div>
{sessionName && (
<>
<BreadcrumbSeparator />
<BreadcrumbItem>
<BreadcrumbPage>{sessionName}</BreadcrumbPage>
</BreadcrumbItem>
</>
)}
</BreadcrumbList>
</Breadcrumb>
</header>
)
}
Loading
Loading