refactor(app): rename Component* UI widgets to accurate domain names

The dashboard widgets were named after the old 'component' concept. Renamed
each to what it actually renders:

- ComponentCard  → ServiceCard      (ServiceSummary, /services/, service actions)
- ComponentTable → ProgramTable     (ProgramSummary[], the program catalog)
- ComponentEditor→ DeploymentEditor (DeploymentDetail, the unified type)
- ComponentFields→ DeploymentFields (AnyDetail)
- AddComponent   → AddDeployment

Also purged the domain term 'component' from the rest of the app: the
useComponent hook → useDeployment, ConfigPanel + the three detail pages'
`component` prop/var → `deployment`, and the gateway/node table headers
(Component → Program / Deployment). Props renamed to match (component →
service / program / deployment). The React UI directory app/src/components/
keeps its conventional name.

App type-checks and builds clean.
This commit is contained in:
2026-06-14 12:13:41 -07:00
parent a5dcb6b346
commit 0515faadfd
17 changed files with 151 additions and 151 deletions

View File

@@ -36,12 +36,12 @@ const TEMPLATES: Record<string, Record<string, unknown>> = {
empty: {}, empty: {},
} }
interface AddComponentProps { interface AddDeploymentProps {
onAdd: (name: string, config: Record<string, unknown>) => Promise<void> onAdd: (name: string, config: Record<string, unknown>) => Promise<void>
existingNames: string[] existingNames: string[]
} }
export function AddComponent({ onAdd, existingNames }: AddComponentProps) { export function AddDeployment({ onAdd, existingNames }: AddDeploymentProps) {
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
const [name, setName] = useState("") const [name, setName] = useState("")
const [description, setDescription] = useState("") const [description, setDescription] = useState("")
@@ -100,7 +100,7 @@ export function AddComponent({ onAdd, existingNames }: AddComponentProps) {
onClick={() => setOpen(true)} onClick={() => setOpen(true)}
className="w-full flex items-center justify-center gap-2 p-4 border border-dashed border-[var(--border)] rounded-lg text-[var(--muted)] hover:text-[var(--foreground)] hover:border-[var(--primary)] transition-colors" className="w-full flex items-center justify-center gap-2 p-4 border border-dashed border-[var(--border)] rounded-lg text-[var(--muted)] hover:text-[var(--foreground)] hover:border-[var(--primary)] transition-colors"
> >
<Plus size={16} /> Add component <Plus size={16} /> Add entry
</button> </button>
) )
} }
@@ -108,7 +108,7 @@ export function AddComponent({ onAdd, existingNames }: AddComponentProps) {
return ( return (
<div className="bg-[var(--card)] border border-[var(--primary)] rounded-lg p-5 space-y-4"> <div className="bg-[var(--card)] border border-[var(--primary)] rounded-lg p-5 space-y-4">
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<h3 className="font-semibold">New component</h3> <h3 className="font-semibold">New entry</h3>
<button onClick={() => setOpen(false)} className="text-[var(--muted)] hover:text-[var(--foreground)]"> <button onClick={() => setOpen(false)} className="text-[var(--muted)] hover:text-[var(--foreground)]">
<X size={16} /> <X size={16} />
</button> </button>
@@ -150,7 +150,7 @@ export function AddComponent({ onAdd, existingNames }: AddComponentProps) {
<input <input
value={description} value={description}
onChange={(e) => setDescription(e.target.value)} onChange={(e) => setDescription(e.target.value)}
placeholder="What does this component do?" placeholder="What does this entry do?"
className="w-full bg-black/30 border border-[var(--border)] rounded px-3 py-1.5 text-sm focus:outline-none focus:border-[var(--primary)]" className="w-full bg-black/30 border border-[var(--border)] rounded px-3 py-1.5 text-sm focus:outline-none focus:border-[var(--primary)]"
/> />
</Field> </Field>

View File

@@ -1,17 +1,17 @@
import { useState } from "react" import { useState } from "react"
import { ChevronDown, ChevronRight } from "lucide-react" import { ChevronDown, ChevronRight } from "lucide-react"
import type { DeploymentDetail } from "@/types" import type { DeploymentDetail } from "@/types"
import { ComponentFields } from "./ComponentFields" import { DeploymentFields } from "./DeploymentFields"
import { BehaviorBadge } from "./BehaviorBadge" import { BehaviorBadge } from "./BehaviorBadge"
import { StackBadge } from "./StackBadge" import { StackBadge } from "./StackBadge"
interface ComponentEditorProps { interface DeploymentEditorProps {
component: DeploymentDetail deployment: DeploymentDetail
onSave: (name: string, config: Record<string, unknown>) => Promise<void> onSave: (name: string, config: Record<string, unknown>) => Promise<void>
onDelete: (name: string) => Promise<void> onDelete: (name: string) => Promise<void>
} }
export function ComponentEditor({ component, onSave, onDelete }: ComponentEditorProps) { export function DeploymentEditor({ deployment, onSave, onDelete }: DeploymentEditorProps) {
const [expanded, setExpanded] = useState(false) const [expanded, setExpanded] = useState(false)
return ( return (
@@ -22,19 +22,19 @@ export function ComponentEditor({ component, onSave, onDelete }: ComponentEditor
> >
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
{expanded ? <ChevronDown size={16} /> : <ChevronRight size={16} />} {expanded ? <ChevronDown size={16} /> : <ChevronRight size={16} />}
<span className="font-semibold">{component.id}</span> <span className="font-semibold">{deployment.id}</span>
<span className="text-sm text-[var(--muted)]">{component.description}</span> <span className="text-sm text-[var(--muted)]">{deployment.description}</span>
</div> </div>
<div className="flex items-center gap-1.5"> <div className="flex items-center gap-1.5">
<BehaviorBadge behavior={component.behavior} /> <BehaviorBadge behavior={deployment.behavior} />
<StackBadge stack={component.stack} /> <StackBadge stack={deployment.stack} />
</div> </div>
</button> </button>
{expanded && ( {expanded && (
<div className="border-t border-[var(--border)] p-4"> <div className="border-t border-[var(--border)] p-4">
<ComponentFields <DeploymentFields
component={component} deployment={deployment}
onSave={onSave} onSave={onSave}
onDelete={onDelete} onDelete={onDelete}
/> />

View File

@@ -4,16 +4,16 @@ import type { AnyDetail } from "@/types"
import { runnerLabel } from "@/lib/labels" import { runnerLabel } from "@/lib/labels"
import { SecretsEditor } from "./SecretsEditor" import { SecretsEditor } from "./SecretsEditor"
interface ComponentFieldsProps { interface DeploymentFieldsProps {
component: AnyDetail deployment: AnyDetail
onSave: (name: string, config: Record<string, unknown>) => Promise<void> onSave: (name: string, config: Record<string, unknown>) => Promise<void>
onDelete?: (name: string) => Promise<void> onDelete?: (name: string) => Promise<void>
} }
const SECRET_RE = /^\$\{secret:([^}]+)\}$/ const SECRET_RE = /^\$\{secret:([^}]+)\}$/
export function ComponentFields({ component, onSave, onDelete }: ComponentFieldsProps) { export function DeploymentFields({ deployment, onSave, onDelete }: DeploymentFieldsProps) {
const m = component.manifest const m = deployment.manifest
const [saving, setSaving] = useState(false) const [saving, setSaving] = useState(false)
const [saved, setSaved] = useState(false) const [saved, setSaved] = useState(false)
@@ -93,7 +93,7 @@ export function ComponentFields({ component, onSave, onDelete }: ComponentFields
delete config.proxy delete config.proxy
} }
await onSave(component.id, config) await onSave(deployment.id, config)
setSaved(true) setSaved(true)
setTimeout(() => setSaved(false), 2000) setTimeout(() => setSaved(false), 2000)
} finally { } finally {
@@ -122,7 +122,7 @@ export function ComponentFields({ component, onSave, onDelete }: ComponentFields
</Field> </Field>
)} )}
{("managed" in component && component.managed || port) && ( {("managed" in deployment && deployment.managed || port) && (
<Field label="Port"> <Field label="Port">
<input <input
value={port} value={port}
@@ -133,7 +133,7 @@ export function ComponentFields({ component, onSave, onDelete }: ComponentFields
</Field> </Field>
)} )}
{("managed" in component && component.managed || healthPath) && ( {("managed" in deployment && deployment.managed || healthPath) && (
<Field label="Health path"> <Field label="Health path">
<input <input
value={healthPath} value={healthPath}
@@ -205,10 +205,10 @@ export function ComponentFields({ component, onSave, onDelete }: ComponentFields
</Field> </Field>
)} )}
{"managed" in component && ( {"managed" in deployment && (
<Field label="Systemd"> <Field label="Systemd">
<span className="text-sm text-[var(--muted)]"> <span className="text-sm text-[var(--muted)]">
{component.managed ? "Yes" : "No"} {deployment.managed ? "Yes" : "No"}
</span> </span>
</Field> </Field>
)} )}
@@ -217,13 +217,13 @@ export function ComponentFields({ component, onSave, onDelete }: ComponentFields
{onDelete ? ( {onDelete ? (
<button <button
onClick={() => { onClick={() => {
if (confirm(`Delete component "${component.id}" from castle.yaml?`)) { if (confirm(`Delete deployment "${deployment.id}" from castle.yaml?`)) {
onDelete(component.id) onDelete(deployment.id)
} }
}} }}
className="flex items-center gap-1.5 text-xs text-red-400 hover:text-red-300" className="flex items-center gap-1.5 text-xs text-red-400 hover:text-red-300"
> >
<Trash2 size={12} /> Remove component <Trash2 size={12} /> Remove deployment
</button> </button>
) : ( ) : (
<div /> <div />

View File

@@ -63,7 +63,7 @@ export function GatewayPanel({ gateway, statuses }: GatewayPanelProps) {
<thead> <thead>
<tr className="border-b border-[var(--border)] text-left"> <tr className="border-b border-[var(--border)] text-left">
<th className="px-4 py-2 font-medium text-[var(--muted)]">Path</th> <th className="px-4 py-2 font-medium text-[var(--muted)]">Path</th>
<th className="px-4 py-2 font-medium text-[var(--muted)]">Component</th> <th className="px-4 py-2 font-medium text-[var(--muted)]">Program</th>
<th className="px-4 py-2 font-medium text-[var(--muted)]">Port</th> <th className="px-4 py-2 font-medium text-[var(--muted)]">Port</th>
{multiNode && ( {multiNode && (
<th className="px-4 py-2 font-medium text-[var(--muted)]">Node</th> <th className="px-4 py-2 font-medium text-[var(--muted)]">Node</th>

View File

@@ -6,14 +6,14 @@ import { BehaviorBadge } from "./BehaviorBadge"
import { StackBadge } from "./StackBadge" import { StackBadge } from "./StackBadge"
import { ProgramActions } from "./ProgramActions" import { ProgramActions } from "./ProgramActions"
interface ComponentTableProps { interface ProgramTableProps {
components: ProgramSummary[] programs: ProgramSummary[]
} }
type SortKey = "id" | "stack" | "behavior" type SortKey = "id" | "stack" | "behavior"
type SortDir = "asc" | "desc" type SortDir = "asc" | "desc"
export function ComponentTable({ components }: ComponentTableProps) { export function ProgramTable({ programs }: ProgramTableProps) {
const [search, setSearch] = useState("") const [search, setSearch] = useState("")
const [sortKey, setSortKey] = useState<SortKey>("id") const [sortKey, setSortKey] = useState<SortKey>("id")
const [sortDir, setSortDir] = useState<SortDir>("asc") const [sortDir, setSortDir] = useState<SortDir>("asc")
@@ -28,14 +28,14 @@ export function ComponentTable({ components }: ComponentTableProps) {
} }
const filtered = useMemo(() => { const filtered = useMemo(() => {
if (!search) return components if (!search) return programs
const q = search.toLowerCase() const q = search.toLowerCase()
return components.filter( return programs.filter(
(c) => (c) =>
c.id.toLowerCase().includes(q) || c.id.toLowerCase().includes(q) ||
(c.description?.toLowerCase().includes(q) ?? false), (c.description?.toLowerCase().includes(q) ?? false),
) )
}, [components, search]) }, [programs, search])
const sorted = useMemo(() => { const sorted = useMemo(() => {
const dir = sortDir === "asc" ? 1 : -1 const dir = sortDir === "asc" ? 1 : -1
@@ -76,7 +76,7 @@ export function ComponentTable({ components }: ComponentTableProps) {
</thead> </thead>
<tbody> <tbody>
{sorted.map((comp) => ( {sorted.map((comp) => (
<ComponentRow key={comp.id} component={comp} /> <ProgramRow key={comp.id} program={comp} />
))} ))}
{sorted.length === 0 && ( {sorted.length === 0 && (
<tr> <tr>
@@ -120,30 +120,30 @@ function SortHeader({
) )
} }
function ComponentRow({ component }: { component: ProgramSummary }) { function ProgramRow({ program }: { program: ProgramSummary }) {
return ( return (
<tr className="border-b border-[var(--border)] last:border-b-0 hover:bg-[var(--card)]/50 transition-colors"> <tr className="border-b border-[var(--border)] last:border-b-0 hover:bg-[var(--card)]/50 transition-colors">
<td className="px-3 py-2.5"> <td className="px-3 py-2.5">
<Link <Link
to={`/programs/${component.id}`} to={`/programs/${program.id}`}
className="font-medium hover:text-[var(--primary)] transition-colors" className="font-medium hover:text-[var(--primary)] transition-colors"
> >
{component.id} {program.id}
</Link> </Link>
{component.description && ( {program.description && (
<p className="text-xs text-[var(--muted)] mt-0.5 truncate max-w-xs"> <p className="text-xs text-[var(--muted)] mt-0.5 truncate max-w-xs">
{component.description} {program.description}
</p> </p>
)} )}
</td> </td>
<td className="px-3 py-2.5"> <td className="px-3 py-2.5">
<StackBadge stack={component.stack} /> <StackBadge stack={program.stack} />
</td> </td>
<td className="px-3 py-2.5"> <td className="px-3 py-2.5">
<BehaviorBadge behavior={component.behavior} /> <BehaviorBadge behavior={program.behavior} />
</td> </td>
<td className="px-3 py-2.5"> <td className="px-3 py-2.5">
<ProgramActions name={component.id} actions={component.actions} installed={component.installed} compact /> <ProgramActions name={program.id} actions={program.actions} installed={program.installed} compact />
</td> </td>
</tr> </tr>
) )

View File

@@ -6,17 +6,17 @@ import { runnerLabel } from "@/lib/labels"
import { HealthBadge } from "./HealthBadge" import { HealthBadge } from "./HealthBadge"
import { StackBadge } from "./StackBadge" import { StackBadge } from "./StackBadge"
interface ComponentCardProps { interface ServiceCardProps {
component: ServiceSummary service: ServiceSummary
health?: HealthStatus health?: HealthStatus
} }
export function ComponentCard({ component, health }: ComponentCardProps) { export function ServiceCard({ service, health }: ServiceCardProps) {
const hasHttp = component.port != null const hasHttp = service.port != null
const { mutate, isPending } = useServiceAction() const { mutate, isPending } = useServiceAction()
const doAction = (action: string) => { const doAction = (action: string) => {
mutate({ name: component.id, action }) mutate({ name: service.id, action })
} }
const isDown = health?.status === "down" const isDown = health?.status === "down"
@@ -25,10 +25,10 @@ export function ComponentCard({ component, health }: ComponentCardProps) {
<div className="bg-[var(--card)] border border-[var(--border)] rounded-lg p-5"> <div className="bg-[var(--card)] border border-[var(--border)] rounded-lg p-5">
<div className="flex items-start justify-between mb-2"> <div className="flex items-start justify-between mb-2">
<Link <Link
to={`/services/${component.id}`} to={`/services/${service.id}`}
className="text-base font-semibold hover:text-[var(--primary)] transition-colors" className="text-base font-semibold hover:text-[var(--primary)] transition-colors"
> >
{component.id} {service.id}
</Link> </Link>
{health ? ( {health ? (
<HealthBadge status={health.status} latency={health.latency_ms} /> <HealthBadge status={health.status} latency={health.latency_ms} />
@@ -38,38 +38,38 @@ export function ComponentCard({ component, health }: ComponentCardProps) {
</div> </div>
<div className="flex gap-1.5 mb-2"> <div className="flex gap-1.5 mb-2">
<StackBadge stack={component.stack} /> <StackBadge stack={service.stack} />
</div> </div>
{component.description && ( {service.description && (
<p className="text-sm text-[var(--muted)] mb-3">{component.description}</p> <p className="text-sm text-[var(--muted)] mb-3">{service.description}</p>
)} )}
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<div className="flex items-center gap-3 text-xs text-[var(--muted)]"> <div className="flex items-center gap-3 text-xs text-[var(--muted)]">
{component.port && ( {service.port && (
<span className="flex items-center gap-1 font-mono"> <span className="flex items-center gap-1 font-mono">
<Server size={12} />:{component.port} <Server size={12} />:{service.port}
</span> </span>
)} )}
{component.runner && ( {service.runner && (
<span className="flex items-center gap-1"> <span className="flex items-center gap-1">
<Terminal size={12} /> <Terminal size={12} />
{runnerLabel(component.runner)} {runnerLabel(service.runner)}
</span> </span>
)} )}
{component.proxy_path && ( {service.proxy_path && (
<a <a
href={component.proxy_path + "/"} href={service.proxy_path + "/"}
className="flex items-center gap-1 text-[var(--primary)] hover:underline" className="flex items-center gap-1 text-[var(--primary)] hover:underline"
> >
<ExternalLink size={12} /> <ExternalLink size={12} />
{component.proxy_path} {service.proxy_path}
</a> </a>
)} )}
{component.port && ( {service.port && (
<a <a
href={`http://localhost:${component.port}/docs`} href={`http://localhost:${service.port}/docs`}
className="text-[var(--primary)] hover:underline" className="text-[var(--primary)] hover:underline"
> >
Docs Docs
@@ -77,7 +77,7 @@ export function ComponentCard({ component, health }: ComponentCardProps) {
)} )}
</div> </div>
{component.managed && ( {service.managed && (
<div className="flex items-center gap-1"> <div className="flex items-center gap-1">
{isDown && ( {isDown && (
<button <button

View File

@@ -1,6 +1,6 @@
import { useMemo } from "react" import { useMemo } from "react"
import type { ServiceSummary, HealthStatus } from "@/types" import type { ServiceSummary, HealthStatus } from "@/types"
import { ComponentCard } from "./ComponentCard" import { ServiceCard } from "./ServiceCard"
import { SectionHeader } from "./SectionHeader" import { SectionHeader } from "./SectionHeader"
interface ServiceSectionProps { interface ServiceSectionProps {
@@ -16,7 +16,7 @@ export function ServiceSection({ services, statuses }: ServiceSectionProps) {
<SectionHeader section="service" /> <SectionHeader section="service" />
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4"> <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
{services.map((svc) => ( {services.map((svc) => (
<ComponentCard key={svc.id} component={svc} health={statusMap.get(svc.id)} /> <ServiceCard key={svc.id} service={svc} health={statusMap.get(svc.id)} />
))} ))}
</div> </div>
</section> </section>

View File

@@ -4,15 +4,15 @@ import { useQueryClient } from "@tanstack/react-query"
import { Check } from "lucide-react" import { Check } from "lucide-react"
import { apiClient } from "@/services/api/client" import { apiClient } from "@/services/api/client"
import type { AnyDetail } from "@/types" import type { AnyDetail } from "@/types"
import { ComponentFields } from "@/components/ComponentFields" import { DeploymentFields } from "@/components/DeploymentFields"
interface ConfigPanelProps { interface ConfigPanelProps {
component: AnyDetail deployment: AnyDetail
configSection: "services" | "jobs" | "programs" configSection: "services" | "jobs" | "programs"
onRefetch: () => void onRefetch: () => void
} }
export function ConfigPanel({ component, configSection, onRefetch }: ConfigPanelProps) { export function ConfigPanel({ deployment, configSection, onRefetch }: ConfigPanelProps) {
const navigate = useNavigate() const navigate = useNavigate()
const qc = useQueryClient() const qc = useQueryClient()
const [message, setMessage] = useState<{ type: "ok" | "error"; text: string } | null>(null) const [message, setMessage] = useState<{ type: "ok" | "error"; text: string } | null>(null)
@@ -61,8 +61,8 @@ export function ConfigPanel({ component, configSection, onRefetch }: ConfigPanel
<h2 className="text-sm font-semibold text-[var(--muted)] uppercase tracking-wider mb-4"> <h2 className="text-sm font-semibold text-[var(--muted)] uppercase tracking-wider mb-4">
Configuration Configuration
</h2> </h2>
<ComponentFields <DeploymentFields
component={component} deployment={deployment}
onSave={handleSave} onSave={handleSave}
onDelete={handleDelete} onDelete={handleDelete}
/> />

View File

@@ -4,8 +4,8 @@ import { ArrowLeft, Check, Loader2, Zap } from "lucide-react"
import { useQuery, useQueryClient } from "@tanstack/react-query" import { useQuery, useQueryClient } from "@tanstack/react-query"
import { apiClient } from "@/services/api/client" import { apiClient } from "@/services/api/client"
import type { DeploymentDetail } from "@/types" import type { DeploymentDetail } from "@/types"
import { AddComponent } from "@/components/AddComponent" import { AddDeployment } from "@/components/AddDeployment"
import { ComponentEditor } from "@/components/ComponentEditor" import { DeploymentEditor } from "@/components/DeploymentEditor"
interface ApplyResult { interface ApplyResult {
ok: boolean ok: boolean
@@ -124,18 +124,18 @@ export function ConfigEditorPage() {
)} )}
{isLoading ? ( {isLoading ? (
<p className="text-[var(--muted)]">Loading components...</p> <p className="text-[var(--muted)]">Loading entries...</p>
) : ( ) : (
<div className="space-y-2"> <div className="space-y-2">
{components?.map((comp) => ( {components?.map((comp) => (
<ComponentEditor <DeploymentEditor
key={comp.id} key={comp.id}
component={comp} deployment={comp}
onSave={handleSave} onSave={handleSave}
onDelete={handleDelete} onDelete={handleDelete}
/> />
))} ))}
<AddComponent <AddDeployment
existingNames={components?.map((c) => c.id) ?? []} existingNames={components?.map((c) => c.id) ?? []}
onAdd={handleSave} onAdd={handleSave}
/> />

View File

@@ -4,7 +4,7 @@ import { MeshPanel } from "@/components/MeshPanel"
import { NodeBar } from "@/components/NodeBar" import { NodeBar } from "@/components/NodeBar"
import { ServiceSection } from "@/components/ServiceSection" import { ServiceSection } from "@/components/ServiceSection"
import { ScheduledSection } from "@/components/ScheduledSection" import { ScheduledSection } from "@/components/ScheduledSection"
import { ComponentTable } from "@/components/ComponentTable" import { ProgramTable } from "@/components/ProgramTable"
import { SectionHeader } from "@/components/SectionHeader" import { SectionHeader } from "@/components/SectionHeader"
@@ -55,7 +55,7 @@ export function Dashboard() {
{programs && programs.length > 0 && ( {programs && programs.length > 0 && (
<section> <section>
<SectionHeader section="program" /> <SectionHeader section="program" />
<ComponentTable components={programs} /> <ProgramTable programs={programs} />
</section> </section>
)} )}
</div> </div>

View File

@@ -62,7 +62,7 @@ export function NodeDetailPage() {
<table className="w-full text-sm"> <table className="w-full text-sm">
<thead> <thead>
<tr className="bg-[var(--card)] border-b border-[var(--border)] text-left"> <tr className="bg-[var(--card)] border-b border-[var(--border)] text-left">
<th className="px-3 py-2 font-medium text-[var(--muted)]">Component</th> <th className="px-3 py-2 font-medium text-[var(--muted)]">Deployment</th>
<th className="px-3 py-2 font-medium text-[var(--muted)]">Behavior</th> <th className="px-3 py-2 font-medium text-[var(--muted)]">Behavior</th>
<th className="px-3 py-2 font-medium text-[var(--muted)]">Stack</th> <th className="px-3 py-2 font-medium text-[var(--muted)]">Stack</th>
<th className="px-3 py-2 font-medium text-[var(--muted)]">Runner</th> <th className="px-3 py-2 font-medium text-[var(--muted)]">Runner</th>

View File

@@ -9,7 +9,7 @@ import { ProgramActions, ActionOutputPanel, type ActionOutput } from "@/componen
export function ProgramDetailPage() { export function ProgramDetailPage() {
useEventStream() useEventStream()
const { name } = useParams<{ name: string }>() const { name } = useParams<{ name: string }>()
const { data: component, isLoading, error, refetch } = useProgram(name ?? "") const { data: deployment, isLoading, error, refetch } = useProgram(name ?? "")
const [actionOutput, setActionOutput] = useState<ActionOutput | null>(null) const [actionOutput, setActionOutput] = useState<ActionOutput | null>(null)
if (isLoading) { if (isLoading) {
@@ -18,7 +18,7 @@ export function ProgramDetailPage() {
) )
} }
if (error || !component) { if (error || !deployment) {
return ( return (
<div className="max-w-3xl mx-auto px-6 py-8"> <div className="max-w-3xl mx-auto px-6 py-8">
<DetailHeader backTo="/" backLabel="Back" name={name ?? ""} /> <DetailHeader backTo="/" backLabel="Back" name={name ?? ""} />
@@ -32,12 +32,12 @@ export function ProgramDetailPage() {
<DetailHeader <DetailHeader
backTo="/" backTo="/"
backLabel="Back to Programs" backLabel="Back to Programs"
name={component.id} name={deployment.id}
behavior={component.behavior} behavior={deployment.behavior}
stack={component.stack} stack={deployment.stack}
source={component.source} source={deployment.source}
> >
<ProgramActions name={component.id} actions={component.actions} installed={component.installed} onOutput={setActionOutput} /> <ProgramActions name={deployment.id} actions={deployment.actions} installed={deployment.installed} onOutput={setActionOutput} />
</DetailHeader> </DetailHeader>
{actionOutput && actionOutput.action && ( {actionOutput && actionOutput.action && (
@@ -46,8 +46,8 @@ export function ProgramDetailPage() {
</div> </div>
)} )}
{component.description && ( {deployment.description && (
<p className="text-sm text-[var(--muted)] -mt-4 mb-6">{component.description}</p> <p className="text-sm text-[var(--muted)] -mt-4 mb-6">{deployment.description}</p>
)} )}
<div className="bg-[var(--card)] border border-[var(--border)] rounded-lg p-5 mb-6"> <div className="bg-[var(--card)] border border-[var(--border)] rounded-lg p-5 mb-6">
@@ -58,48 +58,48 @@ export function ProgramDetailPage() {
Where the source lives and how castle works with it. Where the source lives and how castle works with it.
</p> </p>
<div className="grid grid-cols-2 gap-x-6 gap-y-2 text-sm mb-4"> <div className="grid grid-cols-2 gap-x-6 gap-y-2 text-sm mb-4">
{component.source && ( {deployment.source && (
<> <>
<span className="text-[var(--muted)]">Source</span> <span className="text-[var(--muted)]">Source</span>
<span className="font-mono break-all">{component.source}</span> <span className="font-mono break-all">{deployment.source}</span>
</> </>
)} )}
{component.repo && ( {deployment.repo && (
<> <>
<span className="text-[var(--muted)]">Repo</span> <span className="text-[var(--muted)]">Repo</span>
<span className="font-mono break-all"> <span className="font-mono break-all">
{component.repo} {deployment.repo}
{component.ref ? ` @ ${component.ref}` : ""} {deployment.ref ? ` @ ${deployment.ref}` : ""}
</span> </span>
</> </>
)} )}
{component.version && ( {deployment.version && (
<> <>
<span className="text-[var(--muted)]">Version</span> <span className="text-[var(--muted)]">Version</span>
<span>{component.version}</span> <span>{deployment.version}</span>
</> </>
)} )}
{component.runner && ( {deployment.runner && (
<> <>
<span className="text-[var(--muted)]">Runner</span> <span className="text-[var(--muted)]">Runner</span>
<span>{runnerLabel(component.runner)}</span> <span>{runnerLabel(deployment.runner)}</span>
</> </>
)} )}
{component.active !== null && ( {deployment.active !== null && (
<> <>
<span className="text-[var(--muted)]">Active</span> <span className="text-[var(--muted)]">Active</span>
<span className={component.active ? "text-green-400" : "text-[var(--muted)]"}> <span className={deployment.active ? "text-green-400" : "text-[var(--muted)]"}>
{component.active ? "● active" : "○ inactive"} {deployment.active ? "● active" : "○ inactive"}
</span> </span>
</> </>
)} )}
</div> </div>
{component.commands && Object.keys(component.commands).length > 0 && ( {deployment.commands && Object.keys(deployment.commands).length > 0 && (
<div className="mb-4"> <div className="mb-4">
<span className="text-sm text-[var(--muted)] block mb-1">Commands</span> <span className="text-sm text-[var(--muted)] block mb-1">Commands</span>
<div className="space-y-1"> <div className="space-y-1">
{Object.entries(component.commands).map(([verb, cmds]) => ( {Object.entries(deployment.commands).map(([verb, cmds]) => (
<div key={verb} className="flex gap-2 text-xs"> <div key={verb} className="flex gap-2 text-xs">
<span className="text-[var(--muted)] w-20 shrink-0">{verb}</span> <span className="text-[var(--muted)] w-20 shrink-0">{verb}</span>
<span className="font-mono break-all"> <span className="font-mono break-all">
@@ -111,11 +111,11 @@ export function ProgramDetailPage() {
</div> </div>
)} )}
{component.system_dependencies.length > 0 && ( {deployment.system_dependencies.length > 0 && (
<div className="mb-4"> <div className="mb-4">
<span className="text-sm text-[var(--muted)] block mb-1">System Dependencies</span> <span className="text-sm text-[var(--muted)] block mb-1">System Dependencies</span>
<div className="flex flex-wrap gap-1"> <div className="flex flex-wrap gap-1">
{component.system_dependencies.map((dep) => ( {deployment.system_dependencies.map((dep) => (
<span <span
key={dep} key={dep}
className="text-xs px-2 py-0.5 rounded bg-amber-900/30 text-amber-400 border border-amber-800" className="text-xs px-2 py-0.5 rounded bg-amber-900/30 text-amber-400 border border-amber-800"
@@ -128,7 +128,7 @@ export function ProgramDetailPage() {
)} )}
</div> </div>
<ConfigPanel component={component} configSection="programs" onRefetch={refetch} /> <ConfigPanel deployment={deployment} configSection="programs" onRefetch={refetch} />
</div> </div>
) )
} }

View File

@@ -1,9 +1,9 @@
import { useParams, Navigate } from "react-router-dom" import { useParams, Navigate } from "react-router-dom"
import { useComponent } from "@/services/api/hooks" import { useDeployment } from "@/services/api/hooks"
export function ProgramRedirect() { export function ProgramRedirect() {
const { name } = useParams<{ name: string }>() const { name } = useParams<{ name: string }>()
const { data: component, isLoading, error } = useComponent(name ?? "") const { data: deployment, isLoading, error } = useDeployment(name ?? "")
if (isLoading) { if (isLoading) {
return ( return (
@@ -11,15 +11,15 @@ export function ProgramRedirect() {
) )
} }
if (error || !component) { if (error || !deployment) {
return <Navigate to={`/programs/${name}`} replace /> return <Navigate to={`/programs/${name}`} replace />
} }
if (component.managed && !component.schedule) { if (deployment.managed && !deployment.schedule) {
return <Navigate to={`/services/${name}`} replace /> return <Navigate to={`/services/${name}`} replace />
} }
if (component.managed && component.schedule) { if (deployment.managed && deployment.schedule) {
return <Navigate to={`/jobs/${name}`} replace /> return <Navigate to={`/jobs/${name}`} replace />
} }

View File

@@ -12,7 +12,7 @@ export function ScheduledDetailPage() {
useEventStream() useEventStream()
const logRef = useRef<LogViewerHandle>(null) const logRef = useRef<LogViewerHandle>(null)
const { name } = useParams<{ name: string }>() const { name } = useParams<{ name: string }>()
const { data: component, isLoading, error, refetch } = useJob(name ?? "") const { data: deployment, isLoading, error, refetch } = useJob(name ?? "")
const { data: statusResp } = useStatus() const { data: statusResp } = useStatus()
const health = statusResp?.statuses.find((s) => s.id === name) const health = statusResp?.statuses.find((s) => s.id === name)
@@ -22,7 +22,7 @@ export function ScheduledDetailPage() {
) )
} }
if (error || !component) { if (error || !deployment) {
return ( return (
<div className="max-w-3xl mx-auto px-6 py-8"> <div className="max-w-3xl mx-auto px-6 py-8">
<DetailHeader backTo="/" backLabel="Back" name={name ?? ""} /> <DetailHeader backTo="/" backLabel="Back" name={name ?? ""} />
@@ -36,14 +36,14 @@ export function ScheduledDetailPage() {
<DetailHeader <DetailHeader
backTo="/" backTo="/"
backLabel="Back to Jobs" backLabel="Back to Jobs"
name={component.id} name={deployment.id}
stack={component.stack} stack={deployment.stack}
source={component.source} source={deployment.source}
> >
<ServiceControls name={component.id} health={health} /> <ServiceControls name={deployment.id} health={health} />
</DetailHeader> </DetailHeader>
{component.schedule && ( {deployment.schedule && (
<div className="bg-[var(--card)] border border-[var(--border)] rounded-lg p-5 mb-6"> <div className="bg-[var(--card)] border border-[var(--border)] rounded-lg p-5 mb-6">
<h2 className="text-sm font-semibold text-[var(--muted)] uppercase tracking-wider mb-3"> <h2 className="text-sm font-semibold text-[var(--muted)] uppercase tracking-wider mb-3">
Schedule Schedule
@@ -52,13 +52,13 @@ export function ScheduledDetailPage() {
<span className="text-[var(--muted)]">Cron</span> <span className="text-[var(--muted)]">Cron</span>
<span className="flex items-center gap-2 font-mono"> <span className="flex items-center gap-2 font-mono">
<Clock size={14} className="text-[var(--muted)]" /> <Clock size={14} className="text-[var(--muted)]" />
{component.schedule} {deployment.schedule}
</span> </span>
{component.systemd && ( {deployment.systemd && (
<> <>
<span className="text-[var(--muted)]">Timer unit</span> <span className="text-[var(--muted)]">Timer unit</span>
<span className="font-mono"> <span className="font-mono">
{component.systemd.unit_name.replace(".service", ".timer")} {deployment.systemd.unit_name.replace(".service", ".timer")}
</span> </span>
</> </>
)} )}
@@ -66,13 +66,13 @@ export function ScheduledDetailPage() {
</div> </div>
)} )}
{component.systemd && ( {deployment.systemd && (
<SystemdPanel name={component.id} systemd={component.systemd} /> <SystemdPanel name={deployment.id} systemd={deployment.systemd} />
)} )}
<ConfigPanel component={component} configSection="jobs" onRefetch={refetch} /> <ConfigPanel deployment={deployment} configSection="jobs" onRefetch={refetch} />
{component.managed && ( {deployment.managed && (
<div className="mb-6"> <div className="mb-6">
<div className="flex items-center justify-between mb-3"> <div className="flex items-center justify-between mb-3">
<h2 className="text-lg font-semibold">Logs</h2> <h2 className="text-lg font-semibold">Logs</h2>
@@ -83,7 +83,7 @@ export function ScheduledDetailPage() {
<Trash2 size={14} /> Clear <Trash2 size={14} /> Clear
</button> </button>
</div> </div>
<LogViewer ref={logRef} name={component.id} /> <LogViewer ref={logRef} name={deployment.id} />
</div> </div>
)} )}
</div> </div>

View File

@@ -14,7 +14,7 @@ export function ServiceDetailPage() {
useEventStream() useEventStream()
const logRef = useRef<LogViewerHandle>(null) const logRef = useRef<LogViewerHandle>(null)
const { name } = useParams<{ name: string }>() const { name } = useParams<{ name: string }>()
const { data: component, isLoading, error, refetch } = useService(name ?? "") const { data: deployment, isLoading, error, refetch } = useService(name ?? "")
const { data: statusResp } = useStatus() const { data: statusResp } = useStatus()
const health = statusResp?.statuses.find((s) => s.id === name) const health = statusResp?.statuses.find((s) => s.id === name)
const isGateway = name === "castle-gateway" const isGateway = name === "castle-gateway"
@@ -26,7 +26,7 @@ export function ServiceDetailPage() {
) )
} }
if (error || !component) { if (error || !deployment) {
return ( return (
<div className="max-w-3xl mx-auto px-6 py-8"> <div className="max-w-3xl mx-auto px-6 py-8">
<DetailHeader backTo="/" backLabel="Back" name={name ?? ""} /> <DetailHeader backTo="/" backLabel="Back" name={name ?? ""} />
@@ -35,21 +35,21 @@ export function ServiceDetailPage() {
) )
} }
const runner = (component.manifest.run as Record<string, unknown>)?.runner as string | undefined const runner = (deployment.manifest.run as Record<string, unknown>)?.runner as string | undefined
return ( return (
<div className="max-w-3xl mx-auto px-6 py-8"> <div className="max-w-3xl mx-auto px-6 py-8">
<DetailHeader <DetailHeader
backTo="/" backTo="/"
backLabel="Back to Services" backLabel="Back to Services"
name={component.id} name={deployment.id}
behavior="daemon" behavior="daemon"
stack={component.stack} stack={deployment.stack}
source={component.source} source={deployment.source}
> >
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
{health && <HealthBadge status={health.status} latency={health.latency_ms} />} {health && <HealthBadge status={health.status} latency={health.latency_ms} />}
<ServiceControls name={component.id} health={health} /> <ServiceControls name={deployment.id} health={health} />
</div> </div>
</DetailHeader> </DetailHeader>
@@ -58,28 +58,28 @@ export function ServiceDetailPage() {
Overview Overview
</h2> </h2>
<div className="grid grid-cols-2 gap-x-6 gap-y-2 text-sm"> <div className="grid grid-cols-2 gap-x-6 gap-y-2 text-sm">
{component.port && ( {deployment.port && (
<> <>
<span className="text-[var(--muted)]">Port</span> <span className="text-[var(--muted)]">Port</span>
<span className="flex items-center gap-1 font-mono"> <span className="flex items-center gap-1 font-mono">
<Server size={12} />:{component.port} <Server size={12} />:{deployment.port}
</span> </span>
</> </>
)} )}
{component.health_path && ( {deployment.health_path && (
<> <>
<span className="text-[var(--muted)]">Health</span> <span className="text-[var(--muted)]">Health</span>
<span className="font-mono">{component.health_path}</span> <span className="font-mono">{deployment.health_path}</span>
</> </>
)} )}
{component.proxy_path && ( {deployment.proxy_path && (
<> <>
<span className="text-[var(--muted)]">Proxy</span> <span className="text-[var(--muted)]">Proxy</span>
<a <a
href={component.proxy_path + "/"} href={deployment.proxy_path + "/"}
className="flex items-center gap-1 text-[var(--primary)] hover:underline font-mono" className="flex items-center gap-1 text-[var(--primary)] hover:underline font-mono"
> >
<ExternalLink size={12} />{component.proxy_path} <ExternalLink size={12} />{deployment.proxy_path}
</a> </a>
</> </>
)} )}
@@ -89,17 +89,17 @@ export function ServiceDetailPage() {
<span className="flex items-center gap-1"> <span className="flex items-center gap-1">
<Terminal size={12} /> <Terminal size={12} />
{runnerLabel(runner)} {runnerLabel(runner)}
{(component.manifest.run as Record<string, string>)?.program && ( {(deployment.manifest.run as Record<string, string>)?.program && (
<> &middot; {(component.manifest.run as Record<string, string>).program}</> <> &middot; {(deployment.manifest.run as Record<string, string>).program}</>
)} )}
</span> </span>
</> </>
)} )}
{component.port && ( {deployment.port && (
<> <>
<span className="text-[var(--muted)]">Docs</span> <span className="text-[var(--muted)]">Docs</span>
<a <a
href={`http://localhost:${component.port}/docs`} href={`http://localhost:${deployment.port}/docs`}
className="text-[var(--primary)] hover:underline" className="text-[var(--primary)] hover:underline"
> >
OpenAPI docs OpenAPI docs
@@ -109,8 +109,8 @@ export function ServiceDetailPage() {
</div> </div>
</div> </div>
{component.systemd && ( {deployment.systemd && (
<SystemdPanel name={component.id} systemd={component.systemd} /> <SystemdPanel name={deployment.id} systemd={deployment.systemd} />
)} )}
{isGateway && caddyfile?.content && ( {isGateway && caddyfile?.content && (
@@ -127,9 +127,9 @@ export function ServiceDetailPage() {
</div> </div>
)} )}
<ConfigPanel component={component} configSection="services" onRefetch={refetch} /> <ConfigPanel deployment={deployment} configSection="services" onRefetch={refetch} />
{component.managed && ( {deployment.managed && (
<div className="mb-6"> <div className="mb-6">
<div className="flex items-center justify-between mb-3"> <div className="flex items-center justify-between mb-3">
<h2 className="text-lg font-semibold">Logs</h2> <h2 className="text-lg font-semibold">Logs</h2>
@@ -140,7 +140,7 @@ export function ServiceDetailPage() {
<Trash2 size={14} /> Clear <Trash2 size={14} /> Clear
</button> </button>
</div> </div>
<LogViewer ref={logRef} name={component.id} /> <LogViewer ref={logRef} name={deployment.id} />
</div> </div>
)} )}
</div> </div>

View File

@@ -18,8 +18,8 @@ import type {
NodeDetail, NodeDetail,
} from "@/types" } from "@/types"
// Legacy compat hook — used by ConfigEditorPage and ProgramRedirect // Compat hook for the /deployments/{name} unified detail endpoint
export function useComponent(name: string) { export function useDeployment(name: string) {
return useQuery({ return useQuery({
queryKey: ["deployments", name], queryKey: ["deployments", name],
queryFn: () => apiClient.get<DeploymentDetail>(`/deployments/${name}`), queryFn: () => apiClient.get<DeploymentDetail>(`/deployments/${name}`),

View File

@@ -60,7 +60,7 @@ export interface ProgramDetail extends ProgramSummary {
manifest: Record<string, unknown> manifest: Record<string, unknown>
} }
// Union for shared detail components (ConfigPanel, ComponentFields) // Union for shared detail components (ConfigPanel, DeploymentFields)
export type AnyDetail = ServiceDetail | JobDetail | ProgramDetail export type AnyDetail = ServiceDetail | JobDetail | ProgramDetail
// Legacy unified type — kept for NodeDetail.deployed and compat endpoint // Legacy unified type — kept for NodeDetail.deployed and compat endpoint