feat(#119): expose route state in catalog API and sidebar/dashboard
Add routeState field to RouteSummary DTO (null for started, 'stopped' or 'suspended' for non-default states). Sidebar shows stop/pause icons and state badge for affected routes in both Apps and Routes sections. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -7,6 +7,7 @@ import com.cameleer3.common.graph.RouteGraph;
|
|||||||
import com.cameleer3.server.core.agent.AgentInfo;
|
import com.cameleer3.server.core.agent.AgentInfo;
|
||||||
import com.cameleer3.server.core.agent.AgentRegistryService;
|
import com.cameleer3.server.core.agent.AgentRegistryService;
|
||||||
import com.cameleer3.server.core.agent.AgentState;
|
import com.cameleer3.server.core.agent.AgentState;
|
||||||
|
import com.cameleer3.server.core.agent.RouteStateRegistry;
|
||||||
import com.cameleer3.server.core.storage.DiagramStore;
|
import com.cameleer3.server.core.storage.DiagramStore;
|
||||||
import com.cameleer3.server.core.storage.StatsStore;
|
import com.cameleer3.server.core.storage.StatsStore;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
@@ -40,13 +41,16 @@ public class RouteCatalogController {
|
|||||||
private final AgentRegistryService registryService;
|
private final AgentRegistryService registryService;
|
||||||
private final DiagramStore diagramStore;
|
private final DiagramStore diagramStore;
|
||||||
private final JdbcTemplate jdbc;
|
private final JdbcTemplate jdbc;
|
||||||
|
private final RouteStateRegistry routeStateRegistry;
|
||||||
|
|
||||||
public RouteCatalogController(AgentRegistryService registryService,
|
public RouteCatalogController(AgentRegistryService registryService,
|
||||||
DiagramStore diagramStore,
|
DiagramStore diagramStore,
|
||||||
@org.springframework.beans.factory.annotation.Qualifier("clickHouseJdbcTemplate") JdbcTemplate jdbc) {
|
@org.springframework.beans.factory.annotation.Qualifier("clickHouseJdbcTemplate") JdbcTemplate jdbc,
|
||||||
|
RouteStateRegistry routeStateRegistry) {
|
||||||
this.registryService = registryService;
|
this.registryService = registryService;
|
||||||
this.diagramStore = diagramStore;
|
this.diagramStore = diagramStore;
|
||||||
this.jdbc = jdbc;
|
this.jdbc = jdbc;
|
||||||
|
this.routeStateRegistry = routeStateRegistry;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/catalog")
|
@GetMapping("/catalog")
|
||||||
@@ -128,7 +132,10 @@ public class RouteCatalogController {
|
|||||||
long count = routeExchangeCounts.getOrDefault(key, 0L);
|
long count = routeExchangeCounts.getOrDefault(key, 0L);
|
||||||
Instant lastSeen = routeLastSeen.get(key);
|
Instant lastSeen = routeLastSeen.get(key);
|
||||||
String fromUri = resolveFromEndpointUri(routeId, agentIds);
|
String fromUri = resolveFromEndpointUri(routeId, agentIds);
|
||||||
return new RouteSummary(routeId, count, lastSeen, fromUri);
|
String state = routeStateRegistry.getState(appId, routeId).name().toLowerCase();
|
||||||
|
// Only include non-default states (stopped/suspended); null means started
|
||||||
|
String routeState = "started".equals(state) ? null : state;
|
||||||
|
return new RouteSummary(routeId, count, lastSeen, fromUri, routeState);
|
||||||
})
|
})
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
|
|||||||
@@ -11,5 +11,8 @@ public record RouteSummary(
|
|||||||
@NotNull long exchangeCount,
|
@NotNull long exchangeCount,
|
||||||
Instant lastSeen,
|
Instant lastSeen,
|
||||||
@Schema(description = "The from() endpoint URI, e.g. 'direct:processOrder'")
|
@Schema(description = "The from() endpoint URI, e.g. 'direct:processOrder'")
|
||||||
String fromEndpointUri
|
String fromEndpointUri,
|
||||||
|
@Schema(description = "Operational state of the route: stopped, suspended, or null (started/default)")
|
||||||
|
String routeState
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import {
|
|||||||
useStarred,
|
useStarred,
|
||||||
} from '@cameleer/design-system';
|
} from '@cameleer/design-system';
|
||||||
import type { SearchResult, SidebarTreeNode } from '@cameleer/design-system';
|
import type { SearchResult, SidebarTreeNode } from '@cameleer/design-system';
|
||||||
import { Box, Cpu, GitBranch, Settings, FileText, ChevronRight } from 'lucide-react';
|
import { Box, Cpu, GitBranch, Settings, FileText, ChevronRight, Square, Pause } from 'lucide-react';
|
||||||
import { useRouteCatalog } from '../api/queries/catalog';
|
import { useRouteCatalog } from '../api/queries/catalog';
|
||||||
import { useAgents } from '../api/queries/agents';
|
import { useAgents } from '../api/queries/agents';
|
||||||
import { useSearchExecutions, useAttributeKeys } from '../api/queries/executions';
|
import { useSearchExecutions, useAttributeKeys } from '../api/queries/executions';
|
||||||
@@ -140,6 +140,14 @@ function makeChevron() {
|
|||||||
return createElement(ChevronRight, { size: 14 });
|
return createElement(ChevronRight, { size: 14 });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function makeStopIcon() {
|
||||||
|
return createElement(Square, { size: 12, style: { color: 'var(--error)' } });
|
||||||
|
}
|
||||||
|
|
||||||
|
function makePauseIcon() {
|
||||||
|
return createElement(Pause, { size: 12, style: { color: 'var(--amber)' } });
|
||||||
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
/* Section open-state keys */
|
/* Section open-state keys */
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
@@ -275,6 +283,7 @@ function LayoutContent() {
|
|||||||
id: r.routeId,
|
id: r.routeId,
|
||||||
name: r.routeId,
|
name: r.routeId,
|
||||||
exchangeCount: r.exchangeCount,
|
exchangeCount: r.exchangeCount,
|
||||||
|
routeState: r.routeState ?? undefined,
|
||||||
})),
|
})),
|
||||||
agents: [...(app.agents || [])]
|
agents: [...(app.agents || [])]
|
||||||
.sort((a: any, b: any) => cmp(a.name, b.name))
|
.sort((a: any, b: any) => cmp(a.name, b.name))
|
||||||
@@ -289,7 +298,7 @@ function LayoutContent() {
|
|||||||
|
|
||||||
// --- Tree nodes ---------------------------------------------------
|
// --- Tree nodes ---------------------------------------------------
|
||||||
const appTreeNodes: SidebarTreeNode[] = useMemo(
|
const appTreeNodes: SidebarTreeNode[] = useMemo(
|
||||||
() => buildAppTreeNodes(sidebarApps, makeStatusDot, makeChevron),
|
() => buildAppTreeNodes(sidebarApps, makeStatusDot, makeChevron, makeStopIcon, makePauseIcon),
|
||||||
[sidebarApps],
|
[sidebarApps],
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -299,7 +308,7 @@ function LayoutContent() {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const routeTreeNodes: SidebarTreeNode[] = useMemo(
|
const routeTreeNodes: SidebarTreeNode[] = useMemo(
|
||||||
() => buildRouteTreeNodes(sidebarApps, makeStatusDot, makeChevron),
|
() => buildRouteTreeNodes(sidebarApps, makeStatusDot, makeChevron, makeStopIcon, makePauseIcon),
|
||||||
[sidebarApps],
|
[sidebarApps],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ export interface SidebarRoute {
|
|||||||
id: string;
|
id: string;
|
||||||
name: string;
|
name: string;
|
||||||
exchangeCount: number;
|
exchangeCount: number;
|
||||||
|
routeState?: 'stopped' | 'suspended';
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SidebarAgent {
|
export interface SidebarAgent {
|
||||||
@@ -71,6 +72,8 @@ export function buildAppTreeNodes(
|
|||||||
apps: SidebarApp[],
|
apps: SidebarApp[],
|
||||||
statusDot: (health: string) => ReactNode,
|
statusDot: (health: string) => ReactNode,
|
||||||
chevron: () => ReactNode,
|
chevron: () => ReactNode,
|
||||||
|
stopIcon?: () => ReactNode,
|
||||||
|
pauseIcon?: () => ReactNode,
|
||||||
): SidebarTreeNode[] {
|
): SidebarTreeNode[] {
|
||||||
return apps.map((app) => ({
|
return apps.map((app) => ({
|
||||||
id: app.id,
|
id: app.id,
|
||||||
@@ -83,8 +86,14 @@ export function buildAppTreeNodes(
|
|||||||
children: app.routes.map((r) => ({
|
children: app.routes.map((r) => ({
|
||||||
id: `${app.id}/${r.id}`,
|
id: `${app.id}/${r.id}`,
|
||||||
label: r.name,
|
label: r.name,
|
||||||
icon: chevron(),
|
icon: r.routeState === 'stopped' && stopIcon
|
||||||
badge: formatCount(r.exchangeCount),
|
? stopIcon()
|
||||||
|
: r.routeState === 'suspended' && pauseIcon
|
||||||
|
? pauseIcon()
|
||||||
|
: chevron(),
|
||||||
|
badge: r.routeState
|
||||||
|
? `${r.routeState.toUpperCase()} \u00b7 ${formatCount(r.exchangeCount)}`
|
||||||
|
: formatCount(r.exchangeCount),
|
||||||
path: `/apps/${app.id}/${r.id}`,
|
path: `/apps/${app.id}/${r.id}`,
|
||||||
starrable: true,
|
starrable: true,
|
||||||
starKey: `route:${app.id}/${r.id}`,
|
starKey: `route:${app.id}/${r.id}`,
|
||||||
@@ -128,6 +137,8 @@ export function buildRouteTreeNodes(
|
|||||||
apps: SidebarApp[],
|
apps: SidebarApp[],
|
||||||
statusDot: (health: string) => ReactNode,
|
statusDot: (health: string) => ReactNode,
|
||||||
chevron: () => ReactNode,
|
chevron: () => ReactNode,
|
||||||
|
stopIcon?: () => ReactNode,
|
||||||
|
pauseIcon?: () => ReactNode,
|
||||||
): SidebarTreeNode[] {
|
): SidebarTreeNode[] {
|
||||||
return apps.map((app) => ({
|
return apps.map((app) => ({
|
||||||
id: `route:${app.id}`,
|
id: `route:${app.id}`,
|
||||||
@@ -138,8 +149,14 @@ export function buildRouteTreeNodes(
|
|||||||
children: app.routes.map((r) => ({
|
children: app.routes.map((r) => ({
|
||||||
id: `route:${app.id}/${r.id}`,
|
id: `route:${app.id}/${r.id}`,
|
||||||
label: r.name,
|
label: r.name,
|
||||||
icon: chevron(),
|
icon: r.routeState === 'stopped' && stopIcon
|
||||||
badge: formatCount(r.exchangeCount),
|
? stopIcon()
|
||||||
|
: r.routeState === 'suspended' && pauseIcon
|
||||||
|
? pauseIcon()
|
||||||
|
: chevron(),
|
||||||
|
badge: r.routeState
|
||||||
|
? `${r.routeState.toUpperCase()} \u00b7 ${formatCount(r.exchangeCount)}`
|
||||||
|
: formatCount(r.exchangeCount),
|
||||||
path: `/routes/${app.id}/${r.id}`,
|
path: `/routes/${app.id}/${r.id}`,
|
||||||
})),
|
})),
|
||||||
}));
|
}));
|
||||||
|
|||||||
Reference in New Issue
Block a user