Files
cameleer-server/ui/src/api/queries/diagrams.ts

80 lines
2.3 KiB
TypeScript
Raw Normal View History

import { useQuery } from '@tanstack/react-query';
import { api } from '../client';
fix!: require environment on diagram lookup and attribute keys queries Closes two cross-env data leakage paths. Both endpoints previously returned data aggregated across all environments, so a diagram or attribute key from dev could appear in a prod UI query (and vice versa). B1: GET /api/v1/diagrams?application=&routeId= now requires ?environment= and resolves agents via registryService.findByApplicationAndEnvironment instead of findByApplication. Prevents serving a dev diagram for a prod route. B2: GET /api/v1/search/attributes/keys now requires ?environment=. SearchIndex.distinctAttributeKeys gains an environment parameter and the ClickHouse query adds the env filter alongside the existing tenant_id filter. Prevents prod attribute names leaking into dev autocompletion (and vice versa). SPA hooks updated to thread environment through from useEnvironmentStore; query keys include environment so React Query re-fetches on env switch. No call-site changes needed — hook signatures unchanged. B3 (AgentMetricsController env scope) deferred to P3C: agent-env is effectively 1:1 today via the instance_id naming ({envSlug}-{appSlug}-{replicaIndex}), and the URL migration in P3C to /api/v1/environments/{env}/agents/{agentId}/metrics naturally introduces env from path. A minimal P1 fix would regress the "view metrics of a killed agent" case. BREAKING CHANGE: Both endpoints now require ?environment= (slug). Clients omitting the parameter receive 400. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-16 23:19:55 +02:00
import { useEnvironmentStore } from '../environment-store';
export interface DiagramNode {
id?: string;
label?: string;
type?: string;
x?: number;
y?: number;
width?: number;
height?: number;
children?: DiagramNode[];
endpointUri?: string;
}
export interface DiagramEdge {
sourceId: string;
targetId: string;
label?: string;
points: number[][];
}
export interface DiagramLayout {
width?: number;
height?: number;
nodes?: DiagramNode[];
edges?: DiagramEdge[];
}
export function useDiagramLayout(
contentHash: string | null,
direction: 'LR' | 'TB' = 'LR',
) {
return useQuery({
queryKey: ['diagrams', 'layout', contentHash, direction],
queryFn: async () => {
const { data, error } = await api.GET('/diagrams/{contentHash}/render', {
params: {
path: { contentHash: contentHash! },
query: { direction },
},
headers: { Accept: 'application/json' },
});
if (error) throw new Error('Failed to load diagram layout');
return data as DiagramLayout;
},
enabled: !!contentHash,
});
}
export function useDiagramByRoute(
application: string | undefined,
routeId: string | undefined,
direction: 'LR' | 'TB' = 'LR',
) {
fix!: require environment on diagram lookup and attribute keys queries Closes two cross-env data leakage paths. Both endpoints previously returned data aggregated across all environments, so a diagram or attribute key from dev could appear in a prod UI query (and vice versa). B1: GET /api/v1/diagrams?application=&routeId= now requires ?environment= and resolves agents via registryService.findByApplicationAndEnvironment instead of findByApplication. Prevents serving a dev diagram for a prod route. B2: GET /api/v1/search/attributes/keys now requires ?environment=. SearchIndex.distinctAttributeKeys gains an environment parameter and the ClickHouse query adds the env filter alongside the existing tenant_id filter. Prevents prod attribute names leaking into dev autocompletion (and vice versa). SPA hooks updated to thread environment through from useEnvironmentStore; query keys include environment so React Query re-fetches on env switch. No call-site changes needed — hook signatures unchanged. B3 (AgentMetricsController env scope) deferred to P3C: agent-env is effectively 1:1 today via the instance_id naming ({envSlug}-{appSlug}-{replicaIndex}), and the URL migration in P3C to /api/v1/environments/{env}/agents/{agentId}/metrics naturally introduces env from path. A minimal P1 fix would regress the "view metrics of a killed agent" case. BREAKING CHANGE: Both endpoints now require ?environment= (slug). Clients omitting the parameter receive 400. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-16 23:19:55 +02:00
const environment = useEnvironmentStore((s) => s.environment);
return useQuery({
fix!: require environment on diagram lookup and attribute keys queries Closes two cross-env data leakage paths. Both endpoints previously returned data aggregated across all environments, so a diagram or attribute key from dev could appear in a prod UI query (and vice versa). B1: GET /api/v1/diagrams?application=&routeId= now requires ?environment= and resolves agents via registryService.findByApplicationAndEnvironment instead of findByApplication. Prevents serving a dev diagram for a prod route. B2: GET /api/v1/search/attributes/keys now requires ?environment=. SearchIndex.distinctAttributeKeys gains an environment parameter and the ClickHouse query adds the env filter alongside the existing tenant_id filter. Prevents prod attribute names leaking into dev autocompletion (and vice versa). SPA hooks updated to thread environment through from useEnvironmentStore; query keys include environment so React Query re-fetches on env switch. No call-site changes needed — hook signatures unchanged. B3 (AgentMetricsController env scope) deferred to P3C: agent-env is effectively 1:1 today via the instance_id naming ({envSlug}-{appSlug}-{replicaIndex}), and the URL migration in P3C to /api/v1/environments/{env}/agents/{agentId}/metrics naturally introduces env from path. A minimal P1 fix would regress the "view metrics of a killed agent" case. BREAKING CHANGE: Both endpoints now require ?environment= (slug). Clients omitting the parameter receive 400. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-16 23:19:55 +02:00
queryKey: ['diagrams', 'byRoute', environment, application, routeId, direction],
queryFn: async () => {
feat!: move query/logs/routes/diagram/agent-view endpoints under /environments/{envSlug}/ P3C — the last data/query wave of the taxonomy migration. Every user- facing read endpoint that was keyed on env-as-query-param is now under the env-scoped URL, making env impossible to omit and unambiguous in server-side tenant+env filtering. Server: - SearchController: /api/v1/search/** → /api/v1/environments/{envSlug}/... Endpoints: /executions (GET), /executions/search (POST), /stats, /stats/timeseries, /stats/timeseries/by-app, /stats/timeseries/by-route, /stats/punchcard, /attributes/keys, /errors/top. Env comes from path. - LogQueryController: /api/v1/logs → /api/v1/environments/{envSlug}/logs. - RouteCatalogController: /api/v1/routes/catalog → /api/v1/environments/ {envSlug}/routes. Env filter unconditional (path). - RouteMetricsController: /api/v1/routes/metrics → /api/v1/environments/{envSlug}/routes/metrics (and /metrics/processors). - DiagramRenderController: /{contentHash}/render stays flat (hashes are globally unique). Find-by-route moved to /api/v1/environments/{envSlug}/ apps/{appSlug}/routes/{routeId}/diagram — the old GET /diagrams?... handler is removed. - Agent views split cleanly: - AgentListController (new): /api/v1/environments/{envSlug}/agents - AgentEventsController: /api/v1/environments/{envSlug}/agents/events - AgentMetricsController: /api/v1/environments/{envSlug}/agents/ {agentId}/metrics — now also rejects cross-env agents (404) as a defense-in-depth check, fulfilling B3. Agent self-service endpoints (register/refresh/heartbeat/deregister) remain flat at /api/v1/agents/** — JWT-authoritative. SPA: - queries/agents.ts, agent-metrics.ts, logs.ts, catalog.ts (route metrics only; /catalog stays flat), processor-metrics.ts, executions.ts (attributes/keys, stats, timeseries, search), dashboard.ts (all stats/errors/punchcard), correlation.ts, diagrams.ts (by-route) — all rewritten to env-scoped URLs. - Hooks now either read env from useEnvironmentStore internally or require it as an argument. Query keys include env so switching env invalidates caches. - useAgents/useAgentEvents signature simplified — env is no longer a parameter; it's read from the store. Callers (LayoutShell, AgentHealth, AgentInstance) updated accordingly. - LogTab and useStartupLogs thread env through to useLogs. - envFetch helper introduced in executions.ts for env-prefixed raw fetch until schema.d.ts is regenerated against the new backend. BREAKING CHANGE: All these flat paths are removed: /api/v1/search/**, /api/v1/logs, /api/v1/routes/catalog, /api/v1/routes/metrics (and /processors), /api/v1/diagrams (lookup), /api/v1/agents (list), /api/v1/agents/events-log, /api/v1/agents/{id}/metrics, /api/v1/agent-events. Clients must use the /api/v1/environments/{envSlug}/... equivalents. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-16 23:48:25 +02:00
const { useAuthStore } = await import('../../auth/auth-store');
const { config: appConfig } = await import('../../config');
const token = useAuthStore.getState().accessToken;
const url = `${appConfig.apiBaseUrl}/environments/${encodeURIComponent(environment!)}` +
`/apps/${encodeURIComponent(application!)}` +
`/routes/${encodeURIComponent(routeId!)}/diagram?direction=${direction}`;
const res = await fetch(url, {
headers: {
Accept: 'application/json',
...(token ? { Authorization: `Bearer ${token}` } : {}),
'X-Cameleer-Protocol-Version': '1',
},
});
feat!: move query/logs/routes/diagram/agent-view endpoints under /environments/{envSlug}/ P3C — the last data/query wave of the taxonomy migration. Every user- facing read endpoint that was keyed on env-as-query-param is now under the env-scoped URL, making env impossible to omit and unambiguous in server-side tenant+env filtering. Server: - SearchController: /api/v1/search/** → /api/v1/environments/{envSlug}/... Endpoints: /executions (GET), /executions/search (POST), /stats, /stats/timeseries, /stats/timeseries/by-app, /stats/timeseries/by-route, /stats/punchcard, /attributes/keys, /errors/top. Env comes from path. - LogQueryController: /api/v1/logs → /api/v1/environments/{envSlug}/logs. - RouteCatalogController: /api/v1/routes/catalog → /api/v1/environments/ {envSlug}/routes. Env filter unconditional (path). - RouteMetricsController: /api/v1/routes/metrics → /api/v1/environments/{envSlug}/routes/metrics (and /metrics/processors). - DiagramRenderController: /{contentHash}/render stays flat (hashes are globally unique). Find-by-route moved to /api/v1/environments/{envSlug}/ apps/{appSlug}/routes/{routeId}/diagram — the old GET /diagrams?... handler is removed. - Agent views split cleanly: - AgentListController (new): /api/v1/environments/{envSlug}/agents - AgentEventsController: /api/v1/environments/{envSlug}/agents/events - AgentMetricsController: /api/v1/environments/{envSlug}/agents/ {agentId}/metrics — now also rejects cross-env agents (404) as a defense-in-depth check, fulfilling B3. Agent self-service endpoints (register/refresh/heartbeat/deregister) remain flat at /api/v1/agents/** — JWT-authoritative. SPA: - queries/agents.ts, agent-metrics.ts, logs.ts, catalog.ts (route metrics only; /catalog stays flat), processor-metrics.ts, executions.ts (attributes/keys, stats, timeseries, search), dashboard.ts (all stats/errors/punchcard), correlation.ts, diagrams.ts (by-route) — all rewritten to env-scoped URLs. - Hooks now either read env from useEnvironmentStore internally or require it as an argument. Query keys include env so switching env invalidates caches. - useAgents/useAgentEvents signature simplified — env is no longer a parameter; it's read from the store. Callers (LayoutShell, AgentHealth, AgentInstance) updated accordingly. - LogTab and useStartupLogs thread env through to useLogs. - envFetch helper introduced in executions.ts for env-prefixed raw fetch until schema.d.ts is regenerated against the new backend. BREAKING CHANGE: All these flat paths are removed: /api/v1/search/**, /api/v1/logs, /api/v1/routes/catalog, /api/v1/routes/metrics (and /processors), /api/v1/diagrams (lookup), /api/v1/agents (list), /api/v1/agents/events-log, /api/v1/agents/{id}/metrics, /api/v1/agent-events. Clients must use the /api/v1/environments/{envSlug}/... equivalents. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-16 23:48:25 +02:00
if (!res.ok) throw new Error('Failed to load diagram for route');
return (await res.json()) as DiagramLayout;
},
fix!: require environment on diagram lookup and attribute keys queries Closes two cross-env data leakage paths. Both endpoints previously returned data aggregated across all environments, so a diagram or attribute key from dev could appear in a prod UI query (and vice versa). B1: GET /api/v1/diagrams?application=&routeId= now requires ?environment= and resolves agents via registryService.findByApplicationAndEnvironment instead of findByApplication. Prevents serving a dev diagram for a prod route. B2: GET /api/v1/search/attributes/keys now requires ?environment=. SearchIndex.distinctAttributeKeys gains an environment parameter and the ClickHouse query adds the env filter alongside the existing tenant_id filter. Prevents prod attribute names leaking into dev autocompletion (and vice versa). SPA hooks updated to thread environment through from useEnvironmentStore; query keys include environment so React Query re-fetches on env switch. No call-site changes needed — hook signatures unchanged. B3 (AgentMetricsController env scope) deferred to P3C: agent-env is effectively 1:1 today via the instance_id naming ({envSlug}-{appSlug}-{replicaIndex}), and the URL migration in P3C to /api/v1/environments/{env}/agents/{agentId}/metrics naturally introduces env from path. A minimal P1 fix would regress the "view metrics of a killed agent" case. BREAKING CHANGE: Both endpoints now require ?environment= (slug). Clients omitting the parameter receive 400. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-16 23:19:55 +02:00
enabled: !!application && !!routeId && !!environment,
});
}