From 5a9f28bc1e164c86171a098bb1381ecd8d60ccab Mon Sep 17 00:00:00 2001 From: biersoeckli Date: Mon, 16 Nov 2026 06:50:04 +0000 Subject: [PATCH 1/7] feat: record cluster node monitoring history --- GLOSSARY.md | 4 ++ .../migration.sql | 10 +++ prisma/schema.prisma | 12 ++++ src/app/monitoring/actions.ts | 8 +++ src/app/monitoring/monitoring-client.tsx | 2 + .../monitoring/node-monitoring-history.tsx | 63 ++++++++++++++++ .../monitoring-history-settings.tsx | 4 +- .../custom/app-monitoring-history.tsx | 35 +++++---- .../node-monitoring-history.adapter.ts | 16 +++++ src/server/services/cluster.service.ts | 63 +--------------- .../app-monitoring-history.service.ts | 2 + ...pp-monitoring-history.service.unit.spec.ts | 1 + .../node-monitoring-history.service.ts | 21 ++++++ ...de-monitoring-history.service.unit.spec.ts | 33 +++++++++ .../node-resource.service.ts | 72 +++++++++++++++++++ src/shared/model/generated-zod/index.ts | 1 + .../generated-zod/nodemonitoringsample.ts | 11 +++ .../utils/node-monitoring-history.utils.ts | 24 +++++++ ...node-monitoring-history.utils.unit.spec.ts | 12 ++++ 19 files changed, 319 insertions(+), 75 deletions(-) create mode 100644 prisma/migrations/20261116120000_node_monitoring_history/migration.sql create mode 100644 src/app/monitoring/node-monitoring-history.tsx create mode 100644 src/server/adapter/node-monitoring-history.adapter.ts create mode 100644 src/server/services/standalone-services/node-monitoring-history.service.ts create mode 100644 src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts create mode 100644 src/server/services/standalone-services/node-resource.service.ts create mode 100644 src/shared/model/generated-zod/nodemonitoringsample.ts create mode 100644 src/shared/utils/node-monitoring-history.utils.ts create mode 100644 src/shared/utils/node-monitoring-history.utils.unit.spec.ts diff --git a/GLOSSARY.md b/GLOSSARY.md index a47a3084..dd32da4e 100644 --- a/GLOSSARY.md +++ b/GLOSSARY.md @@ -67,6 +67,10 @@ _Avoid_: global Add-on configuration, runtime version cache The Cluster Add-on that installs the Agent Sandbox controller and its extension CRDs, including SandboxTemplate and SandboxWarmPool. It does not create user workload resources. _Avoid_: Agent, Agent runtime +**Node Monitoring History**: +A record of CPU, memory, and occupied node filesystem usage over time for each cluster node. Cluster totals include all nodes measured at a given time. +_Avoid_: App monitoring history, volume usage + **App**: A deployable workload managed by QuickStack. diff --git a/prisma/migrations/20261116120000_node_monitoring_history/migration.sql b/prisma/migrations/20261116120000_node_monitoring_history/migration.sql new file mode 100644 index 00000000..b64f79fd --- /dev/null +++ b/prisma/migrations/20261116120000_node_monitoring_history/migration.sql @@ -0,0 +1,10 @@ +CREATE TABLE "NodeMonitoringSample" ( + "id" TEXT NOT NULL PRIMARY KEY, + "sampledAt" DATETIME NOT NULL, + "nodeName" TEXT NOT NULL, + "cpuCores" REAL, + "ramBytes" REAL, + "diskBytes" REAL +); +CREATE INDEX "NodeMonitoringSample_sampledAt_idx" ON "NodeMonitoringSample"("sampledAt"); +CREATE INDEX "NodeMonitoringSample_nodeName_sampledAt_idx" ON "NodeMonitoringSample"("nodeName", "sampledAt"); diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 80c07ca0..a1298b3c 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -688,3 +688,15 @@ model AppVolumeMonitoringMembership { @@id([sampleId, volumeId]) @@index([volumeId]) } + +model NodeMonitoringSample { + id String @id @default(uuid()) + sampledAt DateTime + nodeName String + cpuCores Float? + ramBytes Float? + diskBytes Float? + + @@index([sampledAt]) + @@index([nodeName, sampledAt]) +} diff --git a/src/app/monitoring/actions.ts b/src/app/monitoring/actions.ts index 8a403f02..b76e745a 100644 --- a/src/app/monitoring/actions.ts +++ b/src/app/monitoring/actions.ts @@ -1,5 +1,7 @@ 'use server'; +import nodeMonitoringHistoryService from '@/server/services/standalone-services/node-monitoring-history.service'; + import monitoringService from '@/server/services/monitoring.service'; import clusterService from '@/server/services/cluster.service'; import { getAuthUserSession, simpleAction } from '@/server/utils/action-wrapper.utils'; @@ -36,3 +38,9 @@ export const getReservedVolumeStorage = async () => await getAuthUserSession(); return await clusterService.getReservedVolumeStorage(); }) as Promise>; + +export const getNodeMonitoringHistory = async () => + simpleAction(async () => { + await getAuthUserSession(); + return nodeMonitoringHistoryService.getHistory(); + }); diff --git a/src/app/monitoring/monitoring-client.tsx b/src/app/monitoring/monitoring-client.tsx index 7285479e..d617457c 100644 --- a/src/app/monitoring/monitoring-client.tsx +++ b/src/app/monitoring/monitoring-client.tsx @@ -11,6 +11,7 @@ import { getMonitoringForAllApps, getNodeResourceUsage, getReservedVolumeStorage import AppRessourceMonitoring from './app-monitoring'; import AppVolumeMonitoring from './app-volumes-monitoring'; import ResourcesNodes from './monitoring-nodes'; +import NodeMonitoringHistory from './node-monitoring-history'; const MONITORING_POLL_INTERVAL_MS = 10000; @@ -58,6 +59,7 @@ export default function MonitoringClient({ return (
+
diff --git a/src/app/monitoring/node-monitoring-history.tsx b/src/app/monitoring/node-monitoring-history.tsx new file mode 100644 index 00000000..d91dfb60 --- /dev/null +++ b/src/app/monitoring/node-monitoring-history.tsx @@ -0,0 +1,63 @@ +'use client'; + +import { useCallback, useState } from 'react'; +import { HistoryChart, getMonitoringRangeOptions, getMonitoringRangeStart } from '@/components/custom/app-monitoring-history'; +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; +import { usePolling } from '@/frontend/hooks/use-polling'; +import { getNodeMonitoringHistory } from './actions'; + +type History = NonNullable>['data']>; + +export default function NodeMonitoringHistory() { + const [history, setHistory] = useState(); + const [error, setError] = useState(false); + const [range, setRange] = useState('1h'); + const refresh = useCallback(async () => { + try { + const result = await getNodeMonitoringHistory(); + if (result.status !== 'success' || !result.data) throw new Error('Unable to load monitoring history'); + setHistory(result.data); + setError(false); + } catch { + setError(true); + } + }, []); + usePolling(refresh, { intervalMs: 60_000, runImmediately: true }); + const options = getMonitoringRangeOptions(history?.retentionHours ?? 1); + const selected = options.find((option) => option.value === range) ?? options[0]; + const points = history?.points.filter((point) => point.time >= getMonitoringRangeStart(selected.value, selected.hours)) ?? []; + return ( +
+
+

Cluster history

+ +
+ {error &&

Unable to load monitoring history.

} + {history && history.points.length === 0 &&

No measurements yet. History is collected every five minutes.

} + {history?.points.at(-1)?.isGap &&

Collection has stopped or is delayed. The chart shows a gap after the last sample.

} + {history && ( +
+ + + +
+ )} +
+ ); +} diff --git a/src/app/settings/platform/operations/monitoring-history-settings.tsx b/src/app/settings/platform/operations/monitoring-history-settings.tsx index c73b907e..6bf327cd 100644 --- a/src/app/settings/platform/operations/monitoring-history-settings.tsx +++ b/src/app/settings/platform/operations/monitoring-history-settings.tsx @@ -31,8 +31,8 @@ export default function MonitoringHistorySettings() { return ( - App monitoring history - Keep measurements for 1 to 168 hours. Default: 24 hours. + Monitoring history + Keep App and node measurements for 1 to 168 hours. Default: 24 hours.
diff --git a/src/components/custom/app-monitoring-history.tsx b/src/components/custom/app-monitoring-history.tsx index 0582a718..0787153b 100644 --- a/src/components/custom/app-monitoring-history.tsx +++ b/src/components/custom/app-monitoring-history.tsx @@ -13,7 +13,7 @@ import { AppMonitoringHistory } from '@/shared/model/app-monitoring-history.mode import { getAppMonitoringHistory as getOneHistory } from '@/app/project/[projectId]/apps/details/deployments/actions'; import FullLoadingSpinner from '../ui/full-loading-spinnter'; -function HistoryChart({ +export function HistoryChart({ title, data, dataKey, @@ -114,6 +114,25 @@ function HistoryChart({ ); } +export function getMonitoringRangeOptions(retentionHours: number) { + const options = [ + { value: '1h', label: 'Last hour', hours: 1 }, + { value: '5h', label: 'Last 5 hours', hours: 5 }, + { value: 'today', label: 'Today', hours: 24 }, + { value: '48h', label: 'Last 48 hours', hours: 48 }, + { value: '7d', label: 'Last 7 days', hours: 168 } + ].filter((option) => option.hours <= retentionHours); + if (![1, 5, 48, 168].includes(retentionHours)) { + options.push({ value: 'all', label: `Last ${retentionHours} hours`, hours: retentionHours }); + } + return options; +} + +export function getMonitoringRangeStart(value: string, hours: number) { + const now = Date.now(); + return value === 'today' ? new Date(new Date(now).setHours(0, 0, 0, 0)).getTime() : now - hours * 60 * 60_000; +} + export default function AppMonitoringHistoryView({ appId, currentUsage }: { appId: string; currentUsage?: PodsResourceInfoModel }) { const [history, setHistory] = useState(); const [error, setError] = useState(false); @@ -132,19 +151,9 @@ export default function AppMonitoringHistoryView({ appId, currentUsage }: { appI }, [appId]); usePolling(refresh, { intervalMs: 60_000, runImmediately: true }); const retentionHours = history?.retentionHours ?? 1; - const options = [ - { value: '1h', label: 'Last hour', hours: 1 }, - { value: '5h', label: 'Last 5 hours', hours: 5 }, - { value: 'today', label: 'Today', hours: 24 }, - { value: '48h', label: 'Last 48 hours', hours: 48 }, - { value: '7d', label: 'Last 7 days', hours: 168 } - ].filter((option) => option.hours <= retentionHours); - if (![1, 5, 48, 168].includes(retentionHours)) { - options.push({ value: 'all', label: `Last ${retentionHours} hours`, hours: retentionHours }); - } + const options = getMonitoringRangeOptions(retentionHours); const selectedRange = options.find((option) => option.value === range) ?? options[0]; - const now = Date.now(); - const start = selectedRange.value === 'today' ? new Date(new Date(now).setHours(0, 0, 0, 0)).getTime() : now - selectedRange.hours * 60 * 60_000; + const start = getMonitoringRangeStart(selectedRange.value, selectedRange.hours); const visiblePoints = history?.points.filter((point) => point.time >= start) ?? []; const collectionStopped = history?.points.at(-1)?.isGap; const sampleCount = visiblePoints.filter((point) => !point.isGap).length; diff --git a/src/server/adapter/node-monitoring-history.adapter.ts b/src/server/adapter/node-monitoring-history.adapter.ts new file mode 100644 index 00000000..412e66b7 --- /dev/null +++ b/src/server/adapter/node-monitoring-history.adapter.ts @@ -0,0 +1,16 @@ +import { Prisma } from '@prisma/client'; +import dataAccess from './db.client'; + +class NodeMonitoringHistoryAdapter { + async save(samples: Prisma.NodeMonitoringSampleCreateManyInput[], cutoff: Date) { + await dataAccess.client.$transaction(async (tx) => { + for (let i = 0; i < samples.length; i += 100) await tx.nodeMonitoringSample.createMany({ data: samples.slice(i, i + 100) }); + await tx.nodeMonitoringSample.deleteMany({ where: { sampledAt: { lt: cutoff } } }); + }); + } + + async getHistory(cutoff: Date) { + return dataAccess.client.nodeMonitoringSample.findMany({ where: { sampledAt: { gte: cutoff } }, orderBy: { sampledAt: 'asc' } }); + } +} +export default new NodeMonitoringHistoryAdapter(); diff --git a/src/server/services/cluster.service.ts b/src/server/services/cluster.service.ts index 539b1a7e..d7287031 100644 --- a/src/server/services/cluster.service.ts +++ b/src/server/services/cluster.service.ts @@ -1,3 +1,4 @@ +import nodeResourceService from './standalone-services/node-resource.service'; import { getCachedNodeSummary } from './node-summary-cache.service'; import volumeSummaryAdapter from '../adapter/volume-summary.adapter'; import k3s, { kubernetesPatchOptions } from '../adapter/kubernetes-api.adapter'; @@ -117,66 +118,8 @@ class ClusterService { } async getNodeResourceUsage(): Promise { - const topNodes = await k8s.topNodes(k3s.core); - - const metricsData: k8s.NodeMetricsList = await k3s.metrics.getNodeMetrics(); - - return await Promise.all( - topNodes.map(async (node) => { - const nodeMetrics = metricsData.items - .filter((metric) => metric.metadata.name === node.Node.metadata?.name) - .map((metric) => { - return { - timestamp: new Date(metric.timestamp), - cpuUsage: KubeSizeConverter.fromNanoToFullCpu(KubeSizeConverter.fromKubeSizeToNanoCpu(metric.usage.cpu)), - ramUsage: KubeSizeConverter.fromKubeSizeToBytes(metric.usage.memory) - }; - }); - - // sorted by timestamp descending - nodeMetrics.sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime()); - const latestUsageItem = nodeMetrics[0]; - - let filesystem: { usedBytes?: number; availableBytes?: number; capacityBytes?: number; time?: string } | undefined; - try { - const summary = (await getCachedNodeSummary(node.Node.metadata?.name!)) as { node?: { fs?: typeof filesystem } }; - const fs = summary.node?.fs; - const timestamp = Date.parse(fs?.time ?? ''); - if ( - fs && - Number.isFinite(timestamp) && - timestamp <= Date.now() && - Date.now() - timestamp <= 5 * 60_000 && - typeof fs.usedBytes === 'number' && - Number.isFinite(fs.usedBytes) && - fs.usedBytes >= 0 && - typeof fs.availableBytes === 'number' && - Number.isFinite(fs.availableBytes) && - fs.availableBytes >= 0 && - typeof fs.capacityBytes === 'number' && - Number.isFinite(fs.capacityBytes) && - fs.capacityBytes > 0 && - fs.usedBytes <= fs.capacityBytes && - fs.availableBytes <= fs.capacityBytes - ) { - filesystem = fs; - } - } catch { - // A node without a summary must not hide the other nodes' metrics. - } - - return { - name: node.Node.metadata?.name!, - cpuUsage: latestUsageItem.cpuUsage, - cpuCapacity: Number(node.CPU?.Capacity!), - ramUsage: latestUsageItem.ramUsage, - ramCapacity: Number(node.Memory?.Capacity!), - diskUsageAbsolut: filesystem?.usedBytes, - diskUsageAvailable: filesystem?.availableBytes, - diskUsageCapacity: filesystem?.capacityBytes - }; - }) - ); + const nodes = await nodeResourceService.getNodeResourceUsage(getCachedNodeSummary); + return nodes.filter((node): node is NodeResourceModel => node.cpuUsage !== null && node.ramUsage !== null); } } diff --git a/src/server/services/standalone-services/app-monitoring-history.service.ts b/src/server/services/standalone-services/app-monitoring-history.service.ts index f031c6dc..6c289822 100644 --- a/src/server/services/standalone-services/app-monitoring-history.service.ts +++ b/src/server/services/standalone-services/app-monitoring-history.service.ts @@ -1,3 +1,4 @@ +import nodeMonitoringHistoryService from './node-monitoring-history.service'; import { randomUUID } from 'crypto'; import { Prisma } from '@prisma/client'; import appHistoryService from './app-history.service'; @@ -132,6 +133,7 @@ class AppMonitoringHistoryService { }), appHistoryAdapter.getRetentionHours() ]); + await nodeMonitoringHistoryService.collect(sampledAt, retention).catch((error) => console.error('Node monitoring history collection failed', error)); const samples = new Map(); const memberships: Prisma.AppVolumeMonitoringMembershipCreateManyInput[] = []; for (const volume of volumes) { diff --git a/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts b/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts index a8d5c6bd..0e78d4ba 100644 --- a/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts +++ b/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts @@ -1,3 +1,4 @@ +vi.mock('./node-monitoring-history.service', () => ({ default: { collect: vi.fn().mockResolvedValue(undefined) } })); vi.mock('@/server/adapter/app-history.adapter', () => ({ default: { getPopulation: vi.fn(), getRetentionHours: vi.fn(), save: vi.fn() } })); vi.mock('./app-history.service', () => ({ default: { getAppMetrics: vi.fn() } })); vi.mock('./app-volume-filesystem.service', () => ({ default: { getVolumeFilesystemUsage: vi.fn() } })); diff --git a/src/server/services/standalone-services/node-monitoring-history.service.ts b/src/server/services/standalone-services/node-monitoring-history.service.ts new file mode 100644 index 00000000..29babffb --- /dev/null +++ b/src/server/services/standalone-services/node-monitoring-history.service.ts @@ -0,0 +1,21 @@ +import nodeResourceService from './node-resource.service'; +import nodeHistoryAdapter from '@/server/adapter/node-monitoring-history.adapter'; +import appHistoryAdapter from '@/server/adapter/app-history.adapter'; +import { NodeMonitoringHistoryUtils } from '@/shared/utils/node-monitoring-history.utils'; + +class NodeMonitoringHistoryService { + async collect(sampledAt: Date, retentionHours: number) { + const nodes = await nodeResourceService.getNodeResourceUsage(); + await nodeHistoryAdapter.save( + nodes.map((node) => ({ sampledAt, nodeName: node.name, cpuCores: node.cpuUsage, ramBytes: node.ramUsage, diskBytes: node.diskUsageAbsolut ?? null })), + new Date(sampledAt.getTime() - retentionHours * 3600_000) + ); + } + + async getHistory() { + const retentionHours = await appHistoryAdapter.getRetentionHours(); + const samples = await nodeHistoryAdapter.getHistory(new Date(Date.now() - retentionHours * 3600_000)); + return { retentionHours, points: NodeMonitoringHistoryUtils.aggregate(samples) }; + } +} +export default new NodeMonitoringHistoryService(); diff --git a/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts b/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts new file mode 100644 index 00000000..288dd12c --- /dev/null +++ b/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts @@ -0,0 +1,33 @@ +vi.mock('./node-resource.service', () => ({ default: { getNodeResourceUsage: vi.fn() } })); +vi.mock('@/server/adapter/node-monitoring-history.adapter', () => ({ default: { save: vi.fn(), getHistory: vi.fn() } })); +vi.mock('@/server/adapter/app-history.adapter', () => ({ default: { getRetentionHours: vi.fn() } })); +import history from './node-monitoring-history.service'; +import resources from './node-resource.service'; +import adapter from '@/server/adapter/node-monitoring-history.adapter'; +import appAdapter from '@/server/adapter/app-history.adapter'; + +it('stores every node and applies the shared retention period', async () => { + vi.mocked(resources.getNodeResourceUsage).mockResolvedValue([ + { name: 'a', cpuUsage: 1, ramUsage: 20, cpuCapacity: 2, ramCapacity: 40, diskUsageAbsolut: 30 }, + { name: 'b', cpuUsage: null, ramUsage: 10, cpuCapacity: 2, ramCapacity: 40 } + ]); + const time = new Date('2026-11-16T12:00:00Z'); + await history.collect(time, 24); + expect(adapter.save).toHaveBeenCalledWith( + [ + { sampledAt: time, nodeName: 'a', cpuCores: 1, ramBytes: 20, diskBytes: 30 }, + { sampledAt: time, nodeName: 'b', cpuCores: null, ramBytes: 10, diskBytes: null } + ], + new Date('2026-11-15T12:00:00Z') + ); +}); + +it('returns sums and gaps from the retained samples', async () => { + vi.mocked(appAdapter.getRetentionHours).mockResolvedValue(24); + const time = new Date(); + vi.mocked(adapter.getHistory).mockResolvedValue([ + { id: '1', nodeName: 'a', sampledAt: time, cpuCores: 1, ramBytes: 10, diskBytes: 100 }, + { id: '2', nodeName: 'b', sampledAt: time, cpuCores: 2, ramBytes: null, diskBytes: 200 } + ]); + expect(await history.getHistory()).toEqual({ retentionHours: 24, points: [{ time: time.getTime(), cpuCores: 3, ramBytes: null, diskBytes: 300 }] }); +}); diff --git a/src/server/services/standalone-services/node-resource.service.ts b/src/server/services/standalone-services/node-resource.service.ts new file mode 100644 index 00000000..9c51a540 --- /dev/null +++ b/src/server/services/standalone-services/node-resource.service.ts @@ -0,0 +1,72 @@ +import k3s from '@/server/adapter/kubernetes-api.adapter'; +import * as k8s from '@kubernetes/client-node'; +import { KubeSizeConverter } from '@/shared/utils/kubernetes-size-converter.utils'; +import { NodeResourceModel } from '@/shared/model/node-resource.model'; + +type NodeMonitoringResource = Omit & { cpuUsage: number | null; ramUsage: number | null }; + +class NodeResourceService { + async getNodeResourceUsage(getSummary: (name: string) => Promise = (name) => k3s.getNodeSummary(name)): Promise { + const topNodes = await k8s.topNodes(k3s.core); + + const metricsData: k8s.NodeMetricsList = await k3s.metrics.getNodeMetrics().catch(() => ({ items: [] }) as unknown as k8s.NodeMetricsList); + + return await Promise.all( + topNodes.map(async (node) => { + const nodeMetrics = metricsData.items + .filter((metric) => metric.metadata.name === node.Node.metadata?.name) + .map((metric) => { + return { + timestamp: new Date(metric.timestamp), + cpuUsage: KubeSizeConverter.fromNanoToFullCpu(KubeSizeConverter.fromKubeSizeToNanoCpu(metric.usage.cpu)), + ramUsage: KubeSizeConverter.fromKubeSizeToBytes(metric.usage.memory) + }; + }); + + // sorted by timestamp descending + nodeMetrics.sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime()); + const latestUsageItem = nodeMetrics[0]; + + let filesystem: { usedBytes?: number; availableBytes?: number; capacityBytes?: number; time?: string } | undefined; + try { + const summary = (await getSummary(node.Node.metadata?.name!)) as { node?: { fs?: typeof filesystem } }; + const fs = summary.node?.fs; + const timestamp = Date.parse(fs?.time ?? ''); + if ( + fs && + Number.isFinite(timestamp) && + timestamp <= Date.now() && + Date.now() - timestamp <= 5 * 60_000 && + typeof fs.usedBytes === 'number' && + Number.isFinite(fs.usedBytes) && + fs.usedBytes >= 0 && + typeof fs.availableBytes === 'number' && + Number.isFinite(fs.availableBytes) && + fs.availableBytes >= 0 && + typeof fs.capacityBytes === 'number' && + Number.isFinite(fs.capacityBytes) && + fs.capacityBytes > 0 && + fs.usedBytes <= fs.capacityBytes && + fs.availableBytes <= fs.capacityBytes + ) { + filesystem = fs; + } + } catch { + // A node without a summary must not hide the other nodes' metrics. + } + + return { + name: node.Node.metadata?.name!, + cpuUsage: latestUsageItem?.cpuUsage ?? null, + cpuCapacity: Number(node.CPU?.Capacity!), + ramUsage: latestUsageItem?.ramUsage ?? null, + ramCapacity: Number(node.Memory?.Capacity!), + diskUsageAbsolut: filesystem?.usedBytes, + diskUsageAvailable: filesystem?.availableBytes, + diskUsageCapacity: filesystem?.capacityBytes + }; + }) + ); + } +} +export default new NodeResourceService(); diff --git a/src/shared/model/generated-zod/index.ts b/src/shared/model/generated-zod/index.ts index 9a157304..0add58c0 100644 --- a/src/shared/model/generated-zod/index.ts +++ b/src/shared/model/generated-zod/index.ts @@ -35,3 +35,4 @@ export * from "./appbasicauth" export * from "./appmonitoringsample" export * from "./appvolumemonitoringsample" export * from "./appvolumemonitoringmembership" +export * from "./nodemonitoringsample" diff --git a/src/shared/model/generated-zod/nodemonitoringsample.ts b/src/shared/model/generated-zod/nodemonitoringsample.ts new file mode 100644 index 00000000..3020cf90 --- /dev/null +++ b/src/shared/model/generated-zod/nodemonitoringsample.ts @@ -0,0 +1,11 @@ +import * as z from "zod" + + +export const NodeMonitoringSampleModel = z.object({ + id: z.string(), + sampledAt: z.date(), + nodeName: z.string(), + cpuCores: z.number().nullish(), + ramBytes: z.number().nullish(), + diskBytes: z.number().nullish(), +}) diff --git a/src/shared/utils/node-monitoring-history.utils.ts b/src/shared/utils/node-monitoring-history.utils.ts new file mode 100644 index 00000000..1ceb260c --- /dev/null +++ b/src/shared/utils/node-monitoring-history.utils.ts @@ -0,0 +1,24 @@ +type Sample = { sampledAt: Date; cpuCores: number | null; ramBytes: number | null; diskBytes: number | null }; +type Point = { time: number; cpuCores: number | null; ramBytes: number | null; diskBytes: number | null; isGap?: boolean }; + +export class NodeMonitoringHistoryUtils { + static aggregate(samples: Sample[], now = Date.now()): Point[] { + const groups = new Map(); + for (const sample of samples) { + const time = sample.sampledAt.getTime(); + groups.set(time, [...(groups.get(time) ?? []), sample]); + } + const points: Point[] = []; + const gap = (time: number): Point => ({ time, isGap: true, cpuCores: null, ramBytes: null, diskBytes: null }); + for (const [time, group] of [...groups].sort(([a], [b]) => a - b)) { + const last = points.at(-1); + if (last && time - last.time > 7 * 60_000) points.push(gap(last.time + 5 * 60_000)); + const sum = (key: 'cpuCores' | 'ramBytes' | 'diskBytes') => + group.every((sample) => sample[key] !== null) ? group.reduce((total, sample) => total + sample[key]!, 0) : null; + points.push({ time, cpuCores: sum('cpuCores'), ramBytes: sum('ramBytes'), diskBytes: sum('diskBytes') }); + } + const last = points.at(-1); + if (last && now - last.time > 7 * 60_000) points.push(gap(now)); + return points; + } +} diff --git a/src/shared/utils/node-monitoring-history.utils.unit.spec.ts b/src/shared/utils/node-monitoring-history.utils.unit.spec.ts new file mode 100644 index 00000000..fb72393b --- /dev/null +++ b/src/shared/utils/node-monitoring-history.utils.unit.spec.ts @@ -0,0 +1,12 @@ +import { NodeMonitoringHistoryUtils } from './node-monitoring-history.utils'; + +it('sums complete node measurements and leaves each incomplete metric as a gap', () => { + const points = NodeMonitoringHistoryUtils.aggregate( + [ + { sampledAt: new Date(0), cpuCores: 1, ramBytes: 100, diskBytes: 400 }, + { sampledAt: new Date(0), cpuCores: 2, ramBytes: null, diskBytes: 200 } + ], + 0 + ); + expect(points).toEqual([{ time: 0, cpuCores: 3, ramBytes: null, diskBytes: 600 }]); +}); From a6701659d0ba54bce275c1701a7dce7549ec97ec Mon Sep 17 00:00:00 2001 From: biersoeckli Date: Mon, 16 Nov 2026 06:53:14 +0000 Subject: [PATCH 2/7] fix: preserve incomplete node monitoring data --- src/app/monitoring/monitoring-nodes.tsx | 148 ++++++++++-------- .../node-monitoring-history.unit.spec.ts | 32 ++++ src/server.ts | 2 + src/server/adapter/node-resource.adapter.ts | 17 ++ src/server/services/build.service.ts | 2 +- src/server/services/cluster.service.ts | 3 +- .../services/cluster.service.unit.spec.ts | 13 ++ .../app-monitoring-history.service.ts | 7 +- ...pp-monitoring-history.service.unit.spec.ts | 1 - .../node-monitoring-history.service.ts | 24 +++ .../node-resource.service.ts | 41 ++--- src/shared/model/node-resource.model.ts | 4 +- src/shared/utils/monitoring-history.utils.ts | 5 + .../utils/node-monitoring-history.utils.ts | 6 +- 14 files changed, 207 insertions(+), 98 deletions(-) create mode 100644 src/app/monitoring/node-monitoring-history.unit.spec.ts create mode 100644 src/server/adapter/node-resource.adapter.ts create mode 100644 src/shared/utils/monitoring-history.utils.ts diff --git a/src/app/monitoring/monitoring-nodes.tsx b/src/app/monitoring/monitoring-nodes.tsx index afa2b74b..04172deb 100644 --- a/src/app/monitoring/monitoring-nodes.tsx +++ b/src/app/monitoring/monitoring-nodes.tsx @@ -26,9 +26,9 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } return updatedNodeRessources.reduce( (acc, node) => ({ - cpuUsage: acc.cpuUsage + node.cpuUsage, + cpuUsage: acc.cpuUsage + (node.cpuUsage ?? 0), cpuCapacity: acc.cpuCapacity + node.cpuCapacity, - ramUsage: acc.ramUsage + node.ramUsage, + ramUsage: acc.ramUsage + (node.ramUsage ?? 0), ramCapacity: acc.ramCapacity + node.ramCapacity, diskUsageAbsolut: acc.diskUsageAbsolut + getDiskUsageAbsolut(node), diskCapacity: acc.diskCapacity + getDiskUsageCapacity(node) @@ -67,29 +67,33 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } Total Cores Usage - - - } /> - - - - + {updatedNodeRessources.some((node) => node.cpuUsage === null) ? ( +

Metrics unavailable

+ ) : ( + + + } /> + + + + + )}
@@ -100,32 +104,36 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } Total Memory Usage - - - KubeSizeConverter.convertBytesToReadableSize(value as number)} />} - /> - - - - + + + + + )} @@ -244,26 +252,34 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } {node.name} -
-
- {((node.cpuUsage / node.cpuCapacity) * 100).toFixed(0)}% - - {node.cpuUsage.toFixed(2)} / {node.cpuCapacity} Cores - + {node.cpuUsage === null ? ( + Unavailable + ) : ( +
+
+ {((node.cpuUsage / node.cpuCapacity) * 100).toFixed(0)}% + + {node.cpuUsage.toFixed(2)} / {node.cpuCapacity} Cores + +
+
- -
+ )} -
-
- {((node.ramUsage / node.ramCapacity) * 100).toFixed(0)}% - - {KubeSizeConverter.convertBytesToReadableSize(node.ramUsage)} / {KubeSizeConverter.convertBytesToReadableSize(node.ramCapacity)} - + {node.ramUsage === null ? ( + Unavailable + ) : ( +
+
+ {((node.ramUsage / node.ramCapacity) * 100).toFixed(0)}% + + {KubeSizeConverter.convertBytesToReadableSize(node.ramUsage)} / {KubeSizeConverter.convertBytesToReadableSize(node.ramCapacity)} + +
+
- -
+ )}
diff --git a/src/app/monitoring/node-monitoring-history.unit.spec.ts b/src/app/monitoring/node-monitoring-history.unit.spec.ts new file mode 100644 index 00000000..a992bab6 --- /dev/null +++ b/src/app/monitoring/node-monitoring-history.unit.spec.ts @@ -0,0 +1,32 @@ +import React from 'react'; +import { cleanup, render, screen } from '@testing-library/react'; +import NodeMonitoringHistory from './node-monitoring-history'; +import { getNodeMonitoringHistory } from './actions'; + +vi.mock('./actions', () => ({ getNodeMonitoringHistory: vi.fn() })); +vi.mock('recharts', () => ({ + CartesianGrid: () => null, + Line: () => null, + LineChart: () => null, + ResponsiveContainer: () => null, + Tooltip: () => null, + Legend: () => null, + XAxis: () => null, + YAxis: () => null +})); +afterEach(() => { + cleanup(); + vi.clearAllMocks(); +}); + +it('shows CPU, RAM and storage history with a shared range selector', async () => { + vi.mocked(getNodeMonitoringHistory).mockResolvedValue({ + status: 'success', + data: { retentionHours: 24, points: [{ time: Date.now(), cpuCores: 1, ramBytes: 1024, diskBytes: 2048 }] } + } as never); + render(React.createElement(NodeMonitoringHistory)); + expect(await screen.findByText('CPU')).toBeTruthy(); + expect(screen.getByText('RAM')).toBeTruthy(); + expect(screen.getByText('Storage')).toBeTruthy(); + expect(screen.getAllByRole('combobox', { name: 'History time range' })).toHaveLength(1); +}); diff --git a/src/server.ts b/src/server.ts index 907d2da1..0fce1d57 100644 --- a/src/server.ts +++ b/src/server.ts @@ -11,6 +11,7 @@ import { Constants } from './shared/utils/constants'; import backupService from './server/services/standalone-services/backup.service'; import maintenanceService from './server/services/standalone-services/maintenance.service'; import appMonitoringHistoryService from './server/services/standalone-services/app-monitoring-history.service'; +import nodeMonitoringHistoryService from './server/services/standalone-services/node-monitoring-history.service'; import passwordChangeService from './server/services/standalone-services/password-change.service'; declare global { @@ -56,6 +57,7 @@ async function initializeNextJs() { await backupService.registerAllBackups(); maintenanceService.configureMaintenanceCronJobs(); appMonitoringHistoryService.initialize(); + nodeMonitoringHistoryService.initialize(); const app = next({ dev }); const handle = app.getRequestHandler(); diff --git a/src/server/adapter/node-resource.adapter.ts b/src/server/adapter/node-resource.adapter.ts new file mode 100644 index 00000000..503ce82d --- /dev/null +++ b/src/server/adapter/node-resource.adapter.ts @@ -0,0 +1,17 @@ +import * as k8s from '@kubernetes/client-node'; +import k3s from './kubernetes-api.adapter'; + +class NodeResourceAdapter { + getNodes() { + return k8s.topNodes(k3s.core); + } + + getMetrics() { + return k3s.metrics.getNodeMetrics(); + } + + getSummary(name: string) { + return k3s.getNodeSummary(name); + } +} +export default new NodeResourceAdapter(); diff --git a/src/server/services/build.service.ts b/src/server/services/build.service.ts index 6f5dbe59..d853ff54 100644 --- a/src/server/services/build.service.ts +++ b/src/server/services/build.service.ts @@ -251,7 +251,7 @@ class BuildService { ]); const schedulableNames = new Set(nodeInfos.filter(n => n.schedulable).map(n => n.name)); const bestNode = nodeResources - .filter(n => schedulableNames.has(n.name)) + .filter((n): n is typeof n & { ramUsage: number } => schedulableNames.has(n.name) && n.ramUsage !== null) .sort((a, b) => (b.ramCapacity - b.ramUsage) - (a.ramCapacity - a.ramUsage))[0]; if (bestNode) { nodeSelector = { 'kubernetes.io/hostname': bestNode.name }; diff --git a/src/server/services/cluster.service.ts b/src/server/services/cluster.service.ts index d7287031..1971edb9 100644 --- a/src/server/services/cluster.service.ts +++ b/src/server/services/cluster.service.ts @@ -118,8 +118,7 @@ class ClusterService { } async getNodeResourceUsage(): Promise { - const nodes = await nodeResourceService.getNodeResourceUsage(getCachedNodeSummary); - return nodes.filter((node): node is NodeResourceModel => node.cpuUsage !== null && node.ramUsage !== null); + return nodeResourceService.getNodeResourceUsage(getCachedNodeSummary); } } diff --git a/src/server/services/cluster.service.unit.spec.ts b/src/server/services/cluster.service.unit.spec.ts index 744d01dc..801daf90 100644 --- a/src/server/services/cluster.service.unit.spec.ts +++ b/src/server/services/cluster.service.unit.spec.ts @@ -33,6 +33,19 @@ describe('cluster node storage', () => { expect(nodes[1].diskUsageCapacity).toBeUndefined(); }); + it('keeps each node and valid metrics when one CPU measurement is missing', async () => { + mocks.getNodeSummary.mockResolvedValue({ node: { fs: { time: new Date().toISOString(), usedBytes: 10, availableBytes: 90, capacityBytes: 100 } } }); + mocks.getNodeMetrics.mockResolvedValue({ + items: [ + { metadata: { name: 'node-a' }, timestamp: new Date().toISOString(), usage: { cpu: 'invalid', memory: '100Mi' } }, + { metadata: { name: 'node-b' }, timestamp: '2000-01-01T00:00:00Z', usage: { cpu: '1', memory: '100Mi' } } + ] + }); + const nodes = await clusterService.getNodeResourceUsage(); + expect(nodes[0]).toMatchObject({ cpuUsage: null, ramUsage: 104857600, diskUsageAbsolut: 10 }); + expect(nodes[1]).toMatchObject({ cpuUsage: null, ramUsage: null, diskUsageAbsolut: 10 }); + }); + it('does not present stale or incomplete filesystem measurements', async () => { mocks.getNodeSummary.mockImplementation(async (name: string) => ({ node: { diff --git a/src/server/services/standalone-services/app-monitoring-history.service.ts b/src/server/services/standalone-services/app-monitoring-history.service.ts index 6c289822..f39486d5 100644 --- a/src/server/services/standalone-services/app-monitoring-history.service.ts +++ b/src/server/services/standalone-services/app-monitoring-history.service.ts @@ -1,4 +1,4 @@ -import nodeMonitoringHistoryService from './node-monitoring-history.service'; +import { MonitoringHistoryUtils } from '@/shared/utils/monitoring-history.utils'; import { randomUUID } from 'crypto'; import { Prisma } from '@prisma/client'; import appHistoryService from './app-history.service'; @@ -10,9 +10,7 @@ import scheduleService from './schedule.service'; type VolumeSample = Prisma.AppVolumeMonitoringSampleCreateManyInput & { id: string }; -const COLLECTION_INTERVAL_MINUTES = 5; -const COLLECTION_INTERVAL_MS = COLLECTION_INTERVAL_MINUTES * 60_000; -const GAP_THRESHOLD_MS = COLLECTION_INTERVAL_MS + 2 * 60_000; +const { COLLECTION_INTERVAL_MINUTES, COLLECTION_INTERVAL_MS, GAP_THRESHOLD_MS } = MonitoringHistoryUtils; class AppMonitoringHistoryService { private running = false; @@ -133,7 +131,6 @@ class AppMonitoringHistoryService { }), appHistoryAdapter.getRetentionHours() ]); - await nodeMonitoringHistoryService.collect(sampledAt, retention).catch((error) => console.error('Node monitoring history collection failed', error)); const samples = new Map(); const memberships: Prisma.AppVolumeMonitoringMembershipCreateManyInput[] = []; for (const volume of volumes) { diff --git a/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts b/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts index 0e78d4ba..a8d5c6bd 100644 --- a/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts +++ b/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts @@ -1,4 +1,3 @@ -vi.mock('./node-monitoring-history.service', () => ({ default: { collect: vi.fn().mockResolvedValue(undefined) } })); vi.mock('@/server/adapter/app-history.adapter', () => ({ default: { getPopulation: vi.fn(), getRetentionHours: vi.fn(), save: vi.fn() } })); vi.mock('./app-history.service', () => ({ default: { getAppMetrics: vi.fn() } })); vi.mock('./app-volume-filesystem.service', () => ({ default: { getVolumeFilesystemUsage: vi.fn() } })); diff --git a/src/server/services/standalone-services/node-monitoring-history.service.ts b/src/server/services/standalone-services/node-monitoring-history.service.ts index 29babffb..f8919754 100644 --- a/src/server/services/standalone-services/node-monitoring-history.service.ts +++ b/src/server/services/standalone-services/node-monitoring-history.service.ts @@ -1,9 +1,33 @@ +import { MonitoringHistoryUtils } from '@/shared/utils/monitoring-history.utils'; import nodeResourceService from './node-resource.service'; +import scheduleService from './schedule.service'; import nodeHistoryAdapter from '@/server/adapter/node-monitoring-history.adapter'; import appHistoryAdapter from '@/server/adapter/app-history.adapter'; import { NodeMonitoringHistoryUtils } from '@/shared/utils/node-monitoring-history.utils'; class NodeMonitoringHistoryService { + private running = false; + + initialize() { + scheduleService.scheduleJob('node-monitoring-history', `*/${MonitoringHistoryUtils.COLLECTION_INTERVAL_MINUTES} * * * *`, () => { + void this.collectScheduled(); + }); + void this.collectScheduled(); + } + + private async collectScheduled() { + if (this.running) return; + this.running = true; + try { + const retention = await appHistoryAdapter.getRetentionHours(); + await this.collect(new Date(), retention); + } catch (error) { + console.error('Node monitoring history collection failed', error); + } finally { + this.running = false; + } + } + async collect(sampledAt: Date, retentionHours: number) { const nodes = await nodeResourceService.getNodeResourceUsage(); await nodeHistoryAdapter.save( diff --git a/src/server/services/standalone-services/node-resource.service.ts b/src/server/services/standalone-services/node-resource.service.ts index 9c51a540..0fc959ef 100644 --- a/src/server/services/standalone-services/node-resource.service.ts +++ b/src/server/services/standalone-services/node-resource.service.ts @@ -1,4 +1,4 @@ -import k3s from '@/server/adapter/kubernetes-api.adapter'; +import nodeResourceAdapter from '@/server/adapter/node-resource.adapter'; import * as k8s from '@kubernetes/client-node'; import { KubeSizeConverter } from '@/shared/utils/kubernetes-size-converter.utils'; import { NodeResourceModel } from '@/shared/model/node-resource.model'; @@ -6,26 +6,29 @@ import { NodeResourceModel } from '@/shared/model/node-resource.model'; type NodeMonitoringResource = Omit & { cpuUsage: number | null; ramUsage: number | null }; class NodeResourceService { - async getNodeResourceUsage(getSummary: (name: string) => Promise = (name) => k3s.getNodeSummary(name)): Promise { - const topNodes = await k8s.topNodes(k3s.core); + async getNodeResourceUsage(getSummary: (name: string) => Promise = (name) => nodeResourceAdapter.getSummary(name)): Promise { + const topNodes = await nodeResourceAdapter.getNodes(); - const metricsData: k8s.NodeMetricsList = await k3s.metrics.getNodeMetrics().catch(() => ({ items: [] }) as unknown as k8s.NodeMetricsList); + const metricsData: k8s.NodeMetricsList = await nodeResourceAdapter.getMetrics().catch(() => ({ items: [] }) as unknown as k8s.NodeMetricsList); return await Promise.all( topNodes.map(async (node) => { - const nodeMetrics = metricsData.items - .filter((metric) => metric.metadata.name === node.Node.metadata?.name) - .map((metric) => { - return { - timestamp: new Date(metric.timestamp), - cpuUsage: KubeSizeConverter.fromNanoToFullCpu(KubeSizeConverter.fromKubeSizeToNanoCpu(metric.usage.cpu)), - ramUsage: KubeSizeConverter.fromKubeSizeToBytes(metric.usage.memory) - }; - }); - - // sorted by timestamp descending - nodeMetrics.sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime()); - const latestUsageItem = nodeMetrics[0]; + const metric = metricsData.items + .filter((item) => item.metadata.name === node.Node.metadata?.name) + .sort((a, b) => Date.parse(b.timestamp) - Date.parse(a.timestamp))[0]; + const timestamp = Date.parse(metric?.timestamp ?? ''); + const fresh = Number.isFinite(timestamp) && timestamp <= Date.now() && Date.now() - timestamp <= 5 * 60_000; + const convert = (value: string | undefined, converter: (input: string) => number): number | null => { + try { + if (!fresh || !value) return null; + const result = converter(value); + return Number.isFinite(result) && result >= 0 ? result : null; + } catch { + return null; + } + }; + const cpuUsage = convert(metric?.usage?.cpu, (value) => KubeSizeConverter.fromNanoToFullCpu(KubeSizeConverter.fromKubeSizeToNanoCpu(value))); + const ramUsage = convert(metric?.usage?.memory, (value) => KubeSizeConverter.fromKubeSizeToBytes(value)); let filesystem: { usedBytes?: number; availableBytes?: number; capacityBytes?: number; time?: string } | undefined; try { @@ -57,9 +60,9 @@ class NodeResourceService { return { name: node.Node.metadata?.name!, - cpuUsage: latestUsageItem?.cpuUsage ?? null, + cpuUsage: cpuUsage, cpuCapacity: Number(node.CPU?.Capacity!), - ramUsage: latestUsageItem?.ramUsage ?? null, + ramUsage: ramUsage, ramCapacity: Number(node.Memory?.Capacity!), diskUsageAbsolut: filesystem?.usedBytes, diskUsageAvailable: filesystem?.availableBytes, diff --git a/src/shared/model/node-resource.model.ts b/src/shared/model/node-resource.model.ts index 9e5bfd66..00012174 100644 --- a/src/shared/model/node-resource.model.ts +++ b/src/shared/model/node-resource.model.ts @@ -2,9 +2,9 @@ import { z } from 'zod'; export const nodeResourceZodModel = z.object({ name: z.string(), - cpuUsage: z.number(), + cpuUsage: z.number().nullable(), cpuCapacity: z.number(), - ramUsage: z.number(), + ramUsage: z.number().nullable(), ramCapacity: z.number(), diskUsageAbsolut: z.number().optional(), diskUsageCapacity: z.number().optional(), diff --git a/src/shared/utils/monitoring-history.utils.ts b/src/shared/utils/monitoring-history.utils.ts new file mode 100644 index 00000000..70c20a2d --- /dev/null +++ b/src/shared/utils/monitoring-history.utils.ts @@ -0,0 +1,5 @@ +export class MonitoringHistoryUtils { + static readonly COLLECTION_INTERVAL_MINUTES = 5; + static readonly COLLECTION_INTERVAL_MS = this.COLLECTION_INTERVAL_MINUTES * 60_000; + static readonly GAP_THRESHOLD_MS = this.COLLECTION_INTERVAL_MS + 2 * 60_000; +} diff --git a/src/shared/utils/node-monitoring-history.utils.ts b/src/shared/utils/node-monitoring-history.utils.ts index 1ceb260c..dee20cea 100644 --- a/src/shared/utils/node-monitoring-history.utils.ts +++ b/src/shared/utils/node-monitoring-history.utils.ts @@ -1,3 +1,5 @@ +import { MonitoringHistoryUtils } from './monitoring-history.utils'; + type Sample = { sampledAt: Date; cpuCores: number | null; ramBytes: number | null; diskBytes: number | null }; type Point = { time: number; cpuCores: number | null; ramBytes: number | null; diskBytes: number | null; isGap?: boolean }; @@ -12,13 +14,13 @@ export class NodeMonitoringHistoryUtils { const gap = (time: number): Point => ({ time, isGap: true, cpuCores: null, ramBytes: null, diskBytes: null }); for (const [time, group] of [...groups].sort(([a], [b]) => a - b)) { const last = points.at(-1); - if (last && time - last.time > 7 * 60_000) points.push(gap(last.time + 5 * 60_000)); + if (last && time - last.time > MonitoringHistoryUtils.GAP_THRESHOLD_MS) points.push(gap(last.time + MonitoringHistoryUtils.COLLECTION_INTERVAL_MS)); const sum = (key: 'cpuCores' | 'ramBytes' | 'diskBytes') => group.every((sample) => sample[key] !== null) ? group.reduce((total, sample) => total + sample[key]!, 0) : null; points.push({ time, cpuCores: sum('cpuCores'), ramBytes: sum('ramBytes'), diskBytes: sum('diskBytes') }); } const last = points.at(-1); - if (last && now - last.time > 7 * 60_000) points.push(gap(now)); + if (last && now - last.time > MonitoringHistoryUtils.GAP_THRESHOLD_MS) points.push(gap(now)); return points; } } From b4f9411b3b3851301d3c06d7c78d41d6183c20cd Mon Sep 17 00:00:00 2001 From: biersoeckli Date: Mon, 16 Nov 2026 06:54:07 +0000 Subject: [PATCH 3/7] fix: accept byte quantities in node metrics --- src/server/services/cluster.service.unit.spec.ts | 4 ++-- src/server/services/secret.service.ts | 1 - .../services/standalone-services/node-resource.service.ts | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/server/services/cluster.service.unit.spec.ts b/src/server/services/cluster.service.unit.spec.ts index 801daf90..81621658 100644 --- a/src/server/services/cluster.service.unit.spec.ts +++ b/src/server/services/cluster.service.unit.spec.ts @@ -37,12 +37,12 @@ describe('cluster node storage', () => { mocks.getNodeSummary.mockResolvedValue({ node: { fs: { time: new Date().toISOString(), usedBytes: 10, availableBytes: 90, capacityBytes: 100 } } }); mocks.getNodeMetrics.mockResolvedValue({ items: [ - { metadata: { name: 'node-a' }, timestamp: new Date().toISOString(), usage: { cpu: 'invalid', memory: '100Mi' } }, + { metadata: { name: 'node-a' }, timestamp: new Date().toISOString(), usage: { cpu: 'invalid', memory: '1234' } }, { metadata: { name: 'node-b' }, timestamp: '2000-01-01T00:00:00Z', usage: { cpu: '1', memory: '100Mi' } } ] }); const nodes = await clusterService.getNodeResourceUsage(); - expect(nodes[0]).toMatchObject({ cpuUsage: null, ramUsage: 104857600, diskUsageAbsolut: 10 }); + expect(nodes[0]).toMatchObject({ cpuUsage: null, ramUsage: 1234, diskUsageAbsolut: 10 }); expect(nodes[1]).toMatchObject({ cpuUsage: null, ramUsage: null, diskUsageAbsolut: 10 }); }); diff --git a/src/server/services/secret.service.ts b/src/server/services/secret.service.ts index 2351c5c1..ef242870 100644 --- a/src/server/services/secret.service.ts +++ b/src/server/services/secret.service.ts @@ -116,7 +116,6 @@ class SecretService { } try { - console.log('replacing bitch') await k3s.core.replaceNamespacedSecret({ namespace, name: secretName, diff --git a/src/server/services/standalone-services/node-resource.service.ts b/src/server/services/standalone-services/node-resource.service.ts index 0fc959ef..d37db115 100644 --- a/src/server/services/standalone-services/node-resource.service.ts +++ b/src/server/services/standalone-services/node-resource.service.ts @@ -6,7 +6,9 @@ import { NodeResourceModel } from '@/shared/model/node-resource.model'; type NodeMonitoringResource = Omit & { cpuUsage: number | null; ramUsage: number | null }; class NodeResourceService { - async getNodeResourceUsage(getSummary: (name: string) => Promise = (name) => nodeResourceAdapter.getSummary(name)): Promise { + async getNodeResourceUsage( + getSummary: (name: string) => Promise = (name) => nodeResourceAdapter.getSummary(name) + ): Promise { const topNodes = await nodeResourceAdapter.getNodes(); const metricsData: k8s.NodeMetricsList = await nodeResourceAdapter.getMetrics().catch(() => ({ items: [] }) as unknown as k8s.NodeMetricsList); @@ -28,7 +30,9 @@ class NodeResourceService { } }; const cpuUsage = convert(metric?.usage?.cpu, (value) => KubeSizeConverter.fromNanoToFullCpu(KubeSizeConverter.fromKubeSizeToNanoCpu(value))); - const ramUsage = convert(metric?.usage?.memory, (value) => KubeSizeConverter.fromKubeSizeToBytes(value)); + const ramUsage = convert(metric?.usage?.memory, (value) => + /^\d+(?:\.\d+)?$/.test(value) ? Number(value) : KubeSizeConverter.fromKubeSizeToBytes(value) + ); let filesystem: { usedBytes?: number; availableBytes?: number; capacityBytes?: number; time?: string } | undefined; try { From 41f37139de8c60f438394e7211e8fcf5dd9dbcb9 Mon Sep 17 00:00:00 2001 From: biersoeckli Date: Mon, 16 Nov 2026 07:49:43 +0000 Subject: [PATCH 4/7] refactor: app monitoring history service to use new database client and monitoring history service --- .prettierrc.json | 2 +- eslint.config.mjs | 1 + .../migration.sql | 20 + prisma/schema.prisma | 36 +- ...app-monitoring-history.integration.spec.ts | 34 +- ...oring-sample-migration.integration.spec.ts | 34 + src/server/adapter/app-history.adapter.ts | 58 -- .../node-monitoring-history.adapter.ts | 16 - src/server/services/build.service.ts | 837 +++++++++--------- .../services/cluster.service.unit.spec.ts | 10 + src/server/services/secret.service.ts | 469 +++++----- ...itoring-history-query.service.unit.spec.ts | 12 +- .../app-monitoring-history.service.ts | 57 +- ...pp-monitoring-history.service.unit.spec.ts | 34 +- .../monitoring-history.service.ts | 26 + .../node-monitoring-history.service.ts | 32 +- ...de-monitoring-history.service.unit.spec.ts | 27 +- .../node-resource.service.ts | 2 + src/shared/model/generated-zod/app.ts | 6 +- .../generated-zod/appmonitoringsample.ts | 25 - src/shared/model/generated-zod/index.ts | 3 +- .../model/generated-zod/monitoringsample.ts | 27 + .../generated-zod/nodemonitoringsample.ts | 11 - src/shared/model/node-resource.model.ts | 1 + 24 files changed, 910 insertions(+), 870 deletions(-) create mode 100644 prisma/migrations/20261116130000_unify_monitoring_samples/migration.sql create mode 100644 src/__tests__/integration/server/services/monitoring-sample-migration.integration.spec.ts delete mode 100644 src/server/adapter/app-history.adapter.ts delete mode 100644 src/server/adapter/node-monitoring-history.adapter.ts create mode 100644 src/server/services/standalone-services/monitoring-history.service.ts delete mode 100644 src/shared/model/generated-zod/appmonitoringsample.ts create mode 100644 src/shared/model/generated-zod/monitoringsample.ts delete mode 100644 src/shared/model/generated-zod/nodemonitoringsample.ts diff --git a/.prettierrc.json b/.prettierrc.json index 4ddc855d..d064e915 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -8,7 +8,7 @@ "trailingComma": "none", "printWidth": 160, "arrowParens": "always", - "objectWrap": "collapse", + "objectWrap": "preserve", "plugins": ["prettier-plugin-tailwindcss"], "tailwindStylesheet": "src/app/globals.css", "tailwindFunctions": ["cn", "cva"], diff --git a/eslint.config.mjs b/eslint.config.mjs index e0710e9b..2a0a30bb 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -26,6 +26,7 @@ const eslintConfig = [ "unused-imports": unusedImports, }, rules: { + "curly": ["error", "all"], "no-unused-vars": "off", "@typescript-eslint/no-unused-vars": "off", "unused-imports/no-unused-imports": "error", diff --git a/prisma/migrations/20261116130000_unify_monitoring_samples/migration.sql b/prisma/migrations/20261116130000_unify_monitoring_samples/migration.sql new file mode 100644 index 00000000..1f29d214 --- /dev/null +++ b/prisma/migrations/20261116130000_unify_monitoring_samples/migration.sql @@ -0,0 +1,20 @@ +-- Monitoring history is beta data: discard existing App and Node samples. +DROP TABLE "AppMonitoringSample"; +DROP TABLE "NodeMonitoringSample"; + +CREATE TABLE "MonitoringSample" ( + "id" TEXT NOT NULL PRIMARY KEY, + "sampledAt" DATETIME NOT NULL, + "measuredAt" DATETIME, + "appId" TEXT, + "nodeName" TEXT, + "cpuCores" REAL, + "ramBytes" REAL, + "nodeFilesystemUsedBytes" REAL, + CONSTRAINT "MonitoringSample_appId_fkey" FOREIGN KEY ("appId") REFERENCES "App" ("id") ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT "MonitoringSample_owner_check" CHECK (("appId" IS NOT NULL AND "nodeName" IS NULL) OR ("appId" IS NULL AND "nodeName" IS NOT NULL)), + CONSTRAINT "MonitoringSample_storage_check" CHECK ("appId" IS NULL OR "nodeFilesystemUsedBytes" IS NULL) +); +CREATE INDEX "MonitoringSample_appId_sampledAt_idx" ON "MonitoringSample"("appId", "sampledAt"); +CREATE INDEX "MonitoringSample_nodeName_sampledAt_idx" ON "MonitoringSample"("nodeName", "sampledAt"); +CREATE INDEX "MonitoringSample_sampledAt_idx" ON "MonitoringSample"("sampledAt"); diff --git a/prisma/schema.prisma b/prisma/schema.prisma index a1298b3c..04a91c2c 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -466,7 +466,7 @@ model App { appPorts AppPort[] appNodePorts AppNodePort[] appVolumes AppVolume[] - monitoringSamples AppMonitoringSample[] + monitoringSamples MonitoringSample[] appFileMounts AppFileMount[] appBasicAuths AppBasicAuth[] appGitSshKey AppGitSshKey? @@ -649,17 +649,21 @@ model AppBasicAuth { updatedAt DateTime @updatedAt } -// One row per known App and Volume at each collection time. Null values are gaps. -model AppMonitoringSample { - id String @id @default(uuid()) - sampledAt DateTime - appId String - app App @relation(fields: [appId], references: [id], onDelete: Cascade) - cpuCores Float? - ramBytes Float? - measuredAt DateTime? +// One row per App or Node at each collection time. Null metric values are gaps. +// The migration enforces exactly one owner and reserves filesystem usage for Nodes. +model MonitoringSample { + id String @id @default(uuid()) + sampledAt DateTime + measuredAt DateTime? + appId String? + app App? @relation(fields: [appId], references: [id], onDelete: Cascade) + nodeName String? + cpuCores Float? + ramBytes Float? + nodeFilesystemUsedBytes Float? @@index([appId, sampledAt]) + @@index([nodeName, sampledAt]) @@index([sampledAt]) } @@ -688,15 +692,3 @@ model AppVolumeMonitoringMembership { @@id([sampleId, volumeId]) @@index([volumeId]) } - -model NodeMonitoringSample { - id String @id @default(uuid()) - sampledAt DateTime - nodeName String - cpuCores Float? - ramBytes Float? - diskBytes Float? - - @@index([sampledAt]) - @@index([nodeName, sampledAt]) -} diff --git a/src/__tests__/integration/server/services/app-monitoring-history.integration.spec.ts b/src/__tests__/integration/server/services/app-monitoring-history.integration.spec.ts index c9ff01c4..8723a944 100644 --- a/src/__tests__/integration/server/services/app-monitoring-history.integration.spec.ts +++ b/src/__tests__/integration/server/services/app-monitoring-history.integration.spec.ts @@ -2,7 +2,7 @@ vi.mock('@/server/adapter/kubernetes-api.adapter', () => ({ default: {} })); import { createPrismaTestContext } from '@/__tests__/prisma-test.utils'; -import adapter from '@/server/adapter/app-history.adapter'; +import nodeHistory from '@/server/services/standalone-services/node-monitoring-history.service'; import history from '@/server/services/standalone-services/app-monitoring-history.service'; import metrics from '@/server/services/standalone-services/app-history.service'; import filesystem from '@/server/services/standalone-services/app-volume-filesystem.service'; @@ -15,7 +15,7 @@ describe('App monitoring history persistence', () => { await db.project.create({ data: { id: 'project', name: 'Project' } }); await db.app.create({ data: { id: 'app', name: 'App', projectId: 'project' } }); const cutoff = new Date(Date.now() - 3600_000); - await adapter.save( + await history.save( [ { appId: 'app', sampledAt: new Date(cutoff.getTime() - 1), cpuCores: 1, ramBytes: 2 }, { appId: 'app', sampledAt: cutoff, cpuCores: 3, ramBytes: 4 } @@ -34,11 +34,11 @@ describe('App monitoring history persistence', () => { await db.project.create({ data: { id: 'project', name: 'Project' } }); await db.app.create({ data: { id: 'app', name: 'App', projectId: 'project' } }); const now = Date.now(); - await adapter.save([{ appId: 'app', sampledAt: new Date(now - 2 * 3600_000), cpuCores: 1, ramBytes: 2 }], [], [], new Date(now - 24 * 3600_000)); - await adapter.setRetentionHours(1); + await history.save([{ appId: 'app', sampledAt: new Date(now - 2 * 3600_000), cpuCores: 1, ramBytes: 2 }], [], [], new Date(now - 24 * 3600_000)); + await history.setRetentionHours(1); expect((await history.getHistory(['app'])).points).toEqual([]); - await adapter.save([], [], [], new Date(now - (await adapter.getRetentionHours()) * 3600_000)); - expect(await db.appMonitoringSample.count()).toBe(0); + await history.save([], [], [], new Date(now - (await history.getRetentionHours()) * 3600_000)); + expect(await db.monitoringSample.count()).toBe(0); }); it('stores shared Volume usage once and exposes it only through accessible mounts', async () => { @@ -53,7 +53,7 @@ describe('App monitoring history persistence', () => { await db.appVolume.create({ data: { id: 'base', appId: 'one', containerMountPath: '/data', size: 1 } }); await db.appVolume.create({ data: { id: 'shared', appId: 'two', containerMountPath: '/share', size: 1, sharedVolumeId: 'base' } }); const sampledAt = new Date(); - await adapter.save( + await history.save( [], [{ id: 'sample', volumeId: 'base', sampledAt, status: 'available', usedBytes: 42, measuredAt: sampledAt }], [ @@ -104,6 +104,24 @@ describe('App monitoring history persistence', () => { } }); + it('keeps App and Node histories separate in the shared table', async () => { + const db = ctx.getDataAccess().client; + await db.project.create({ data: { id: 'project', name: 'Project' } }); + await db.app.create({ data: { id: 'app', name: 'App', projectId: 'project' } }); + const sampledAt = new Date(); + const cutoff = new Date(sampledAt.getTime() - 3600_000); + await history.save([{ appId: 'app', sampledAt, cpuCores: 1, ramBytes: 2 }], [], [], cutoff); + await nodeHistory.save([{ nodeName: 'node', sampledAt, measuredAt: sampledAt, cpuCores: 3, ramBytes: 4, nodeFilesystemUsedBytes: 5 }], cutoff); + expect((await history.getRawHistory(['app'], cutoff))[0]).toHaveLength(1); + expect(await db.monitoringSample.findMany({ where: { nodeName: { not: null }, sampledAt: { gte: cutoff } } })).toMatchObject([ + { nodeName: 'node', measuredAt: sampledAt, nodeFilesystemUsedBytes: 5 } + ]); + await db.app.delete({ where: { id: 'app' } }); + expect(await db.monitoringSample.findMany({ where: { nodeName: { not: null }, sampledAt: { gte: cutoff } } })).toHaveLength(1); + await nodeHistory.save([], new Date(sampledAt.getTime() + 1)); + expect(await db.monitoringSample.findMany({ where: { nodeName: { not: null }, sampledAt: { gte: cutoff } } })).toHaveLength(0); + }); + it('reads a day of five-minute history for 100 Apps', async () => { const db = ctx.getDataAccess().client; await db.project.create({ data: { id: 'project', name: 'Project' } }); @@ -113,7 +131,7 @@ describe('App monitoring history persistence', () => { const samples = Array.from({ length: 288 }, (_, index) => appIds.map((appId) => ({ appId, sampledAt: new Date(now - index * 5 * 60_000), cpuCores: 0.25, ramBytes: 1024 })) ).flat(); - await adapter.save(samples, [], [], new Date(now - 24 * 3600_000)); + await history.save(samples, [], [], new Date(now - 24 * 3600_000)); const result = await history.getHistory(appIds); expect(result.points).toHaveLength(288); expect(result.points[0]).toMatchObject({ cpuCores: 25, ramBytes: 102400 }); diff --git a/src/__tests__/integration/server/services/monitoring-sample-migration.integration.spec.ts b/src/__tests__/integration/server/services/monitoring-sample-migration.integration.spec.ts new file mode 100644 index 00000000..5c98c12d --- /dev/null +++ b/src/__tests__/integration/server/services/monitoring-sample-migration.integration.spec.ts @@ -0,0 +1,34 @@ +// @vitest-environment node +import Database from 'better-sqlite3'; +import { readFileSync } from 'node:fs'; + +it('replaces beta samples while preserving volumes and enforcing ownership and cascade rules', () => { + const db = new Database(':memory:'); + db.pragma('foreign_keys = ON'); + try { + db.exec(` + CREATE TABLE App (id TEXT PRIMARY KEY); + CREATE TABLE AppMonitoringSample (id TEXT PRIMARY KEY); + CREATE TABLE NodeMonitoringSample (id TEXT PRIMARY KEY); + CREATE TABLE AppVolumeMonitoringSample (id TEXT PRIMARY KEY); + INSERT INTO App VALUES ('app'); + INSERT INTO AppMonitoringSample VALUES ('old-app'); + INSERT INTO NodeMonitoringSample VALUES ('old-node'); + INSERT INTO AppVolumeMonitoringSample VALUES ('volume'); + `); + db.exec(readFileSync('prisma/migrations/20261116130000_unify_monitoring_samples/migration.sql', 'utf8')); + expect(db.prepare('SELECT count(*) AS n FROM MonitoringSample').get()).toEqual({ n: 0 }); + expect(db.prepare('SELECT count(*) AS n FROM AppVolumeMonitoringSample').get()).toEqual({ n: 1 }); + const insert = db.prepare('INSERT INTO MonitoringSample (id, sampledAt, appId, nodeName, nodeFilesystemUsedBytes) VALUES (?, ?, ?, ?, ?)'); + insert.run('app-sample', 1, 'app', null, null); + insert.run('node-sample', 1, null, 'node', 5); + expect(() => insert.run('none', 1, null, null, null)).toThrow(); + expect(() => insert.run('both', 1, 'app', 'node', null)).toThrow(); + expect(() => insert.run('storage-on-app', 1, 'app', null, 5)).toThrow(); + expect(() => insert.run('missing-app', 1, 'missing', null, null)).toThrow(); + db.prepare('DELETE FROM App WHERE id = ?').run('app'); + expect(db.prepare('SELECT id FROM MonitoringSample').all()).toEqual([{ id: 'node-sample' }]); + } finally { + db.close(); + } +}); diff --git a/src/server/adapter/app-history.adapter.ts b/src/server/adapter/app-history.adapter.ts deleted file mode 100644 index d1422e0f..00000000 --- a/src/server/adapter/app-history.adapter.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { Prisma } from '@prisma/client'; -import dataAccess from '@/server/adapter/db.client'; -import { Constants } from '@/shared/utils/constants'; - -class AppHistoryAdapter { - async getPopulation() { - const [apps, volumes] = await Promise.all([ - dataAccess.client.app.findMany({ select: { id: true, projectId: true } }), - dataAccess.client.appVolume.findMany({ include: { app: { select: { projectId: true } } } }) - ]); - return { apps, volumes }; - } - - async getRetentionHours() { - const value = (await dataAccess.client.parameter.findUnique({ where: { name: Constants.APP_MONITORING_HISTORY_RETENTION_HOURS } }))?.value; - const hours = Number(value); - return Number.isInteger(hours) && hours >= 1 && hours <= 168 ? hours : 24; - } - - async setRetentionHours(hours: number) { - await dataAccess.client.parameter.upsert({ - where: { name: Constants.APP_MONITORING_HISTORY_RETENTION_HOURS }, - create: { name: Constants.APP_MONITORING_HISTORY_RETENTION_HOURS, value: String(hours) }, - update: { value: String(hours) } - }); - } - - async save( - apps: Prisma.AppMonitoringSampleCreateManyInput[], - volumes: Prisma.AppVolumeMonitoringSampleCreateManyInput[], - memberships: Prisma.AppVolumeMonitoringMembershipCreateManyInput[], - cutoff: Date - ) { - await dataAccess.client.$transaction(async (tx) => { - for (let i = 0; i < apps.length; i += 100) await tx.appMonitoringSample.createMany({ data: apps.slice(i, i + 100) }); - for (let i = 0; i < volumes.length; i += 100) await tx.appVolumeMonitoringSample.createMany({ data: volumes.slice(i, i + 100) }); - for (let i = 0; i < memberships.length; i += 100) await tx.appVolumeMonitoringMembership.createMany({ data: memberships.slice(i, i + 100) }); - await tx.appMonitoringSample.deleteMany({ where: { sampledAt: { lt: cutoff } } }); - await tx.appVolumeMonitoringSample.deleteMany({ where: { sampledAt: { lt: cutoff } } }); - }); - } - - async getHistory(appIds: string[], cutoff: Date) { - return Promise.all([ - dataAccess.client.appMonitoringSample.findMany({ where: { appId: { in: appIds }, sampledAt: { gte: cutoff } }, orderBy: { sampledAt: 'asc' } }), - dataAccess.client.appVolumeMonitoringMembership - .findMany({ - where: { volume: { appId: { in: appIds } }, sample: { sampledAt: { gte: cutoff } } }, - include: { sample: true, volume: { select: { appId: true, sharedVolumeId: true, containerMountPath: true, app: { select: { projectId: true } } } } }, - orderBy: { sample: { sampledAt: 'asc' } } - }) - .then((memberships) => memberships.map((item) => ({ ...item.sample, volumeId: item.volumeId, volume: item.volume }))) - ]); - } -} - -const appHistoryAdapter = new AppHistoryAdapter(); -export default appHistoryAdapter; diff --git a/src/server/adapter/node-monitoring-history.adapter.ts b/src/server/adapter/node-monitoring-history.adapter.ts deleted file mode 100644 index 412e66b7..00000000 --- a/src/server/adapter/node-monitoring-history.adapter.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Prisma } from '@prisma/client'; -import dataAccess from './db.client'; - -class NodeMonitoringHistoryAdapter { - async save(samples: Prisma.NodeMonitoringSampleCreateManyInput[], cutoff: Date) { - await dataAccess.client.$transaction(async (tx) => { - for (let i = 0; i < samples.length; i += 100) await tx.nodeMonitoringSample.createMany({ data: samples.slice(i, i + 100) }); - await tx.nodeMonitoringSample.deleteMany({ where: { sampledAt: { lt: cutoff } } }); - }); - } - - async getHistory(cutoff: Date) { - return dataAccess.client.nodeMonitoringSample.findMany({ where: { sampledAt: { gte: cutoff } }, orderBy: { sampledAt: 'asc' } }); - } -} -export default new NodeMonitoringHistoryAdapter(); diff --git a/src/server/services/build.service.ts b/src/server/services/build.service.ts index d853ff54..3153bc44 100644 --- a/src/server/services/build.service.ts +++ b/src/server/services/build.service.ts @@ -1,479 +1,452 @@ -import { AppExtendedModel } from "@/shared/model/app-extended.model"; -import { AppBuildMethod } from "@/shared/model/app-source-info.model"; -import { AgentExtendedModel } from "@/shared/model/agent-extended.model"; -import { BuildJobModel } from "@/shared/model/build-job"; -import { GlobalBuildJobModel } from "@/shared/model/global-build-job.model"; -import { ServiceException } from "@/shared/model/service.exception.model"; -import { WorkloadType } from "@/shared/model/runtime-type.model"; -import { Constants } from "../../shared/utils/constants"; -import dataAccess from "../adapter/db.client"; -import k3s from "../adapter/kubernetes-api.adapter"; -import buildQueueInitContainer from "./build-job-builders/build-init-container.service"; -import dockerfileBuildJobBuilder from "./build-job-builders/dockerfile-build-job-builder.service"; -import frameworkBuildJobBuilder from "./build-job-builders/framework-build-job-builder.service"; -import railpackBuildJobBuilder from "./build-job-builders/railpack-build-job-builder.service"; -import { BuildJobBuilder } from "./build-job-builders/build-job-builder.interface"; -import { AppBuildMethodUtils } from "@/shared/utils/app-build-method.utils"; -import clusterService from "./cluster.service"; -import { dlog } from "./deployment-logs.service"; -import gitService from "./git.service"; -import namespaceService from "./namespace.service"; -import paramService, { ParamService } from "./param.service"; -import registryService, { BUILD_NAMESPACE } from "./registry.service"; -import { KubeObjectNameUtils } from "../utils/kube-object-name.utils"; -import { V1JobStatus, V1ResourceRequirements } from "@kubernetes/client-node"; -import appGitSshKeyService from "./app-git-ssh-key.service"; -import agentGitSshKeyService from "./agent-git-ssh-key.service"; -import { GitHashUtils } from "@/shared/utils/git-hash.utils"; -import { BuildTargetSource } from "@/shared/model/deployment-source.model"; -import { RollbackAnnotationUtils } from "@/shared/utils/rollback-annotation.utils"; +import { AppExtendedModel } from '@/shared/model/app-extended.model'; +import { AppBuildMethod } from '@/shared/model/app-source-info.model'; +import { AgentExtendedModel } from '@/shared/model/agent-extended.model'; +import { BuildJobModel } from '@/shared/model/build-job'; +import { GlobalBuildJobModel } from '@/shared/model/global-build-job.model'; +import { ServiceException } from '@/shared/model/service.exception.model'; +import { WorkloadType } from '@/shared/model/runtime-type.model'; +import { Constants } from '../../shared/utils/constants'; +import dataAccess from '../adapter/db.client'; +import k3s from '../adapter/kubernetes-api.adapter'; +import buildQueueInitContainer from './build-job-builders/build-init-container.service'; +import dockerfileBuildJobBuilder from './build-job-builders/dockerfile-build-job-builder.service'; +import frameworkBuildJobBuilder from './build-job-builders/framework-build-job-builder.service'; +import railpackBuildJobBuilder from './build-job-builders/railpack-build-job-builder.service'; +import { BuildJobBuilder } from './build-job-builders/build-job-builder.interface'; +import { AppBuildMethodUtils } from '@/shared/utils/app-build-method.utils'; +import clusterService from './cluster.service'; +import { dlog } from './deployment-logs.service'; +import gitService from './git.service'; +import namespaceService from './namespace.service'; +import paramService, { ParamService } from './param.service'; +import registryService, { BUILD_NAMESPACE } from './registry.service'; +import { KubeObjectNameUtils } from '../utils/kube-object-name.utils'; +import { V1JobStatus, V1ResourceRequirements } from '@kubernetes/client-node'; +import appGitSshKeyService from './app-git-ssh-key.service'; +import agentGitSshKeyService from './agent-git-ssh-key.service'; +import { GitHashUtils } from '@/shared/utils/git-hash.utils'; +import { BuildTargetSource } from '@/shared/model/deployment-source.model'; +import { RollbackAnnotationUtils } from '@/shared/utils/rollback-annotation.utils'; type BuildWorkload = AppExtendedModel | AgentExtendedModel; -type BuildWorkloadOptions = { - forceBuild?: boolean; - target?: BuildTargetSource; -}; +type BuildWorkloadOptions = { forceBuild?: boolean; target?: BuildTargetSource }; class BuildService { - - async buildApp(deploymentId: string, app: AppExtendedModel, forceBuild: boolean = false): Promise<[string, string, string, boolean]> { - return this.buildWorkload(deploymentId, app, 'app', { forceBuild }); + async buildApp(deploymentId: string, app: AppExtendedModel, forceBuild: boolean = false): Promise<[string, string, string, boolean]> { + return this.buildWorkload(deploymentId, app, 'app', { forceBuild }); + } + + async buildAppAtCommit(deploymentId: string, app: AppExtendedModel, target: BuildTargetSource): Promise<[string, string, string, boolean]> { + return this.buildWorkload(deploymentId, app, 'app', { target }); + } + + async buildAgent(deploymentId: string, agent: AgentExtendedModel, forceBuild: boolean = false): Promise<[string, string, string, boolean]> { + return this.buildWorkload(deploymentId, agent, 'agent', { forceBuild }); + } + + async buildWorkload( + deploymentId: string, + workload: BuildWorkload, + workloadType: WorkloadType, + options: BuildWorkloadOptions = {} + ): Promise<[string, string, string, boolean]> { + const { forceBuild = false, target } = options; + await namespaceService.createNamespaceIfNotExists(BUILD_NAMESPACE); + const registryLocation = (await paramService.getString(ParamService.REGISTRY_SOTRAGE_LOCATION)) ?? Constants.INTERNAL_REGISTRY_LOCATION; + await registryService.deployRegistry(registryLocation); + + const buildsForWorkload = await this.getBuildsForWorkload(workload.id); + if (buildsForWorkload.some((job) => job.status === 'RUNNING' || job.status === 'PENDING')) { + throw new ServiceException(`A build job is already running for this ${workloadType}.`); } - async buildAppAtCommit(deploymentId: string, app: AppExtendedModel, target: BuildTargetSource): Promise<[string, string, string, boolean]> { - return this.buildWorkload(deploymentId, app, 'app', { target }); - } + const buildMethod = this.getBuildMethod(workload, workloadType); + await dlog(deploymentId, `Initialized ${workloadType} build...`); + await dlog(deploymentId, `Selected build method: ${buildMethod}`); + await dlog(deploymentId, `Trying to clone repository...`); - async buildAgent(deploymentId: string, agent: AgentExtendedModel, forceBuild: boolean = false): Promise<[string, string, string, boolean]> { - return this.buildWorkload(deploymentId, agent, 'agent', { forceBuild }); + if (target) { + await dlog(deploymentId, `Building specific git commit ${target.gitCommitHash}...`); + return this.createAndStartBuildJob(deploymentId, workload, workloadType, target); } - async buildWorkload(deploymentId: string, workload: BuildWorkload, workloadType: WorkloadType, options: BuildWorkloadOptions = {}): Promise<[string, string, string, boolean]> { - const { forceBuild = false, target } = options; - await namespaceService.createNamespaceIfNotExists(BUILD_NAMESPACE); - const registryLocation = await paramService.getString(ParamService.REGISTRY_SOTRAGE_LOCATION) - ?? Constants.INTERNAL_REGISTRY_LOCATION; - await registryService.deployRegistry(registryLocation); - - const buildsForWorkload = await this.getBuildsForWorkload(workload.id); - if (buildsForWorkload.some((job) => job.status === 'RUNNING' || job.status === 'PENDING')) { - throw new ServiceException(`A build job is already running for this ${workloadType}.`); - } - - const buildMethod = this.getBuildMethod(workload, workloadType); - await dlog(deploymentId, `Initialized ${workloadType} build...`); - await dlog(deploymentId, `Selected build method: ${buildMethod}`); - await dlog(deploymentId, `Trying to clone repository...`); - - if (target) { - await dlog(deploymentId, `Building specific git commit ${target.gitCommitHash}...`); - return this.createAndStartBuildJob(deploymentId, workload, workloadType, target); - } - - const latestSuccessfulBuild = buildsForWorkload.find(x => x.status === 'SUCCEEDED'); - const { latestRemoteGitHash, latestRemoteGitCommitMessage } = await gitService.openGitContext({ - ...workload, - workloadType, - }, async (ctx) => { - if (buildMethod === 'DOCKERFILE') { - await ctx.checkIfDockerfileExists(); - } - - const [hash, message] = await Promise.all([ - ctx.getLatestRemoteCommitHash(), - ctx.getLatestRemoteCommitMessage(), - ]); - return { latestRemoteGitHash: hash, latestRemoteGitCommitMessage: message }; - }); - - await dlog(deploymentId, `Cloned repository successfully`); - await dlog(deploymentId, `Latest remote git hash: ${latestRemoteGitHash}`); - - if (!forceBuild && latestSuccessfulBuild?.gitCommit && latestRemoteGitHash && - latestSuccessfulBuild.gitCommit === latestRemoteGitHash) { - const imageTag = GitHashUtils.shortGitHash(latestRemoteGitHash) ?? 'latest'; - if (await registryService.doesImageExist(workload.id, imageTag)) { - await dlog(deploymentId, `Latest build is already up to date with git repository, using container from last build.`); - return [latestSuccessfulBuild.name, latestRemoteGitHash, latestRemoteGitCommitMessage, true]; - } - - await dlog(deploymentId, `Docker Image for last build not found in internal registry, creating new build.`); - } - - return this.createAndStartBuildJob(deploymentId, workload, workloadType, { - gitCommitHash: latestRemoteGitHash, - gitCommitMessage: latestRemoteGitCommitMessage, - }); - } + const latestSuccessfulBuild = buildsForWorkload.find((x) => x.status === 'SUCCEEDED'); + const { latestRemoteGitHash, latestRemoteGitCommitMessage } = await gitService.openGitContext({ ...workload, workloadType }, async (ctx) => { + if (buildMethod === 'DOCKERFILE') { + await ctx.checkIfDockerfileExists(); + } - private async createAndStartBuildJob( - deploymentId: string, - workload: BuildWorkload, - workloadType: WorkloadType, - source: BuildTargetSource, - ): Promise<[string, string, string, boolean]> { - const buildName = KubeObjectNameUtils.addRandomSuffix(KubeObjectNameUtils.toJobName(workload.id)); - const buildMethod = this.getBuildMethod(workload, workloadType); - const builder = this.getBuilder(buildMethod); - - await dlog(deploymentId, `Creating build job with name: ${buildName}`); - await buildQueueInitContainer.ensureRbacResources(); - - if (buildMethod === 'DOCKERFILE') { - await dlog(deploymentId, `Dockerfile path: ${workload.dockerfilePath || './Dockerfile'}`); - } else if (buildMethod === 'FRAMEWORK') { - const app = workload as AppExtendedModel; - await dlog(deploymentId, `Framework build (${app.framework ?? 'unknown'}) with Railpack prepare, build and start overrides.`); - } else { - await dlog(deploymentId, `Railpack build will run queue wait, prepare step, and BuildKit build in sequence.`); - } - - const queuedAt = Date.now().toString(); - const schedulingConfig = await this.getBuildSchedulingConfig(deploymentId); - const maxParallelBuilds = await this.getMaxParallelBuilds(deploymentId); - const gitSshPrivateKeySecretName = workload.sourceType === 'GIT_SSH' - ? await this.createTemporaryGitSshBuildSecret(workloadType, workload.id, buildName) - : undefined; - - try { - const jobDefinition = await builder.buildJobDefinition({ - workload, - workloadType, - buildName, - deploymentId, - latestRemoteGitHash: source.gitCommitHash, - latestRemoteGitCommitMessage: source.gitCommitMessage ?? '', - queuedAt, - ...schedulingConfig, - maxParallelBuilds, - gitSshPrivateKeySecretName, - isRollback: source.isRollback ?? false, - }); - - await k3s.batch.createNamespacedJob({ namespace: BUILD_NAMESPACE, body: jobDefinition }); - } catch (error) { - await this.deleteTemporaryGitSshBuildSecret(gitSshPrivateKeySecretName); - throw error; - } - await dlog(deploymentId, `Build job ${buildName} scheduled successfully`); - - return [buildName, source.gitCommitHash, source.gitCommitMessage ?? '', false]; - } + const [hash, message] = await Promise.all([ctx.getLatestRemoteCommitHash(), ctx.getLatestRemoteCommitMessage()]); + return { latestRemoteGitHash: hash, latestRemoteGitCommitMessage: message }; + }); - private getBuildMethod(workload: BuildWorkload, workloadType: WorkloadType): AppBuildMethod { - if (workloadType === 'agent') { - return 'DOCKERFILE'; - } - return AppBuildMethodUtils.normalize(workload.buildMethod); - } + await dlog(deploymentId, `Cloned repository successfully`); + await dlog(deploymentId, `Latest remote git hash: ${latestRemoteGitHash}`); - private async getMaxParallelBuilds(deploymentId: string): Promise { - const configured = await paramService.getNumber(ParamService.MAX_PARALLEL_BUILDS); - if (configured === undefined) { - throw new ServiceException('Build settings have not been initialized yet.'); - } - const maxParallelBuilds = Math.min(Constants.MAX_PARALLEL_BUILDS_LIMIT, Math.max(Constants.DEFAULT_MAX_PARALLEL_BUILDS, Math.floor(configured))); - await dlog(deploymentId, `Max parallel builds: ${maxParallelBuilds}`); - return maxParallelBuilds; - } + if (!forceBuild && latestSuccessfulBuild?.gitCommit && latestRemoteGitHash && latestSuccessfulBuild.gitCommit === latestRemoteGitHash) { + const imageTag = GitHashUtils.shortGitHash(latestRemoteGitHash) ?? 'latest'; + if (await registryService.doesImageExist(workload.id, imageTag)) { + await dlog(deploymentId, `Latest build is already up to date with git repository, using container from last build.`); + return [latestSuccessfulBuild.name, latestRemoteGitHash, latestRemoteGitCommitMessage, true]; + } - private getBuilder(buildMethod: AppBuildMethod): BuildJobBuilder { - if (buildMethod === 'DOCKERFILE') { - return dockerfileBuildJobBuilder; - } - if (buildMethod === 'FRAMEWORK') { - return frameworkBuildJobBuilder; - } - return railpackBuildJobBuilder; + await dlog(deploymentId, `Docker Image for last build not found in internal registry, creating new build.`); } - private async getBuildSchedulingConfig(deploymentId: string): Promise<{ - nodeSelector?: Record; - resources?: V1ResourceRequirements; - }> { - const buildNode = await paramService.getString(ParamService.BUILD_NODE); - let nodeSelector: Record | undefined; - let resources: V1ResourceRequirements | undefined; - - if (buildNode === Constants.BUILD_NODE_K3S_NATIVE_VALUE) { - const [memoryLimit, memoryReservation, cpuLimit, cpuReservation] = await Promise.all([ - paramService.getNumber(ParamService.BUILD_MEMORY_LIMIT), - paramService.getNumber(ParamService.BUILD_MEMORY_RESERVATION), - paramService.getNumber(ParamService.BUILD_CPU_LIMIT), - paramService.getNumber(ParamService.BUILD_CPU_RESERVATION), - ]); - const hasLimits = memoryLimit || cpuLimit; - const hasRequests = memoryReservation || cpuReservation; - if (hasLimits || hasRequests) { - resources = { - ...(hasLimits ? { - limits: { - ...(cpuLimit ? { cpu: `${cpuLimit}m` } : {}), - ...(memoryLimit ? { memory: `${memoryLimit}M` } : {}), - } - } : {}), - ...(hasRequests ? { - requests: { - ...(cpuReservation ? { cpu: `${cpuReservation}m` } : {}), - ...(memoryReservation ? { memory: `${memoryReservation}M` } : {}), - } - } : {}), - }; - } - - const resourceLimitsString = [ - memoryLimit ? `memory limit: ${memoryLimit}M` : null, - memoryReservation ? `memory reservation: ${memoryReservation}M` : null, - cpuLimit ? `CPU limit: ${cpuLimit}m` : null, - cpuReservation ? `CPU reservation: ${cpuReservation}m` : null, - ]; - await dlog(deploymentId, `Build scheduling: k3s native - ${resourceLimitsString.filter(Boolean).join(', ') || 'no resource limits or reservations configured'}`); - return { resources }; - } - - if (buildNode) { - const nodes = await clusterService.getNodeInfo(); - const targetNode = nodes.find(n => n.name === buildNode); - if (!targetNode || !targetNode.schedulable) { - throw new ServiceException(`Configured build node '${buildNode}' is not schedulable. Please update build settings.`); - } - - nodeSelector = { 'kubernetes.io/hostname': buildNode }; - await dlog(deploymentId, `Build node pinned to: ${buildNode}`); - return { nodeSelector }; - } - - try { - const [nodeResources, nodeInfos] = await Promise.all([ - clusterService.getNodeResourceUsage(), - clusterService.getNodeInfo(), - ]); - const schedulableNames = new Set(nodeInfos.filter(n => n.schedulable).map(n => n.name)); - const bestNode = nodeResources - .filter((n): n is typeof n & { ramUsage: number } => schedulableNames.has(n.name) && n.ramUsage !== null) - .sort((a, b) => (b.ramCapacity - b.ramUsage) - (a.ramCapacity - a.ramUsage))[0]; - if (bestNode) { - nodeSelector = { 'kubernetes.io/hostname': bestNode.name }; - await dlog(deploymentId, `Auto-selected build node with most available resources: ${bestNode.name}`); - } - } catch { - await dlog(deploymentId, `Could not determine best build node, scheduling on any available node.`); - } - - return { nodeSelector }; + return this.createAndStartBuildJob(deploymentId, workload, workloadType, { + gitCommitHash: latestRemoteGitHash, + gitCommitMessage: latestRemoteGitCommitMessage + }); + } + + private async createAndStartBuildJob( + deploymentId: string, + workload: BuildWorkload, + workloadType: WorkloadType, + source: BuildTargetSource + ): Promise<[string, string, string, boolean]> { + const buildName = KubeObjectNameUtils.addRandomSuffix(KubeObjectNameUtils.toJobName(workload.id)); + const buildMethod = this.getBuildMethod(workload, workloadType); + const builder = this.getBuilder(buildMethod); + + await dlog(deploymentId, `Creating build job with name: ${buildName}`); + await buildQueueInitContainer.ensureRbacResources(); + + if (buildMethod === 'DOCKERFILE') { + await dlog(deploymentId, `Dockerfile path: ${workload.dockerfilePath || './Dockerfile'}`); + } else if (buildMethod === 'FRAMEWORK') { + const app = workload as AppExtendedModel; + await dlog(deploymentId, `Framework build (${app.framework ?? 'unknown'}) with Railpack prepare, build and start overrides.`); + } else { + await dlog(deploymentId, `Railpack build will run queue wait, prepare step, and BuildKit build in sequence.`); } - async deleteAllBuildsOfApp(appId: string) { - return this.deleteAllBuildsOfWorkload(appId); + const queuedAt = Date.now().toString(); + const schedulingConfig = await this.getBuildSchedulingConfig(deploymentId); + const maxParallelBuilds = await this.getMaxParallelBuilds(deploymentId); + const gitSshPrivateKeySecretName = + workload.sourceType === 'GIT_SSH' ? await this.createTemporaryGitSshBuildSecret(workloadType, workload.id, buildName) : undefined; + + try { + const jobDefinition = await builder.buildJobDefinition({ + workload, + workloadType, + buildName, + deploymentId, + latestRemoteGitHash: source.gitCommitHash, + latestRemoteGitCommitMessage: source.gitCommitMessage ?? '', + queuedAt, + ...schedulingConfig, + maxParallelBuilds, + gitSshPrivateKeySecretName, + isRollback: source.isRollback ?? false + }); + + await k3s.batch.createNamespacedJob({ namespace: BUILD_NAMESPACE, body: jobDefinition }); + } catch (error) { + await this.deleteTemporaryGitSshBuildSecret(gitSshPrivateKeySecretName); + throw error; } + await dlog(deploymentId, `Build job ${buildName} scheduled successfully`); - async deleteAllBuildsOfAgent(agentId: string) { - return this.deleteAllBuildsOfWorkload(agentId); - } + return [buildName, source.gitCommitHash, source.gitCommitMessage ?? '', false]; + } - async deleteAllBuildsOfWorkload(workloadId: string) { - const jobNamePrefix = KubeObjectNameUtils.toJobName(workloadId); - const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); - const jobsOfBuild = jobs.items.filter((job) => job.metadata?.name?.startsWith(jobNamePrefix)); - for (const job of jobsOfBuild) { - await this.deleteBuild(job.metadata?.name!); - } + private getBuildMethod(workload: BuildWorkload, workloadType: WorkloadType): AppBuildMethod { + if (workloadType === 'agent') { + return 'DOCKERFILE'; } + return AppBuildMethodUtils.normalize(workload.buildMethod); + } - async deleteAllFailedOrSuccededBuilds() { - const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); - const jobsToDelete = jobs.items.filter((job) => { - const status = this.getJobStatusString(job.status); - return status !== 'RUNNING' && status !== 'PENDING'; - }); - for (const job of jobsToDelete) { - await this.deleteBuild(job.metadata?.name!); - } + private async getMaxParallelBuilds(deploymentId: string): Promise { + const configured = await paramService.getNumber(ParamService.MAX_PARALLEL_BUILDS); + if (configured === undefined) { + throw new ServiceException('Build settings have not been initialized yet.'); } - - async deleteAllBuildsOfProject(projectId: string) { - const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); - const jobsOfProject = jobs.items.filter((job) => job.metadata?.annotations?.[Constants.QS_ANNOTATION_PROJECT_ID] === projectId); - for (const job of jobsOfProject) { - await this.deleteBuild(job.metadata?.name!); - } + const maxParallelBuilds = Math.min(Constants.MAX_PARALLEL_BUILDS_LIMIT, Math.max(Constants.DEFAULT_MAX_PARALLEL_BUILDS, Math.floor(configured))); + await dlog(deploymentId, `Max parallel builds: ${maxParallelBuilds}`); + return maxParallelBuilds; + } + + private getBuilder(buildMethod: AppBuildMethod): BuildJobBuilder { + if (buildMethod === 'DOCKERFILE') { + return dockerfileBuildJobBuilder; } - - async getBuildByName(buildName: string) { - const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); - return jobs.items.find((job) => job.metadata?.name === buildName); + if (buildMethod === 'FRAMEWORK') { + return frameworkBuildJobBuilder; } - - async getAppIdByBuildName(buildName: string) { - const job = await this.getBuildByName(buildName); - if (!job) { - throw new ServiceException(`No build found with name ${buildName}`); - } - const appId = job.metadata?.annotations?.[Constants.QS_ANNOTATION_APP_ID]; - if (!appId) { - throw new ServiceException(`No appId found for build ${buildName}`); - } - return appId; + return railpackBuildJobBuilder; + } + + private async getBuildSchedulingConfig(deploymentId: string): Promise<{ nodeSelector?: Record; resources?: V1ResourceRequirements }> { + const buildNode = await paramService.getString(ParamService.BUILD_NODE); + let nodeSelector: Record | undefined; + let resources: V1ResourceRequirements | undefined; + + if (buildNode === Constants.BUILD_NODE_K3S_NATIVE_VALUE) { + const [memoryLimit, memoryReservation, cpuLimit, cpuReservation] = await Promise.all([ + paramService.getNumber(ParamService.BUILD_MEMORY_LIMIT), + paramService.getNumber(ParamService.BUILD_MEMORY_RESERVATION), + paramService.getNumber(ParamService.BUILD_CPU_LIMIT), + paramService.getNumber(ParamService.BUILD_CPU_RESERVATION) + ]); + const hasLimits = memoryLimit || cpuLimit; + const hasRequests = memoryReservation || cpuReservation; + if (hasLimits || hasRequests) { + resources = { + ...(hasLimits ? { limits: { ...(cpuLimit ? { cpu: `${cpuLimit}m` } : {}), ...(memoryLimit ? { memory: `${memoryLimit}M` } : {}) } } : {}), + ...(hasRequests + ? { requests: { ...(cpuReservation ? { cpu: `${cpuReservation}m` } : {}), ...(memoryReservation ? { memory: `${memoryReservation}M` } : {}) } } + : {}) + }; + } + + const resourceLimitsString = [ + memoryLimit ? `memory limit: ${memoryLimit}M` : null, + memoryReservation ? `memory reservation: ${memoryReservation}M` : null, + cpuLimit ? `CPU limit: ${cpuLimit}m` : null, + cpuReservation ? `CPU reservation: ${cpuReservation}m` : null + ]; + await dlog( + deploymentId, + `Build scheduling: k3s native - ${resourceLimitsString.filter(Boolean).join(', ') || 'no resource limits or reservations configured'}` + ); + return { resources }; } - async getWorkloadByBuildName(buildName: string): Promise<{ workloadId: string; workloadType: WorkloadType }> { - const job = await this.getBuildByName(buildName); - if (!job) { - throw new ServiceException(`No build found with name ${buildName}`); - } - const workloadType = job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_TYPE] as WorkloadType | undefined - ?? (job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] ? 'agent' : 'app'); - const workloadId = job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] - ?? job.metadata?.annotations?.[Constants.QS_ANNOTATION_APP_ID]; - if (!workloadId) { - throw new ServiceException(`No workloadId found for build ${buildName}`); - } - return { workloadId, workloadType }; - } + if (buildNode) { + const nodes = await clusterService.getNodeInfo(); + const targetNode = nodes.find((n) => n.name === buildNode); + if (!targetNode || !targetNode.schedulable) { + throw new ServiceException(`Configured build node '${buildNode}' is not schedulable. Please update build settings.`); + } - async deleteBuild(buildName: string) { - const job = await this.getBuildByName(buildName); - const gitSshSecretName = job?.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_SSH_SECRET]; - await k3s.batch.deleteNamespacedJob({ name: buildName, namespace: BUILD_NAMESPACE }); - await this.deleteTemporaryGitSshBuildSecret(gitSshSecretName); - console.log(`Deleted build job ${buildName}`); + nodeSelector = { 'kubernetes.io/hostname': buildNode }; + await dlog(deploymentId, `Build node pinned to: ${buildNode}`); + return { nodeSelector }; } - async getBuildsForApp(appId: string) { - return this.getBuildsForWorkload(appId); + try { + const [nodeResources, nodeInfos] = await Promise.all([clusterService.getNodeResourceUsage(), clusterService.getNodeInfo()]); + const schedulableNames = new Set(nodeInfos.filter((n) => n.schedulable).map((n) => n.name)); + const bestNode = nodeResources + .filter((n): n is typeof n & { ramUsage: number } => schedulableNames.has(n.name) && n.ramUsage !== null) + .sort((a, b) => b.ramCapacity - b.ramUsage - (a.ramCapacity - a.ramUsage))[0]; + if (bestNode) { + nodeSelector = { 'kubernetes.io/hostname': bestNode.name }; + await dlog(deploymentId, `Auto-selected build node with most available resources: ${bestNode.name}`); + } + } catch { + await dlog(deploymentId, `Could not determine best build node, scheduling on any available node.`); } - async getBuildsForAgent(agentId: string) { - return this.getBuildsForWorkload(agentId); - } + return { nodeSelector }; + } - async getBuildsForWorkload(workloadId: string) { - const jobNamePrefix = KubeObjectNameUtils.toJobName(workloadId); - const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); - const jobsOfBuild = jobs.items.filter((job) => job.metadata?.name?.startsWith(jobNamePrefix)); - const builds = jobsOfBuild.map((job) => ({ - name: job.metadata?.name, - startTime: job.status?.startTime, - status: this.getJobStatusString(job.status), - workloadId: workloadId, - workloadType: (job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_TYPE] as WorkloadType | undefined) - ?? (job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] ? 'agent' : 'app'), - gitCommit: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT], - gitCommitMessage: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT_MESSAGE], - deploymentId: job.metadata?.annotations?.[Constants.QS_ANNOTATION_DEPLOYMENT_ID], - buildMethod: job.metadata?.annotations?.[Constants.QS_ANNOTATION_BUILD_METHOD] as AppBuildMethod | undefined, - isRollback: RollbackAnnotationUtils.isRollbackAnnotation(job.metadata?.annotations), - } as BuildJobModel)); - builds.sort((a, b) => { - if (a.startTime && b.startTime) { - return new Date(b.startTime).getTime() - new Date(a.startTime).getTime(); - } - return 0; - }); - return builds; - } + async deleteAllBuildsOfApp(appId: string) { + return this.deleteAllBuildsOfWorkload(appId); + } - async getJobStatus(buildName: string): Promise<'UNKNOWN' | 'RUNNING' | 'FAILED' | 'SUCCEEDED' | 'PENDING'> { - try { - const response = await k3s.batch.readNamespacedJobStatus({ name: buildName, namespace: BUILD_NAMESPACE }); - return this.getJobStatusString(response.status); - } catch (err) { - console.error(err); - } - return 'UNKNOWN'; + async deleteAllBuildsOfAgent(agentId: string) { + return this.deleteAllBuildsOfWorkload(agentId); + } + + async deleteAllBuildsOfWorkload(workloadId: string) { + const jobNamePrefix = KubeObjectNameUtils.toJobName(workloadId); + const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); + const jobsOfBuild = jobs.items.filter((job) => job.metadata?.name?.startsWith(jobNamePrefix)); + for (const job of jobsOfBuild) { + await this.deleteBuild(job.metadata?.name!); + } + } + + async deleteAllFailedOrSuccededBuilds() { + const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); + const jobsToDelete = jobs.items.filter((job) => { + const status = this.getJobStatusString(job.status); + return status !== 'RUNNING' && status !== 'PENDING'; + }); + for (const job of jobsToDelete) { + await this.deleteBuild(job.metadata?.name!); } + } - getJobStatusString(status?: V1JobStatus) { - if (!status) { - return 'UNKNOWN'; - } - if ((status.ready ?? 0) > 0) { - return 'RUNNING'; - } - if ((status.failed ?? 0) > 0) { - return 'FAILED'; - } - if ((status.succeeded ?? 0) > 0) { - return 'SUCCEEDED'; - } - if ((status.terminating ?? 0) > 0) { - return 'UNKNOWN'; - } - if (status.completionTime) { - return 'SUCCEEDED'; - } - if ((status.active ?? 0) > 0) { - return 'PENDING'; - } - return 'UNKNOWN'; + async deleteAllBuildsOfProject(projectId: string) { + const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); + const jobsOfProject = jobs.items.filter((job) => job.metadata?.annotations?.[Constants.QS_ANNOTATION_PROJECT_ID] === projectId); + for (const job of jobsOfProject) { + await this.deleteBuild(job.metadata?.name!); } + } + + async getBuildByName(buildName: string) { + const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); + return jobs.items.find((job) => job.metadata?.name === buildName); + } - async getAllBuilds(): Promise { - const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); - const appIds = Array.from(new Set( - jobs.items - .map((job) => job.metadata?.annotations?.[Constants.QS_ANNOTATION_APP_ID]) - .filter((id): id is string => !!id) - )); - const agentIds = Array.from(new Set( - jobs.items - .map((job) => job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID]) - .filter((id): id is string => !!id) - )); - - const [apps, agents] = await Promise.all([ - dataAccess.client.app.findMany({ - where: { id: { in: appIds } }, - include: { project: true }, - }), - dataAccess.client.agent.findMany({ - where: { id: { in: agentIds } }, - include: { project: true }, - }), - ]); - const appMap = new Map(apps.map((a) => [a.id, a])); - const agentMap = new Map(agents.map((a) => [a.id, a])); - - return jobs.items - .map((job) => { - const workloadType = (job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_TYPE] as WorkloadType | undefined) - ?? (job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] ? 'agent' : 'app'); - const workloadId = job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_ID] - ?? job.metadata?.annotations?.[workloadType === 'agent' ? Constants.QS_ANNOTATION_AGENT_ID : Constants.QS_ANNOTATION_APP_ID] - ?? ''; - const projectId = job.metadata?.annotations?.[Constants.QS_ANNOTATION_PROJECT_ID]; - const workload = workloadType === 'agent' - ? agentMap.get(workloadId) - : appMap.get(workloadId); - return { - name: job.metadata?.name ?? '', - startTime: job.status?.startTime ?? new Date(0), - status: this.getJobStatusString(job.status), - workloadId, - workloadType, - gitCommit: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT] ?? '', - gitCommitMessage: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT_MESSAGE], - deploymentId: job.metadata?.annotations?.[Constants.QS_ANNOTATION_DEPLOYMENT_ID] ?? '', - projectId: projectId ?? '', - workloadName: workload?.name ?? workloadId ?? 'Unknown', - projectName: workload?.project?.name ?? projectId ?? 'Unknown', - completionTime: job.status?.completionTime ?? undefined, - buildMethod: job.metadata?.annotations?.[Constants.QS_ANNOTATION_BUILD_METHOD] as AppBuildMethod | undefined, - } as GlobalBuildJobModel; - }) - .sort((a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime()); + async getAppIdByBuildName(buildName: string) { + const job = await this.getBuildByName(buildName); + if (!job) { + throw new ServiceException(`No build found with name ${buildName}`); } + const appId = job.metadata?.annotations?.[Constants.QS_ANNOTATION_APP_ID]; + if (!appId) { + throw new ServiceException(`No appId found for build ${buildName}`); + } + return appId; + } - private createTemporaryGitSshBuildSecret(workloadType: WorkloadType, workloadId: string, buildName: string) { - return workloadType === 'agent' - ? agentGitSshKeyService.createTemporaryBuildSecret(workloadId, buildName) - : appGitSshKeyService.createTemporaryBuildSecret(workloadId, buildName); + async getWorkloadByBuildName(buildName: string): Promise<{ workloadId: string; workloadType: WorkloadType }> { + const job = await this.getBuildByName(buildName); + if (!job) { + throw new ServiceException(`No build found with name ${buildName}`); + } + const workloadType = + (job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_TYPE] as WorkloadType | undefined) ?? + (job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] ? 'agent' : 'app'); + const workloadId = job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] ?? job.metadata?.annotations?.[Constants.QS_ANNOTATION_APP_ID]; + if (!workloadId) { + throw new ServiceException(`No workloadId found for build ${buildName}`); + } + return { workloadId, workloadType }; + } + + async deleteBuild(buildName: string) { + const job = await this.getBuildByName(buildName); + const gitSshSecretName = job?.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_SSH_SECRET]; + await k3s.batch.deleteNamespacedJob({ name: buildName, namespace: BUILD_NAMESPACE }); + await this.deleteTemporaryGitSshBuildSecret(gitSshSecretName); + console.log(`Deleted build job ${buildName}`); + } + + async getBuildsForApp(appId: string) { + return this.getBuildsForWorkload(appId); + } + + async getBuildsForAgent(agentId: string) { + return this.getBuildsForWorkload(agentId); + } + + async getBuildsForWorkload(workloadId: string) { + const jobNamePrefix = KubeObjectNameUtils.toJobName(workloadId); + const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); + const jobsOfBuild = jobs.items.filter((job) => job.metadata?.name?.startsWith(jobNamePrefix)); + const builds = jobsOfBuild.map( + (job) => + ({ + name: job.metadata?.name, + startTime: job.status?.startTime, + status: this.getJobStatusString(job.status), + workloadId: workloadId, + workloadType: + (job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_TYPE] as WorkloadType | undefined) ?? + (job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] ? 'agent' : 'app'), + gitCommit: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT], + gitCommitMessage: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT_MESSAGE], + deploymentId: job.metadata?.annotations?.[Constants.QS_ANNOTATION_DEPLOYMENT_ID], + buildMethod: job.metadata?.annotations?.[Constants.QS_ANNOTATION_BUILD_METHOD] as AppBuildMethod | undefined, + isRollback: RollbackAnnotationUtils.isRollbackAnnotation(job.metadata?.annotations) + }) as BuildJobModel + ); + builds.sort((a, b) => { + if (a.startTime && b.startTime) { + return new Date(b.startTime).getTime() - new Date(a.startTime).getTime(); + } + return 0; + }); + return builds; + } + + async getJobStatus(buildName: string): Promise<'UNKNOWN' | 'RUNNING' | 'FAILED' | 'SUCCEEDED' | 'PENDING'> { + try { + const response = await k3s.batch.readNamespacedJobStatus({ name: buildName, namespace: BUILD_NAMESPACE }); + return this.getJobStatusString(response.status); + } catch (err) { + console.error(err); } + return 'UNKNOWN'; + } - private async deleteTemporaryGitSshBuildSecret(secretName?: string) { - await appGitSshKeyService.deleteTemporaryBuildSecret(secretName); + getJobStatusString(status?: V1JobStatus) { + if (!status) { + return 'UNKNOWN'; + } + if ((status.ready ?? 0) > 0) { + return 'RUNNING'; + } + if ((status.failed ?? 0) > 0) { + return 'FAILED'; + } + if ((status.succeeded ?? 0) > 0) { + return 'SUCCEEDED'; + } + if ((status.terminating ?? 0) > 0) { + return 'UNKNOWN'; + } + if (status.completionTime) { + return 'SUCCEEDED'; + } + if ((status.active ?? 0) > 0) { + return 'PENDING'; } + return 'UNKNOWN'; + } + + async getAllBuilds(): Promise { + const jobs = await k3s.batch.listNamespacedJob({ namespace: BUILD_NAMESPACE }); + const appIds = Array.from(new Set(jobs.items.map((job) => job.metadata?.annotations?.[Constants.QS_ANNOTATION_APP_ID]).filter((id): id is string => !!id))); + const agentIds = Array.from( + new Set(jobs.items.map((job) => job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID]).filter((id): id is string => !!id)) + ); + + const [apps, agents] = await Promise.all([ + dataAccess.client.app.findMany({ where: { id: { in: appIds } }, include: { project: true } }), + dataAccess.client.agent.findMany({ where: { id: { in: agentIds } }, include: { project: true } }) + ]); + const appMap = new Map(apps.map((a) => [a.id, a])); + const agentMap = new Map(agents.map((a) => [a.id, a])); + + return jobs.items + .map((job) => { + const workloadType = + (job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_TYPE] as WorkloadType | undefined) ?? + (job.metadata?.annotations?.[Constants.QS_ANNOTATION_AGENT_ID] ? 'agent' : 'app'); + const workloadId = + job.metadata?.annotations?.[Constants.QS_ANNOTATION_WORKLOAD_ID] ?? + job.metadata?.annotations?.[workloadType === 'agent' ? Constants.QS_ANNOTATION_AGENT_ID : Constants.QS_ANNOTATION_APP_ID] ?? + ''; + const projectId = job.metadata?.annotations?.[Constants.QS_ANNOTATION_PROJECT_ID]; + const workload = workloadType === 'agent' ? agentMap.get(workloadId) : appMap.get(workloadId); + return { + name: job.metadata?.name ?? '', + startTime: job.status?.startTime ?? new Date(0), + status: this.getJobStatusString(job.status), + workloadId, + workloadType, + gitCommit: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT] ?? '', + gitCommitMessage: job.metadata?.annotations?.[Constants.QS_ANNOTATION_GIT_COMMIT_MESSAGE], + deploymentId: job.metadata?.annotations?.[Constants.QS_ANNOTATION_DEPLOYMENT_ID] ?? '', + projectId: projectId ?? '', + workloadName: workload?.name ?? workloadId ?? 'Unknown', + projectName: workload?.project?.name ?? projectId ?? 'Unknown', + completionTime: job.status?.completionTime ?? undefined, + buildMethod: job.metadata?.annotations?.[Constants.QS_ANNOTATION_BUILD_METHOD] as AppBuildMethod | undefined + } as GlobalBuildJobModel; + }) + .sort((a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime()); + } + + private createTemporaryGitSshBuildSecret(workloadType: WorkloadType, workloadId: string, buildName: string) { + return workloadType === 'agent' + ? agentGitSshKeyService.createTemporaryBuildSecret(workloadId, buildName) + : appGitSshKeyService.createTemporaryBuildSecret(workloadId, buildName); + } + + private async deleteTemporaryGitSshBuildSecret(secretName?: string) { + await appGitSshKeyService.deleteTemporaryBuildSecret(secretName); + } } const buildService = new BuildService(); diff --git a/src/server/services/cluster.service.unit.spec.ts b/src/server/services/cluster.service.unit.spec.ts index 81621658..f0cccf3f 100644 --- a/src/server/services/cluster.service.unit.spec.ts +++ b/src/server/services/cluster.service.unit.spec.ts @@ -46,6 +46,16 @@ describe('cluster node storage', () => { expect(nodes[1]).toMatchObject({ cpuUsage: null, ramUsage: null, diskUsageAbsolut: 10 }); }); + it('reports the oldest source timestamp among valid node measurements', async () => { + const metricTime = new Date(Date.now() - 60_000).toISOString(); + const filesystemTime = new Date(Date.now() - 120_000).toISOString(); + mocks.getNodeMetrics.mockResolvedValue({ items: [{ metadata: { name: 'node-a' }, timestamp: metricTime, usage: { cpu: '1', memory: '100Mi' } }] }); + mocks.getNodeSummary.mockResolvedValue({ node: { fs: { time: filesystemTime, usedBytes: 10, availableBytes: 90, capacityBytes: 100 } } }); + const nodes = await clusterService.getNodeResourceUsage(); + expect(nodes[0].measuredAt).toEqual(new Date(filesystemTime)); + expect(nodes[1].measuredAt).toEqual(new Date(filesystemTime)); + }); + it('does not present stale or incomplete filesystem measurements', async () => { mocks.getNodeSummary.mockImplementation(async (name: string) => ({ node: { diff --git a/src/server/services/secret.service.ts b/src/server/services/secret.service.ts index ef242870..664e5d6a 100644 --- a/src/server/services/secret.service.ts +++ b/src/server/services/secret.service.ts @@ -1,270 +1,251 @@ -import { ApiException, V1Secret } from "@kubernetes/client-node"; -import k3s from "../adapter/kubernetes-api.adapter"; -import { AppExtendedModel } from "@/shared/model/app-extended.model"; -import { AgentExtendedModel } from "@/shared/model/agent-extended.model"; -import { KubeObjectNameUtils } from "../utils/kube-object-name.utils"; -import { ServiceException } from "@/shared/model/service.exception.model"; +import { ApiException, V1Secret } from '@kubernetes/client-node'; +import k3s from '../adapter/kubernetes-api.adapter'; +import { AppExtendedModel } from '@/shared/model/app-extended.model'; +import { AgentExtendedModel } from '@/shared/model/agent-extended.model'; +import { KubeObjectNameUtils } from '../utils/kube-object-name.utils'; +import { ServiceException } from '@/shared/model/service.exception.model'; class SecretService { - - async createOrUpdateDockerPullSecret(app: AppExtendedModel) { - if (this.workloadNeedsNoPullSecret(app)) { - return; - } - return this.createOrUpdateDockerPullSecretForWorkload(app, KubeObjectNameUtils.toPullSecretId(app.id)); + async createOrUpdateDockerPullSecret(app: AppExtendedModel) { + if (this.workloadNeedsNoPullSecret(app)) { + return; } + return this.createOrUpdateDockerPullSecretForWorkload(app, KubeObjectNameUtils.toPullSecretId(app.id)); + } - async createOrUpdateAgentDockerPullSecret(agent: AgentExtendedModel) { - if (this.workloadNeedsNoPullSecret(agent)) { - return; - } - return this.createOrUpdateDockerPullSecretForWorkload(agent, KubeObjectNameUtils.toPullSecretId(agent.id)); + async createOrUpdateAgentDockerPullSecret(agent: AgentExtendedModel) { + if (this.workloadNeedsNoPullSecret(agent)) { + return; } - - private async createOrUpdateDockerPullSecretForWorkload( - workload: Pick, - secretName: string, - ) { - const dockerImage = workload.containerImageSource; - const dockerUsername = workload.containerRegistryUsername; - const dockerPassword = workload.containerRegistryPassword; - const namespace = workload.projectId; - let dockerServer = dockerImage!.split("/")[0]; - - // if no registry url is provided, use Docker Hub - if (!dockerServer.includes('.')) { - dockerServer = 'https://index.docker.io/v2/'; - } - - // Create a Docker registry secret - const dockerConfigJson = { - auths: { - [dockerServer]: { - username: dockerUsername, - password: dockerPassword, - //email: dockerEmail, - auth: Buffer.from(`${dockerUsername}:${dockerPassword}`).toString('base64'), - }, - }, - }; - - const secretManifest: V1Secret = { - metadata: { - name: secretName, - }, - data: { - '.dockerconfigjson': Buffer.from(JSON.stringify(dockerConfigJson)).toString('base64'), - }, - type: 'kubernetes.io/dockerconfigjson', - }; - - await this.saveSecret(namespace, secretName, secretManifest); - return secretName; + return this.createOrUpdateDockerPullSecretForWorkload(agent, KubeObjectNameUtils.toPullSecretId(agent.id)); + } + + private async createOrUpdateDockerPullSecretForWorkload( + workload: Pick, + secretName: string + ) { + const dockerImage = workload.containerImageSource; + const dockerUsername = workload.containerRegistryUsername; + const dockerPassword = workload.containerRegistryPassword; + const namespace = workload.projectId; + let dockerServer = dockerImage!.split('/')[0]; + + // if no registry url is provided, use Docker Hub + if (!dockerServer.includes('.')) { + dockerServer = 'https://index.docker.io/v2/'; } - async deleteUnusedSecrets(app: AppExtendedModel) { - if (this.workloadNeedsNoPullSecret(app)) { - const existingSecret = await this.getExistingSecret(app.projectId, KubeObjectNameUtils.toPullSecretId(app.id)); - if (existingSecret) { - console.log(`Deleting secret ${existingSecret.metadata?.name}...`); - await this.deleteSecretIfExists(app.projectId, existingSecret.metadata?.name!); - } + // Create a Docker registry secret + const dockerConfigJson = { + auths: { + [dockerServer]: { + username: dockerUsername, + password: dockerPassword, + //email: dockerEmail, + auth: Buffer.from(`${dockerUsername}:${dockerPassword}`).toString('base64') } + } + }; + + const secretManifest: V1Secret = { + metadata: { name: secretName }, + data: { '.dockerconfigjson': Buffer.from(JSON.stringify(dockerConfigJson)).toString('base64') }, + type: 'kubernetes.io/dockerconfigjson' + }; + + await this.saveSecret(namespace, secretName, secretManifest); + return secretName; + } + + async deleteUnusedSecrets(app: AppExtendedModel) { + if (this.workloadNeedsNoPullSecret(app)) { + const existingSecret = await this.getExistingSecret(app.projectId, KubeObjectNameUtils.toPullSecretId(app.id)); + if (existingSecret) { + console.log(`Deleting secret ${existingSecret.metadata?.name}...`); + await this.deleteSecretIfExists(app.projectId, existingSecret.metadata?.name!); + } } + } - async deleteUnusedAgentDockerPullSecret(agent: AgentExtendedModel) { - if (this.workloadNeedsNoPullSecret(agent)) { - await this.deleteSecretIfExists(agent.projectId, KubeObjectNameUtils.toPullSecretId(agent.id)); - } + async deleteUnusedAgentDockerPullSecret(agent: AgentExtendedModel) { + if (this.workloadNeedsNoPullSecret(agent)) { + await this.deleteSecretIfExists(agent.projectId, KubeObjectNameUtils.toPullSecretId(agent.id)); } - - private workloadNeedsNoPullSecret(workload: { sourceType: string; containerImageSource?: string | null | undefined; containerRegistryUsername?: string | null | undefined; containerRegistryPassword?: string | null | undefined; }) { - return workload.sourceType === 'GIT' || workload.sourceType === 'GIT_SSH' || !workload.containerImageSource || !workload.containerRegistryUsername || !workload.containerRegistryPassword; + } + + private workloadNeedsNoPullSecret(workload: { + sourceType: string; + containerImageSource?: string | null | undefined; + containerRegistryUsername?: string | null | undefined; + containerRegistryPassword?: string | null | undefined; + }) { + return ( + workload.sourceType === 'GIT' || + workload.sourceType === 'GIT_SSH' || + !workload.containerImageSource || + !workload.containerRegistryUsername || + !workload.containerRegistryPassword + ); + } + + async createSecret(namespace: string, secretManifest: V1Secret) { + const secretName = secretManifest.metadata?.name; + if (!secretName) { + throw new Error('Secret name is required.'); } - - async createSecret(namespace: string, secretManifest: V1Secret) { - const secretName = secretManifest.metadata?.name; - if (!secretName) { - throw new Error('Secret name is required.'); + console.log(`Creating secret ${secretName}...`); + await k3s.core.createNamespacedSecret({ namespace: namespace, body: secretManifest }); + } + + async updateSecret(namespace: string, secretName: string, secretManifest: V1Secret) { + await this.saveSecret(namespace, secretName, secretManifest); + } + + async saveSecret(namespace: string, secretName: string, secretManifest: V1Secret) { + //Sometimes issues occured, when starting a agent sandbox beecause of race conditions. Yes its ugly, but for now it works. Investiage in future releases. + const maxAttempts = 5; + for (let attempt = 0; attempt < maxAttempts; attempt++) { + let existingSecret: V1Secret; + try { + existingSecret = await k3s.core.readNamespacedSecret({ namespace, name: secretName }); + } catch (err) { + if ((err as ApiException).code !== 404) throw err; + try { + await this.createSecret(namespace, secretManifest); + return; + } catch (createError) { + if ((createError as ApiException).code !== 409 || attempt === maxAttempts - 1) { + throw createError; + } + continue; } - console.log(`Creating secret ${secretName}...`); - await k3s.core.createNamespacedSecret({ namespace: namespace, body: secretManifest }); - } - - async updateSecret(namespace: string, secretName: string, secretManifest: V1Secret) { - await this.saveSecret(namespace, secretName, secretManifest); - } - - async saveSecret(namespace: string, secretName: string, secretManifest: V1Secret) { - //Sometimes issues occured, when starting a agent sandbox beecause of race conditions. Yes its ugly, but for now it works. Investiage in future releases. - const maxAttempts = 5; - for (let attempt = 0; attempt < maxAttempts; attempt++) { - let existingSecret: V1Secret; - try { - existingSecret = await k3s.core.readNamespacedSecret({ namespace, name: secretName }); - } catch (err) { - if ((err as ApiException).code !== 404) throw err; - try { - await this.createSecret(namespace, secretManifest); - return; - } catch (createError) { - if ((createError as ApiException).code !== 409 || attempt === maxAttempts - 1) { - throw createError; - } - continue; - } - } - - try { - await k3s.core.replaceNamespacedSecret({ - namespace, - name: secretName, - body: { - ...secretManifest, - metadata: { - ...existingSecret.metadata, - ...secretManifest.metadata, - resourceVersion: existingSecret.metadata?.resourceVersion, - }, - }, - }); - return; - } catch (err) { - const code = (err as ApiException).code; - if ((code !== 409 && code !== 404) || attempt === maxAttempts - 1) { - throw err; - } - } + } + + try { + await k3s.core.replaceNamespacedSecret({ + namespace, + name: secretName, + body: { + ...secretManifest, + metadata: { ...existingSecret.metadata, ...secretManifest.metadata, resourceVersion: existingSecret.metadata?.resourceVersion } + } + }); + return; + } catch (err) { + const code = (err as ApiException).code; + if ((code !== 409 && code !== 404) || attempt === maxAttempts - 1) { + throw err; } + } } + } - async deleteSecretIfExists(namespace: string, secretName?: string) { - if (!secretName) { - return; - } - const existingSecret = await this.getExistingSecret(namespace, secretName); - if (existingSecret) { - console.log(`Deleting secret ${secretName}...`); - await k3s.core.deleteNamespacedSecret({ name: secretName, namespace: namespace }); - } else { - console.log(`Triggered deletion of secret ${secretName}, but secret does not exist.`); - } + async deleteSecretIfExists(namespace: string, secretName?: string) { + if (!secretName) { + return; } - - async getExistingSecret(namespace: string, secretName: string) { - const existingSecrets = await k3s.core.listNamespacedSecret({ namespace: namespace }); - const existingSecret = existingSecrets.items.find(s => s.metadata?.name === secretName); - return existingSecret; + const existingSecret = await this.getExistingSecret(namespace, secretName); + if (existingSecret) { + console.log(`Deleting secret ${secretName}...`); + await k3s.core.deleteNamespacedSecret({ name: secretName, namespace: namespace }); + } else { + console.log(`Triggered deletion of secret ${secretName}, but secret does not exist.`); } - - /** - * Creates or replaces a generic (Opaque) Secret with base64-encoded string data. - * Does NOT handle 404 on read gracefully — surfaces all non-404 errors. - */ - async createOrReplaceGenericSecret( - name: string, - namespace: string, - data: Record, - labels?: Record, - annotations?: Record, - ): Promise { - const base64Data: Record = {}; - for (const [key, value] of Object.entries(data)) { - base64Data[key] = Buffer.from(value).toString('base64'); - } - - const secretManifest: V1Secret = { - metadata: { - name, - ...(labels ? { labels } : {}), - ...(annotations ? { annotations } : {}), - }, - data: base64Data, - }; - - try { - const existingResponse = await k3s.core.readNamespacedSecret({ name: name, namespace: namespace }); - secretManifest.metadata!.resourceVersion = existingResponse.metadata?.resourceVersion; - await k3s.core.replaceNamespacedSecret({ name: name, namespace: namespace, body: secretManifest }); - } catch (err) { - const error = err as ApiException; - if (error?.code !== 404) { - console.error(`Failed to read Secret "${name}":`, error); - throw new ServiceException( - `Failed to read Secret "${name}": ${error?.message || error}`, - ); - } - await k3s.core.createNamespacedSecret({ namespace: namespace, body: secretManifest }); - } + } + + async getExistingSecret(namespace: string, secretName: string) { + const existingSecrets = await k3s.core.listNamespacedSecret({ namespace: namespace }); + const existingSecret = existingSecrets.items.find((s) => s.metadata?.name === secretName); + return existingSecret; + } + + /** + * Creates or replaces a generic (Opaque) Secret with base64-encoded string data. + * Does NOT handle 404 on read gracefully — surfaces all non-404 errors. + */ + async createOrReplaceGenericSecret( + name: string, + namespace: string, + data: Record, + labels?: Record, + annotations?: Record + ): Promise { + const base64Data: Record = {}; + for (const [key, value] of Object.entries(data)) { + base64Data[key] = Buffer.from(value).toString('base64'); } - /** - * Reads a Secret and returns its decoded data as key-value pairs. - * Returns null when the Secret does not exist (404). - */ - async getDecodedSecret(name: string, namespace: string): Promise | null> { - try { - const response = await k3s.core.readNamespacedSecret({ name: name, namespace: namespace }); - const data = response.data || {}; - const decoded: Record = {}; - for (const [key, value] of Object.entries(data)) { - decoded[key] = value ? Buffer.from(value, 'base64').toString('utf-8') : ''; - } - return decoded; - } catch (err) { - const error = err as ApiException; - if (error?.code === 404) { - return null; - } - console.error(`Failed to read Secret "${name}":`, error); - throw new ServiceException( - `Failed to read Secret "${name}": ${error?.message || error}`, - ); - } + const secretManifest: V1Secret = { metadata: { name, ...(labels ? { labels } : {}), ...(annotations ? { annotations } : {}) }, data: base64Data }; + + try { + const existingResponse = await k3s.core.readNamespacedSecret({ name: name, namespace: namespace }); + secretManifest.metadata!.resourceVersion = existingResponse.metadata?.resourceVersion; + await k3s.core.replaceNamespacedSecret({ name: name, namespace: namespace, body: secretManifest }); + } catch (err) { + const error = err as ApiException; + if (error?.code !== 404) { + console.error(`Failed to read Secret "${name}":`, error); + throw new ServiceException(`Failed to read Secret "${name}": ${error?.message || error}`); + } + await k3s.core.createNamespacedSecret({ namespace: namespace, body: secretManifest }); } - - async listDecodedSecretsByLabels(namespace: string, labels: Record): Promise; - labels: Record; - annotations: Record; - }>> { - const response = await k3s.core.listNamespacedSecret({ namespace }); - return response.items.flatMap((secret) => { - if (!secret.metadata?.name || !Object.entries(labels).every(([key, value]) => secret.metadata?.labels?.[key] === value)) { - return []; - } - - const data = Object.fromEntries(Object.entries(secret.data ?? {}).map(([key, value]) => [ - key, - value ? Buffer.from(value, 'base64').toString('utf-8') : '', - ])); - return [{ - name: secret.metadata.name, - data, - labels: secret.metadata.labels ?? {}, - annotations: secret.metadata.annotations ?? {}, - }]; - }); + } + + /** + * Reads a Secret and returns its decoded data as key-value pairs. + * Returns null when the Secret does not exist (404). + */ + async getDecodedSecret(name: string, namespace: string): Promise | null> { + try { + const response = await k3s.core.readNamespacedSecret({ name: name, namespace: namespace }); + const data = response.data || {}; + const decoded: Record = {}; + for (const [key, value] of Object.entries(data)) { + decoded[key] = value ? Buffer.from(value, 'base64').toString('utf-8') : ''; + } + return decoded; + } catch (err) { + const error = err as ApiException; + if (error?.code === 404) { + return null; + } + console.error(`Failed to read Secret "${name}":`, error); + throw new ServiceException(`Failed to read Secret "${name}": ${error?.message || error}`); } - - /** - * Deletes a Secret, silently ignoring 404 (not found). - */ - async deleteSecretSafe(name: string, namespace: string): Promise { - try { - await k3s.core.deleteNamespacedSecret({ name: name, namespace: namespace }); - } catch (err) { - const error = err as ApiException; - if (error?.code === 404) { - return; - } - console.error(`Failed to delete Secret "${name}":`, error); - throw new ServiceException( - `Failed to delete Secret "${name}": ${error?.message || error}`, - ); - } + } + + async listDecodedSecretsByLabels( + namespace: string, + labels: Record + ): Promise; labels: Record; annotations: Record }>> { + const response = await k3s.core.listNamespacedSecret({ namespace }); + return response.items.flatMap((secret) => { + if (!secret.metadata?.name || !Object.entries(labels).every(([key, value]) => secret.metadata?.labels?.[key] === value)) { + return []; + } + + const data = Object.fromEntries( + Object.entries(secret.data ?? {}).map(([key, value]) => [key, value ? Buffer.from(value, 'base64').toString('utf-8') : '']) + ); + return [{ name: secret.metadata.name, data, labels: secret.metadata.labels ?? {}, annotations: secret.metadata.annotations ?? {} }]; + }); + } + + /** + * Deletes a Secret, silently ignoring 404 (not found). + */ + async deleteSecretSafe(name: string, namespace: string): Promise { + try { + await k3s.core.deleteNamespacedSecret({ name: name, namespace: namespace }); + } catch (err) { + const error = err as ApiException; + if (error?.code === 404) { + return; + } + console.error(`Failed to delete Secret "${name}":`, error); + throw new ServiceException(`Failed to delete Secret "${name}": ${error?.message || error}`); } + } } const secretService = new SecretService(); diff --git a/src/server/services/standalone-services/app-monitoring-history-query.service.unit.spec.ts b/src/server/services/standalone-services/app-monitoring-history-query.service.unit.spec.ts index cf34ca45..3049c7ab 100644 --- a/src/server/services/standalone-services/app-monitoring-history-query.service.unit.spec.ts +++ b/src/server/services/standalone-services/app-monitoring-history-query.service.unit.spec.ts @@ -1,8 +1,10 @@ -vi.mock('@/server/adapter/app-history.adapter', () => ({ default: { getRetentionHours: vi.fn().mockResolvedValue(24), getHistory: vi.fn() } })); +vi.mock('@/server/adapter/db.client', () => ({ default: { client: {} } })); +vi.mock('./monitoring-history.service', () => ({ default: { getRetentionHours: vi.fn().mockResolvedValue(24) } })); vi.mock('@/server/adapter/kubernetes-api.adapter', () => ({ default: {} })); -import adapter from '@/server/adapter/app-history.adapter'; import historyService from '@/server/services/standalone-services/app-monitoring-history.service'; +const getRawHistory = vi.spyOn(historyService, 'getRawHistory'); + it('shows incomplete App totals as gaps and counts shared volumes once', async () => { const now = new Date(); const app = (appId: string, cpuCores: number | null) => ({ @@ -24,7 +26,7 @@ it('shows incomplete App totals as gaps and counts shared volumes once', async ( measuredAt: now, volume: { appId: id, sharedVolumeId, containerMountPath: '/data', app: { projectId: 'project' } } }); - vi.mocked(adapter.getHistory).mockResolvedValue([ + getRawHistory.mockResolvedValue([ [app('one', 1), app('two', null)], [volume('base', null, 'available', 20), volume('shared', 'base', 'available', 20), volume('missing', null, 'unavailable', null)] ]); @@ -43,7 +45,7 @@ it('inserts a gap across collection downtime', async () => { ramBytes: 100, measuredAt: new Date(time + offset) }); - vi.mocked(adapter.getHistory).mockResolvedValue([[sample(0), sample(15 * 60_000)], []]); + getRawHistory.mockResolvedValue([[sample(0), sample(15 * 60_000)], []]); const result = await historyService.getHistory(['app']); expect(result.points.map((point) => point.cpuCores)).toEqual([1, null, 1]); }); @@ -51,7 +53,7 @@ it('inserts a gap across collection downtime', async () => { it('shows a trailing gap while collection remains stopped', async () => { const now = Date.now(); const sampledAt = new Date(now - 30 * 60_000); - vi.mocked(adapter.getHistory).mockResolvedValue([ + getRawHistory.mockResolvedValue([ [{ id: 'one', appId: 'app', sampledAt, cpuCores: 1, ramBytes: 100, measuredAt: sampledAt }], [ { diff --git a/src/server/services/standalone-services/app-monitoring-history.service.ts b/src/server/services/standalone-services/app-monitoring-history.service.ts index f39486d5..4097e3c6 100644 --- a/src/server/services/standalone-services/app-monitoring-history.service.ts +++ b/src/server/services/standalone-services/app-monitoring-history.service.ts @@ -2,7 +2,9 @@ import { MonitoringHistoryUtils } from '@/shared/utils/monitoring-history.utils' import { randomUUID } from 'crypto'; import { Prisma } from '@prisma/client'; import appHistoryService from './app-history.service'; -import appHistoryAdapter from '@/server/adapter/app-history.adapter'; +import dataAccess from '@/server/adapter/db.client'; +import monitoringHistoryService from './monitoring-history.service'; +import { ListUtils } from '@/shared/utils/list.utils'; import { AppHistoryPoint, AppMonitoringHistory, AppVolumeHistory } from '@/shared/model/app-monitoring-history.model'; import { AppVolumeIdentityUtils } from '@/shared/utils/app-volume-identity.utils'; import appVolumeFilesystemService from './app-volume-filesystem.service'; @@ -22,9 +24,48 @@ class AppMonitoringHistoryService { void this.collect(); } + async getPopulation() { + const [apps, volumes] = await Promise.all([ + dataAccess.client.app.findMany({ select: { id: true, projectId: true } }), + dataAccess.client.appVolume.findMany({ include: { app: { select: { projectId: true } } } }) + ]); + return { apps, volumes }; + } + + async getRawHistory(appIds: string[], cutoff: Date) { + return Promise.all([ + dataAccess.client.monitoringSample.findMany({ + where: { appId: { in: appIds }, sampledAt: { gte: cutoff } }, + select: { id: true, appId: true, sampledAt: true, cpuCores: true, ramBytes: true, measuredAt: true }, + orderBy: { sampledAt: 'asc' } + }), + dataAccess.client.appVolumeMonitoringMembership + .findMany({ + where: { volume: { appId: { in: appIds } }, sample: { sampledAt: { gte: cutoff } } }, + include: { sample: true, volume: { select: { appId: true, sharedVolumeId: true, containerMountPath: true, app: { select: { projectId: true } } } } }, + orderBy: { sample: { sampledAt: 'asc' } } + }) + .then((items) => items.map((item) => ({ ...item.sample, volumeId: item.volumeId, volume: item.volume }))) + ]); + } + + async save( + apps: Prisma.MonitoringSampleCreateManyInput[], + volumes: Prisma.AppVolumeMonitoringSampleCreateManyInput[], + memberships: Prisma.AppVolumeMonitoringMembershipCreateManyInput[], + cutoff: Date + ) { + await dataAccess.client.$transaction(async (tx) => { + await monitoringHistoryService.saveSamples(tx, apps, cutoff); + for (const chunk of ListUtils.chunk(volumes, 100)) await tx.appVolumeMonitoringSample.createMany({ data: chunk }); + for (const chunk of ListUtils.chunk(memberships, 100)) await tx.appVolumeMonitoringMembership.createMany({ data: chunk }); + await tx.appVolumeMonitoringSample.deleteMany({ where: { sampledAt: { lt: cutoff } } }); + }); + } + async getHistory(appIds: string[]): Promise { - const retention = await appHistoryAdapter.getRetentionHours(); - const [apps, volumes] = await appHistoryAdapter.getHistory(appIds, new Date(Date.now() - retention * 3600_000)); + const retention = await monitoringHistoryService.getRetentionHours(); + const [apps, volumes] = await this.getRawHistory(appIds, new Date(Date.now() - retention * 3600_000)); const appsByTime = new Map(); const volumesByTime = new Map(); for (const item of apps) { @@ -107,11 +148,11 @@ class AppMonitoringHistoryService { } async getRetentionHours() { - return appHistoryAdapter.getRetentionHours(); + return monitoringHistoryService.getRetentionHours(); } async setRetentionHours(hours: number) { - await appHistoryAdapter.setRetentionHours(hours); + await monitoringHistoryService.setRetentionHours(hours); } async collect() { @@ -119,7 +160,7 @@ class AppMonitoringHistoryService { this.running = true; try { const sampledAt = new Date(); - const { apps, volumes } = await appHistoryAdapter.getPopulation(); + const { apps, volumes } = await this.getPopulation(); const [metrics, filesystem, retention] = await Promise.all([ appHistoryService.getAppMetrics(apps).catch((error) => { console.error('App metrics collection failed', error); @@ -129,7 +170,7 @@ class AppMonitoringHistoryService { console.error('Volume metrics collection failed', error); return new Map(); }), - appHistoryAdapter.getRetentionHours() + monitoringHistoryService.getRetentionHours() ]); const samples = new Map(); const memberships: Prisma.AppVolumeMonitoringMembershipCreateManyInput[] = []; @@ -153,7 +194,7 @@ class AppMonitoringHistoryService { } memberships.push({ sampleId: sample.id, volumeId: volume.id }); } - await appHistoryAdapter.save( + await this.save( apps.map((app) => ({ appId: app.id, sampledAt, diff --git a/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts b/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts index a8d5c6bd..6a291524 100644 --- a/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts +++ b/src/server/services/standalone-services/app-monitoring-history.service.unit.spec.ts @@ -1,22 +1,26 @@ -vi.mock('@/server/adapter/app-history.adapter', () => ({ default: { getPopulation: vi.fn(), getRetentionHours: vi.fn(), save: vi.fn() } })); +vi.mock('@/server/adapter/db.client', () => ({ default: { client: {} } })); +vi.mock('./monitoring-history.service', () => ({ default: { getRetentionHours: vi.fn() } })); vi.mock('./app-history.service', () => ({ default: { getAppMetrics: vi.fn() } })); vi.mock('./app-volume-filesystem.service', () => ({ default: { getVolumeFilesystemUsage: vi.fn() } })); vi.mock('./schedule.service', () => ({ default: { scheduleJob: vi.fn() } })); import history from './app-monitoring-history.service'; -import adapter from '@/server/adapter/app-history.adapter'; +import monitoringHistory from './monitoring-history.service'; + +const getPopulation = vi.spyOn(history, 'getPopulation'); +const save = vi.spyOn(history, 'save').mockResolvedValue(undefined); import metrics from './app-history.service'; import filesystem from './app-volume-filesystem.service'; it('records a gap for failed App metrics while preserving successful volume data', async () => { - vi.mocked(adapter.getPopulation).mockResolvedValue({ + getPopulation.mockResolvedValue({ apps: [{ id: 'app', projectId: 'p' }], volumes: [{ id: 'v', appId: 'app', sharedVolumeId: null, app: { projectId: 'p' } }] } as never); - vi.mocked(adapter.getRetentionHours).mockResolvedValue(24); + vi.mocked(monitoringHistory.getRetentionHours).mockResolvedValue(24); vi.mocked(metrics.getAppMetrics).mockRejectedValue(new Error('metrics unavailable')); vi.mocked(filesystem.getVolumeFilesystemUsage).mockResolvedValue(new Map([['v', { pvcName: 'pvc-v', status: 'available', usedBytes: 4 }]])); await history.collect(); - expect(adapter.save).toHaveBeenCalledWith( + expect(save).toHaveBeenCalledWith( [expect.objectContaining({ appId: 'app', cpuCores: null, ramBytes: null })], [expect.objectContaining({ volumeId: 'v', status: 'available', usedBytes: 4 })], [expect.objectContaining({ volumeId: 'v' })], @@ -27,47 +31,47 @@ it('records a gap for failed App metrics while preserving successful volume data it('does not start a second collection while the first is running', async () => { vi.clearAllMocks(); let release!: (value: { apps: never[]; volumes: never[] }) => void; - vi.mocked(adapter.getPopulation).mockReturnValue( + getPopulation.mockReturnValue( new Promise((resolve) => { release = resolve; }) ); - vi.mocked(adapter.getRetentionHours).mockResolvedValue(24); + vi.mocked(monitoringHistory.getRetentionHours).mockResolvedValue(24); vi.mocked(metrics.getAppMetrics).mockResolvedValue(new Map()); vi.mocked(filesystem.getVolumeFilesystemUsage).mockResolvedValue(new Map()); const first = history.collect(); await history.collect(); - expect(adapter.getPopulation).toHaveBeenCalledTimes(1); + expect(getPopulation).toHaveBeenCalledTimes(1); release({ apps: [], volumes: [] }); await first; }); it('stores one filesystem measurement for a shared Volume with a link for each mount', async () => { vi.clearAllMocks(); - vi.mocked(adapter.getPopulation).mockResolvedValue({ + getPopulation.mockResolvedValue({ apps: [], volumes: [ { id: 'v', appId: 'app', sharedVolumeId: null, app: { projectId: 'p' } }, { id: 'shared', appId: 'other', sharedVolumeId: 'v', app: { projectId: 'p' } } ] } as never); - vi.mocked(adapter.getRetentionHours).mockResolvedValue(24); + vi.mocked(monitoringHistory.getRetentionHours).mockResolvedValue(24); vi.mocked(metrics.getAppMetrics).mockResolvedValue(new Map()); vi.mocked(filesystem.getVolumeFilesystemUsage).mockResolvedValue(new Map([['v', { pvcName: 'pvc-v', status: 'available', usedBytes: 4 }]])); await history.collect(); - const [, samples, memberships] = vi.mocked(adapter.save).mock.calls[0]; + const [, samples, memberships] = save.mock.calls[0]; expect(samples).toHaveLength(1); expect(memberships).toHaveLength(2); }); it('collects promptly on startup and resumes collection after a restart', async () => { vi.clearAllMocks(); - vi.mocked(adapter.getPopulation).mockResolvedValue({ apps: [], volumes: [] }); - vi.mocked(adapter.getRetentionHours).mockResolvedValue(24); + getPopulation.mockResolvedValue({ apps: [], volumes: [] }); + vi.mocked(monitoringHistory.getRetentionHours).mockResolvedValue(24); vi.mocked(metrics.getAppMetrics).mockResolvedValue(new Map()); vi.mocked(filesystem.getVolumeFilesystemUsage).mockResolvedValue(new Map()); history.initialize(); - await vi.waitFor(() => expect(adapter.save).toHaveBeenCalledTimes(1)); + await vi.waitFor(() => expect(save).toHaveBeenCalledTimes(1)); history.initialize(); - await vi.waitFor(() => expect(adapter.save).toHaveBeenCalledTimes(2)); + await vi.waitFor(() => expect(save).toHaveBeenCalledTimes(2)); }); diff --git a/src/server/services/standalone-services/monitoring-history.service.ts b/src/server/services/standalone-services/monitoring-history.service.ts new file mode 100644 index 00000000..dcbed4c1 --- /dev/null +++ b/src/server/services/standalone-services/monitoring-history.service.ts @@ -0,0 +1,26 @@ +import { Prisma } from '@prisma/client'; +import dataAccess from '@/server/adapter/db.client'; +import { Constants } from '@/shared/utils/constants'; +import { ListUtils } from '@/shared/utils/list.utils'; + +class MonitoringHistoryService { + async getRetentionHours() { + const value = (await dataAccess.client.parameter.findUnique({ where: { name: Constants.APP_MONITORING_HISTORY_RETENTION_HOURS } }))?.value; + const hours = Number(value); + return Number.isInteger(hours) && hours >= 1 && hours <= 168 ? hours : 24; + } + + async setRetentionHours(hours: number) { + await dataAccess.client.parameter.upsert({ + where: { name: Constants.APP_MONITORING_HISTORY_RETENTION_HOURS }, + create: { name: Constants.APP_MONITORING_HISTORY_RETENTION_HOURS, value: String(hours) }, + update: { value: String(hours) } + }); + } + + async saveSamples(tx: Prisma.TransactionClient, samples: Prisma.MonitoringSampleCreateManyInput[], cutoff: Date) { + for (const chunk of ListUtils.chunk(samples, 100)) await tx.monitoringSample.createMany({ data: chunk }); + await tx.monitoringSample.deleteMany({ where: { sampledAt: { lt: cutoff } } }); + } +} +export default new MonitoringHistoryService(); diff --git a/src/server/services/standalone-services/node-monitoring-history.service.ts b/src/server/services/standalone-services/node-monitoring-history.service.ts index f8919754..7085d065 100644 --- a/src/server/services/standalone-services/node-monitoring-history.service.ts +++ b/src/server/services/standalone-services/node-monitoring-history.service.ts @@ -1,8 +1,9 @@ import { MonitoringHistoryUtils } from '@/shared/utils/monitoring-history.utils'; import nodeResourceService from './node-resource.service'; import scheduleService from './schedule.service'; -import nodeHistoryAdapter from '@/server/adapter/node-monitoring-history.adapter'; -import appHistoryAdapter from '@/server/adapter/app-history.adapter'; +import dataAccess from '@/server/adapter/db.client'; +import { Prisma } from '@prisma/client'; +import monitoringHistoryService from './monitoring-history.service'; import { NodeMonitoringHistoryUtils } from '@/shared/utils/node-monitoring-history.utils'; class NodeMonitoringHistoryService { @@ -19,7 +20,7 @@ class NodeMonitoringHistoryService { if (this.running) return; this.running = true; try { - const retention = await appHistoryAdapter.getRetentionHours(); + const retention = await monitoringHistoryService.getRetentionHours(); await this.collect(new Date(), retention); } catch (error) { console.error('Node monitoring history collection failed', error); @@ -28,18 +29,33 @@ class NodeMonitoringHistoryService { } } + async save(samples: Prisma.MonitoringSampleCreateManyInput[], cutoff: Date) { + await dataAccess.client.$transaction((tx) => monitoringHistoryService.saveSamples(tx, samples, cutoff)); + } + async collect(sampledAt: Date, retentionHours: number) { const nodes = await nodeResourceService.getNodeResourceUsage(); - await nodeHistoryAdapter.save( - nodes.map((node) => ({ sampledAt, nodeName: node.name, cpuCores: node.cpuUsage, ramBytes: node.ramUsage, diskBytes: node.diskUsageAbsolut ?? null })), + await this.save( + nodes.map((node) => ({ + sampledAt, + nodeName: node.name, + cpuCores: node.cpuUsage, + ramBytes: node.ramUsage, + nodeFilesystemUsedBytes: node.diskUsageAbsolut ?? null, + measuredAt: node.measuredAt ?? null + })), new Date(sampledAt.getTime() - retentionHours * 3600_000) ); } async getHistory() { - const retentionHours = await appHistoryAdapter.getRetentionHours(); - const samples = await nodeHistoryAdapter.getHistory(new Date(Date.now() - retentionHours * 3600_000)); - return { retentionHours, points: NodeMonitoringHistoryUtils.aggregate(samples) }; + const retentionHours = await monitoringHistoryService.getRetentionHours(); + const samples = await dataAccess.client.monitoringSample.findMany({ + where: { nodeName: { not: null }, sampledAt: { gte: new Date(Date.now() - retentionHours * 3600_000) } }, + orderBy: { sampledAt: 'asc' } + }); + const points = samples.map((sample) => ({ ...sample, diskBytes: sample.nodeFilesystemUsedBytes })); + return { retentionHours, points: NodeMonitoringHistoryUtils.aggregate(points) }; } } export default new NodeMonitoringHistoryService(); diff --git a/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts b/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts index 288dd12c..03fb16dc 100644 --- a/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts +++ b/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts @@ -1,33 +1,36 @@ vi.mock('./node-resource.service', () => ({ default: { getNodeResourceUsage: vi.fn() } })); -vi.mock('@/server/adapter/node-monitoring-history.adapter', () => ({ default: { save: vi.fn(), getHistory: vi.fn() } })); -vi.mock('@/server/adapter/app-history.adapter', () => ({ default: { getRetentionHours: vi.fn() } })); +vi.mock('@/server/adapter/db.client', () => ({ default: { client: { monitoringSample: { findMany: vi.fn() } } } })); +vi.mock('./monitoring-history.service', () => ({ default: { getRetentionHours: vi.fn() } })); import history from './node-monitoring-history.service'; import resources from './node-resource.service'; -import adapter from '@/server/adapter/node-monitoring-history.adapter'; -import appAdapter from '@/server/adapter/app-history.adapter'; +import dataAccess from '@/server/adapter/db.client'; +import monitoringHistory from './monitoring-history.service'; + +const save = vi.spyOn(history, 'save').mockResolvedValue(undefined); it('stores every node and applies the shared retention period', async () => { + const measuredAt = new Date('2026-11-16T11:59:00Z'); vi.mocked(resources.getNodeResourceUsage).mockResolvedValue([ - { name: 'a', cpuUsage: 1, ramUsage: 20, cpuCapacity: 2, ramCapacity: 40, diskUsageAbsolut: 30 }, + { name: 'a', measuredAt, cpuUsage: 1, ramUsage: 20, cpuCapacity: 2, ramCapacity: 40, diskUsageAbsolut: 30 }, { name: 'b', cpuUsage: null, ramUsage: 10, cpuCapacity: 2, ramCapacity: 40 } ]); const time = new Date('2026-11-16T12:00:00Z'); await history.collect(time, 24); - expect(adapter.save).toHaveBeenCalledWith( + expect(save).toHaveBeenCalledWith( [ - { sampledAt: time, nodeName: 'a', cpuCores: 1, ramBytes: 20, diskBytes: 30 }, - { sampledAt: time, nodeName: 'b', cpuCores: null, ramBytes: 10, diskBytes: null } + { sampledAt: time, nodeName: 'a', cpuCores: 1, ramBytes: 20, nodeFilesystemUsedBytes: 30, measuredAt }, + { sampledAt: time, nodeName: 'b', cpuCores: null, ramBytes: 10, nodeFilesystemUsedBytes: null, measuredAt: null } ], new Date('2026-11-15T12:00:00Z') ); }); it('returns sums and gaps from the retained samples', async () => { - vi.mocked(appAdapter.getRetentionHours).mockResolvedValue(24); + vi.mocked(monitoringHistory.getRetentionHours).mockResolvedValue(24); const time = new Date(); - vi.mocked(adapter.getHistory).mockResolvedValue([ - { id: '1', nodeName: 'a', sampledAt: time, cpuCores: 1, ramBytes: 10, diskBytes: 100 }, - { id: '2', nodeName: 'b', sampledAt: time, cpuCores: 2, ramBytes: null, diskBytes: 200 } + vi.mocked(dataAccess.client.monitoringSample.findMany).mockResolvedValue([ + { id: '1', nodeName: 'a', appId: null, sampledAt: time, cpuCores: 1, ramBytes: 10, nodeFilesystemUsedBytes: 100, measuredAt: time }, + { id: '2', nodeName: 'b', appId: null, sampledAt: time, cpuCores: 2, ramBytes: null, nodeFilesystemUsedBytes: 200, measuredAt: time } ]); expect(await history.getHistory()).toEqual({ retentionHours: 24, points: [{ time: time.getTime(), cpuCores: 3, ramBytes: null, diskBytes: 300 }] }); }); diff --git a/src/server/services/standalone-services/node-resource.service.ts b/src/server/services/standalone-services/node-resource.service.ts index d37db115..2ed8aa47 100644 --- a/src/server/services/standalone-services/node-resource.service.ts +++ b/src/server/services/standalone-services/node-resource.service.ts @@ -62,7 +62,9 @@ class NodeResourceService { // A node without a summary must not hide the other nodes' metrics. } + const measuredTimes = [...(cpuUsage !== null || ramUsage !== null ? [timestamp] : []), ...(filesystem?.time ? [Date.parse(filesystem.time)] : [])]; return { + measuredAt: measuredTimes.length ? new Date(Math.min(...measuredTimes)) : null, name: node.Node.metadata?.name!, cpuUsage: cpuUsage, cpuCapacity: Number(node.CPU?.Capacity!), diff --git a/src/shared/model/generated-zod/app.ts b/src/shared/model/generated-zod/app.ts index ba408b16..23037d89 100644 --- a/src/shared/model/generated-zod/app.ts +++ b/src/shared/model/generated-zod/app.ts @@ -1,6 +1,6 @@ import * as z from "zod" -import { CompleteProject, RelatedProjectModel, CompleteAppDomain, RelatedAppDomainModel, CompleteAppPort, RelatedAppPortModel, CompleteAppNodePort, RelatedAppNodePortModel, CompleteAppVolume, RelatedAppVolumeModel, CompleteAppMonitoringSample, RelatedAppMonitoringSampleModel, CompleteAppFileMount, RelatedAppFileMountModel, CompleteAppBasicAuth, RelatedAppBasicAuthModel, CompleteAppGitSshKey, RelatedAppGitSshKeyModel, CompleteAppNetworkPolicy, RelatedAppNetworkPolicyModel, CompleteRoleAppPermission, RelatedRoleAppPermissionModel, CompleteAgentNetworkPolicyRule, RelatedAgentNetworkPolicyRuleModel, CompleteAppNetworkPolicyRule, RelatedAppNetworkPolicyRuleModel } from "./index" +import { CompleteProject, RelatedProjectModel, CompleteAppDomain, RelatedAppDomainModel, CompleteAppPort, RelatedAppPortModel, CompleteAppNodePort, RelatedAppNodePortModel, CompleteAppVolume, RelatedAppVolumeModel, CompleteMonitoringSample, RelatedMonitoringSampleModel, CompleteAppFileMount, RelatedAppFileMountModel, CompleteAppBasicAuth, RelatedAppBasicAuthModel, CompleteAppGitSshKey, RelatedAppGitSshKeyModel, CompleteAppNetworkPolicy, RelatedAppNetworkPolicyModel, CompleteRoleAppPermission, RelatedRoleAppPermissionModel, CompleteAgentNetworkPolicyRule, RelatedAgentNetworkPolicyRuleModel, CompleteAppNetworkPolicyRule, RelatedAppNetworkPolicyRuleModel } from "./index" export const AppModel = z.object({ id: z.string(), @@ -60,7 +60,7 @@ export interface CompleteApp extends z.infer { appPorts: CompleteAppPort[] appNodePorts: CompleteAppNodePort[] appVolumes: CompleteAppVolume[] - monitoringSamples: CompleteAppMonitoringSample[] + monitoringSamples: CompleteMonitoringSample[] appFileMounts: CompleteAppFileMount[] appBasicAuths: CompleteAppBasicAuth[] appGitSshKey?: CompleteAppGitSshKey | null @@ -81,7 +81,7 @@ export const RelatedAppModel: z.ZodSchema = z.lazy(() => AppModel.e appPorts: RelatedAppPortModel.array(), appNodePorts: RelatedAppNodePortModel.array(), appVolumes: RelatedAppVolumeModel.array(), - monitoringSamples: RelatedAppMonitoringSampleModel.array(), + monitoringSamples: RelatedMonitoringSampleModel.array(), appFileMounts: RelatedAppFileMountModel.array(), appBasicAuths: RelatedAppBasicAuthModel.array(), appGitSshKey: RelatedAppGitSshKeyModel.nullish(), diff --git a/src/shared/model/generated-zod/appmonitoringsample.ts b/src/shared/model/generated-zod/appmonitoringsample.ts deleted file mode 100644 index 8fc9c140..00000000 --- a/src/shared/model/generated-zod/appmonitoringsample.ts +++ /dev/null @@ -1,25 +0,0 @@ -import * as z from "zod" - -import { CompleteApp, RelatedAppModel } from "./index" - -export const AppMonitoringSampleModel = z.object({ - id: z.string(), - sampledAt: z.date(), - appId: z.string(), - cpuCores: z.number().nullish(), - ramBytes: z.number().nullish(), - measuredAt: z.date().nullish(), -}) - -export interface CompleteAppMonitoringSample extends z.infer { - app: CompleteApp -} - -/** - * RelatedAppMonitoringSampleModel contains all relations on your model in addition to the scalars - * - * NOTE: Lazy required in case of potential circular dependencies within schema - */ -export const RelatedAppMonitoringSampleModel: z.ZodSchema = z.lazy(() => AppMonitoringSampleModel.extend({ - app: RelatedAppModel, -})) diff --git a/src/shared/model/generated-zod/index.ts b/src/shared/model/generated-zod/index.ts index 0add58c0..9038be70 100644 --- a/src/shared/model/generated-zod/index.ts +++ b/src/shared/model/generated-zod/index.ts @@ -32,7 +32,6 @@ export * from "./parameter" export * from "./s3target" export * from "./volumebackup" export * from "./appbasicauth" -export * from "./appmonitoringsample" +export * from "./monitoringsample" export * from "./appvolumemonitoringsample" export * from "./appvolumemonitoringmembership" -export * from "./nodemonitoringsample" diff --git a/src/shared/model/generated-zod/monitoringsample.ts b/src/shared/model/generated-zod/monitoringsample.ts new file mode 100644 index 00000000..1325abbf --- /dev/null +++ b/src/shared/model/generated-zod/monitoringsample.ts @@ -0,0 +1,27 @@ +import * as z from "zod" + +import { CompleteApp, RelatedAppModel } from "./index" + +export const MonitoringSampleModel = z.object({ + id: z.string(), + sampledAt: z.date(), + measuredAt: z.date().nullish(), + appId: z.string().nullish(), + nodeName: z.string().nullish(), + cpuCores: z.number().nullish(), + ramBytes: z.number().nullish(), + nodeFilesystemUsedBytes: z.number().nullish(), +}) + +export interface CompleteMonitoringSample extends z.infer { + app?: CompleteApp | null +} + +/** + * RelatedMonitoringSampleModel contains all relations on your model in addition to the scalars + * + * NOTE: Lazy required in case of potential circular dependencies within schema + */ +export const RelatedMonitoringSampleModel: z.ZodSchema = z.lazy(() => MonitoringSampleModel.extend({ + app: RelatedAppModel.nullish(), +})) diff --git a/src/shared/model/generated-zod/nodemonitoringsample.ts b/src/shared/model/generated-zod/nodemonitoringsample.ts deleted file mode 100644 index 3020cf90..00000000 --- a/src/shared/model/generated-zod/nodemonitoringsample.ts +++ /dev/null @@ -1,11 +0,0 @@ -import * as z from "zod" - - -export const NodeMonitoringSampleModel = z.object({ - id: z.string(), - sampledAt: z.date(), - nodeName: z.string(), - cpuCores: z.number().nullish(), - ramBytes: z.number().nullish(), - diskBytes: z.number().nullish(), -}) diff --git a/src/shared/model/node-resource.model.ts b/src/shared/model/node-resource.model.ts index 00012174..b1f5d84c 100644 --- a/src/shared/model/node-resource.model.ts +++ b/src/shared/model/node-resource.model.ts @@ -2,6 +2,7 @@ import { z } from 'zod'; export const nodeResourceZodModel = z.object({ name: z.string(), + measuredAt: z.date().nullable().optional(), cpuUsage: z.number().nullable(), cpuCapacity: z.number(), ramUsage: z.number().nullable(), From ec6658dab36a05e270d122f30c1e2bf78b52854c Mon Sep 17 00:00:00 2001 From: biersoeckli Date: Mon, 16 Nov 2026 12:37:41 +0000 Subject: [PATCH 5/7] fix: improve confirmation flow and adjust table layout in backups tab --- .../details/volumes/backups/app-details-backups-tab.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/project/[projectId]/apps/details/volumes/backups/app-details-backups-tab.tsx b/src/app/project/[projectId]/apps/details/volumes/backups/app-details-backups-tab.tsx index 62672a2b..639afd4a 100644 --- a/src/app/project/[projectId]/apps/details/volumes/backups/app-details-backups-tab.tsx +++ b/src/app/project/[projectId]/apps/details/volumes/backups/app-details-backups-tab.tsx @@ -93,7 +93,9 @@ export function DrawerBackupsTab({ description: `Create a ${scheduleLabels.get(schedule.id)?.toLowerCase()} now?`, okButton: 'Create Backup' }); - if (!confirmed) return; + if (!confirmed) { + return; + } try { setRunningSchedule(schedule.id); await Toast.fromAction(() => runBackupVolumeSchedule(schedule.id), undefined, 'Creating backup...'); @@ -171,7 +173,7 @@ export function DrawerBackupsTab({ - Created + Created Size Backup Location Type @@ -185,7 +187,7 @@ export function DrawerBackupsTab({ const backupId = `${backup.schedule.id}:${backup.key}`; return ( - {formatDateTime(backup.backupDate, true)} + {formatDateTime(backup.backupDate, true)} {backup.sizeBytes ? KubeSizeConverter.convertBytesToReadableSize(backup.sizeBytes) : 'Unknown'}
From 7e0a71ef6c930c35b9381c2fcd73eaeeb17a46de Mon Sep 17 00:00:00 2001 From: biersoeckli Date: Mon, 16 Nov 2026 15:50:59 +0000 Subject: [PATCH 6/7] refactor: enhance node monitoring components for better data handling and display --- src/app/monitoring/monitoring-nodes.tsx | 26 +++++++----- .../monitoring/node-monitoring-history.tsx | 5 ++- .../services/cluster.service.unit.spec.ts | 36 +++++++++++++++- ...de-monitoring-history.service.unit.spec.ts | 2 +- .../node-resource.service.ts | 42 +++++++++++-------- .../utils/node-monitoring-history.utils.ts | 6 +-- ...node-monitoring-history.utils.unit.spec.ts | 8 ++-- 7 files changed, 87 insertions(+), 38 deletions(-) diff --git a/src/app/monitoring/monitoring-nodes.tsx b/src/app/monitoring/monitoring-nodes.tsx index 04172deb..f036c79c 100644 --- a/src/app/monitoring/monitoring-nodes.tsx +++ b/src/app/monitoring/monitoring-nodes.tsx @@ -22,14 +22,14 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } useEffect(() => setBreadcrumbs([{ name: 'Monitoring', url: '/monitoring' }]), [setBreadcrumbs]); const clusterStats = useMemo(() => { - if (!updatedNodeRessources) return { cpuUsage: 0, cpuCapacity: 1, ramUsage: 0, ramCapacity: 1, diskUsageAbsolut: 0, diskCapacity: 1 }; + if (!updatedNodeRessources) { return { cpuUsage: 0, cpuCapacity: 1, ramUsage: 0, ramCapacity: 1, diskUsageAbsolut: 0, diskCapacity: 1 }; } return updatedNodeRessources.reduce( (acc, node) => ({ cpuUsage: acc.cpuUsage + (node.cpuUsage ?? 0), - cpuCapacity: acc.cpuCapacity + node.cpuCapacity, + cpuCapacity: acc.cpuCapacity + (node.cpuUsage === null ? 0 : node.cpuCapacity), ramUsage: acc.ramUsage + (node.ramUsage ?? 0), - ramCapacity: acc.ramCapacity + node.ramCapacity, + ramCapacity: acc.ramCapacity + (node.ramUsage === null ? 0 : node.ramCapacity), diskUsageAbsolut: acc.diskUsageAbsolut + getDiskUsageAbsolut(node), diskCapacity: acc.diskCapacity + getDiskUsageCapacity(node) }), @@ -38,8 +38,8 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } }, [updatedNodeRessources]); const getUsageColor = (percentage: number) => { - if (percentage >= 90) return 'var(--chart-1)'; - if (percentage >= 80) return 'var(--chart-4)'; + if (percentage >= 90) { return 'var(--chart-1)'; } + if (percentage >= 80) { return 'var(--chart-4)'; } return 'var(--chart-2)'; }; @@ -64,10 +64,13 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } Cluster CPU - Total Cores Usage + Usage of reporting nodes - {updatedNodeRessources.some((node) => node.cpuUsage === null) ? ( + {updatedNodeRessources.some((node) => node.cpuUsage === null) && ( +

Incomplete: some node CPU metrics are unavailable.

+ )} + {clusterStats.cpuCapacity <= 0 ? (

Metrics unavailable

) : ( @@ -101,10 +104,13 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } Cluster RAM - Total Memory Usage + Usage of reporting nodes - {updatedNodeRessources.some((node) => node.ramUsage === null) ? ( + {updatedNodeRessources.some((node) => node.ramUsage === null) && ( +

Incomplete: some node memory metrics are unavailable.

+ )} + {clusterStats.ramCapacity <= 0 ? (

Metrics unavailable

) : ( @@ -288,7 +294,7 @@ export default function ResourcesNodes({ resourcesNodes, reservedVolumeStorage } const diskCapacity = getDiskUsageCapacity(node); const diskUsedAndReserved = diskUsed; const diskPercent = toPercent(diskUsedAndReserved, diskCapacity); - if (node.diskUsageCapacity === undefined) return Unavailable; + if (node.diskUsageCapacity === undefined) { return Unavailable; } return ( <>
diff --git a/src/app/monitoring/node-monitoring-history.tsx b/src/app/monitoring/node-monitoring-history.tsx index d91dfb60..21e0cfe1 100644 --- a/src/app/monitoring/node-monitoring-history.tsx +++ b/src/app/monitoring/node-monitoring-history.tsx @@ -15,7 +15,7 @@ export default function NodeMonitoringHistory() { const refresh = useCallback(async () => { try { const result = await getNodeMonitoringHistory(); - if (result.status !== 'success' || !result.data) throw new Error('Unable to load monitoring history'); + if (result.status !== 'success' || !result.data) { throw new Error('Unable to load monitoring history'); } setHistory(result.data); setError(false); } catch { @@ -33,7 +33,7 @@ export default function NodeMonitoringHistory() {
+

Totals include only nodes reporting each metric. Missing nodes or metrics are excluded.

{error &&

Unable to load monitoring history.

} {history && history.points.length === 0 &&

No measurements yet. History is collected every five minutes.

} {history?.points.at(-1)?.isGap &&

Collection has stopped or is delayed. The chart shows a gap after the last sample.

} diff --git a/src/server/services/cluster.service.unit.spec.ts b/src/server/services/cluster.service.unit.spec.ts index f0cccf3f..b1b8b1ad 100644 --- a/src/server/services/cluster.service.unit.spec.ts +++ b/src/server/services/cluster.service.unit.spec.ts @@ -25,7 +25,9 @@ describe('cluster node storage', () => { it('returns filesystem metrics and preserves other nodes when a summary fails', async () => { mocks.getNodeSummary.mockImplementation(async (name: string) => { - if (name === 'node-b') throw new Error('unavailable'); + if (name === 'node-b') { + throw new Error('unavailable'); + } return { node: { fs: { time: new Date().toISOString(), usedBytes: 300, availableBytes: 600, capacityBytes: 1000 } } }; }); const nodes = await clusterService.getNodeResourceUsage(); @@ -56,6 +58,38 @@ describe('cluster node storage', () => { expect(nodes[1].measuredAt).toEqual(new Date(filesystemTime)); }); + it('accepts timestamps within one minute of clock skew and rejects later timestamps', async () => { + const now = Date.now(); + mocks.getNodeMetrics.mockResolvedValue({ + items: ['node-a', 'node-b'].map((name, index) => ({ + metadata: { name }, timestamp: new Date(now + (index ? 61_000 : 30_000)).toISOString(), usage: { cpu: '1', memory: '100Mi' } + })) + }); + mocks.getNodeSummary.mockImplementation(async (name: string) => ({ + node: { fs: { time: new Date(now + (name === 'node-a' ? 30_000 : 61_000)).toISOString(), usedBytes: 10, availableBytes: 90, capacityBytes: 100 } } + })); + const nodes = await clusterService.getNodeResourceUsage(); + expect(nodes[0]).toMatchObject({ cpuUsage: expect.any(Number), ramUsage: expect.any(Number), diskUsageCapacity: 100 }); + expect(nodes[1]).toMatchObject({ cpuUsage: null, ramUsage: null, diskUsageCapacity: undefined }); + }); + + it('logs metrics and summary failures while returning available nodes', async () => { + const log = vi.spyOn(console, 'error').mockImplementation(() => {}); + const metricsError = new Error('metrics unavailable'); + const summaryError = new Error('summary unavailable'); + mocks.getNodeMetrics.mockRejectedValue(metricsError); + mocks.getNodeSummary.mockRejectedValue(summaryError); + try { + const nodes = await clusterService.getNodeResourceUsage(); + expect(nodes).toHaveLength(2); + expect(nodes[0]).toMatchObject({ cpuUsage: null, ramUsage: null, diskUsageCapacity: undefined }); + expect(log).toHaveBeenCalledWith('Failed to fetch node metrics:', metricsError); + expect(log).toHaveBeenCalledWith('Failed to fetch summary for node node-a:', summaryError); + } finally { + log.mockRestore(); + } + }); + it('does not present stale or incomplete filesystem measurements', async () => { mocks.getNodeSummary.mockImplementation(async (name: string) => ({ node: { diff --git a/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts b/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts index 03fb16dc..298019af 100644 --- a/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts +++ b/src/server/services/standalone-services/node-monitoring-history.service.unit.spec.ts @@ -32,5 +32,5 @@ it('returns sums and gaps from the retained samples', async () => { { id: '1', nodeName: 'a', appId: null, sampledAt: time, cpuCores: 1, ramBytes: 10, nodeFilesystemUsedBytes: 100, measuredAt: time }, { id: '2', nodeName: 'b', appId: null, sampledAt: time, cpuCores: 2, ramBytes: null, nodeFilesystemUsedBytes: 200, measuredAt: time } ]); - expect(await history.getHistory()).toEqual({ retentionHours: 24, points: [{ time: time.getTime(), cpuCores: 3, ramBytes: null, diskBytes: 300 }] }); + expect(await history.getHistory()).toEqual({ retentionHours: 24, points: [{ time: time.getTime(), cpuCores: 3, ramBytes: 10, diskBytes: 300 }] }); }); diff --git a/src/server/services/standalone-services/node-resource.service.ts b/src/server/services/standalone-services/node-resource.service.ts index 2ed8aa47..5df7a67c 100644 --- a/src/server/services/standalone-services/node-resource.service.ts +++ b/src/server/services/standalone-services/node-resource.service.ts @@ -6,12 +6,24 @@ import { NodeResourceModel } from '@/shared/model/node-resource.model'; type NodeMonitoringResource = Omit & { cpuUsage: number | null; ramUsage: number | null }; class NodeResourceService { + private isFresh(timestamp: number): boolean { + const age = Date.now() - timestamp; + return Number.isFinite(timestamp) && age <= 5 * 60_000 && age >= -60_000; + } + + private isValidDiskValue(value: number | undefined): value is number { + return typeof value === 'number' && Number.isFinite(value) && value >= 0; + } + async getNodeResourceUsage( getSummary: (name: string) => Promise = (name) => nodeResourceAdapter.getSummary(name) ): Promise { const topNodes = await nodeResourceAdapter.getNodes(); - const metricsData: k8s.NodeMetricsList = await nodeResourceAdapter.getMetrics().catch(() => ({ items: [] }) as unknown as k8s.NodeMetricsList); + const metricsData: k8s.NodeMetricsList = await nodeResourceAdapter.getMetrics().catch((error) => { + console.error('Failed to fetch node metrics:', error); + return { items: [] } as unknown as k8s.NodeMetricsList; + }); return await Promise.all( topNodes.map(async (node) => { @@ -19,10 +31,12 @@ class NodeResourceService { .filter((item) => item.metadata.name === node.Node.metadata?.name) .sort((a, b) => Date.parse(b.timestamp) - Date.parse(a.timestamp))[0]; const timestamp = Date.parse(metric?.timestamp ?? ''); - const fresh = Number.isFinite(timestamp) && timestamp <= Date.now() && Date.now() - timestamp <= 5 * 60_000; + const fresh = this.isFresh(timestamp); const convert = (value: string | undefined, converter: (input: string) => number): number | null => { try { - if (!fresh || !value) return null; + if (!fresh || !value) { + return null; + } const result = converter(value); return Number.isFinite(result) && result >= 0 ? result : null; } catch { @@ -41,25 +55,18 @@ class NodeResourceService { const timestamp = Date.parse(fs?.time ?? ''); if ( fs && - Number.isFinite(timestamp) && - timestamp <= Date.now() && - Date.now() - timestamp <= 5 * 60_000 && - typeof fs.usedBytes === 'number' && - Number.isFinite(fs.usedBytes) && - fs.usedBytes >= 0 && - typeof fs.availableBytes === 'number' && - Number.isFinite(fs.availableBytes) && - fs.availableBytes >= 0 && - typeof fs.capacityBytes === 'number' && - Number.isFinite(fs.capacityBytes) && + this.isFresh(timestamp) && + this.isValidDiskValue(fs.usedBytes) && + this.isValidDiskValue(fs.availableBytes) && + this.isValidDiskValue(fs.capacityBytes) && fs.capacityBytes > 0 && fs.usedBytes <= fs.capacityBytes && fs.availableBytes <= fs.capacityBytes ) { filesystem = fs; } - } catch { - // A node without a summary must not hide the other nodes' metrics. + } catch (error) { + console.error(`Failed to fetch summary for node ${node.Node.metadata?.name}:`, error); } const measuredTimes = [...(cpuUsage !== null || ramUsage !== null ? [timestamp] : []), ...(filesystem?.time ? [Date.parse(filesystem.time)] : [])]; @@ -78,4 +85,5 @@ class NodeResourceService { ); } } -export default new NodeResourceService(); +const nodeResourceService = new NodeResourceService(); +export default nodeResourceService; diff --git a/src/shared/utils/node-monitoring-history.utils.ts b/src/shared/utils/node-monitoring-history.utils.ts index dee20cea..304d97cb 100644 --- a/src/shared/utils/node-monitoring-history.utils.ts +++ b/src/shared/utils/node-monitoring-history.utils.ts @@ -14,13 +14,13 @@ export class NodeMonitoringHistoryUtils { const gap = (time: number): Point => ({ time, isGap: true, cpuCores: null, ramBytes: null, diskBytes: null }); for (const [time, group] of [...groups].sort(([a], [b]) => a - b)) { const last = points.at(-1); - if (last && time - last.time > MonitoringHistoryUtils.GAP_THRESHOLD_MS) points.push(gap(last.time + MonitoringHistoryUtils.COLLECTION_INTERVAL_MS)); + if (last && time - last.time > MonitoringHistoryUtils.GAP_THRESHOLD_MS) {points.push(gap(last.time + MonitoringHistoryUtils.COLLECTION_INTERVAL_MS));} const sum = (key: 'cpuCores' | 'ramBytes' | 'diskBytes') => - group.every((sample) => sample[key] !== null) ? group.reduce((total, sample) => total + sample[key]!, 0) : null; + group.some((sample) => sample[key] !== null) ? group.reduce((total, sample) => total + (sample[key] ?? 0), 0) : null; points.push({ time, cpuCores: sum('cpuCores'), ramBytes: sum('ramBytes'), diskBytes: sum('diskBytes') }); } const last = points.at(-1); - if (last && now - last.time > MonitoringHistoryUtils.GAP_THRESHOLD_MS) points.push(gap(now)); + if (last && now - last.time > MonitoringHistoryUtils.GAP_THRESHOLD_MS) {points.push(gap(now));} return points; } } diff --git a/src/shared/utils/node-monitoring-history.utils.unit.spec.ts b/src/shared/utils/node-monitoring-history.utils.unit.spec.ts index fb72393b..1f16d650 100644 --- a/src/shared/utils/node-monitoring-history.utils.unit.spec.ts +++ b/src/shared/utils/node-monitoring-history.utils.unit.spec.ts @@ -1,12 +1,12 @@ import { NodeMonitoringHistoryUtils } from './node-monitoring-history.utils'; -it('sums complete node measurements and leaves each incomplete metric as a gap', () => { +it('sums available node measurements and leaves fully unavailable metrics as a gap', () => { const points = NodeMonitoringHistoryUtils.aggregate( [ - { sampledAt: new Date(0), cpuCores: 1, ramBytes: 100, diskBytes: 400 }, - { sampledAt: new Date(0), cpuCores: 2, ramBytes: null, diskBytes: 200 } + { sampledAt: new Date(0), cpuCores: 1, ramBytes: 100, diskBytes: null }, + { sampledAt: new Date(0), cpuCores: 2, ramBytes: null, diskBytes: null } ], 0 ); - expect(points).toEqual([{ time: 0, cpuCores: 3, ramBytes: null, diskBytes: 600 }]); + expect(points).toEqual([{ time: 0, cpuCores: 3, ramBytes: 100, diskBytes: null }]); }); From 18f63f74fab08c4336da0ace649d6bdd5f3dfc90 Mon Sep 17 00:00:00 2001 From: biersoeckli Date: Mon, 16 Nov 2026 15:57:57 +0000 Subject: [PATCH 7/7] chore: run eslint and prettier --- .../server/mcp/mcp-eval.integration.spec.ts | 176 +-- src/app/api/agent-sandboxes/route.ts | 187 ++- src/app/api/build-status/route.ts | 182 +-- src/app/api/deployment-status/route.ts | 254 ++-- src/app/monitoring/app-volumes-monitoring.tsx | 4 +- .../node-monitoring-history.unit.spec.ts | 32 - .../project/[projectId]/actions.unit.spec.ts | 56 +- .../agents/details/agent-drawer.tsx | 342 +++--- .../details/builds/agent-builds-grid.tsx | 313 +++-- .../environment/agent-env-vars-card.tsx | 146 ++- .../agent-model-configuration-editor.tsx | 314 +++-- .../details/sandboxes/agent-access-dialog.tsx | 163 ++- .../sandboxes/agent-sandboxes-card.tsx | 938 +++++++-------- .../source/agent-source-wizard-dialog.tsx | 752 ++++++------ .../details/volumes/agent-volumes-card.tsx | 4 +- .../apps/create/edit-app-dialog.tsx | 81 +- .../apps/details/app-details-settings.tsx | 357 +++--- .../apps/details/deployments/deployments.tsx | 168 +-- .../policy/app-network-policy-rule-dialog.tsx | 333 ++++-- .../app-network-policy-rule-section.tsx | 316 ++--- .../network/policy/network-policy-graph.tsx | 652 +++++----- .../app-source-wizard-dialog.tsx | 989 +++++++-------- .../network-graph/connection-edge.tsx | 24 +- ...ject-network-graph-canvas-context-menu.tsx | 145 ++- .../project-network-graph-drawer-session.ts | 250 ++-- .../project-network-graph-projection.ts | 317 ++--- .../network-graph/project-network-graph.tsx | 1059 +++++++++-------- .../use-project-network-graph.ts | 142 ++- .../[projectId]/overview/project-overview.tsx | 294 +++-- .../[projectId]/template-details-panel.tsx | 87 +- src/app/projects/edit-project-dialog.tsx | 90 +- src/app/settings/access/users/users-table.tsx | 351 +++--- .../storage/qs-system-backup-settings.tsx | 522 ++++---- .../updates/cluster-addon-details-dialog.tsx | 306 +++-- .../custom/app-monitoring-history.tsx | 8 +- .../custom/build-status-indicator.tsx | 130 +- src/components/custom/code.tsx | 44 +- src/components/custom/domain-edit-overlay.tsx | 332 +++--- src/components/custom/input-dialog.tsx | 51 +- src/components/custom/sso-provider-logo.tsx | 33 +- src/components/ui/calendar.tsx | 198 +-- src/frontend/utils/format.utils.ts | 4 +- src/server/adapter/db.client.ts | 175 +-- src/server/adapter/kubernetes-api.adapter.ts | 4 +- src/server/adapter/volume-summary.adapter.ts | 4 +- src/server/api/v1/agent/deploy/route.ts | 63 +- src/server/api/v1/agent/route.ts | 262 ++-- src/server/api/v1/agent/sandbox/route.ts | 845 +++++++------ src/server/api/v1/app/deploy/route.ts | 272 +++-- src/server/api/v1/app/route.ts | 397 +++--- src/server/api/v1/project/route.ts | 194 +-- src/server/mcp/mcp-handler.unit.spec.ts | 971 +++++++-------- .../addons/agent-sandbox-addon.service.ts | 373 +++--- .../addons/cert-manager-addon.service.ts | 411 ++++--- .../services/addons/longhorn-addon.service.ts | 244 ++-- src/server/services/agent-sandbox.service.ts | 686 ++++++----- .../railpack-build-job-builder.utils.ts | 276 +++-- src/server/services/cluster.service.ts | 1 - src/server/services/ingress.service.ts | 823 +++++++------ src/server/services/longhorn-ui.service.ts | 163 +-- .../services/monitoring.service.unit.spec.ts | 4 +- src/server/services/network-policy.service.ts | 999 ++++++++-------- .../services/node-summary-cache.service.ts | 4 +- src/server/services/secret.service.ts | 4 +- .../app-history.service.ts | 22 +- .../app-monitoring-history.service.ts | 16 +- .../app-volume-filesystem.service.ts | 7 +- .../build-watch.service.ts | 285 ++--- .../build-watch.service.unit.spec.ts | 388 +++--- .../deployment-event-watch.service.ts | 127 +- .../monitoring-history.service.ts | 4 +- .../node-monitoring-history.service.ts | 4 +- .../standalone-pod.service.ts | 553 ++++----- .../services/terminal.service.unit.spec.ts | 648 +++++----- src/server/utils/action-wrapper.utils.ts | 491 ++++---- src/server/utils/app-template.utils.ts | 323 +++-- src/server/utils/cron-check.utils.ts | 137 +-- src/server/utils/file-upload.utils.ts | 34 +- .../utils/file-upload.utils.unit.spec.ts | 79 +- src/shared/model/app-source-info.model.ts | 148 +-- .../agents/agent-harness-template.utils.ts | 197 +-- .../templates/agents/claude-code.template.ts | 77 +- .../templates/agents/copilot-cli.template.ts | 77 +- .../agents/deepseek-harness-cli.template.ts | 105 +- .../templates/agents/gemini-cli.template.ts | 73 +- .../templates/agents/opencode-cli.template.ts | 50 +- .../templates/template-icons.unit.spec.ts | 127 +- .../utils/agent-drawer-navigation.utils.ts | 25 +- .../utils/app-drawer-navigation.utils.ts | 29 +- .../utils/app-network-policy-draft.utils.ts | 282 ++--- src/shared/utils/list.utils.ts | 117 +- src/shared/utils/path-builder.utils.ts | 44 +- 92 files changed, 11720 insertions(+), 11070 deletions(-) delete mode 100644 src/app/monitoring/node-monitoring-history.unit.spec.ts diff --git a/src/__tests__/integration/server/mcp/mcp-eval.integration.spec.ts b/src/__tests__/integration/server/mcp/mcp-eval.integration.spec.ts index c33af21c..3ef4febe 100644 --- a/src/__tests__/integration/server/mcp/mcp-eval.integration.spec.ts +++ b/src/__tests__/integration/server/mcp/mcp-eval.integration.spec.ts @@ -7,93 +7,105 @@ import { z } from 'zod'; import { createQuickStackMcpHandler } from '@/server/mcp/mcp-handler'; function runHarness(url: string, apiKey: string): Promise<{ code: number | null; stdout: string; stderr: string }> { - return new Promise((resolve, reject) => { - const child = spawn(process.execPath, ['scripts/mcp-eval.mjs', '--url', url, '--api-key', apiKey], { - cwd: process.cwd(), - env: process.env, - }); - let stdout = ''; - let stderr = ''; - child.stdout.on('data', (chunk) => { stdout += chunk.toString(); }); - child.stderr.on('data', (chunk) => { stderr += chunk.toString(); }); - child.on('error', reject); - child.on('close', (code) => resolve({ code, stdout, stderr })); + return new Promise((resolve, reject) => { + const child = spawn(process.execPath, ['scripts/mcp-eval.mjs', '--url', url, '--api-key', apiKey], { + cwd: process.cwd(), + env: process.env }); + let stdout = ''; + let stderr = ''; + child.stdout.on('data', (chunk) => { + stdout += chunk.toString(); + }); + child.stderr.on('data', (chunk) => { + stderr += chunk.toString(); + }); + child.on('error', reject); + child.on('close', (code) => resolve({ code, stdout, stderr })); + }); } describe('MCP evaluation harness', () => { - it('runs the scripted tasks against the real MCP handler', async () => { - const fixture = new Elysia({ prefix: '/api/v1' }) - .get('/projects', ({ query }) => { - const projects = [{ id: 'p1', name: 'Demo' }, { id: 'p2', name: 'Second' }]; - if (query.limit === undefined) return projects; - const limit = Number(query.limit); - return { - items: projects.slice(0, limit), - total: projects.length, - limit, - nextCursor: limit < projects.length ? String(limit) : null, - }; - }, { - query: z.object({ limit: z.coerce.number().optional() }), - response: { 200: z.union([z.array(z.object({ id: z.string(), name: z.string() })), z.object({ - items: z.array(z.object({ id: z.string(), name: z.string() })), - total: z.number(), - limit: z.number(), - nextCursor: z.string().nullable(), - })]) }, - detail: { operationId: 'listProjects', summary: 'List projects', tags: ['Projects'] }, - }) - .post('/apps/:appId/deploy', ({ params }) => ({ deploymentId: `deploy-${params.appId}` }), { - params: z.object({ appId: z.string() }), - query: z.object({ forceRebuild: z.coerce.boolean().optional() }), - response: { 200: z.object({ deploymentId: z.string() }) }, - detail: { operationId: 'deployApp', summary: 'Deploy app', description: 'Deploy an app.', tags: ['Apps'] }, - }); + it('runs the scripted tasks against the real MCP handler', async () => { + const fixture = new Elysia({ prefix: '/api/v1' }) + .get( + '/projects', + ({ query }) => { + const projects = [ + { id: 'p1', name: 'Demo' }, + { id: 'p2', name: 'Second' } + ]; + if (query.limit === undefined) { + return projects; + } + const limit = Number(query.limit); + return { + items: projects.slice(0, limit), + total: projects.length, + limit, + nextCursor: limit < projects.length ? String(limit) : null + }; + }, + { + query: z.object({ limit: z.coerce.number().optional() }), + response: { + 200: z.union([ + z.array(z.object({ id: z.string(), name: z.string() })), + z.object({ + items: z.array(z.object({ id: z.string(), name: z.string() })), + total: z.number(), + limit: z.number(), + nextCursor: z.string().nullable() + }) + ]) + }, + detail: { operationId: 'listProjects', summary: 'List projects', tags: ['Projects'] } + } + ) + .post('/apps/:appId/deploy', ({ params }) => ({ deploymentId: `deploy-${params.appId}` }), { + params: z.object({ appId: z.string() }), + query: z.object({ forceRebuild: z.coerce.boolean().optional() }), + response: { 200: z.object({ deploymentId: z.string() }) }, + detail: { operationId: 'deployApp', summary: 'Deploy app', description: 'Deploy an app.', tags: ['Apps'] } + }); - const handler = createQuickStackMcpHandler({ - app: fixture, - resolveAuthInfo: async () => ({ token: 'eval-token', clientId: 'eval', scopes: [] }), - }); - const server = createServer(async (request, response) => { - const chunks: Buffer[] = []; - for await (const chunk of request) { - chunks.push(Buffer.from(chunk)); - } - const method = request.method ?? 'GET'; - const body = method === 'GET' || method === 'HEAD' - ? undefined - : new Uint8Array(Buffer.concat(chunks)); - const fetchResponse = await handler.fetch(new Request( - `http://127.0.0.1${request.url ?? '/api/mcp'}`, - { - method, - headers: request.headers as Record, - body, - } - )); - response.statusCode = fetchResponse.status; - fetchResponse.headers.forEach((value, key) => response.setHeader(key, value)); - response.end(Buffer.from(await fetchResponse.arrayBuffer())); - }); - await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)); + const handler = createQuickStackMcpHandler({ + app: fixture, + resolveAuthInfo: async () => ({ token: 'eval-token', clientId: 'eval', scopes: [] }) + }); + const server = createServer(async (request, response) => { + const chunks: Buffer[] = []; + for await (const chunk of request) { + chunks.push(Buffer.from(chunk)); + } + const method = request.method ?? 'GET'; + const body = method === 'GET' || method === 'HEAD' ? undefined : new Uint8Array(Buffer.concat(chunks)); + const fetchResponse = await handler.fetch( + new Request(`http://127.0.0.1${request.url ?? '/api/mcp'}`, { + method, + headers: request.headers as Record, + body + }) + ); + response.statusCode = fetchResponse.status; + fetchResponse.headers.forEach((value, key) => response.setHeader(key, value)); + response.end(Buffer.from(await fetchResponse.arrayBuffer())); + }); + await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)); - try { - const address = server.address(); - if (!address || typeof address === 'string') { - throw new Error('Test server did not expose a port.'); - } - const { code, stdout, stderr } = await runHarness( - `http://127.0.0.1:${address.port}/api/mcp`, - 'eval-token' - ); + try { + const address = server.address(); + if (!address || typeof address === 'string') { + throw new Error('Test server did not expose a port.'); + } + const { code, stdout, stderr } = await runHarness(`http://127.0.0.1:${address.port}/api/mcp`, 'eval-token'); - expect(stderr).toBe(''); - expect(stdout).toContain('Success: 3/3 tasks'); - expect(code).toBe(0); - } finally { - await handler.close(); - await new Promise((resolve, reject) => server.close((error) => error ? reject(error) : resolve())); - } - }, 60_000); + expect(stderr).toBe(''); + expect(stdout).toContain('Success: 3/3 tasks'); + expect(code).toBe(0); + } finally { + await handler.close(); + await new Promise((resolve, reject) => server.close((error) => (error ? reject(error) : resolve()))); + } + }, 60_000); }); diff --git a/src/app/api/agent-sandboxes/route.ts b/src/app/api/agent-sandboxes/route.ts index cb53ea42..ab9f0e3b 100644 --- a/src/app/api/agent-sandboxes/route.ts +++ b/src/app/api/agent-sandboxes/route.ts @@ -1,111 +1,110 @@ -import k3s from "@/server/adapter/kubernetes-api.adapter"; -import { - BASE_SANDBOX_API_GROUP, - CLAIM_PLURAL, - SANDBOX_API_GROUP, - SANDBOX_API_VERSION, - SANDBOX_PLURAL, -} from "@/server/adapter/agent-sandbox.adapter"; -import agentRuntimeService from "@/server/services/agent-runtime.service"; -import agentService from "@/server/services/agent.service"; -import { isAuthorizedReadForWorkload, simpleRoute } from "@/server/utils/action-wrapper.utils"; -import { Constants } from "@/shared/utils/constants"; +import k3s from '@/server/adapter/kubernetes-api.adapter'; +import { BASE_SANDBOX_API_GROUP, CLAIM_PLURAL, SANDBOX_API_GROUP, SANDBOX_API_VERSION, SANDBOX_PLURAL } from '@/server/adapter/agent-sandbox.adapter'; +import agentRuntimeService from '@/server/services/agent-runtime.service'; +import agentService from '@/server/services/agent.service'; +import { isAuthorizedReadForWorkload, simpleRoute } from '@/server/utils/action-wrapper.utils'; +import { Constants } from '@/shared/utils/constants'; import * as k8s from '@kubernetes/client-node'; -import z from "zod"; -import { AgentSandboxUtils } from "@/server/utils/agent-sandbox.utils"; +import z from 'zod'; +import { AgentSandboxUtils } from '@/server/utils/agent-sandbox.utils'; // Prevents this route's response from being cached -export const dynamic = "force-dynamic"; +export const dynamic = 'force-dynamic'; export async function POST(request: Request) { - return simpleRoute(async () => { + return simpleRoute(async () => { + const inputParam = z + .object({ + agentId: z.string() + }) + .parse(await request.json()); - const inputParam = z.object({ - agentId: z.string(), - }).parse(await request.json()); + await isAuthorizedReadForWorkload(inputParam.agentId); + const agent = await agentService.getById(inputParam.agentId); + const namespace = agent.project.id; - await isAuthorizedReadForWorkload(inputParam.agentId); - const agent = await agentService.getById(inputParam.agentId); - const namespace = agent.project.id; + const encoder = new TextEncoder(); + let shouldStopStreaming = false; + let watchRequest: { abort: () => void } | null = null; - const encoder = new TextEncoder(); - let shouldStopStreaming = false; - let watchRequest: { abort: () => void } | null = null; + let agentSandboxes = await agentRuntimeService.listSandboxes(agent.id); - let agentSandboxes = await agentRuntimeService.listSandboxes(agent.id); + const customReadable = new ReadableStream({ + async start(controller) { + const send = (data: any) => { + if (shouldStopStreaming) { + return; + } + try { + controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`)); + } catch (e) { + console.error(`[ENQUEUE ERROR] Error while enqueueing Agent Sandbox Status data: `, e); + shouldStopStreaming = true; + controller.close(); + } + }; - const customReadable = new ReadableStream({ - async start(controller) { + // 1. Send full initial snapshot + send({ type: 'FULL', data: agentSandboxes }); - const send = (data: any) => { - if (shouldStopStreaming) return; - try { - controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`)); - } catch (e) { - console.error(`[ENQUEUE ERROR] Error while enqueueing Agent Sandbox Status data: `, e); - shouldStopStreaming = true; - controller.close(); - } - }; - - // 1. Send full initial snapshot - send({ type: 'FULL', data: agentSandboxes }); - - - // 2. Watch for changes — direct base Sandboxes for PER_CUSTOM_TAG agents, claims otherwise - const usesDirectSandbox = AgentSandboxUtils.usesPerCustomTagVolume(agent.agentVolumes); - const watchPath = usesDirectSandbox - ? `/apis/${BASE_SANDBOX_API_GROUP}/${SANDBOX_API_VERSION}/namespaces/${namespace}/${SANDBOX_PLURAL}` - : `/apis/${SANDBOX_API_GROUP}/${SANDBOX_API_VERSION}/namespaces/${namespace}/${CLAIM_PLURAL}`; - const kc = k3s.getKubeConfig(); - const watch = new k8s.Watch(kc); - console.log("[START] Starting watch for agent sandboxes in namespace", namespace); - watchRequest = await watch.watch( - watchPath, - { labelSelector: `${Constants.QS_ANNOTATION_AGENT_ID}=${inputParam.agentId}` }, - async (type, apiObj) => { - if (shouldStopStreaming) return; + // 2. Watch for changes — direct base Sandboxes for PER_CUSTOM_TAG agents, claims otherwise + const usesDirectSandbox = AgentSandboxUtils.usesPerCustomTagVolume(agent.agentVolumes); + const watchPath = usesDirectSandbox + ? `/apis/${BASE_SANDBOX_API_GROUP}/${SANDBOX_API_VERSION}/namespaces/${namespace}/${SANDBOX_PLURAL}` + : `/apis/${SANDBOX_API_GROUP}/${SANDBOX_API_VERSION}/namespaces/${namespace}/${CLAIM_PLURAL}`; + const kc = k3s.getKubeConfig(); + const watch = new k8s.Watch(kc); + console.log('[START] Starting watch for agent sandboxes in namespace', namespace); + watchRequest = await watch.watch( + watchPath, + { labelSelector: `${Constants.QS_ANNOTATION_AGENT_ID}=${inputParam.agentId}` }, + async (type, apiObj) => { + if (shouldStopStreaming) { + return; + } - // DELETED: only need the name — apiObj is the deleted object - if (type === 'DELETED') { - const name = apiObj?.metadata?.name; - if (name) { - send({ type: 'DELETED', sandbox: { name } }); - } - return; - } + // DELETED: only need the name — apiObj is the deleted object + if (type === 'DELETED') { + const name = apiObj?.metadata?.name; + if (name) { + send({ type: 'DELETED', sandbox: { name } }); + } + return; + } - // ADDED / MODIFIED: map full object to sandbox DTO - const sandbox = usesDirectSandbox - ? agentRuntimeService.mapSandboxToSandbox(apiObj, namespace) - : agentRuntimeService.mapClaimToSandbox(apiObj, namespace); - send({ type, sandbox }); - }, - (err) => { - if (err) console.error('agent sandboxes watch error', err); - console.log('agent sandboxes watch ended'); - if (!shouldStopStreaming) { - controller.close(); - } - } - ); - }, - cancel() { - console.log("[LEAVE] Cancelling informer for agent sandboxes"); - shouldStopStreaming = true; - if (watchRequest && typeof watchRequest.abort === 'function') { - watchRequest.abort(); - } + // ADDED / MODIFIED: map full object to sandbox DTO + const sandbox = usesDirectSandbox + ? agentRuntimeService.mapSandboxToSandbox(apiObj, namespace) + : agentRuntimeService.mapClaimToSandbox(apiObj, namespace); + send({ type, sandbox }); + }, + (err) => { + if (err) { + console.error('agent sandboxes watch error', err); + } + console.log('agent sandboxes watch ended'); + if (!shouldStopStreaming) { + controller.close(); } - }); + } + ); + }, + cancel() { + console.log('[LEAVE] Cancelling informer for agent sandboxes'); + shouldStopStreaming = true; + if (watchRequest && typeof watchRequest.abort === 'function') { + watchRequest.abort(); + } + } + }); - return new Response(customReadable, { - headers: { - Connection: "keep-alive", - "Content-Encoding": "none", - "Cache-Control": "no-cache, no-transform", - "Content-Type": "text/event-stream; charset=utf-8", - }, - }); + return new Response(customReadable, { + headers: { + Connection: 'keep-alive', + 'Content-Encoding': 'none', + 'Cache-Control': 'no-cache, no-transform', + 'Content-Type': 'text/event-stream; charset=utf-8' + } }); + }); } diff --git a/src/app/api/build-status/route.ts b/src/app/api/build-status/route.ts index 24e02a2c..fc203e47 100644 --- a/src/app/api/build-status/route.ts +++ b/src/app/api/build-status/route.ts @@ -1,103 +1,111 @@ -import buildLiveStatusService from "@/server/services/build-live-status.service"; -import buildStatusService from "@/server/services/standalone-services/build-status-pub-sub.service"; -import buildWatchService from "@/server/services/standalone-services/build-watch.service"; -import { getAuthUserSession, simpleRoute } from "@/server/utils/action-wrapper.utils"; -import { StreamUtils } from "@/shared/utils/stream.utils"; +import buildLiveStatusService from '@/server/services/build-live-status.service'; +import buildStatusService from '@/server/services/standalone-services/build-status-pub-sub.service'; +import buildWatchService from '@/server/services/standalone-services/build-watch.service'; +import { getAuthUserSession, simpleRoute } from '@/server/utils/action-wrapper.utils'; +import { StreamUtils } from '@/shared/utils/stream.utils'; // Prevents this route's response from being cached -export const dynamic = "force-dynamic"; +export const dynamic = 'force-dynamic'; export async function POST() { - return simpleRoute(async () => { - const session = await getAuthUserSession(); + return simpleRoute(async () => { + const session = await getAuthUserSession(); - void buildWatchService.startWatch(); - await buildStatusService.ensureSeeded(); + void buildWatchService.startWatch(); + await buildStatusService.ensureSeeded(); - let appLookup = await buildLiveStatusService.getBuildableAppLookup(session); + let appLookup = await buildLiveStatusService.getBuildableAppLookup(session); - const encoder = new TextEncoder(); - let shouldStopStreaming = false; - let unsubscribe: (() => void) | null = null; - let heartbeat: ReturnType | null = null; + const encoder = new TextEncoder(); + let shouldStopStreaming = false; + let unsubscribe: (() => void) | null = null; + let heartbeat: ReturnType | null = null; - const customReadable = new ReadableStream({ - async start(controller) { - const sendData = (data: unknown) => { - if (shouldStopStreaming) { - return; - } - try { - controller.enqueue(encoder.encode(StreamUtils.encodeSseData(data))); - } catch (e) { - console.error(`[BUILD STATUS] Error while enqueueing build status data: `, e); - shouldStopStreaming = true; - unsubscribe?.(); - unsubscribe = null; - if (heartbeat) clearInterval(heartbeat); - heartbeat = null; - controller.close(); - } - }; + const customReadable = new ReadableStream({ + async start(controller) { + const sendData = (data: unknown) => { + if (shouldStopStreaming) { + return; + } + try { + controller.enqueue(encoder.encode(StreamUtils.encodeSseData(data))); + } catch (e) { + console.error(`[BUILD STATUS] Error while enqueueing build status data: `, e); + shouldStopStreaming = true; + unsubscribe?.(); + unsubscribe = null; + if (heartbeat) { + clearInterval(heartbeat); + } + heartbeat = null; + controller.close(); + } + }; - unsubscribe = buildStatusService.subscribe(async (status) => { - if (shouldStopStreaming || status.workloadType !== 'app') { - return; - } + unsubscribe = buildStatusService.subscribe(async (status) => { + if (shouldStopStreaming || status.workloadType !== 'app') { + return; + } - let appInfo = appLookup.get(status.workloadId); - if (!appInfo) { - // A new app might have been created while streaming, refresh the lookup. - appLookup = await buildLiveStatusService.getBuildableAppLookup(session); - appInfo = appLookup.get(status.workloadId); - } - if (!appInfo) { - return; - } + let appInfo = appLookup.get(status.workloadId); + if (!appInfo) { + // A new app might have been created while streaming, refresh the lookup. + appLookup = await buildLiveStatusService.getBuildableAppLookup(session); + appInfo = appLookup.get(status.workloadId); + } + if (!appInfo) { + return; + } - sendData(buildLiveStatusService.mapBuildToStatus(status, appInfo)); - }); + sendData(buildLiveStatusService.mapBuildToStatus(status, appInfo)); + }); - try { - sendData(buildLiveStatusService.getInitialStatus(appLookup)); - } catch (e) { - console.error("Error fetching initial build status", e); - } + try { + sendData(buildLiveStatusService.getInitialStatus(appLookup)); + } catch (e) { + console.error('Error fetching initial build status', e); + } - heartbeat = setInterval(() => { - if (shouldStopStreaming) return; - try { - controller.enqueue(encoder.encode(': ping\n\n')); - } catch (error) { - console.error('[BUILD STATUS] Error while sending heartbeat:', error); - shouldStopStreaming = true; - unsubscribe?.(); - unsubscribe = null; - if (heartbeat) clearInterval(heartbeat); - heartbeat = null; - controller.close(); - } - }, 25_000); - }, - cancel() { - console.log("[BUILD STATUS] Client left, cancelling build status stream"); - shouldStopStreaming = true; - if (unsubscribe) { - unsubscribe(); - unsubscribe = null; - } - if (heartbeat) clearInterval(heartbeat); - heartbeat = null; - }, - }); + heartbeat = setInterval(() => { + if (shouldStopStreaming) { + return; + } + try { + controller.enqueue(encoder.encode(': ping\n\n')); + } catch (error) { + console.error('[BUILD STATUS] Error while sending heartbeat:', error); + shouldStopStreaming = true; + unsubscribe?.(); + unsubscribe = null; + if (heartbeat) { + clearInterval(heartbeat); + } + heartbeat = null; + controller.close(); + } + }, 25_000); + }, + cancel() { + console.log('[BUILD STATUS] Client left, cancelling build status stream'); + shouldStopStreaming = true; + if (unsubscribe) { + unsubscribe(); + unsubscribe = null; + } + if (heartbeat) { + clearInterval(heartbeat); + } + heartbeat = null; + } + }); - return new Response(customReadable, { - headers: { - Connection: "keep-alive", - "Content-Encoding": "none", - "Cache-Control": "no-cache, no-transform", - "Content-Type": "text/event-stream; charset=utf-8", - }, - }); + return new Response(customReadable, { + headers: { + Connection: 'keep-alive', + 'Content-Encoding': 'none', + 'Cache-Control': 'no-cache, no-transform', + 'Content-Type': 'text/event-stream; charset=utf-8' + } }); + }); } diff --git a/src/app/api/deployment-status/route.ts b/src/app/api/deployment-status/route.ts index fbbb4a44..ab43cefe 100644 --- a/src/app/api/deployment-status/route.ts +++ b/src/app/api/deployment-status/route.ts @@ -1,130 +1,146 @@ -import deploymentLiveStatusService from "@/server/services/deployment-live-status.service"; -import buildPodLogWatchService from "@/server/services/standalone-services/build-pod-log-watch.service"; -import buildWatchService from "@/server/services/standalone-services/build-watch.service"; -import deploymentEventWatchService from "@/server/services/standalone-services/deployment-event-watch.service"; -import deploymentWatchService from "@/server/services/standalone-services/deployment-watch.service"; -import { getAuthUserSession, simpleRoute } from "@/server/utils/action-wrapper.utils"; -import { V1Deployment } from "@kubernetes/client-node"; +import deploymentLiveStatusService from '@/server/services/deployment-live-status.service'; +import buildPodLogWatchService from '@/server/services/standalone-services/build-pod-log-watch.service'; +import buildWatchService from '@/server/services/standalone-services/build-watch.service'; +import deploymentEventWatchService from '@/server/services/standalone-services/deployment-event-watch.service'; +import deploymentWatchService from '@/server/services/standalone-services/deployment-watch.service'; +import { getAuthUserSession, simpleRoute } from '@/server/utils/action-wrapper.utils'; +import { V1Deployment } from '@kubernetes/client-node'; // Prevents this route's response from being cached -export const dynamic = "force-dynamic"; +export const dynamic = 'force-dynamic'; const IGNORED_NAMESPACES = ['default', 'longhorn-system', 'kube-public', 'kube-system', 'cert-manager']; export async function POST() { - return simpleRoute(async () => { - - const session = await getAuthUserSession(); - - buildPodLogWatchService.startWatch(); - buildWatchService.startWatch(); - deploymentEventWatchService.startWatch(); - - const encoder = new TextEncoder(); - let shouldStopStreaming = false; - let unsubscribe: (() => void) | null = null; - let heartbeat: ReturnType | null = null; - - // Fetch all projects and apps to build a lookup map - let appLookup = await deploymentLiveStatusService.getAppLookup(session); - - const customReadable = new ReadableStream({ - async start(controller) { - - const sendData = (data: any) => { - if (shouldStopStreaming) return; - try { - controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`)); - } catch (e) { - console.error(`[ENQUEUE ERROR] Error while enqueueing Deployment Status data: `, e); - shouldStopStreaming = true; - unsubscribe?.(); - unsubscribe = null; - if (heartbeat) clearInterval(heartbeat); - heartbeat = null; - controller.close(); - } - }; - - // 1. Send initial state - try { - const initialStatus = await deploymentLiveStatusService.getInitialStatus(appLookup); - sendData(initialStatus); - } catch (e) { - console.error("Error fetching initial status", e); - } - - // 2. Subscribe to the shared watch for changes - unsubscribe = deploymentWatchService.subscribe(async (type, deployment: V1Deployment) => { - if (shouldStopStreaming) { return; } - - const appId = deployment.metadata?.name; - const projectId = deployment.metadata?.namespace; - - if (!appId || !projectId) { return; } - - // ignore system namespaces - if (IGNORED_NAMESPACES.includes(projectId)) { return; } - - // If a new deployment is detected (ADDED) and we don't know about it, - // it might be a newly created app. Refresh the lookup. - if (type === 'ADDED' && !appLookup.has(appId)) { - console.log(`[LiveStatus] New unknown deployment detected for ${appId}, refreshing app lookup`); - appLookup = await deploymentLiveStatusService.getAppLookup(session); - } - - const appInfo = appLookup.get(appId); - if (!appInfo) { - return; - } - - // Verify namespace matches project ID - if (appInfo.projectId !== projectId) { return; } - - let status; - if (type === 'DELETED') { - status = deploymentLiveStatusService.mapDeploymentToStatus(appId, appInfo, undefined); - } else { - status = deploymentLiveStatusService.mapDeploymentToStatus(appId, appInfo, deployment); - } - - sendData(status); - }); - - heartbeat = setInterval(() => { - if (shouldStopStreaming) return; - try { - controller.enqueue(encoder.encode(': ping\n\n')); - } catch (error) { - console.error('[ENQUEUE ERROR] Error while sending deployment status heartbeat:', error); - shouldStopStreaming = true; - unsubscribe?.(); - unsubscribe = null; - if (heartbeat) clearInterval(heartbeat); - heartbeat = null; - controller.close(); - } - }, 25_000); - }, - cancel() { - console.log("[LEAVE] Cancelling deployment status stream"); - shouldStopStreaming = true; - if (unsubscribe) { - unsubscribe(); - unsubscribe = null; - } - if (heartbeat) clearInterval(heartbeat); - heartbeat = null; + return simpleRoute(async () => { + const session = await getAuthUserSession(); + + buildPodLogWatchService.startWatch(); + buildWatchService.startWatch(); + deploymentEventWatchService.startWatch(); + + const encoder = new TextEncoder(); + let shouldStopStreaming = false; + let unsubscribe: (() => void) | null = null; + let heartbeat: ReturnType | null = null; + + // Fetch all projects and apps to build a lookup map + let appLookup = await deploymentLiveStatusService.getAppLookup(session); + + const customReadable = new ReadableStream({ + async start(controller) { + const sendData = (data: any) => { + if (shouldStopStreaming) { + return; + } + try { + controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`)); + } catch (e) { + console.error(`[ENQUEUE ERROR] Error while enqueueing Deployment Status data: `, e); + shouldStopStreaming = true; + unsubscribe?.(); + unsubscribe = null; + if (heartbeat) { + clearInterval(heartbeat); } + heartbeat = null; + controller.close(); + } + }; + + // 1. Send initial state + try { + const initialStatus = await deploymentLiveStatusService.getInitialStatus(appLookup); + sendData(initialStatus); + } catch (e) { + console.error('Error fetching initial status', e); + } + + // 2. Subscribe to the shared watch for changes + unsubscribe = deploymentWatchService.subscribe(async (type, deployment: V1Deployment) => { + if (shouldStopStreaming) { + return; + } + + const appId = deployment.metadata?.name; + const projectId = deployment.metadata?.namespace; + + if (!appId || !projectId) { + return; + } + + // ignore system namespaces + if (IGNORED_NAMESPACES.includes(projectId)) { + return; + } + + // If a new deployment is detected (ADDED) and we don't know about it, + // it might be a newly created app. Refresh the lookup. + if (type === 'ADDED' && !appLookup.has(appId)) { + console.log(`[LiveStatus] New unknown deployment detected for ${appId}, refreshing app lookup`); + appLookup = await deploymentLiveStatusService.getAppLookup(session); + } + + const appInfo = appLookup.get(appId); + if (!appInfo) { + return; + } + + // Verify namespace matches project ID + if (appInfo.projectId !== projectId) { + return; + } + + let status; + if (type === 'DELETED') { + status = deploymentLiveStatusService.mapDeploymentToStatus(appId, appInfo, undefined); + } else { + status = deploymentLiveStatusService.mapDeploymentToStatus(appId, appInfo, deployment); + } + + sendData(status); }); - return new Response(customReadable, { - headers: { - Connection: "keep-alive", - "Content-Encoding": "none", - "Cache-Control": "no-cache, no-transform", - "Content-Type": "text/event-stream; charset=utf-8", - }, - }); + heartbeat = setInterval(() => { + if (shouldStopStreaming) { + return; + } + try { + controller.enqueue(encoder.encode(': ping\n\n')); + } catch (error) { + console.error('[ENQUEUE ERROR] Error while sending deployment status heartbeat:', error); + shouldStopStreaming = true; + unsubscribe?.(); + unsubscribe = null; + if (heartbeat) { + clearInterval(heartbeat); + } + heartbeat = null; + controller.close(); + } + }, 25_000); + }, + cancel() { + console.log('[LEAVE] Cancelling deployment status stream'); + shouldStopStreaming = true; + if (unsubscribe) { + unsubscribe(); + unsubscribe = null; + } + if (heartbeat) { + clearInterval(heartbeat); + } + heartbeat = null; + } + }); + + return new Response(customReadable, { + headers: { + Connection: 'keep-alive', + 'Content-Encoding': 'none', + 'Cache-Control': 'no-cache, no-transform', + 'Content-Type': 'text/event-stream; charset=utf-8' + } }); + }); } diff --git a/src/app/monitoring/app-volumes-monitoring.tsx b/src/app/monitoring/app-volumes-monitoring.tsx index 26fbe4a1..be6695d1 100644 --- a/src/app/monitoring/app-volumes-monitoring.tsx +++ b/src/app/monitoring/app-volumes-monitoring.tsx @@ -17,7 +17,9 @@ export default function AppVolumeMonitoring({ volumesUsage }: { volumesUsage?: A const updatedVolumeUsage = volumesUsage; const totals = useMemo(() => { const unique = new Map(); - for (const volume of volumesUsage ?? []) unique.set(AppVolumeIdentityUtils.observationKey(volume.projectId, volume.pvcName), volume); + for (const volume of volumesUsage ?? []) { + unique.set(AppVolumeIdentityUtils.observationKey(volume.projectId, volume.pvcName), volume); + } const values = [...unique.values()]; return { used: values.reduce((sum, value) => sum + (value.usedBytes ?? 0), 0), diff --git a/src/app/monitoring/node-monitoring-history.unit.spec.ts b/src/app/monitoring/node-monitoring-history.unit.spec.ts deleted file mode 100644 index a992bab6..00000000 --- a/src/app/monitoring/node-monitoring-history.unit.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react'; -import { cleanup, render, screen } from '@testing-library/react'; -import NodeMonitoringHistory from './node-monitoring-history'; -import { getNodeMonitoringHistory } from './actions'; - -vi.mock('./actions', () => ({ getNodeMonitoringHistory: vi.fn() })); -vi.mock('recharts', () => ({ - CartesianGrid: () => null, - Line: () => null, - LineChart: () => null, - ResponsiveContainer: () => null, - Tooltip: () => null, - Legend: () => null, - XAxis: () => null, - YAxis: () => null -})); -afterEach(() => { - cleanup(); - vi.clearAllMocks(); -}); - -it('shows CPU, RAM and storage history with a shared range selector', async () => { - vi.mocked(getNodeMonitoringHistory).mockResolvedValue({ - status: 'success', - data: { retentionHours: 24, points: [{ time: Date.now(), cpuCores: 1, ramBytes: 1024, diskBytes: 2048 }] } - } as never); - render(React.createElement(NodeMonitoringHistory)); - expect(await screen.findByText('CPU')).toBeTruthy(); - expect(screen.getByText('RAM')).toBeTruthy(); - expect(screen.getByText('Storage')).toBeTruthy(); - expect(screen.getAllByRole('combobox', { name: 'History time range' })).toHaveLength(1); -}); diff --git a/src/app/project/[projectId]/actions.unit.spec.ts b/src/app/project/[projectId]/actions.unit.spec.ts index 995b0319..90382480 100644 --- a/src/app/project/[projectId]/actions.unit.spec.ts +++ b/src/app/project/[projectId]/actions.unit.spec.ts @@ -1,22 +1,24 @@ import { z } from 'zod'; vi.mock('@/server/utils/action-wrapper.utils', () => ({ - getAuthUserSession: vi.fn().mockResolvedValue({}), - isAuthorizedDeleteForProject: vi.fn(), - saveFormAction: async (input: unknown, schema: z.ZodType, action: (data: unknown) => unknown) => { - const result = schema.safeParse(input); - if (!result.success) throw result.error; - return action(result.data); - }, - simpleAction: (action: () => unknown) => action(), + getAuthUserSession: vi.fn().mockResolvedValue({}), + isAuthorizedDeleteForProject: vi.fn(), + saveFormAction: async (input: unknown, schema: z.ZodType, action: (data: unknown) => unknown) => { + const result = schema.safeParse(input); + if (!result.success) { + throw result.error; + } + return action(result.data); + }, + simpleAction: (action: () => unknown) => action() })); vi.mock('@/server/utils/shared-authorization.utils', () => ({ - ensureCreateProjectWorkloadInProject: vi.fn(), - ensureDeleteProjectWorkloadInProject: vi.fn(), - ensureWriteProject: vi.fn(), + ensureCreateProjectWorkloadInProject: vi.fn(), + ensureDeleteProjectWorkloadInProject: vi.fn(), + ensureWriteProject: vi.fn() })); vi.mock('@/server/services/addons/agent-sandbox-addon.service', () => ({ - default: { isAvailable: vi.fn() }, + default: { isAvailable: vi.fn() } })); vi.mock('@/server/services/agent.service', () => ({ default: { saveAgent: vi.fn() } })); vi.mock('@/server/services/agent-template.service', () => ({ default: { createAgentFromTemplate: vi.fn() } })); @@ -29,14 +31,14 @@ vi.mock('@/server/services/db-tool-services/pgadmin.service', () => ({ default: vi.mock('@/server/services/llm-gateway.service', () => ({ default: {} })); vi.mock('@/server/services/project-network-graph-layout.service', () => ({ default: {} })); vi.mock('@/server/services/param.service', () => ({ - default: {}, - ParamService: { FEATURE_NEW_NETWORK_POLICY_EXPLENATION: 'feature' }, + default: {}, + ParamService: { FEATURE_NEW_NETWORK_POLICY_EXPLENATION: 'feature' } })); vi.mock('@/shared/model/app-template.model', () => ({ appTemplateZodModel: z.unknown() })); vi.mock('@/shared/model/agent-template.model', () => ({ agentTemplateZodModel: z.unknown() })); vi.mock('@/shared/model/rename-agent.model', () => ({ renameAgentZodModel: z.unknown() })); vi.mock('@/shared/model/project-network-graph-layout.model', () => ({ - projectNetworkGraphPositionSchema: z.unknown(), + projectNetworkGraphPositionSchema: z.unknown() })); import agentSandboxAddonService from '@/server/services/addons/agent-sandbox-addon.service'; @@ -45,21 +47,19 @@ import agentTemplateService from '@/server/services/agent-template.service'; import { createAgent, createAgentFromTemplate } from './actions'; describe('agent creation actions', () => { - beforeEach(() => { - vi.mocked(agentSandboxAddonService.isAvailable).mockResolvedValue(false); - }); + beforeEach(() => { + vi.mocked(agentSandboxAddonService.isAvailable).mockResolvedValue(false); + }); - it('rejects direct single-agent creation when the add-on is unavailable', async () => { - await expect(createAgent('Agent', 'project-1', 'gateway-1', ['model-1'])) - .rejects.toThrow('The Agent Sandbox Add-on is not available.'); + it('rejects direct single-agent creation when the add-on is unavailable', async () => { + await expect(createAgent('Agent', 'project-1', 'gateway-1', ['model-1'])).rejects.toThrow('The Agent Sandbox Add-on is not available.'); - expect(agentService.saveAgent).not.toHaveBeenCalled(); - }); + expect(agentService.saveAgent).not.toHaveBeenCalled(); + }); - it('rejects direct template-based agent creation when the add-on is unavailable', async () => { - await expect(createAgentFromTemplate(null, {}, 'project-1')) - .rejects.toThrow('The Agent Sandbox Add-on is not available.'); + it('rejects direct template-based agent creation when the add-on is unavailable', async () => { + await expect(createAgentFromTemplate(null, {}, 'project-1')).rejects.toThrow('The Agent Sandbox Add-on is not available.'); - expect(agentTemplateService.createAgentFromTemplate).not.toHaveBeenCalled(); - }); + expect(agentTemplateService.createAgentFromTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/project/[projectId]/agents/details/agent-drawer.tsx b/src/app/project/[projectId]/agents/details/agent-drawer.tsx index 7f262d20..691e3f7b 100644 --- a/src/app/project/[projectId]/agents/details/agent-drawer.tsx +++ b/src/app/project/[projectId]/agents/details/agent-drawer.tsx @@ -1,29 +1,11 @@ 'use client'; import { type Ref } from 'react'; -import { - Bot, - Hammer, - Pencil, - Settings, - X, -} from 'lucide-react'; +import { Bot, Hammer, Pencil, Settings, X } from 'lucide-react'; import { Button } from '@/components/ui/button'; -import { - Drawer, - DrawerContent, - DrawerDescription, - DrawerHeader, - DrawerTitle, -} from '@/components/ui/drawer'; +import { Drawer, DrawerContent, DrawerDescription, DrawerHeader, DrawerTitle } from '@/components/ui/drawer'; import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'; -import { - Empty, - EmptyDescription, - EmptyHeader, - EmptyMedia, - EmptyTitle, -} from '@/components/ui/empty'; +import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'; import { ScrollArea } from '@/components/ui/scroll-area'; import { useDialog } from '@/frontend/states/zustand.states'; import { DrawerTabScrollArea } from '@/app/project/workload-components/drawer/drawer-tab-scroll-area'; @@ -36,188 +18,158 @@ import AgentSandboxDrawerSettings from './agent-sandbox-drawer-settings'; import type { AgentExtendedModel } from '@/shared/model/agent-extended.model'; import { RolePermissionEnum } from '@/shared/model/role-extended.model'; import type { AgentSandboxTemplateInfo } from '@/shared/model/agent-sandbox-template-info.model'; -import { - AgentDrawerNavigationUtils, - type AgentDrawerTab, -} from '@/shared/utils/agent-drawer-navigation.utils'; +import { AgentDrawerNavigationUtils, type AgentDrawerTab } from '@/shared/utils/agent-drawer-navigation.utils'; import { formatDateTime } from '@/frontend/utils/format.utils'; export function AgentSandboxDrawer({ - contentRef, - agent, - role, - templateInfo, - storageClasses, - runtimeClasses, - open, - onOpenChange, - onOpenChangeComplete, - requestedTab, - onTabChange, + contentRef, + agent, + role, + templateInfo, + storageClasses, + runtimeClasses, + open, + onOpenChange, + onOpenChangeComplete, + requestedTab, + onTabChange }: { - contentRef?: Ref; - agent?: AgentExtendedModel; - role?: RolePermissionEnum; - templateInfo?: AgentSandboxTemplateInfo; - storageClasses: string[]; - runtimeClasses: string[]; - open: boolean; - onOpenChange: (open: boolean) => void; - onOpenChangeComplete: (open: boolean) => void; - requestedTab?: string | null; - onTabChange: (tab: AgentDrawerTab) => void; + contentRef?: Ref; + agent?: AgentExtendedModel; + role?: RolePermissionEnum; + templateInfo?: AgentSandboxTemplateInfo; + storageClasses: string[]; + runtimeClasses: string[]; + open: boolean; + onOpenChange: (open: boolean) => void; + onOpenChangeComplete: (open: boolean) => void; + requestedTab?: string | null; + onTabChange: (tab: AgentDrawerTab) => void; }) { - const { openDialog } = useDialog(); - const readonly = role !== RolePermissionEnum.READWRITE; - const hasGitSource = agent?.sourceType === 'GIT' || agent?.sourceType === 'GIT_SSH'; - const activeTab = AgentDrawerNavigationUtils.resolveTab(requestedTab, { readonly, hasGitSource: !!hasGitSource }); + const { openDialog } = useDialog(); + const readonly = role !== RolePermissionEnum.READWRITE; + const hasGitSource = agent?.sourceType === 'GIT' || agent?.sourceType === 'GIT_SSH'; + const activeTab = AgentDrawerNavigationUtils.resolveTab(requestedTab, { readonly, hasGitSource: !!hasGitSource }); - const handleTabChange = (tab: string) => { - onTabChange(AgentDrawerNavigationUtils.resolveTab(tab, { readonly, hasGitSource: !!hasGitSource })); - }; + const handleTabChange = (tab: string) => { + onTabChange(AgentDrawerNavigationUtils.resolveTab(tab, { readonly, hasGitSource: !!hasGitSource })); + }; - const openRenameDialog = () => { - if (!agent) return; - openDialog(, { maxWidth: 'max-w-md' }); - }; + const openRenameDialog = () => { + if (!agent) { + return; + } + openDialog(, { maxWidth: 'max-w-md' }); + }; - return ( - - - - + + +
+
+ +
+
+ + {agent?.name ?? 'Agent Sandbox'} + {agent && role === RolePermissionEnum.READWRITE && ( + - - -
-
- -
-
- - {agent?.name ?? 'Agent Sandbox'} - {agent && role === RolePermissionEnum.READWRITE && ( - - )} - - - Agent Sandbox{agent ? ` · ${agent.project.name}` : ''} - {templateInfo?.lastDeployedAt - ? ` · Last deployed ${formatDateTime(templateInfo.lastDeployedAt)}` - : ''} - -
- {agent && ( -
- -
- )} -
- {agent && role ? ( - - - - - Sandboxes - - {!readonly && hasGitSource && ( - - - Builds - - )} - {!readonly && ( - - - Configuration - - )} - - - ) : ( -
- )} -
- {agent && role ? ( - <> - - - - - - {!readonly && hasGitSource && ( - - - - - - )} - {!readonly && ( - - - - - - )} - - ) : ( - - - - - - Agent Sandbox unavailable - - This Agent Sandbox could not be loaded. It may have been deleted. - - - - )} -
- - - - ); + size="icon-sm" + className="shrink-0 opacity-0 transition-opacity group-hover/title:opacity-100 focus-visible:opacity-100" + onClick={openRenameDialog} + > + + Rename Agent Sandbox + + )} +
+ + Agent Sandbox{agent ? ` · ${agent.project.name}` : ''} + {templateInfo?.lastDeployedAt ? ` · Last deployed ${formatDateTime(templateInfo.lastDeployedAt)}` : ''} + +
+ {agent && ( +
+ +
+ )} +
+ {agent && role ? ( + + + + + Sandboxes + + {!readonly && hasGitSource && ( + + + Builds + + )} + {!readonly && ( + + + Configuration + + )} + + + ) : ( +
+ )} +
+ {agent && role ? ( + <> + + + + + + {!readonly && hasGitSource && ( + + + + + + )} + {!readonly && ( + + + + + + )} + + ) : ( + + + + + + Agent Sandbox unavailable + This Agent Sandbox could not be loaded. It may have been deleted. + + + )} +
+
+
+
+ ); } diff --git a/src/app/project/[projectId]/agents/details/builds/agent-builds-grid.tsx b/src/app/project/[projectId]/agents/details/builds/agent-builds-grid.tsx index c92e7b84..72133d3d 100644 --- a/src/app/project/[projectId]/agents/details/builds/agent-builds-grid.tsx +++ b/src/app/project/[projectId]/agents/details/builds/agent-builds-grid.tsx @@ -1,28 +1,10 @@ 'use client'; import { useCallback, useState } from 'react'; -import { - Boxes, - EllipsisVertical, - File, - GitCommit, - Hammer, - LucideTerminal, -} from 'lucide-react'; +import { Boxes, EllipsisVertical, File, GitCommit, Hammer, LucideTerminal } from 'lucide-react'; import { Button } from '@/components/ui/button'; -import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuTrigger, -} from '@/components/ui/dropdown-menu'; -import { - Empty, - EmptyDescription, - EmptyHeader, - EmptyMedia, - EmptyTitle, -} from '@/components/ui/empty'; +import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'; +import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'; import { Item, ItemContent, ItemTitle } from '@/components/ui/item'; import FullLoadingSpinner from '@/components/ui/full-loading-spinnter'; import ShortCommitHash from '@/components/custom/short-commit-hash'; @@ -38,162 +20,155 @@ import { appBuildMethodLabels } from '@/shared/model/app-source-info.model'; import type { BuildJobModel } from '@/shared/model/build-job'; export function AgentBuildsGrid({ agentId }: { agentId: string }) { - const { openConfirmDialog } = useConfirmDialog(); - const { openNestedDrawer } = useNestedDrawer(); - const [builds, setBuilds] = useState(); + const { openConfirmDialog } = useConfirmDialog(); + const { openNestedDrawer } = useNestedDrawer(); + const [builds, setBuilds] = useState(); - const updateBuilds = useCallback(async () => { - const response = await getWorkloadBuildsAction({ - workloadId: agentId, - workloadType: 'agent', - }); - if (response.status === 'success') { - setBuilds(response.data ?? []); - } - }, [agentId]); - - usePolling(updateBuilds, { - intervalMs: 10000, - runImmediately: true, + const updateBuilds = useCallback(async () => { + const response = await getWorkloadBuildsAction({ + workloadId: agentId, + workloadType: 'agent' }); + if (response.status === 'success') { + setBuilds(response.data ?? []); + } + }, [agentId]); - const stopBuild = async (build: BuildJobModel) => { - const confirmed = await openConfirmDialog({ - title: 'Stop Build', - description: 'The build will be stopped and removed. Are you sure you want to stop this build?', - okButton: 'Stop & Remove Build', - }); - if (!confirmed) return; + usePolling(updateBuilds, { + intervalMs: 10000, + runImmediately: true + }); - await Toast.fromAction(() => deleteWorkloadBuildAction(build.name, { - workloadId: agentId, - workloadType: 'agent', - })); - await updateBuilds(); - }; + const stopBuild = async (build: BuildJobModel) => { + const confirmed = await openConfirmDialog({ + title: 'Stop Build', + description: 'The build will be stopped and removed. Are you sure you want to stop this build?', + okButton: 'Stop & Remove Build' + }); + if (!confirmed) { + return; + } - const showLogs = (build: BuildJobModel) => { - openNestedDrawer({ - title: 'Build Logs', - description: `View the logs for the build started ${formatDateTime(build.startTime)}.`, - content: ( - - ), - }); - }; + await Toast.fromAction(() => + deleteWorkloadBuildAction(build.name, { + workloadId: agentId, + workloadType: 'agent' + }) + ); + await updateBuilds(); + }; - if (!builds) { - return ( -
-
Latest Builds
- -
- ); - } + const showLogs = (build: BuildJobModel) => { + openNestedDrawer({ + title: 'Build Logs', + description: `View the logs for the build started ${formatDateTime(build.startTime)}.`, + content: ( + + ) + }); + }; - if (builds.length === 0) { - return ( -
-
Latest Builds
- - - - - - No builds available - - This Agent Sandbox has no builds yet. - - - -
- ); - } + if (!builds) { + return ( +
+
Latest Builds
+ +
+ ); + } + if (builds.length === 0) { return ( -
-
Latest Builds
-
- {builds.map(build => ( - -
- - - {build.status} - - {build.gitCommitMessage && ( -
- {build.gitCommitMessage.length > 200 - ? `${build.gitCommitMessage.slice(0, 200)}…` - : build.gitCommitMessage} -
- )} -
- - {(build.status === 'RUNNING' || build.status === 'PENDING') && ( - - - - Build actions - } /> - - void stopBuild(build)} - > - Stop Build - - - - )} -
-
- {build.gitCommit &&
- - {build.gitCommit} -
} - {build.gitCommit && } - {build.buildMethod && <> - - {build.buildMethod === 'DOCKERFILE' && } - {build.buildMethod === 'FRAMEWORK' && } - {appBuildMethodLabels[build.buildMethod] ?? '-'} - - - } - {formatDateTime(build.startTime)} -
-
- ))} -
-
+
+
Latest Builds
+ + + + + + No builds available + This Agent Sandbox has no builds yet. + + +
); + } + + return ( +
+
Latest Builds
+
+ {builds.map((build) => ( + +
+ + + {build.status} + + {build.gitCommitMessage && ( +
+ {build.gitCommitMessage.length > 200 ? `${build.gitCommitMessage.slice(0, 200)}…` : build.gitCommitMessage} +
+ )} +
+ + {(build.status === 'RUNNING' || build.status === 'PENDING') && ( + + + + Build actions + + } + /> + + void stopBuild(build)}> + Stop Build + + + + )} +
+
+ {build.gitCommit && ( +
+ + {build.gitCommit} +
+ )} + {build.gitCommit && } + {build.buildMethod && ( + <> + + {build.buildMethod === 'DOCKERFILE' && } + {build.buildMethod === 'FRAMEWORK' && } + {appBuildMethodLabels[build.buildMethod] ?? '-'} + + + + )} + {formatDateTime(build.startTime)} +
+
+ ))} +
+
+ ); } diff --git a/src/app/project/[projectId]/agents/details/environment/agent-env-vars-card.tsx b/src/app/project/[projectId]/agents/details/environment/agent-env-vars-card.tsx index a7906e57..dc8c80f8 100644 --- a/src/app/project/[projectId]/agents/details/environment/agent-env-vars-card.tsx +++ b/src/app/project/[projectId]/agents/details/environment/agent-env-vars-card.tsx @@ -1,72 +1,94 @@ 'use client'; -import { Button } from "@/components/ui/button"; -import { DrawerCard, DrawerCardContent, DrawerCardDescription, DrawerCardFooter, DrawerCardHeader, DrawerCardTitle } from "@/components/custom/drawer-card"; -import { Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"; -import { useConfirmDialog, useDialog } from "@/frontend/states/zustand.states"; -import { Toast } from "@/frontend/utils/toast.utils"; -import { AgentExtendedModel } from "@/shared/model/agent-extended.model"; -import { EditIcon, Plus, TrashIcon } from "lucide-react"; -import { deleteAgentEnvVar } from "../configuration/actions"; -import AgentEnvVarEditOverlay from "./agent-env-var-edit-overlay"; +import { Button } from '@/components/ui/button'; +import { DrawerCard, DrawerCardContent, DrawerCardDescription, DrawerCardFooter, DrawerCardHeader, DrawerCardTitle } from '@/components/custom/drawer-card'; +import { Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'; +import { useConfirmDialog, useDialog } from '@/frontend/states/zustand.states'; +import { Toast } from '@/frontend/utils/toast.utils'; +import { AgentExtendedModel } from '@/shared/model/agent-extended.model'; +import { EditIcon, Plus, TrashIcon } from 'lucide-react'; +import { deleteAgentEnvVar } from '../configuration/actions'; +import AgentEnvVarEditOverlay from './agent-env-var-edit-overlay'; function getEnvironmentVariableNames(encryptedEnvVars: string | null | undefined): string[] { - if (!encryptedEnvVars) return []; - try { - const parsed = JSON.parse(encryptedEnvVars) as Array<{ name?: unknown }>; - return parsed.flatMap((envVar) => typeof envVar.name === 'string' ? [envVar.name] : []); - } catch { - return []; - } + if (!encryptedEnvVars) { + return []; + } + try { + const parsed = JSON.parse(encryptedEnvVars) as Array<{ name?: unknown }>; + return parsed.flatMap((envVar) => (typeof envVar.name === 'string' ? [envVar.name] : [])); + } catch { + return []; + } } export default function AgentEnvVarsCard({ agent, readonly }: { agent: AgentExtendedModel; readonly: boolean }) { - const { openConfirmDialog } = useConfirmDialog(); - const { openDialog } = useDialog(); - const environmentVariableNames = getEnvironmentVariableNames(agent.encryptedEnvVars); + const { openConfirmDialog } = useConfirmDialog(); + const { openDialog } = useDialog(); + const environmentVariableNames = getEnvironmentVariableNames(agent.encryptedEnvVars); - const openEditDialog = async (name?: string) => { - await openDialog(, { maxWidth: 'max-w-md' }); - }; - const deleteEnvironmentVariable = async (name: string) => { - const confirmed = await openConfirmDialog({ - title: 'Delete Environment Variable', - description: `Remove ${name}? This takes effect after deploying the agent.`, - okButton: 'Delete Environment Variable', - }); - if (confirmed) await Toast.fromAction(() => deleteAgentEnvVar(agent.id, name), 'Deleted Env Variable Successfully'); - }; + const openEditDialog = async (name?: string) => { + await openDialog(, { maxWidth: 'max-w-md' }); + }; + const deleteEnvironmentVariable = async (name: string) => { + const confirmed = await openConfirmDialog({ + title: 'Delete Environment Variable', + description: `Remove ${name}? This takes effect after deploying the agent.`, + okButton: 'Delete Environment Variable' + }); + if (confirmed) { + await Toast.fromAction(() => deleteAgentEnvVar(agent.id, name), 'Deleted Env Variable Successfully'); + } + }; - return ( - - - Environment Variables - - Values are encrypted at rest and never shown. Names starting with QS_ are reserved by QuickStack. - - - {environmentVariableNames.length > 0 && - -
- {environmentVariableNames.length} Environment Variables - - Key - {!readonly && } - - - {environmentVariableNames.map((name) => - {name} - {!readonly && -
- - -
-
} -
)} -
-
- } - {!readonly && } - - ); + return ( + + + Environment Variables + + Values are encrypted at rest and never shown. Names starting with QS_ are reserved by + QuickStack. + + + {environmentVariableNames.length > 0 && ( + + + {environmentVariableNames.length} Environment Variables + + + Key + {!readonly && } + + + + {environmentVariableNames.map((name) => ( + + {name} + {!readonly && ( + +
+ + +
+
+ )} +
+ ))} +
+
+
+ )} + {!readonly && ( + + + + )} +
+ ); } diff --git a/src/app/project/[projectId]/agents/details/model/agent-model-configuration-editor.tsx b/src/app/project/[projectId]/agents/details/model/agent-model-configuration-editor.tsx index c12dda29..273bbf0c 100644 --- a/src/app/project/[projectId]/agents/details/model/agent-model-configuration-editor.tsx +++ b/src/app/project/[projectId]/agents/details/model/agent-model-configuration-editor.tsx @@ -1,172 +1,168 @@ 'use client'; -import type { z } from "zod"; -import { useActionState, useEffect, useState } from "react"; -import { SubmitButton } from "@/components/custom/submit-button"; -import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form"; -import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; -import SelectBox from "@/components/custom/multiselect-field"; -import { FormUtils } from "@/frontend/utils/form.utilts"; -import { agentModelConfigurationZodModel, AgentModelConfigurationModel } from "@/shared/model/agent-config.model"; -import { ServerActionResult } from "@/shared/model/server-action-error-return.model"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { useForm } from "react-hook-form"; -import { useRouter } from "next/navigation"; -import { toast } from "sonner"; -import { saveAgentModelConfiguration } from "../configuration/actions"; -import { getLlmGateways, getModelAliasesForGateway } from "@/app/project/[projectId]/actions"; -import { AgentExtendedModel } from "@/shared/model/agent-extended.model"; -import { LlmGatewayModel } from "@/shared/model/llm-gateway.model"; -import { Loader2 } from "lucide-react"; +import type { z } from 'zod'; +import { useActionState, useEffect, useState } from 'react'; +import { SubmitButton } from '@/components/custom/submit-button'; +import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'; +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; +import SelectBox from '@/components/custom/multiselect-field'; +import { FormUtils } from '@/frontend/utils/form.utilts'; +import { agentModelConfigurationZodModel, AgentModelConfigurationModel } from '@/shared/model/agent-config.model'; +import { ServerActionResult } from '@/shared/model/server-action-error-return.model'; +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import { useRouter } from 'next/navigation'; +import { toast } from 'sonner'; +import { saveAgentModelConfiguration } from '../configuration/actions'; +import { getLlmGateways, getModelAliasesForGateway } from '@/app/project/[projectId]/actions'; +import { AgentExtendedModel } from '@/shared/model/agent-extended.model'; +import { LlmGatewayModel } from '@/shared/model/llm-gateway.model'; +import { Loader2 } from 'lucide-react'; -export function AgentModelConfigurationEditor({ agent, readonly }: { - agent: AgentExtendedModel; - readonly: boolean; -}) { - const router = useRouter(); - const [gateways, setGateways] = useState([]); - const [modelAliases, setModelAliases] = useState([]); - const [loadingAliases, setLoadingAliases] = useState(false); - const [selectedGatewayId, setSelectedGatewayId] = useState(agent.llmGatewayId || ''); +export function AgentModelConfigurationEditor({ agent, readonly }: { agent: AgentExtendedModel; readonly: boolean }) { + const router = useRouter(); + const [gateways, setGateways] = useState([]); + const [modelAliases, setModelAliases] = useState([]); + const [loadingAliases, setLoadingAliases] = useState(false); + const [selectedGatewayId, setSelectedGatewayId] = useState(agent.llmGatewayId || ''); - useEffect(() => { - getLlmGateways().then((r: any) => { - if (r?.data) setGateways(r.data); - }); - }, []); - - const form = useForm, unknown, z.output>({ - resolver: zodResolver(agentModelConfigurationZodModel), - defaultValues: { - llmGatewayId: agent.llmGatewayId || '', - modelAlias: agent.modelAlias || [], - }, - disabled: readonly, + useEffect(() => { + getLlmGateways().then((r: any) => { + if (r?.data) { + setGateways(r.data); + } }); + }, []); + + const form = useForm, unknown, z.output>({ + resolver: zodResolver(agentModelConfigurationZodModel), + defaultValues: { + llmGatewayId: agent.llmGatewayId || '', + modelAlias: agent.modelAlias || [] + }, + disabled: readonly + }); - useEffect(() => { - if (!selectedGatewayId) { - setModelAliases([]); - return; - } - loadModelAliases(selectedGatewayId); - }, [selectedGatewayId]); + useEffect(() => { + if (!selectedGatewayId) { + setModelAliases([]); + return; + } + loadModelAliases(selectedGatewayId); + }, [selectedGatewayId]); - const loadModelAliases = async (gatewayId: string) => { - setLoadingAliases(true); - try { - const result = await getModelAliasesForGateway(gatewayId); - if (result?.data) { - setModelAliases(result.data as string[]); - } else if (Array.isArray(result)) { - setModelAliases(result as string[]); - } else { - setModelAliases([]); - } - } catch { - setModelAliases([]); - } finally { - setLoadingAliases(false); - } - }; + const loadModelAliases = async (gatewayId: string) => { + setLoadingAliases(true); + try { + const result = await getModelAliasesForGateway(gatewayId); + if (result?.data) { + setModelAliases(result.data as string[]); + } else if (Array.isArray(result)) { + setModelAliases(result as string[]); + } else { + setModelAliases([]); + } + } catch { + setModelAliases([]); + } finally { + setLoadingAliases(false); + } + }; - const [state, formAction] = useActionState( - (state: ServerActionResult, payload: AgentModelConfigurationModel) => - saveAgentModelConfiguration(state, payload, agent.id), - FormUtils.getInitialFormState(), - ); + const [state, formAction] = useActionState( + (state: ServerActionResult, payload: AgentModelConfigurationModel) => saveAgentModelConfiguration(state, payload, agent.id), + FormUtils.getInitialFormState() + ); - useEffect(() => { - if (state.status === 'success') { - toast.success('Model configuration saved. Click "Deploy" to apply changes.'); - router.refresh(); - } - FormUtils.mapValidationErrorsToForm(state, form); - }, [form, router, state]); + useEffect(() => { + if (state.status === 'success') { + toast.success('Model configuration saved. Click "Deploy" to apply changes.'); + router.refresh(); + } + FormUtils.mapValidationErrorsToForm(state, form); + }, [form, router, state]); - return ( - - form.handleSubmit((data) => formAction(data))()}> -
-
- ( - - LLM Gateway - - - - )} - /> + return ( + + form.handleSubmit((data) => formAction(data))()}> +
+
+ ( + + LLM Gateway + + + + )} + /> - ( - - Model Alias - {!selectedGatewayId ? ( -

Select a gateway first

- ) : loadingAliases ? ( -
- Loading model aliases... -
- ) : modelAliases.length === 0 ? ( -

No model aliases available

- ) : ( - - field.onChange(Array.isArray(value) ? value : [])} - options={modelAliases.map((alias) => ({ value: alias, label: alias }))} - placeholder="Select model aliases" - inputPlaceholder="Search model aliases..." - emptyPlaceholder="No model aliases found." - className={readonly ? "pointer-events-none opacity-50" : undefined} - /> - - )} - -
- )} - /> + ( + + Model Alias + {!selectedGatewayId ? ( +

Select a gateway first

+ ) : loadingAliases ? ( +
+ Loading model aliases...
- {!readonly && ( -
- Save Model Configuration - {state?.status === 'error' && !state?.errors && ( -

{state.message}

- )} -
- )} -
- - - ); + ) : modelAliases.length === 0 ? ( +

No model aliases available

+ ) : ( + + field.onChange(Array.isArray(value) ? value : [])} + options={modelAliases.map((alias) => ({ value: alias, label: alias }))} + placeholder="Select model aliases" + inputPlaceholder="Search model aliases..." + emptyPlaceholder="No model aliases found." + className={readonly ? 'pointer-events-none opacity-50' : undefined} + /> + + )} + + + )} + /> +
+ {!readonly && ( +
+ Save Model Configuration + {state?.status === 'error' && !state?.errors &&

{state.message}

} +
+ )} +
+ + + ); } diff --git a/src/app/project/[projectId]/agents/details/sandboxes/agent-access-dialog.tsx b/src/app/project/[projectId]/agents/details/sandboxes/agent-access-dialog.tsx index f6b46eaa..d63b7038 100644 --- a/src/app/project/[projectId]/agents/details/sandboxes/agent-access-dialog.tsx +++ b/src/app/project/[projectId]/agents/details/sandboxes/agent-access-dialog.tsx @@ -1,96 +1,95 @@ 'use client'; - -import { useEffect, useState } from "react"; -import { DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { Button } from "@/components/ui/button"; -import { useDialogContext } from "@/frontend/states/dialog-context"; -import { ExternalLink } from "lucide-react"; -import { createAgentAccessUrl } from "./actions"; -import { Spinner } from "@/components/ui/spinner"; -import { Actions } from "@/frontend/utils/nextjs-actions.utils"; +import { useEffect, useState } from 'react'; +import { DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; +import { Button } from '@/components/ui/button'; +import { useDialogContext } from '@/frontend/states/dialog-context'; +import { ExternalLink } from 'lucide-react'; +import { createAgentAccessUrl } from './actions'; +import { Spinner } from '@/components/ui/spinner'; +import { Actions } from '@/frontend/utils/nextjs-actions.utils'; export default function AgentAccessDialogContent({ - agentId, - sandboxName, - view, - domainId, + agentId, + sandboxName, + view, + domainId }: { - agentId: string; - sandboxName: string; - view: 'agent' | 'files'; - domainId: string; + agentId: string; + sandboxName: string; + view: 'agent' | 'files'; + domainId: string; }) { - const { closeDialog } = useDialogContext(); - const [url, setUrl] = useState(); - const [error, setError] = useState(); - const viewLabel = view === 'agent' ? 'Agent UI' : 'File Browser'; + const { closeDialog } = useDialogContext(); + const [url, setUrl] = useState(); + const [error, setError] = useState(); + const viewLabel = view === 'agent' ? 'Agent UI' : 'File Browser'; - useEffect(() => { - let active = true; + useEffect(() => { + let active = true; - const createUrl = async () => { - setUrl(undefined); - setError(undefined); + const createUrl = async () => { + setUrl(undefined); + setError(undefined); - try { - const result = await Actions.run(() => createAgentAccessUrl(agentId, sandboxName, view, domainId)); - if (active) { - setUrl(result.url); - } - } catch (err: any) { - if (active) { - setError(err?.message || 'Could not open Agent access.'); - } - } - }; + try { + const result = await Actions.run(() => createAgentAccessUrl(agentId, sandboxName, view, domainId)); + if (active) { + setUrl(result.url); + } + } catch (err: any) { + if (active) { + setError(err?.message || 'Could not open Agent access.'); + } + } + }; - createUrl(); + createUrl(); - return () => { - active = false; - }; - }, [agentId, sandboxName, domainId, view]); + return () => { + active = false; + }; + }, [agentId, sandboxName, domainId, view]); - return ( - <> - - Open {viewLabel} - + return ( + <> + + Open {viewLabel} + -
- {!url && !error && ( -
- - Generating access link... -
- )} - {url && ( -

- The link is ready. Open the {viewLabel} in a new tab by clicking the button below. This link is valid for 20 seconds. -

- )} - {error && ( -

{error}

- )} -
+
+ {!url && !error && ( +
+ + Generating access link... +
+ )} + {url && ( +

+ The link is ready. Open the {viewLabel} in a new tab by clicking the button below. This link is valid for 20 seconds. +

+ )} + {error &&

{error}

} +
- - - - - - ); -} \ No newline at end of file + + + + + + ); +} diff --git a/src/app/project/[projectId]/agents/details/sandboxes/agent-sandboxes-card.tsx b/src/app/project/[projectId]/agents/details/sandboxes/agent-sandboxes-card.tsx index 95bc3c20..371a938d 100644 --- a/src/app/project/[projectId]/agents/details/sandboxes/agent-sandboxes-card.tsx +++ b/src/app/project/[projectId]/agents/details/sandboxes/agent-sandboxes-card.tsx @@ -1,41 +1,43 @@ 'use client'; -import { useEffect, useState } from "react"; -import { Button } from "@/components/ui/button"; -import { useConfirmDialog, useDialog, useInputDialog } from "@/frontend/states/zustand.states"; -import { Toast } from "@/frontend/utils/toast.utils"; -import { DeploymentStatus } from "@/shared/model/deployment-info.model"; -import { Bot, ChevronDown, ExternalLink, Files, Filter, Logs, Pause, Play, PlayIcon, Search, Square, TagPlus, TagX, Terminal } from "lucide-react"; -import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; -import { startSandbox, stopSandbox, suspendSandbox, resumeSandbox, deleteAgentTag } from "./actions"; -import { ListUtils } from "@/shared/utils/list.utils"; -import { StreamUtils } from "@/shared/utils/stream.utils"; -import FullLoadingSpinner from "@/components/ui/full-loading-spinnter"; -import { LogsDialogContent } from "@/components/custom/logs-overlay"; +import { useEffect, useState } from 'react'; +import { Button } from '@/components/ui/button'; +import { useConfirmDialog, useDialog, useInputDialog } from '@/frontend/states/zustand.states'; +import { Toast } from '@/frontend/utils/toast.utils'; +import { DeploymentStatus } from '@/shared/model/deployment-info.model'; +import { Bot, ChevronDown, ExternalLink, Files, Filter, Logs, Pause, Play, PlayIcon, Search, Square, TagPlus, TagX, Terminal } from 'lucide-react'; +import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'; +import { startSandbox, stopSandbox, suspendSandbox, resumeSandbox, deleteAgentTag } from './actions'; +import { ListUtils } from '@/shared/utils/list.utils'; +import { StreamUtils } from '@/shared/utils/stream.utils'; +import FullLoadingSpinner from '@/components/ui/full-loading-spinnter'; +import { LogsDialogContent } from '@/components/custom/logs-overlay'; +import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'; +import DeploymentStatusBadge from '@/app/project/workload-components/deployment-status-badge'; +import type { AgentExtendedModel } from '@/shared/model/agent-extended.model'; +import { toast } from 'sonner'; import { - Empty, - EmptyContent, - EmptyDescription, - EmptyHeader, - EmptyMedia, - EmptyTitle, -} from "@/components/ui/empty" -import DeploymentStatusBadge from "@/app/project/workload-components/deployment-status-badge"; -import type { AgentExtendedModel } from "@/shared/model/agent-extended.model"; -import { toast } from "sonner"; -import { DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"; -import AgentAccessDialogContent from "./agent-access-dialog"; -import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible"; -import { DrawerCard, DrawerCardDescription, DrawerCardHeader, DrawerCardTitle } from "@/components/custom/drawer-card"; -import { Input } from "@/components/ui/input"; -import { SplitButton } from "@/components/custom/split-button"; + DropdownMenu, + DropdownMenuCheckboxItem, + DropdownMenuContent, + DropdownMenuGroup, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuSeparator, + DropdownMenuTrigger +} from '@/components/ui/dropdown-menu'; +import AgentAccessDialogContent from './agent-access-dialog'; +import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'; +import { DrawerCard, DrawerCardDescription, DrawerCardHeader, DrawerCardTitle } from '@/components/custom/drawer-card'; +import { Input } from '@/components/ui/input'; +import { SplitButton } from '@/components/custom/split-button'; interface SandboxInfo { - name: string; - status: DeploymentStatus; - statusText: string; - createdAt: string | null; - customTag?: string; + name: string; + status: DeploymentStatus; + statusText: string; + createdAt: string | null; + customTag?: string; } const SSE_RETRY_BASE_DELAY_MS = 1_000; @@ -43,469 +45,451 @@ const SSE_RETRY_MAX_DELAY_MS = 30_000; const SANDBOX_STATUSES: DeploymentStatus[] = ['DEPLOYED', 'DEPLOYING', 'BUILDING', 'PENDING', 'SUSPENDED', 'SHUTTING_DOWN', 'SHUTDOWN', 'ERROR', 'UNKNOWN']; const SANDBOX_STATUS_LABELS: Record = { - DEPLOYED: 'Deployed', - DEPLOYING: 'Deploying', - BUILDING: 'Building', - PENDING: 'Pending', - SUSPENDED: 'Suspended', - SHUTTING_DOWN: 'Stopping', - SHUTDOWN: 'Shutdown', - ERROR: 'Error', - UNKNOWN: 'Unknown', + DEPLOYED: 'Deployed', + DEPLOYING: 'Deploying', + BUILDING: 'Building', + PENDING: 'Pending', + SUSPENDED: 'Suspended', + SHUTTING_DOWN: 'Stopping', + SHUTDOWN: 'Shutdown', + ERROR: 'Error', + UNKNOWN: 'Unknown' }; -export default function AgentSandboxesCard({ - agent, - readonly, -}: { - agent: AgentExtendedModel; - readonly: boolean; -}) { - const { id: agentId, projectId: namespace, agentDomains, deployFileBrowser } = agent; - const { openDialog } = useDialog(); - const { openInputDialog } = useInputDialog(); - const { openConfirmDialog } = useConfirmDialog(); - const [sandboxes, setSandboxes] = useState([]); - const [loading, setLoading] = useState(false); - const [isConnected, setIsConnected] = useState(false); - const [expandedSandboxNames, setExpandedSandboxNames] = useState([]); - const [searchQuery, setSearchQuery] = useState(''); - const [statusFilter, setStatusFilter] = useState([]); - - // SSE stream for live sandbox updates - useEffect(() => { - const controller = new AbortController(); - let stopped = false; - let reader: ReadableStreamDefaultReader | null = null; - let retryTimeout: ReturnType | null = null; - let resolveRetry: (() => void) | null = null; - let retryAttempt = 0; - - const waitForRetry = (delayMs: number) => new Promise(resolve => { - resolveRetry = resolve; - retryTimeout = setTimeout(() => { - retryTimeout = null; - resolveRetry = null; - resolve(); - }, delayMs); - }); - - const connectSse = async () => { - while (!stopped) { - try { - const response = await fetch('/api/agent-sandboxes', { - method: 'POST', - headers: { 'Content-Type': 'text/event-stream' }, - body: JSON.stringify({ agentId }), - signal: controller.signal, - }); - - if (!response.ok || !response.body) { - throw new Error(`SSE request failed with status ${response.status}`); - } +export default function AgentSandboxesCard({ agent, readonly }: { agent: AgentExtendedModel; readonly: boolean }) { + const { id: agentId, projectId: namespace, agentDomains, deployFileBrowser } = agent; + const { openDialog } = useDialog(); + const { openInputDialog } = useInputDialog(); + const { openConfirmDialog } = useConfirmDialog(); + const [sandboxes, setSandboxes] = useState([]); + const [loading, setLoading] = useState(false); + const [isConnected, setIsConnected] = useState(false); + const [expandedSandboxNames, setExpandedSandboxNames] = useState([]); + const [searchQuery, setSearchQuery] = useState(''); + const [statusFilter, setStatusFilter] = useState([]); + + // SSE stream for live sandbox updates + useEffect(() => { + const controller = new AbortController(); + let stopped = false; + let reader: ReadableStreamDefaultReader | null = null; + let retryTimeout: ReturnType | null = null; + let resolveRetry: (() => void) | null = null; + let retryAttempt = 0; + + const waitForRetry = (delayMs: number) => + new Promise((resolve) => { + resolveRetry = resolve; + retryTimeout = setTimeout(() => { + retryTimeout = null; + resolveRetry = null; + resolve(); + }, delayMs); + }); + + const connectSse = async () => { + while (!stopped) { + try { + const response = await fetch('/api/agent-sandboxes', { + method: 'POST', + headers: { 'Content-Type': 'text/event-stream' }, + body: JSON.stringify({ agentId }), + signal: controller.signal + }); + + if (!response.ok || !response.body) { + throw new Error(`SSE request failed with status ${response.status}`); + } + + setIsConnected(true); + reader = response.body.pipeThrough(new TextDecoderStream()).getReader(); + + let buffer = ''; + while (!stopped) { + const { value, done } = await reader.read(); + if (done) { + break; + } - setIsConnected(true); - reader = response.body - .pipeThrough(new TextDecoderStream()) - .getReader(); - - let buffer = ''; - while (!stopped) { - const { value, done } = await reader.read(); - if (done) break; - - const parsed = StreamUtils.parseSseFrames(buffer, value); - buffer = parsed.buffer; - - for (const frame of parsed.frames) { - try { - const msg = JSON.parse(frame); - if (msg.type === 'FULL' && Array.isArray(msg.data)) { - setSandboxes(ListUtils.dedupByName(msg.data, 'name')); - } else if (msg.type === 'ADDED' && msg.sandbox) { - setSandboxes(prev => { - if (prev.some(i => i.name === msg.sandbox.name)) return prev; - return [...prev, msg.sandbox]; - }); - } else if (msg.type === 'MODIFIED' && msg.sandbox) { - setSandboxes(prev => prev.map(i => - i.name === msg.sandbox.name ? msg.sandbox : i - )); - } else if (msg.type === 'DELETED' && msg.sandbox?.name) { - setSandboxes(prev => prev.filter(i => - i.name !== msg.sandbox.name - )); - } - } catch { - // Ignore malformed SSE payloads and keep the stream alive. - } - } - } - } catch (err: any) { - if (err?.name !== 'AbortError' && !stopped) { - console.error('Agent sandboxes SSE error:', err); - } - } finally { - reader = null; - if (!stopped) { - setIsConnected(false); + const parsed = StreamUtils.parseSseFrames(buffer, value); + buffer = parsed.buffer; + + for (const frame of parsed.frames) { + try { + const msg = JSON.parse(frame); + if (msg.type === 'FULL' && Array.isArray(msg.data)) { + setSandboxes(ListUtils.dedupByName(msg.data, 'name')); + } else if (msg.type === 'ADDED' && msg.sandbox) { + setSandboxes((prev) => { + if (prev.some((i) => i.name === msg.sandbox.name)) { + return prev; } + return [...prev, msg.sandbox]; + }); + } else if (msg.type === 'MODIFIED' && msg.sandbox) { + setSandboxes((prev) => prev.map((i) => (i.name === msg.sandbox.name ? msg.sandbox : i))); + } else if (msg.type === 'DELETED' && msg.sandbox?.name) { + setSandboxes((prev) => prev.filter((i) => i.name !== msg.sandbox.name)); } - - if (stopped) break; - - const exponentialDelay = Math.min( - SSE_RETRY_BASE_DELAY_MS * 2 ** retryAttempt, - SSE_RETRY_MAX_DELAY_MS, - ); - const jitteredDelay = exponentialDelay * (0.8 + Math.random() * 0.4); - retryAttempt += 1; - await waitForRetry(jitteredDelay); + } catch { + // Ignore malformed SSE payloads and keep the stream alive. + } } - }; - - void connectSse(); - - return () => { - stopped = true; - controller.abort(); - if (retryTimeout) { - clearTimeout(retryTimeout); - retryTimeout = null; - } - resolveRetry?.(); - void reader?.cancel(); - }; - }, [agentId]); - - const handleStartSandbox = async () => { - setLoading(true); - try { - await Toast.fromAction( - () => startSandbox(agentId), - 'Sandbox started', - 'Starting sandbox...', - ); - } finally { - setLoading(false); - // SSE will push updated list automatically - } - }; - - const handleStartSandboxWithCustomTag = async () => { - const customTag = await openInputDialog({ - title: 'Start sandbox with custom tag', - description: 'The tag identifies this sandbox and must be unique for this Sandbox Instance (1–63 characters).', - fieldName: 'Custom tag', - okButton: 'Start sandbox', - }); - if (!customTag) { - return; - } - - setLoading(true); - try { - await Toast.fromAction( - () => startSandbox(agentId, customTag), - 'Sandbox started', - 'Starting sandbox...', - ); + } + } catch (err: any) { + if (err?.name !== 'AbortError' && !stopped) { + console.error('Agent sandboxes SSE error:', err); + } } finally { - setLoading(false); - } - }; - - const handleDeleteTagData = async () => { - const customTag = await openInputDialog({ - title: 'Delete Custom Tag data', - description: 'Deletes all stored data of this Custom Tag. The tag must not have a running sandbox. 1–63 characters.', - fieldName: 'Custom tag', - okButton: 'Continue', - }); - if (!customTag) { - return; + reader = null; + if (!stopped) { + setIsConnected(false); + } } - const confirmed = await openConfirmDialog({ - title: 'Delete Custom Tag data', - description: `All stored data of Custom Tag "${customTag}" will be deleted permanently. This cannot be undone.`, - okButton: 'Delete data', - }); - if (!confirmed) { - return; + if (stopped) { + break; } - await Toast.fromAction( - () => deleteAgentTag(agentId, customTag), - 'Custom Tag data deleted', - 'Deleting Custom Tag data...', - ); - }; - - const renderStartSandboxActions = () => ( - - void handleStartSandboxWithCustomTag()}> - Start with custom tag - - void handleDeleteTagData()}> - Delete custom tag data - - } - > - - Start sandbox - - ); - - const handleStopSandbox = async (sandboxName: string) => { - try { - await Toast.fromAction( - () => stopSandbox(agentId, sandboxName), - 'Sandbox stopped', - 'Stopping sandbox...', - ); - // SSE will push updated list automatically - } finally { - // nothing to fetch — SSE handles it - } + const exponentialDelay = Math.min(SSE_RETRY_BASE_DELAY_MS * 2 ** retryAttempt, SSE_RETRY_MAX_DELAY_MS); + const jitteredDelay = exponentialDelay * (0.8 + Math.random() * 0.4); + retryAttempt += 1; + await waitForRetry(jitteredDelay); + } }; - const handleSuspendSandbox = async (sandboxName: string) => { - await Toast.fromAction( - () => suspendSandbox(agentId, sandboxName), - 'Sandbox suspended', - 'Suspending sandbox...', - ); + void connectSse(); + + return () => { + stopped = true; + controller.abort(); + if (retryTimeout) { + clearTimeout(retryTimeout); + retryTimeout = null; + } + resolveRetry?.(); + void reader?.cancel(); }; - - const handleResumeSandbox = async (sandboxName: string) => { - await Toast.fromAction( - () => resumeSandbox(agentId, sandboxName), - 'Sandbox resumed', - 'Resuming sandbox...', - ); - }; - - const handleOpenTerminal = async () => { - // Terminal opening is delegated to parent component via callback - // For now, this is a placeholder — terminal per sandbox needs pod discovery - }; - - const toggleSandboxExpanded = (sandboxName: string, open: boolean) => { - setExpandedSandboxNames(current => open - ? [...new Set([...current, sandboxName])] - : current.filter(name => name !== sandboxName), - ); - }; - - const toggleStatusFilter = (status: DeploymentStatus, checked: boolean) => { - setStatusFilter(current => checked - ? [...current, status] - : current.filter(value => value !== status), - ); - }; - - const normalizedSearchQuery = searchQuery.trim().toLowerCase(); - const filteredSandboxes = sandboxes.filter(sandbox => { - const matchesSearch = normalizedSearchQuery.length === 0 - || sandbox.name.toLowerCase().includes(normalizedSearchQuery) - || sandbox.customTag?.toLowerCase().includes(normalizedSearchQuery); - const matchesStatus = statusFilter.length === 0 || statusFilter.includes(sandbox.status); - - return matchesSearch && matchesStatus; + }, [agentId]); + + const handleStartSandbox = async () => { + setLoading(true); + try { + await Toast.fromAction(() => startSandbox(agentId), 'Sandbox started', 'Starting sandbox...'); + } finally { + setLoading(false); + // SSE will push updated list automatically + } + }; + + const handleStartSandboxWithCustomTag = async () => { + const customTag = await openInputDialog({ + title: 'Start sandbox with custom tag', + description: 'The tag identifies this sandbox and must be unique for this Sandbox Instance (1–63 characters).', + fieldName: 'Custom tag', + okButton: 'Start sandbox' }); + if (!customTag) { + return; + } + + setLoading(true); + try { + await Toast.fromAction(() => startSandbox(agentId, customTag), 'Sandbox started', 'Starting sandbox...'); + } finally { + setLoading(false); + } + }; + + const handleDeleteTagData = async () => { + const customTag = await openInputDialog({ + title: 'Delete Custom Tag data', + description: 'Deletes all stored data of this Custom Tag. The tag must not have a running sandbox. 1–63 characters.', + fieldName: 'Custom tag', + okButton: 'Continue' + }); + if (!customTag) { + return; + } + + const confirmed = await openConfirmDialog({ + title: 'Delete Custom Tag data', + description: `All stored data of Custom Tag "${customTag}" will be deleted permanently. This cannot be undone.`, + okButton: 'Delete data' + }); + if (!confirmed) { + return; + } + + await Toast.fromAction(() => deleteAgentTag(agentId, customTag), 'Custom Tag data deleted', 'Deleting Custom Tag data...'); + }; + + const renderStartSandboxActions = () => ( + + void handleStartSandboxWithCustomTag()}> + Start with custom tag + + void handleDeleteTagData()}> + Delete custom tag data + + + } + > + + Start sandbox + + ); + + const handleStopSandbox = async (sandboxName: string) => { + try { + await Toast.fromAction(() => stopSandbox(agentId, sandboxName), 'Sandbox stopped', 'Stopping sandbox...'); + // SSE will push updated list automatically + } finally { + // nothing to fetch — SSE handles it + } + }; + + const handleSuspendSandbox = async (sandboxName: string) => { + await Toast.fromAction(() => suspendSandbox(agentId, sandboxName), 'Sandbox suspended', 'Suspending sandbox...'); + }; + + const handleResumeSandbox = async (sandboxName: string) => { + await Toast.fromAction(() => resumeSandbox(agentId, sandboxName), 'Sandbox resumed', 'Resuming sandbox...'); + }; + + const handleOpenTerminal = async () => { + // Terminal opening is delegated to parent component via callback + // For now, this is a placeholder — terminal per sandbox needs pod discovery + }; + + const toggleSandboxExpanded = (sandboxName: string, open: boolean) => { + setExpandedSandboxNames((current) => (open ? [...new Set([...current, sandboxName])] : current.filter((name) => name !== sandboxName))); + }; + + const toggleStatusFilter = (status: DeploymentStatus, checked: boolean) => { + setStatusFilter((current) => (checked ? [...current, status] : current.filter((value) => value !== status))); + }; + + const normalizedSearchQuery = searchQuery.trim().toLowerCase(); + const filteredSandboxes = sandboxes.filter((sandbox) => { + const matchesSearch = + normalizedSearchQuery.length === 0 || + sandbox.name.toLowerCase().includes(normalizedSearchQuery) || + sandbox.customTag?.toLowerCase().includes(normalizedSearchQuery); + const matchesStatus = statusFilter.length === 0 || statusFilter.includes(sandbox.status); + + return matchesSearch && matchesStatus; + }); + + const handleOpenLogs = (sandboxName: string) => { + openDialog(, { maxWidth: '1300px' }); + }; + + const handleOpenAgentAccess = (sandboxName: string, view: 'agent' | 'files', domainId: string) => { + if (agentDomains.length === 0) { + toast.error('Configure an Agent access domain first.'); + return; + } + + openDialog(, { maxWidth: '440px' }); + }; + + const renderAccessButton = (sandboxName: string, view: 'agent' | 'files', showLabel = false) => { + const icon = view === 'agent' ? : ; + const label = view === 'agent' ? 'Open agent' : 'Files'; + const disabled = agentDomains.length === 0; + + if (agentDomains.length <= 1) { + return ( + + ); + } - const handleOpenLogs = (sandboxName: string) => { - openDialog(, { maxWidth: '1300px' }); - }; - - const handleOpenAgentAccess = (sandboxName: string, view: 'agent' | 'files', domainId: string) => { - if (agentDomains.length === 0) { - toast.error('Configure an Agent access domain first.'); - return; - } - - openDialog( - , - { maxWidth: '440px' } - ); - }; - - const renderAccessButton = (sandboxName: string, view: 'agent' | 'files', showLabel = false) => { - const icon = view === 'agent' - ? - : ; - const label = view === 'agent' ? 'Open agent' : 'Files'; - const disabled = agentDomains.length === 0; - - if (agentDomains.length <= 1) { - return ( - - ); - } - - return ( - - - {icon} - {showLabel && {label}} - } /> - - {agentDomains.map((domain) => ( - handleOpenAgentAccess(sandboxName, view, domain.id)}> - {domain.hostname} - + return ( + + + {icon} + {showLabel && {label}} + + } + /> + + {agentDomains.map((domain) => ( + handleOpenAgentAccess(sandboxName, view, domain.id)}> + {domain.hostname} + + ))} + + + ); + }; + + return ( + +
+ + Sandboxes + + {sandboxes.length === 0 + ? 'Start a sandbox to open an agent workspace.' + : `${sandboxes.length} sandbox${sandboxes.length === 1 ? '' : 'es'} · ${sandboxes.filter((sandbox) => sandbox.status === 'DEPLOYED').length} running`} + + + {!readonly && renderStartSandboxActions()} +
+ + {!isConnected ? ( + + ) : sandboxes.length === 0 ? ( + + + + + + No sandboxes yet + Start a sandbox to create an agent workspace. + + {!readonly && {renderStartSandboxActions()}} + + ) : ( + +
+
+
+ + setSearchQuery(event.target.value)} placeholder="Search name or tag" className="pl-9" /> +
+ + }> + + Filter{statusFilter.length > 0 && ` (${statusFilter.length})`} + + + + Status + + {SANDBOX_STATUSES.map((status) => ( + toggleStatusFilter(status, checked)} + > + {SANDBOX_STATUS_LABELS[status]} + ))} + - - ); - }; - - return ( - -
- - Sandboxes - - {sandboxes.length === 0 - ? 'Start a sandbox to open an agent workspace.' - : `${sandboxes.length} sandbox${sandboxes.length === 1 ? '' : 'es'} · ${sandboxes.filter(sandbox => sandbox.status === 'DEPLOYED').length} running`} - - - {!readonly && ( - renderStartSandboxActions() - )} +
- {!isConnected ? : ( - sandboxes.length === 0 ? ( - - - - No sandboxes yet - Start a sandbox to create an agent workspace. - - {!readonly && - {renderStartSandboxActions()} - } - - ) : ( - -
-
-
- - setSearchQuery(event.target.value)} - placeholder="Search name or tag" - className="pl-9" - /> -
- - }> - - Filter{statusFilter.length > 0 && ` (${statusFilter.length})`} - - - - Status - - {SANDBOX_STATUSES.map((status) => ( - toggleStatusFilter(status, checked)} - > - {SANDBOX_STATUS_LABELS[status]} - - ))} - - - -
- - {filteredSandboxes.length === 0 && ( -
- No sandboxes match the current search or filter. -
- )} - - {filteredSandboxes.map((sandbox) => ( - toggleSandboxExpanded(sandbox.name, open)} - className="overflow-hidden rounded-lg border bg-card" - > - }> - -
- {sandbox.name} -
- Tag: {sandbox.customTag ?? '—'} - · - Created {sandbox.createdAt ? new Date(sandbox.createdAt).toLocaleString() : '—'} -
-
- {sandbox.status} -
- -
- {sandbox.status === 'DEPLOYED' && <> - - - Open Agent UI - - {deployFileBrowser && - - Open Files - } - - - {!readonly && } - } - {sandbox.status === 'SUSPENDED' && !readonly && } - {!readonly && } -
-
-
- ))} -
-
- ) + {filteredSandboxes.length === 0 && ( +
+ No sandboxes match the current search or filter. +
)} -
- ); + + {filteredSandboxes.map((sandbox) => ( + toggleSandboxExpanded(sandbox.name, open)} + className="overflow-hidden rounded-lg border bg-card" + > + }> + +
+ {sandbox.name} +
+ + Tag: {sandbox.customTag ?? '—'} + + · + Created {sandbox.createdAt ? new Date(sandbox.createdAt).toLocaleString() : '—'} +
+
+ + {sandbox.status} + +
+ +
+ {sandbox.status === 'DEPLOYED' && ( + <> + + + Open Agent UI + + {deployFileBrowser && ( + + + Open Files + + )} + + + {!readonly && ( + + )} + + )} + {sandbox.status === 'SUSPENDED' && !readonly && ( + + )} + {!readonly && ( + + )} +
+
+
+ ))} +
+ + )} + + ); } diff --git a/src/app/project/[projectId]/agents/details/source/agent-source-wizard-dialog.tsx b/src/app/project/[projectId]/agents/details/source/agent-source-wizard-dialog.tsx index 302585a5..b932ed6f 100644 --- a/src/app/project/[projectId]/agents/details/source/agent-source-wizard-dialog.tsx +++ b/src/app/project/[projectId]/agents/details/source/agent-source-wizard-dialog.tsx @@ -1,400 +1,432 @@ 'use client'; -import { Button } from "@/components/ui/button"; -import { DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { useDialogContext } from "@/frontend/states/dialog-context"; -import { useConfirmDialog } from "@/frontend/states/zustand.states"; -import { Actions } from "@/frontend/utils/nextjs-actions.utils"; -import { Toast } from "@/frontend/utils/toast.utils"; -import { AgentExtendedModel } from "@/shared/model/agent-extended.model"; -import { AgentDockerfileDetectionModel, AgentGitBranchesLookupModel, AgentSourceInfoInputModel } from "@/shared/model/agent-config.model"; -import { ChevronLeft, Loader2, Rocket, Save } from "lucide-react"; -import { useRouter } from "next/navigation"; -import { useEffect, useState } from "react"; -import { toast } from "sonner"; +import { Button } from '@/components/ui/button'; +import { DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; +import { useDialogContext } from '@/frontend/states/dialog-context'; +import { useConfirmDialog } from '@/frontend/states/zustand.states'; +import { Actions } from '@/frontend/utils/nextjs-actions.utils'; +import { Toast } from '@/frontend/utils/toast.utils'; +import { AgentExtendedModel } from '@/shared/model/agent-extended.model'; +import { AgentDockerfileDetectionModel, AgentGitBranchesLookupModel, AgentSourceInfoInputModel } from '@/shared/model/agent-config.model'; +import { ChevronLeft, Loader2, Rocket, Save } from 'lucide-react'; +import { useRouter } from 'next/navigation'; +import { useEffect, useState } from 'react'; +import { toast } from 'sonner'; import { - detectAgentDockerfilePath, - ensureAgentGitSshPublicKey, - generateOrRegenerateAgentGitSshKey, - getAgentGitBranches, - saveAgentSource, -} from "../configuration/actions"; -import { deployAgent } from "../agent-actions"; -import { PathBuilderUtils } from "@/shared/utils/path-builder.utils"; -import { ContainerImageStep } from "@/app/project/workload-components/source-wizard/container-image-step"; -import { DockerfilePathStep } from "@/app/project/workload-components/source-wizard/dockerfile-path-step"; -import { GitBranchStep } from "@/app/project/workload-components/source-wizard/git-branch-step"; -import { GitHttpsUrlStep } from "@/app/project/workload-components/source-wizard/git-https-url-step"; -import { GitSshUrlStep } from "@/app/project/workload-components/source-wizard/git-ssh-url-step"; -import { SourceSummaryStep } from "@/app/project/workload-components/source-wizard/source-summary-step"; -import { SourceTypeStep } from "@/app/project/workload-components/source-wizard/source-type-step"; -import { defaultDockerfilePath, SourceFormPatch, sourceTypeLabels, SourceType, StepId } from "@/app/project/workload-components/source-wizard/types"; -import { WizardProgress } from "@/app/project/workload-components/source-wizard/wizard-progress"; + detectAgentDockerfilePath, + ensureAgentGitSshPublicKey, + generateOrRegenerateAgentGitSshKey, + getAgentGitBranches, + saveAgentSource +} from '../configuration/actions'; +import { deployAgent } from '../agent-actions'; +import { PathBuilderUtils } from '@/shared/utils/path-builder.utils'; +import { ContainerImageStep } from '@/app/project/workload-components/source-wizard/container-image-step'; +import { DockerfilePathStep } from '@/app/project/workload-components/source-wizard/dockerfile-path-step'; +import { GitBranchStep } from '@/app/project/workload-components/source-wizard/git-branch-step'; +import { GitHttpsUrlStep } from '@/app/project/workload-components/source-wizard/git-https-url-step'; +import { GitSshUrlStep } from '@/app/project/workload-components/source-wizard/git-ssh-url-step'; +import { SourceSummaryStep } from '@/app/project/workload-components/source-wizard/source-summary-step'; +import { SourceTypeStep } from '@/app/project/workload-components/source-wizard/source-type-step'; +import { defaultDockerfilePath, SourceFormPatch, sourceTypeLabels, SourceType, StepId } from '@/app/project/workload-components/source-wizard/types'; +import { WizardProgress } from '@/app/project/workload-components/source-wizard/wizard-progress'; -export function AgentSourceWizardDialog({ agent, gitSshPublicKey }: { - agent: AgentExtendedModel; - gitSshPublicKey?: string; -}) { - const router = useRouter(); - const { closeDialog } = useDialogContext(); - const { openConfirmDialog } = useConfirmDialog(); - const [step, setStep] = useState('source'); - const [history, setHistory] = useState([]); - const [formData, setFormData] = useState(() => toSourceInput(agent)); - const [publicKey, setPublicKey] = useState(gitSshPublicKey); - const [branches, setBranches] = useState([]); - const [isLoadingBranches, setIsLoadingBranches] = useState(false); - const [branchError, setBranchError] = useState(null); - const [isEnsuringKey, setIsEnsuringKey] = useState(false); - const [isDetectingDockerfile, setIsDetectingDockerfile] = useState(false); - const [dockerfileDetectionResult, setDockerfileDetectionResult] = useState<'detected' | 'not-found' | null>(null); - const [showGitToken, setShowGitToken] = useState(false); - const [showRegistryPassword, setShowRegistryPassword] = useState(false); +export function AgentSourceWizardDialog({ agent, gitSshPublicKey }: { agent: AgentExtendedModel; gitSshPublicKey?: string }) { + const router = useRouter(); + const { closeDialog } = useDialogContext(); + const { openConfirmDialog } = useConfirmDialog(); + const [step, setStep] = useState('source'); + const [history, setHistory] = useState([]); + const [formData, setFormData] = useState(() => toSourceInput(agent)); + const [publicKey, setPublicKey] = useState(gitSshPublicKey); + const [branches, setBranches] = useState([]); + const [isLoadingBranches, setIsLoadingBranches] = useState(false); + const [branchError, setBranchError] = useState(null); + const [isEnsuringKey, setIsEnsuringKey] = useState(false); + const [isDetectingDockerfile, setIsDetectingDockerfile] = useState(false); + const [dockerfileDetectionResult, setDockerfileDetectionResult] = useState<'detected' | 'not-found' | null>(null); + const [showGitToken, setShowGitToken] = useState(false); + const [showRegistryPassword, setShowRegistryPassword] = useState(false); - const isGitSource = formData.sourceType === 'GIT' || formData.sourceType === 'GIT_SSH'; - const showGitCredentials = formData.sourceType === 'GIT' && !!formData.gitUrl?.trim(); - const showRegistryCredentials = formData.sourceType === 'CONTAINER' && !!formData.containerImageSource?.trim(); - const currentTitle = getStepTitle(step, formData.sourceType); + const isGitSource = formData.sourceType === 'GIT' || formData.sourceType === 'GIT_SSH'; + const showGitCredentials = formData.sourceType === 'GIT' && !!formData.gitUrl?.trim(); + const showRegistryCredentials = formData.sourceType === 'CONTAINER' && !!formData.containerImageSource?.trim(); + const currentTitle = getStepTitle(step, formData.sourceType); - const goTo = (nextStep: StepId) => { - setHistory((items) => [...items, step]); - setStep(nextStep); - }; + const goTo = (nextStep: StepId) => { + setHistory((items) => [...items, step]); + setStep(nextStep); + }; - const goBack = () => { - const previous = history[history.length - 1]; - if (!previous) return; - setHistory((items) => items.slice(0, -1)); - setStep(previous); - }; + const goBack = () => { + const previous = history[history.length - 1]; + if (!previous) { + return; + } + setHistory((items) => items.slice(0, -1)); + setStep(previous); + }; - const updateFormData = (patch: SourceFormPatch) => { - setFormData((current) => ({ ...current, ...patch, buildMethod: 'DOCKERFILE' })); - }; + const updateFormData = (patch: SourceFormPatch) => { + setFormData((current) => ({ ...current, ...patch, buildMethod: 'DOCKERFILE' })); + }; - const chooseSourceType = (sourceType: SourceType) => { - setBranches([]); - setBranchError(null); - setDockerfileDetectionResult(null); - setFormData((current) => resetForSourceType(current, sourceType)); - }; + const chooseSourceType = (sourceType: SourceType) => { + setBranches([]); + setBranchError(null); + setDockerfileDetectionResult(null); + setFormData((current) => resetForSourceType(current, sourceType)); + }; - const loadBranches = async () => { - if (!formData.gitUrl?.trim()) { - setBranchError('Enter a Git repository URL first.'); - return false; - } + const loadBranches = async () => { + if (!formData.gitUrl?.trim()) { + setBranchError('Enter a Git repository URL first.'); + return false; + } - const inputData: AgentGitBranchesLookupModel = formData.sourceType === 'GIT' - ? { - sourceType: 'GIT', - gitUrl: formData.gitUrl, - gitUsername: formData.gitUsername, - gitToken: formData.gitToken, - } - : { - sourceType: 'GIT_SSH', - gitUrl: formData.gitUrl, - }; + const inputData: AgentGitBranchesLookupModel = + formData.sourceType === 'GIT' + ? { + sourceType: 'GIT', + gitUrl: formData.gitUrl, + gitUsername: formData.gitUsername, + gitToken: formData.gitToken + } + : { + sourceType: 'GIT_SSH', + gitUrl: formData.gitUrl + }; - setIsLoadingBranches(true); - setBranchError(null); - try { - const result = await Actions.run(() => getAgentGitBranches(agent.id, inputData)); - setBranches(result ?? []); - if (formData.gitBranch && !result?.includes(formData.gitBranch)) { - updateFormData({ gitBranch: '' }); - } - return true; - } catch (error) { - setBranches([]); - setBranchError(error instanceof Error ? error.message : 'Branches could not be loaded.'); - return false; - } finally { - setIsLoadingBranches(false); - } - }; + setIsLoadingBranches(true); + setBranchError(null); + try { + const result = await Actions.run(() => getAgentGitBranches(agent.id, inputData)); + setBranches(result ?? []); + if (formData.gitBranch && !result?.includes(formData.gitBranch)) { + updateFormData({ gitBranch: '' }); + } + return true; + } catch (error) { + setBranches([]); + setBranchError(error instanceof Error ? error.message : 'Branches could not be loaded.'); + return false; + } finally { + setIsLoadingBranches(false); + } + }; - const ensureSshKey = async () => { - if (publicKey || isEnsuringKey) return; - setIsEnsuringKey(true); - try { - const key = await Actions.run(() => ensureAgentGitSshPublicKey(agent.id)); - setPublicKey(key); - } finally { - setIsEnsuringKey(false); - } - }; + const ensureSshKey = async () => { + if (publicKey || isEnsuringKey) { + return; + } + setIsEnsuringKey(true); + try { + const key = await Actions.run(() => ensureAgentGitSshPublicKey(agent.id)); + setPublicKey(key); + } finally { + setIsEnsuringKey(false); + } + }; - useEffect(() => { - if (step === 'ssh-url') { - ensureSshKey(); - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [step, formData.gitUrl, publicKey]); + useEffect(() => { + if (step === 'ssh-url') { + ensureSshKey(); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [step, formData.gitUrl, publicKey]); - const regenerateKey = async () => { - const confirmed = await openConfirmDialog({ - title: "Regenerate Deploy Key", - description: "This replaces the current agent SSH key. Update the deploy key in your Git provider before deploying again.", - okButton: "Regenerate", - }); - if (!confirmed) return; - const key = await Actions.run(() => generateOrRegenerateAgentGitSshKey(agent.id)); - setPublicKey(key); - toast.success('Deploy key regenerated.'); - }; + const regenerateKey = async () => { + const confirmed = await openConfirmDialog({ + title: 'Regenerate Deploy Key', + description: 'This replaces the current agent SSH key. Update the deploy key in your Git provider before deploying again.', + okButton: 'Regenerate' + }); + if (!confirmed) { + return; + } + const key = await Actions.run(() => generateOrRegenerateAgentGitSshKey(agent.id)); + setPublicKey(key); + toast.success('Deploy key regenerated.'); + }; - const copyPublicKey = () => { - if (!publicKey) return; - navigator.clipboard.writeText(publicKey); - toast.success('Copied to clipboard.'); - }; + const copyPublicKey = () => { + if (!publicKey) { + return; + } + navigator.clipboard.writeText(publicKey); + toast.success('Copied to clipboard.'); + }; - const runDockerfileDetection = async (selectedBranch = formData.gitBranch) => { - if (!isGitSource || !formData.gitUrl || !selectedBranch) return; + const runDockerfileDetection = async (selectedBranch = formData.gitBranch) => { + if (!isGitSource || !formData.gitUrl || !selectedBranch) { + return; + } - const inputData: AgentDockerfileDetectionModel = formData.sourceType === 'GIT' - ? { - sourceType: 'GIT', - gitUrl: formData.gitUrl, - gitBranch: selectedBranch, - gitUsername: formData.gitUsername, - gitToken: formData.gitToken, - } - : { - sourceType: 'GIT_SSH', - gitUrl: formData.gitUrl, - gitBranch: selectedBranch, - }; + const inputData: AgentDockerfileDetectionModel = + formData.sourceType === 'GIT' + ? { + sourceType: 'GIT', + gitUrl: formData.gitUrl, + gitBranch: selectedBranch, + gitUsername: formData.gitUsername, + gitToken: formData.gitToken + } + : { + sourceType: 'GIT_SSH', + gitUrl: formData.gitUrl, + gitBranch: selectedBranch + }; - setIsDetectingDockerfile(true); - try { - const dockerfilePath = await Actions.run(() => detectAgentDockerfilePath(agent.id, inputData)); - updateFormData({ dockerfilePath: dockerfilePath || defaultDockerfilePath }); - setDockerfileDetectionResult(dockerfilePath ? 'detected' : 'not-found'); - } finally { - setIsDetectingDockerfile(false); - } - }; + setIsDetectingDockerfile(true); + try { + const dockerfilePath = await Actions.run(() => detectAgentDockerfilePath(agent.id, inputData)); + updateFormData({ dockerfilePath: dockerfilePath || defaultDockerfilePath }); + setDockerfileDetectionResult(dockerfilePath ? 'detected' : 'not-found'); + } finally { + setIsDetectingDockerfile(false); + } + }; - const selectGitBranch = async (gitBranch: string) => { - updateFormData({ gitBranch, buildMethod: 'DOCKERFILE' }); - setDockerfileDetectionResult(null); - goTo('dockerfile'); - await runDockerfileDetection(gitBranch); - }; + const selectGitBranch = async (gitBranch: string) => { + updateFormData({ gitBranch, buildMethod: 'DOCKERFILE' }); + setDockerfileDetectionResult(null); + goTo('dockerfile'); + await runDockerfileDetection(gitBranch); + }; - const next = async () => { - if (step === 'source') { - goTo(formData.sourceType === 'GIT' ? 'git-url' : formData.sourceType === 'GIT_SSH' ? 'ssh-url' : 'container-image'); - return; - } - if (step === 'git-url' || step === 'ssh-url') { - if (await loadBranches()) { - goTo('branch'); - } - return; - } - if (step === 'dockerfile' || step === 'container-image') { - goTo('summary'); - } - }; + const next = async () => { + if (step === 'source') { + goTo(formData.sourceType === 'GIT' ? 'git-url' : formData.sourceType === 'GIT_SSH' ? 'ssh-url' : 'container-image'); + return; + } + if (step === 'git-url' || step === 'ssh-url') { + if (await loadBranches()) { + goTo('branch'); + } + return; + } + if (step === 'dockerfile' || step === 'container-image') { + goTo('summary'); + } + }; - const save = async (deployAfterSave: boolean) => { - await Toast.fromAction(() => saveAgentSource(null, formData, agent.id), 'Source saved', 'Saving source...'); - if (deployAfterSave) { - await Toast.fromAction(() => deployAgent(agent.id, true), 'Deployment started', 'Starting deployment...'); - closeDialog(true); - router.refresh(); - router.push(PathBuilderUtils.projectAgentDrawer(agent.projectId, agent.id, 'configuration')); - return; - } - closeDialog(true); - router.refresh(); - }; + const save = async (deployAfterSave: boolean) => { + await Toast.fromAction(() => saveAgentSource(null, formData, agent.id), 'Source saved', 'Saving source...'); + if (deployAfterSave) { + await Toast.fromAction(() => deployAgent(agent.id, true), 'Deployment started', 'Starting deployment...'); + closeDialog(true); + router.refresh(); + router.push(PathBuilderUtils.projectAgentDrawer(agent.projectId, agent.id, 'configuration')); + return; + } + closeDialog(true); + router.refresh(); + }; - const nextDisabled = getNextDisabled(step, formData, publicKey, isLoadingBranches, isEnsuringKey, isDetectingDockerfile); + const nextDisabled = getNextDisabled(step, formData, publicKey, isLoadingBranches, isEnsuringKey, isDetectingDockerfile); - return ( - <> - - {currentTitle} - - {step === 'summary' ? 'Review the agent source before saving.' : 'Connect a source with the details QuickStack needs to run this agent.'} - - + return ( + <> + + {currentTitle} + + {step === 'summary' ? 'Review the agent source before saving.' : 'Connect a source with the details QuickStack needs to run this agent.'} + + -
- - {step === 'source' && ( - - )} - {step === 'git-url' && ( - - )} - {step === 'ssh-url' && ( - - )} - {step === 'branch' && ( - - )} - {step === 'dockerfile' && ( - updateFormData({ dockerfilePath })} - onRetry={() => void runDockerfileDetection()} - /> - )} - {step === 'container-image' && ( - - )} - {step === 'summary' && ( - - )} -
+
+ + {step === 'source' && } + {step === 'git-url' && ( + + )} + {step === 'ssh-url' && ( + + )} + {step === 'branch' && } + {step === 'dockerfile' && ( + updateFormData({ dockerfilePath })} + onRetry={() => void runDockerfileDetection()} + /> + )} + {step === 'container-image' && ( + + )} + {step === 'summary' && ( + + )} +
- -
-
- {history.length > 0 && ( - - )} -
-
- {step === 'summary' ? ( - <> - - - - ) : step === 'branch' ? null : ( - - )} -
-
-
- - ); + +
+
+ {history.length > 0 && ( + + )} +
+
+ {step === 'summary' ? ( + <> + + + + ) : step === 'branch' ? null : ( + + )} +
+
+
+ + ); } function getStepTitle(step: StepId, sourceType: AgentSourceInfoInputModel['sourceType']) { - if (step === 'source') return 'Choose source'; - if (step === 'git-url') return 'Connect Git HTTPS'; - if (step === 'ssh-url') return 'Connect Git SSH'; - if (step === 'branch') return 'Choose Git Branch'; - if (step === 'dockerfile') return 'Confirm Dockerfile Path'; - if (step === 'container-image') return 'Connect Docker Container Image'; - if (step === 'summary') return `${sourceTypeLabels[sourceType as SourceType]} Summary`; - return 'Connect Agent Source'; + if (step === 'source') { + return 'Choose source'; + } + if (step === 'git-url') { + return 'Connect Git HTTPS'; + } + if (step === 'ssh-url') { + return 'Connect Git SSH'; + } + if (step === 'branch') { + return 'Choose Git Branch'; + } + if (step === 'dockerfile') { + return 'Confirm Dockerfile Path'; + } + if (step === 'container-image') { + return 'Connect Docker Container Image'; + } + if (step === 'summary') { + return `${sourceTypeLabels[sourceType as SourceType]} Summary`; + } + return 'Connect Agent Source'; } -function getNextDisabled(step: StepId, formData: AgentSourceInfoInputModel, publicKey: string | undefined, isLoadingBranches: boolean, isEnsuringKey: boolean, isDetectingDockerfile: boolean) { - if (isLoadingBranches || isEnsuringKey || isDetectingDockerfile) return true; - if (step === 'git-url') return !formData.gitUrl?.trim(); - if (step === 'ssh-url') return !formData.gitUrl?.trim() || !publicKey; - if (step === 'branch') return !formData.gitBranch; - if (step === 'dockerfile') return !formData.dockerfilePath?.trim(); - if (step === 'container-image') return !formData.containerImageSource?.trim(); - return false; +function getNextDisabled( + step: StepId, + formData: AgentSourceInfoInputModel, + publicKey: string | undefined, + isLoadingBranches: boolean, + isEnsuringKey: boolean, + isDetectingDockerfile: boolean +) { + if (isLoadingBranches || isEnsuringKey || isDetectingDockerfile) { + return true; + } + if (step === 'git-url') { + return !formData.gitUrl?.trim(); + } + if (step === 'ssh-url') { + return !formData.gitUrl?.trim() || !publicKey; + } + if (step === 'branch') { + return !formData.gitBranch; + } + if (step === 'dockerfile') { + return !formData.dockerfilePath?.trim(); + } + if (step === 'container-image') { + return !formData.containerImageSource?.trim(); + } + return false; } function resetForSourceType(current: AgentSourceInfoInputModel, sourceType: SourceType): AgentSourceInfoInputModel { - if (sourceType === current.sourceType) return current; - if (sourceType === 'GIT') { - return { - sourceType, - buildMethod: 'DOCKERFILE', - gitUrl: '', - gitBranch: '', - gitUsername: '', - gitToken: '', - dockerfilePath: defaultDockerfilePath, - }; - } - if (sourceType === 'GIT_SSH') { - return { - sourceType, - buildMethod: 'DOCKERFILE', - gitUrl: '', - gitBranch: '', - dockerfilePath: defaultDockerfilePath, - }; - } + if (sourceType === current.sourceType) { + return current; + } + if (sourceType === 'GIT') { return { - sourceType, - buildMethod: 'DOCKERFILE', - containerImageSource: '', - containerRegistryUsername: '', - containerRegistryPassword: '', - dockerfilePath: defaultDockerfilePath, + sourceType, + buildMethod: 'DOCKERFILE', + gitUrl: '', + gitBranch: '', + gitUsername: '', + gitToken: '', + dockerfilePath: defaultDockerfilePath }; + } + if (sourceType === 'GIT_SSH') { + return { + sourceType, + buildMethod: 'DOCKERFILE', + gitUrl: '', + gitBranch: '', + dockerfilePath: defaultDockerfilePath + }; + } + return { + sourceType, + buildMethod: 'DOCKERFILE', + containerImageSource: '', + containerRegistryUsername: '', + containerRegistryPassword: '', + dockerfilePath: defaultDockerfilePath + }; } function toSourceInput(agent: AgentExtendedModel): AgentSourceInfoInputModel { - return { - sourceType: agent.sourceType as SourceType, - buildMethod: 'DOCKERFILE', - containerImageSource: agent.containerImageSource ?? '', - containerRegistryUsername: agent.containerRegistryUsername ?? '', - containerRegistryPassword: agent.containerRegistryPassword ?? '', - gitUrl: agent.gitUrl ?? '', - gitBranch: agent.gitBranch ?? '', - gitUsername: agent.gitUsername ?? '', - gitToken: agent.gitToken ?? '', - dockerfilePath: agent.dockerfilePath ?? defaultDockerfilePath, - }; + return { + sourceType: agent.sourceType as SourceType, + buildMethod: 'DOCKERFILE', + containerImageSource: agent.containerImageSource ?? '', + containerRegistryUsername: agent.containerRegistryUsername ?? '', + containerRegistryPassword: agent.containerRegistryPassword ?? '', + gitUrl: agent.gitUrl ?? '', + gitBranch: agent.gitBranch ?? '', + gitUsername: agent.gitUsername ?? '', + gitToken: agent.gitToken ?? '', + dockerfilePath: agent.dockerfilePath ?? defaultDockerfilePath + }; } diff --git a/src/app/project/[projectId]/agents/details/volumes/agent-volumes-card.tsx b/src/app/project/[projectId]/agents/details/volumes/agent-volumes-card.tsx index 26f7717a..ee099399 100644 --- a/src/app/project/[projectId]/agents/details/volumes/agent-volumes-card.tsx +++ b/src/app/project/[projectId]/agents/details/volumes/agent-volumes-card.tsx @@ -13,7 +13,9 @@ import { deleteAgentVolume } from '../configuration/actions'; import { Constants } from '@/shared/utils/constants'; function formatSize(mb: number): string { - if (mb >= 1024) return `${(mb / 1024).toFixed(1)} GiB`; + if (mb >= 1024) { + return `${(mb / 1024).toFixed(1)} GiB`; + } return `${mb} MiB`; } diff --git a/src/app/project/[projectId]/apps/create/edit-app-dialog.tsx b/src/app/project/[projectId]/apps/create/edit-app-dialog.tsx index daaf7b8f..672c2824 100644 --- a/src/app/project/[projectId]/apps/create/edit-app-dialog.tsx +++ b/src/app/project/[projectId]/apps/create/edit-app-dialog.tsx @@ -1,48 +1,51 @@ -'use client' +'use client'; -import { Toast } from "@/frontend/utils/toast.utils"; -import { createApp } from "../../actions"; -import { useRouter } from "next/navigation"; -import { cloneElement, type MouseEvent, type ReactElement } from "react"; -import type { App } from "@prisma/client"; -import { useInputDialog } from "@/frontend/states/zustand.states"; -import { PathBuilderUtils } from "@/shared/utils/path-builder.utils"; +import { Toast } from '@/frontend/utils/toast.utils'; +import { createApp } from '../../actions'; +import { useRouter } from 'next/navigation'; +import { cloneElement, type MouseEvent, type ReactElement } from 'react'; +import type { App } from '@prisma/client'; +import { useInputDialog } from '@/frontend/states/zustand.states'; +import { PathBuilderUtils } from '@/shared/utils/path-builder.utils'; export function EditAppDialog({ - children, - projectId, - existingItem, - openAppAfterCreate = true + children, + projectId, + existingItem, + openAppAfterCreate = true }: { - children?: ReactElement<{ onClick?: (event: MouseEvent) => void }>; - projectId: string; - existingItem?: Pick; - openAppAfterCreate?: boolean; + children?: ReactElement<{ onClick?: (event: MouseEvent) => void }>; + projectId: string; + existingItem?: Pick; + openAppAfterCreate?: boolean; }) { + const router = useRouter(); + const { openInputDialog } = useInputDialog(); - const router = useRouter(); - const { openInputDialog } = useInputDialog(); - - const createAppFunc = async () => { - const name = await openInputDialog({ - title: "Create App", - description: "Name your new App.", - fieldName: "Name", - inputValue: existingItem?.name ?? '' - }) - if (!name) { return; } - const result = await Toast.fromAction(() => createApp(name, projectId, existingItem?.id)); - if (result.status === "success" && !existingItem && openAppAfterCreate) { - router.push(PathBuilderUtils.projectAppDrawer(projectId, result.data!.id, 'settings')); - } - }; + const createAppFunc = async () => { + const name = await openInputDialog({ + title: 'Create App', + description: 'Name your new App.', + fieldName: 'Name', + inputValue: existingItem?.name ?? '' + }); + if (!name) { + return; + } + const result = await Toast.fromAction(() => createApp(name, projectId, existingItem?.id)); + if (result.status === 'success' && !existingItem && openAppAfterCreate) { + router.push(PathBuilderUtils.projectAppDrawer(projectId, result.data!.id, 'settings')); + } + }; - if (!children) return null; + if (!children) { + return null; + } - return cloneElement(children, { - onClick: (event) => { - children.props.onClick?.(event); - void createAppFunc(); - }, - }); + return cloneElement(children, { + onClick: (event) => { + children.props.onClick?.(event); + void createAppFunc(); + } + }); } diff --git a/src/app/project/[projectId]/apps/details/app-details-settings.tsx b/src/app/project/[projectId]/apps/details/app-details-settings.tsx index b4334913..32b73ffc 100644 --- a/src/app/project/[projectId]/apps/details/app-details-settings.tsx +++ b/src/app/project/[projectId]/apps/details/app-details-settings.tsx @@ -1,13 +1,6 @@ 'use client'; -import { - Boxes, - Globe2, - HardDrive, - Network, - SlidersHorizontal, - Zap, -} from 'lucide-react'; +import { Boxes, Globe2, HardDrive, Network, SlidersHorizontal, Zap } from 'lucide-react'; import { useCallback, useContext, useEffect } from 'react'; import { Button } from '@/components/ui/button'; import BasicAuth from '@/app/project/[projectId]/apps/details/network/policy/basic-auth'; @@ -31,208 +24,166 @@ import { AppDrawerAppContext } from './app-drawer-app-context'; import { DrawerCard, DrawerCardDescription, DrawerCardFooter, DrawerCardHeader, DrawerCardTitle } from '@/components/custom/drawer-card'; export function DrawerSettings({ - app, - role, - storageClasses, - gitSshPublicKey, - openEnvironment = false, - onEnvironmentOpened, + app, + role, + storageClasses, + gitSshPublicKey, + openEnvironment = false, + onEnvironmentOpened }: { - app: AppExtendedModel; - role: RolePermissionEnum; - storageClasses: string[]; - gitSshPublicKey?: string; - openEnvironment?: boolean; - onEnvironmentOpened?: () => void; + app: AppExtendedModel; + role: RolePermissionEnum; + storageClasses: string[]; + gitSshPublicKey?: string; + openEnvironment?: boolean; + onEnvironmentOpened?: () => void; }) { - const readonly = role !== RolePermissionEnum.READWRITE; - const { openNestedDrawer } = useNestedDrawer(); - const openEnvironmentEditor = useCallback(() => { - openNestedDrawer({ - title: 'Environment variables', - description: <>Values are encrypted at rest and never shown. Names starting with QS_ are reserved by QuickStack., - content: , - }); - }, [app, openNestedDrawer, readonly]); + const readonly = role !== RolePermissionEnum.READWRITE; + const { openNestedDrawer } = useNestedDrawer(); + const openEnvironmentEditor = useCallback(() => { + openNestedDrawer({ + title: 'Environment variables', + description: ( + <> + Values are encrypted at rest and never shown. Names starting with QS_ are reserved by + QuickStack. + + ), + content: + }); + }, [app, openNestedDrawer, readonly]); - useEffect(() => { - if (!openEnvironment) return; - openEnvironmentEditor(); - onEnvironmentOpened?.(); - }, [onEnvironmentOpened, openEnvironment, openEnvironmentEditor]); + useEffect(() => { + if (!openEnvironment) { + return; + } + openEnvironmentEditor(); + onEnvironmentOpened?.(); + }, [onEnvironmentOpened, openEnvironment, openEnvironmentEditor]); - return ( -
-
- - - - - + return ( +
+
+ + + + + - - - Advanced Container Configuration - Configure the container command, arguments, isolation and other advanced settings. - - - - - - - - - - - - - - Network Policies - Configure network policies to control the traffic flow. - - - - - - - - Advanced Network Settings - Configure node ports and basic authentication. - - - - - - - - - - - - - - Health Checks - - Configure healthchecks so that k3s can automatically monitor when your application is fully started up and ready to receive traffic. - - - - - - - -
-
- ); + + + Advanced Container Configuration + Configure the container command, arguments, isolation and other advanced settings. + + + + + +
+ + + + + + + + Network Policies + Configure network policies to control the traffic flow. + + + + + + + + Advanced Network Settings + Configure node ports and basic authentication. + + + + + + + + + + + + + + Health Checks + + Configure healthchecks so that k3s can automatically monitor when your application is fully started up and ready to receive traffic. + + + + + + + +
+
+ ); } function AdvancedNetworkSettings({ readonly }: { readonly: boolean }) { - const app = useContext(AppDrawerAppContext); - if (!app) return null; + const app = useContext(AppDrawerAppContext); + if (!app) { + return null; + } - return
- - -
; + return ( +
+ + +
+ ); } diff --git a/src/app/project/[projectId]/apps/details/deployments/deployments.tsx b/src/app/project/[projectId]/apps/details/deployments/deployments.tsx index 30fdc19f..48dc43ad 100644 --- a/src/app/project/[projectId]/apps/details/deployments/deployments.tsx +++ b/src/app/project/[projectId]/apps/details/deployments/deployments.tsx @@ -7,103 +7,103 @@ import type { AppExtendedModel } from '@/shared/model/app-extended.model'; import type { DeploymentInfoModel } from '@/shared/model/deployment-info.model'; import { RolePermissionEnum } from '@/shared/model/role-extended.model'; import { GitHashUtils } from '@/shared/utils/git-hash.utils'; -import { - deleteBuild, - getDeploymentsAndBuildsForApp, - rollbackToDeployment, -} from './actions'; +import { deleteBuild, getDeploymentsAndBuildsForApp, rollbackToDeployment } from './actions'; import { DeploymentsGridView } from './deployments-grid-view'; export default function BuildsTab({ - app, - role, - onShowLogs, + app, + role, + onShowLogs }: { - app: AppExtendedModel; - role: RolePermissionEnum; - onShowLogs: (deployment: DeploymentInfoModel) => void; + app: AppExtendedModel; + role: RolePermissionEnum; + onShowLogs: (deployment: DeploymentInfoModel) => void; }) { - const { openConfirmDialog } = useConfirmDialog(); - const [appBuilds, setAppBuilds] = useState(); - const [, setError] = useState(); + const { openConfirmDialog } = useConfirmDialog(); + const [appBuilds, setAppBuilds] = useState(); + const [, setError] = useState(); - const updateBuilds = useCallback(async () => { - setError(undefined); - try { - const response = await getDeploymentsAndBuildsForApp(app.id); - if (response.status === 'success' && response.data) { - setAppBuilds(response.data); - } else { - console.error(response); - setError(response.message ?? 'An unknown error occurred.'); - } - } catch (error) { - console.error(error); - setError('An unknown error occurred.'); - } - }, [app.id]); + const updateBuilds = useCallback(async () => { + setError(undefined); + try { + const response = await getDeploymentsAndBuildsForApp(app.id); + if (response.status === 'success' && response.data) { + setAppBuilds(response.data); + } else { + console.error(response); + setError(response.message ?? 'An unknown error occurred.'); + } + } catch (error) { + console.error(error); + setError('An unknown error occurred.'); + } + }, [app.id]); - const stopBuild = async (deployment: DeploymentInfoModel) => { - if (!deployment.buildJobName) return; - const confirmed = await openConfirmDialog({ - title: 'Delete Build', - description: 'The build will be stopped and removed. Are you sure you want to stop this build?', - okButton: 'Stop & Remove Build', - }); - if (!confirmed) return; - await Toast.fromAction(() => deleteBuild(deployment.buildJobName!)); - await updateBuilds(); - }; + const stopBuild = async (deployment: DeploymentInfoModel) => { + if (!deployment.buildJobName) { + return; + } + const confirmed = await openConfirmDialog({ + title: 'Delete Build', + description: 'The build will be stopped and removed. Are you sure you want to stop this build?', + okButton: 'Stop & Remove Build' + }); + if (!confirmed) { + return; + } + await Toast.fromAction(() => deleteBuild(deployment.buildJobName!)); + await updateBuilds(); + }; - const rollback = async (deployment: DeploymentInfoModel) => { - const confirmed = await openConfirmDialog({ - title: 'Rollback Deployment', - description: `Roll back to git commit ${GitHashUtils.shortGitHash(deployment.gitCommit)}? The App will be redeployed with the code from this commit.`, - okButton: 'Rollback', - }); - if (!confirmed) return; - await Toast.fromAction(() => rollbackToDeployment(app.id, deployment.deploymentId)); - await updateBuilds(); - }; + const rollback = async (deployment: DeploymentInfoModel) => { + const confirmed = await openConfirmDialog({ + title: 'Rollback Deployment', + description: `Roll back to git commit ${GitHashUtils.shortGitHash(deployment.gitCommit)}? The App will be redeployed with the code from this commit.`, + okButton: 'Rollback' + }); + if (!confirmed) { + return; + } + await Toast.fromAction(() => rollbackToDeployment(app.id, deployment.deploymentId)); + await updateBuilds(); + }; - const canStopBuild = (deployment: DeploymentInfoModel) => - role === RolePermissionEnum.READWRITE - && !!deployment.buildJobName - && deployment.status === 'BUILDING'; - const canRollback = (deployment: DeploymentInfoModel) => - role === RolePermissionEnum.READWRITE - && !!deployment.replicasetName - && !!deployment.gitCommit - && deployment.status !== 'DEPLOYING' - && deployment.status !== 'DEPLOYED'; + const canStopBuild = (deployment: DeploymentInfoModel) => + role === RolePermissionEnum.READWRITE && !!deployment.buildJobName && deployment.status === 'BUILDING'; + const canRollback = (deployment: DeploymentInfoModel) => + role === RolePermissionEnum.READWRITE && + !!deployment.replicasetName && + !!deployment.gitCommit && + deployment.status !== 'DEPLOYING' && + deployment.status !== 'DEPLOYED'; - const currentBuildStatus = useBuildStatus(state => state.buildStatus.get(app.id)?.status); + const currentBuildStatus = useBuildStatus((state) => state.buildStatus.get(app.id)?.status); - useEffect(() => { - if (currentBuildStatus === undefined) { - return; - } - void updateBuilds(); - }, [currentBuildStatus, updateBuilds]); + useEffect(() => { + if (currentBuildStatus === undefined) { + return; + } + void updateBuilds(); + }, [currentBuildStatus, updateBuilds]); - usePolling(updateBuilds, { - intervalMs: 10000, - enabled: app.sourceType !== 'container', - runImmediately: true, - }); + usePolling(updateBuilds, { + intervalMs: 10000, + enabled: app.sourceType !== 'container', + runImmediately: true + }); - if (app.sourceType === 'container') return null; + if (app.sourceType === 'container') { + return null; + } - const viewProps = { - deployments: appBuilds ?? [], - canStopBuild, - canRollback, - onShowLogs, - onStopBuild: (deployment: DeploymentInfoModel) => void stopBuild(deployment), - onRollback: (deployment: DeploymentInfoModel) => void rollback(deployment), - }; + const viewProps = { + deployments: appBuilds ?? [], + canStopBuild, + canRollback, + onShowLogs, + onStopBuild: (deployment: DeploymentInfoModel) => void stopBuild(deployment), + onRollback: (deployment: DeploymentInfoModel) => void rollback(deployment) + }; - return !appBuilds - ? - : ; + return !appBuilds ? : ; } diff --git a/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-dialog.tsx b/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-dialog.tsx index aaab0239..4e3f2f34 100644 --- a/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-dialog.tsx +++ b/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-dialog.tsx @@ -11,148 +11,225 @@ import { Input } from '@/components/ui/input'; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { SubmitButton } from '@/components/custom/submit-button'; import { useDialogContext } from '@/frontend/states/dialog-context'; -import { AppNetworkPolicyRuleEditModel, appNetworkPolicyRuleEditZodModel, NetworkPolicyDirection, NetworkPolicySelectableTarget, NetworkPolicyTargetProject } from '@/shared/model/app-network-policy-edit.model'; +import { + AppNetworkPolicyRuleEditModel, + appNetworkPolicyRuleEditZodModel, + NetworkPolicyDirection, + NetworkPolicySelectableTarget, + NetworkPolicyTargetProject +} from '@/shared/model/app-network-policy-edit.model'; import { Constants } from '@/shared/utils/constants'; const appNetworkPolicyRuleFormZodModel = appNetworkPolicyRuleEditZodModel.extend({ - projectId: z.string().optional(), + projectId: z.string().optional() }); type AppNetworkPolicyRuleDialogProps = { - direction: NetworkPolicyDirection; - targets: NetworkPolicySelectableTarget[]; - currentProject: NetworkPolicyTargetProject; - initialTarget?: NetworkPolicySelectableTarget; - isDuplicate: (rule: AppNetworkPolicyRuleEditModel) => boolean; - onAdd: (rule: AppNetworkPolicyRuleEditModel) => void; + direction: NetworkPolicyDirection; + targets: NetworkPolicySelectableTarget[]; + currentProject: NetworkPolicyTargetProject; + initialTarget?: NetworkPolicySelectableTarget; + isDuplicate: (rule: AppNetworkPolicyRuleEditModel) => boolean; + onAdd: (rule: AppNetworkPolicyRuleEditModel) => void; }; export default function AppNetworkPolicyRuleDialog({ direction, targets, currentProject, initialTarget, isDuplicate, onAdd }: AppNetworkPolicyRuleDialogProps) { - const { closeDialog } = useDialogContext(); - const [errorMessage, setErrorMessage] = useState(null); - const ingress = direction === 'INGRESS'; - const form = useForm, unknown, z.output>({ - resolver: zodResolver(appNetworkPolicyRuleFormZodModel), - defaultValues: { - type: direction, - projectId: initialTarget?.project.id ?? currentProject.id, - targetType: initialTarget?.type ?? 'APP', - targetId: initialTarget?.id ?? '', - port: getSuggestedPort(initialTarget) ?? '', - protocol: 'TCP', - }, - }); + const { closeDialog } = useDialogContext(); + const [errorMessage, setErrorMessage] = useState(null); + const ingress = direction === 'INGRESS'; + const form = useForm, unknown, z.output>({ + resolver: zodResolver(appNetworkPolicyRuleFormZodModel), + defaultValues: { + type: direction, + projectId: initialTarget?.project.id ?? currentProject.id, + targetType: initialTarget?.type ?? 'APP', + targetId: initialTarget?.id ?? '', + port: getSuggestedPort(initialTarget) ?? '', + protocol: 'TCP' + } + }); - const submit = (data: z.output) => { - const { projectId: _projectId, ...rule } = data; - if (isDuplicate(rule)) { - setErrorMessage('A matching network policy rule already exists.'); - return; - } - onAdd(rule); - closeDialog(); - }; + const submit = (data: z.output) => { + const { projectId: _projectId, ...rule } = data; + if (isDuplicate(rule)) { + setErrorMessage('A matching network policy rule already exists.'); + return; + } + onAdd(rule); + closeDialog(); + }; - const projects = Array.from(new Map([ - [currentProject.id, currentProject], - ...targets.map(target => [target.project.id, target.project] as const), - ]).values()); - const selectedProjectId = form.watch('projectId') ?? ''; - const targetsForSelectedProject = targets.filter(target => target.project.id === selectedProjectId); - const selectedTargetId = form.watch('targetId'); - const selectedTargetType = form.watch('targetType'); - const selectedTarget = targetsForSelectedProject.find(target => target.id === selectedTargetId && target.type === selectedTargetType); - const suggestedPort = getSuggestedPort(selectedTarget); + const projects = Array.from( + new Map([[currentProject.id, currentProject], ...targets.map((target) => [target.project.id, target.project] as const)]).values() + ); + const selectedProjectId = form.watch('projectId') ?? ''; + const targetsForSelectedProject = targets.filter((target) => target.project.id === selectedProjectId); + const selectedTargetId = form.watch('targetId'); + const selectedTargetType = form.watch('targetType'); + const selectedTarget = targetsForSelectedProject.find((target) => target.id === selectedTargetId && target.type === selectedTargetType); + const suggestedPort = getSuggestedPort(selectedTarget); - return <> - - Add {ingress ? 'ingress' : 'egress'} rule - {ingress ? 'Allow a source app or agent sandbox to access this app.' : 'Allow this app to access a target app or agent sandbox.'} - -
- - - Project - - - } - /> - - {ingress ? 'Source' : 'Target'} - - - } - /> - -
- Port - {suggestedPort !== undefined && Recommended: {suggestedPort}} -
- { - field.onChange(event); - setErrorMessage(null); - }} /> - -
} - /> - - Protocol - - - } - /> - {errorMessage &&

{errorMessage}

} -
- Add rule - + return ( + <> + + Add {ingress ? 'ingress' : 'egress'} rule + + {ingress ? 'Allow a source app or agent sandbox to access this app.' : 'Allow this app to access a target app or agent sandbox.'} + + + + + ( + + Project + + + + )} + /> + ( + + {ingress ? 'Source' : 'Target'} + + + + )} + /> + ( + +
+ Port + {suggestedPort !== undefined && ( + + Recommended: {suggestedPort} + + )}
- - - ; + + { + field.onChange(event); + setErrorMessage(null); + }} + /> + + +
+ )} + /> + ( + + Protocol + + + + )} + /> + {errorMessage &&

{errorMessage}

} +
+ Add rule + +
+ + + + ); } function getSuggestedPort(target?: NetworkPolicySelectableTarget): number | undefined { - if (!target?.appType || !(target.appType in Constants.DATABASE_TEMPLATE_PORTS)) return undefined; - return Constants.DATABASE_TEMPLATE_PORTS[target.appType as keyof typeof Constants.DATABASE_TEMPLATE_PORTS]; + if (!target?.appType || !(target.appType in Constants.DATABASE_TEMPLATE_PORTS)) { + return undefined; + } + return Constants.DATABASE_TEMPLATE_PORTS[target.appType as keyof typeof Constants.DATABASE_TEMPLATE_PORTS]; } diff --git a/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-section.tsx b/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-section.tsx index 7f8393c6..24febf72 100644 --- a/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-section.tsx +++ b/src/app/project/[projectId]/apps/details/network/policy/app-network-policy-rule-section.tsx @@ -16,167 +16,189 @@ import { PathBuilderUtils } from '@/shared/utils/path-builder.utils'; export type AppNetworkPolicyDirection = NetworkPolicyDirection; export type AppNetworkPolicyRuleDraft = { - key: string; - persistedId?: string; - type: AppNetworkPolicyDirection; - targetType: 'APP' | 'AGENT'; - targetId: string; - targetName: string; - targetProjectId: string; - port: number; - protocol: 'TCP' | 'UDP'; + key: string; + persistedId?: string; + type: AppNetworkPolicyDirection; + targetType: 'APP' | 'AGENT'; + targetId: string; + targetName: string; + targetProjectId: string; + port: number; + protocol: 'TCP' | 'UDP'; }; type AppNetworkPolicyRuleSectionProps = { - direction: AppNetworkPolicyDirection; - rules: AppNetworkPolicyRuleDraft[]; - readonly: boolean; - onAdd: () => void; - onDeleteRule: (key: string) => void; - currentProjectId: string; - projects: NetworkPolicyTargetProject[]; - internetAccess?: boolean; - onInternetAccessChange?: (checked: boolean) => void; - traefikAccess?: boolean; - onTraefikAccessChange?: (checked: boolean) => void; + direction: AppNetworkPolicyDirection; + rules: AppNetworkPolicyRuleDraft[]; + readonly: boolean; + onAdd: () => void; + onDeleteRule: (key: string) => void; + currentProjectId: string; + projects: NetworkPolicyTargetProject[]; + internetAccess?: boolean; + onInternetAccessChange?: (checked: boolean) => void; + traefikAccess?: boolean; + onTraefikAccessChange?: (checked: boolean) => void; }; export default function AppNetworkPolicyRuleSection({ - direction, - rules, - readonly, - onAdd, - onDeleteRule, - currentProjectId, - projects, - internetAccess, - onInternetAccessChange, - traefikAccess, - onTraefikAccessChange, + direction, + rules, + readonly, + onAdd, + onDeleteRule, + currentProjectId, + projects, + internetAccess, + onInternetAccessChange, + traefikAccess, + onTraefikAccessChange }: AppNetworkPolicyRuleSectionProps) { - const ingress = direction === 'INGRESS'; - const title = ingress ? 'Ingress rules' : 'Egress rules'; - const description = ingress ? 'Who can access this app?' : 'Which apps or agent sandboxes can this app access?'; + const ingress = direction === 'INGRESS'; + const title = ingress ? 'Ingress rules' : 'Egress rules'; + const description = ingress ? 'Who can access this app?' : 'Which apps or agent sandboxes can this app access?'; - return ( -
- - -
-
- {ingress ? : } -
-
-

{title}

-

{description}

-
-
+ return ( +
+ + +
+
+ {ingress ? : } +
+
+

{title}

+

{description}

+
+
- {!ingress && internetAccess !== undefined && onInternetAccessChange && ( - - -
- -

Allow outgoing connections to the public internet.

-
- -
-
- )} + {!ingress && internetAccess !== undefined && onInternetAccessChange && ( + + +
+ +

Allow outgoing connections to the public internet.

+
+ +
+
+ )} - {!ingress && traefikAccess !== undefined && onTraefikAccessChange && ( - - -
- -

Allow outgoing connections to apps and agents exposed through this cluster's Traefik ingress.

-
- -
-
- )} + {!ingress && traefikAccess !== undefined && onTraefikAccessChange && ( + + +
+ +

+ Allow outgoing connections to apps and agents exposed through this cluster's Traefik ingress. +

+
+ +
+
+ )} - - - - {ingress ? 'Source' : 'Target'} - Port - Protocol - Actions - - - - {rules.length > 0 ? rules.map(rule => ) : ( - - No rules configured. - - )} - -
+ + + + {ingress ? 'Source' : 'Target'} + Port + Protocol + + Actions + + + + + {rules.length > 0 ? ( + rules.map((rule) => ( + + )) + ) : ( + + + No rules configured. + + + )} + +
- {!readonly && } -
-
-
- ); + {!readonly && ( + + )} +
+
+
+ ); } -function RuleRow({ rule, readonly, onDelete, currentProjectId, projects }: { - rule: AppNetworkPolicyRuleDraft; - readonly: boolean; - onDelete: (key: string) => void; - currentProjectId: string; - projects: NetworkPolicyTargetProject[]; +function RuleRow({ + rule, + readonly, + onDelete, + currentProjectId, + projects +}: { + rule: AppNetworkPolicyRuleDraft; + readonly: boolean; + onDelete: (key: string) => void; + currentProjectId: string; + projects: NetworkPolicyTargetProject[]; }) { - const projectName = rule.targetProjectId === currentProjectId - ? 'This project' - : projects.find(project => project.id === rule.targetProjectId)?.name ?? 'Unknown project'; - const targetTypeLabel = rule.targetType === 'AGENT' ? 'Agent sandbox' : 'App'; - const copyInternalHostname = () => { - if (rule.targetType !== 'APP') return; - navigator.clipboard.writeText(InternalHostnameUtils.getInternalBaseUrlForApp({ id: rule.targetId, projectId: rule.targetProjectId }, rule.port)); - toast.success('Copied internal hostname to clipboard'); - }; - - return ( - - + const projectName = + rule.targetProjectId === currentProjectId ? 'This project' : (projects.find((project) => project.id === rule.targetProjectId)?.name ?? 'Unknown project'); + const targetTypeLabel = rule.targetType === 'AGENT' ? 'Agent sandbox' : 'App'; + const copyInternalHostname = () => { + if (rule.targetType !== 'APP') { + return; + } + navigator.clipboard.writeText(InternalHostnameUtils.getInternalBaseUrlForApp({ id: rule.targetId, projectId: rule.targetProjectId }, rule.port)); + toast.success('Copied internal hostname to clipboard'); + }; - {rule.targetType === 'APP' - ? {rule.targetName} - : rule.targetName} - - {projectName} · {targetTypeLabel} - - - {rule.port} - {rule.protocol} - - {!readonly && ( - - - - Rule actions - } /> - - {rule.targetType === 'APP' && - Copy internal hostname - } - onDelete(rule.key)}> - Delete - - - - )} - - - ); + return ( + + + {rule.targetType === 'APP' ? ( + + {rule.targetName} + + ) : ( + rule.targetName + )} + + {projectName} · {targetTypeLabel} + + + {rule.port} + {rule.protocol} + + {!readonly && ( + + + + Rule actions + + } + /> + + {rule.targetType === 'APP' && ( + + Copy internal hostname + + )} + onDelete(rule.key)}> + Delete + + + + )} + + + ); } diff --git a/src/app/project/[projectId]/apps/details/network/policy/network-policy-graph.tsx b/src/app/project/[projectId]/apps/details/network/policy/network-policy-graph.tsx index 2208963a..33d61177 100644 --- a/src/app/project/[projectId]/apps/details/network/policy/network-policy-graph.tsx +++ b/src/app/project/[projectId]/apps/details/network/policy/network-policy-graph.tsx @@ -3,17 +3,17 @@ import { useMemo, type CSSProperties } from 'react'; import { useRouter } from 'next/navigation'; import { - Background, - BackgroundVariant, - Controls, - Handle, - MarkerType, - Position, - ReactFlow, - type Edge, - type Node, - type NodeProps, - type NodeTypes, + Background, + BackgroundVariant, + Controls, + Handle, + MarkerType, + Position, + ReactFlow, + type Edge, + type Node, + type NodeProps, + type NodeTypes } from '@xyflow/react'; import '@xyflow/react/dist/style.css'; import { Bot, Boxes, Cloud, MoveRight } from 'lucide-react'; @@ -25,12 +25,12 @@ import { PathBuilderUtils } from '@/shared/utils/path-builder.utils'; type WorkloadType = 'APP' | 'AGENT'; type Neighbor = { - type: WorkloadType; - id: string; - name: string; - projectId: string; - ingress: string[]; - egress: string[]; + type: WorkloadType; + id: string; + name: string; + projectId: string; + ingress: string[]; + egress: string[]; }; const CENTER_WIDTH = 224; @@ -41,344 +41,390 @@ const COLUMN_X_RIGHT = 360; const INTERNET_Y = -320; const EDGE_COLORS = { - ingress: '#10b981', - egress: '#0ea5e9', - internet: '#8b5cf6', + ingress: '#10b981', + egress: '#0ea5e9', + internet: '#8b5cf6' } as const; const handleClassName = 'h-1.5! w-1.5! border-0! bg-transparent! opacity-0!'; function formatRuleLabel(port: number, protocol: string) { - return `${port}/${protocol.toUpperCase()}`; + return `${port}/${protocol.toUpperCase()}`; } function aggregateLabels(labels: string[]) { - return Array.from(new Set(labels)).sort((a, b) => { - const portA = parseInt(a, 10); - const portB = parseInt(b, 10); - if (!Number.isNaN(portA) && !Number.isNaN(portB)) return portA - portB; - return a.localeCompare(b); - }).join(' · '); + return Array.from(new Set(labels)) + .sort((a, b) => { + const portA = parseInt(a, 10); + const portB = parseInt(b, 10); + if (!Number.isNaN(portA) && !Number.isNaN(portB)) { + return portA - portB; + } + return a.localeCompare(b); + }) + .join(' · '); } function collectNeighbors(rules: AppNetworkPolicyRuleWithTargetAppModel[], appId: string) { - const map = new Map(); - for (const rule of rules) { - const target = rule.targetAgent ?? rule.targetApp; - if (!target) continue; - if (rule.targetAppId === appId || rule.targetAgentId === appId) continue; - const type: WorkloadType = rule.targetApp ? 'APP' : 'AGENT'; - const key = `${type}:${target.id}`; - let neighbor = map.get(key); - if (!neighbor) { - neighbor = { type, id: target.id, name: target.name, projectId: target.projectId, ingress: [], egress: [] }; - map.set(key, neighbor); - } - const label = formatRuleLabel(rule.port, rule.protocol); - if (rule.type === 'INGRESS') neighbor.ingress.push(label); - else if (rule.type === 'EGRESS') neighbor.egress.push(label); + const map = new Map(); + for (const rule of rules) { + const target = rule.targetAgent ?? rule.targetApp; + if (!target) { + continue; + } + if (rule.targetAppId === appId || rule.targetAgentId === appId) { + continue; + } + const type: WorkloadType = rule.targetApp ? 'APP' : 'AGENT'; + const key = `${type}:${target.id}`; + let neighbor = map.get(key); + if (!neighbor) { + neighbor = { type, id: target.id, name: target.name, projectId: target.projectId, ingress: [], egress: [] }; + map.set(key, neighbor); + } + const label = formatRuleLabel(rule.port, rule.protocol); + if (rule.type === 'INGRESS') { + neighbor.ingress.push(label); + } else if (rule.type === 'EGRESS') { + neighbor.egress.push(label); } - return Array.from(map.values()).map(neighbor => ({ - ...neighbor, - ingress: aggregateLabels(neighbor.ingress).split(' · ').filter(Boolean), - egress: aggregateLabels(neighbor.egress).split(' · ').filter(Boolean), - })); + } + return Array.from(map.values()).map((neighbor) => ({ + ...neighbor, + ingress: aggregateLabels(neighbor.ingress).split(' · ').filter(Boolean), + egress: aggregateLabels(neighbor.egress).split(' · ').filter(Boolean) + })); } type PeerNodeData = { - type: WorkloadType; - projectId: string; - name: string; - side: 'left' | 'right'; - both: boolean; - externalProject: boolean; - caption?: string; + type: WorkloadType; + projectId: string; + name: string; + side: 'left' | 'right'; + both: boolean; + externalProject: boolean; + caption?: string; }; type CenterNodeData = { - name: string; + name: string; }; type InternetNodeData = Record; const CenterNode = ({ data }: NodeProps>) => ( -
- This app -
- -
-

{data.name}

- - - - - +
+ This app +
+
+

+ {data.name} +

+ + + + + +
); const PeerNode = ({ data }: NodeProps>) => { - const AgentIcon = data.type === 'AGENT' ? Bot : Boxes; - const iconClasses = data.type === 'AGENT' - ? 'bg-violet-500/15 text-violet-600 ring-violet-500/30' - : 'bg-qs-500/10 text-qs-600 ring-qs-500/30'; - return ( -
-
- -
-
-

{data.name}

- {data.caption &&

{data.caption}

} -
- {data.side === 'left' && } - {data.side === 'right' && ( - <> - - {data.both && } - - )} -
- ); + const AgentIcon = data.type === 'AGENT' ? Bot : Boxes; + const iconClasses = data.type === 'AGENT' ? 'bg-violet-500/15 text-violet-600 ring-violet-500/30' : 'bg-qs-500/10 text-qs-600 ring-qs-500/30'; + return ( +
+
+ +
+
+

+ {data.name} +

+ {data.caption &&

{data.caption}

} +
+ {data.side === 'left' && } + {data.side === 'right' && ( + <> + + {data.both && } + + )} +
+ ); }; const InternetNode = () => ( -
-
- -
- Internet - - +
+
+
+ Internet + + +
); const nodeTypes = { peer: PeerNode, center: CenterNode, internet: InternetNode } satisfies NodeTypes; function getLegendItem(label: string, children: React.ReactNode) { - return ( - - {children} - {label} - - ); + return ( + + {children} + {label} + + ); } function Legend() { - return ( -
- {getLegendItem('Ingress rule', )} - {getLegendItem('Egress rule', )} - {getLegendItem('Internet access', )} - {getLegendItem('Other project', )} - {getLegendItem('App', )} - {getLegendItem('Agent sandbox', )} - Arrows point in the direction of allowed traffic -
- ); + return ( +
+ {getLegendItem('Ingress rule', )} + {getLegendItem('Egress rule', )} + {getLegendItem('Internet access', )} + {getLegendItem('Other project', )} + {getLegendItem('App', )} + {getLegendItem('Agent sandbox', )} + + + Arrows point in the direction of allowed traffic + +
+ ); } function edgeLabelStyle() { - return { - labelStyle: { fill: 'var(--muted-foreground)', fontSize: 10, fontWeight: 600 }, - labelBgStyle: { fill: 'var(--card)', fillOpacity: 0.9, stroke: 'var(--border)', strokeWidth: 1 }, - labelBgPadding: [6, 3] as [number, number], - labelBgBorderRadius: 6, - }; + return { + labelStyle: { fill: 'var(--muted-foreground)', fontSize: 10, fontWeight: 600 }, + labelBgStyle: { fill: 'var(--card)', fillOpacity: 0.9, stroke: 'var(--border)', strokeWidth: 1 }, + labelBgPadding: [6, 3] as [number, number], + labelBgBorderRadius: 6 + }; } export default function NetworkPolicyGraph({ - appId, - appName, - appProjectId, - rules, - allowInternetAccess, - domainLabels, - projects, + appId, + appName, + appProjectId, + rules, + allowInternetAccess, + domainLabels, + projects }: { - appId: string; - appName: string; - appProjectId: string; - rules: AppNetworkPolicyRuleWithTargetAppModel[]; - allowInternetAccess: boolean; - domainLabels: string[]; - projects: NetworkPolicyTargetProject[]; + appId: string; + appName: string; + appProjectId: string; + rules: AppNetworkPolicyRuleWithTargetAppModel[]; + allowInternetAccess: boolean; + domainLabels: string[]; + projects: NetworkPolicyTargetProject[]; }) { - const router = useRouter(); - - const projectNameById = useMemo(() => { - const map = new Map(); - for (const project of projects) map.set(project.id, project.name); - return map; - }, [projects]); - - const { nodes, edges, hasContent } = useMemo(() => { - const neighbors = collectNeighbors(rules, appId); - const ingressOnly = neighbors.filter(neighbor => neighbor.ingress.length > 0 && neighbor.egress.length === 0); - const egressOnly = neighbors.filter(neighbor => neighbor.egress.length > 0 && neighbor.ingress.length === 0); - const both = neighbors.filter(neighbor => neighbor.ingress.length > 0 && neighbor.egress.length > 0); - const leftPeers = [...ingressOnly].sort((a, b) => a.name.localeCompare(b.name)); - const rightPeers = [...egressOnly, ...both].sort((a, b) => a.name.localeCompare(b.name)); - - const hasDomains = domainLabels.length > 0; - const hasContent = neighbors.length > 0 || allowInternetAccess || hasDomains; - - const nodes: (Node | Node | Node)[] = []; - const edges: Edge[] = []; - - nodes.push({ - id: 'center', - type: 'center', - position: { x: -CENTER_WIDTH / 2, y: -60 }, - data: { name: appName }, - }); - - const captionFor = (neighbor: Neighbor) => { - const parts: string[] = []; - if (neighbor.type === 'AGENT') parts.push('Agent sandbox'); - if (neighbor.projectId !== appProjectId) parts.push(projectNameById.get(neighbor.projectId) ?? 'Other project'); - return parts.join(' · '); - }; - - const yForIndex = (index: number, count: number) => (index - (count - 1) / 2) * ROW_SPACING; - - leftPeers.forEach((neighbor, index) => { - const y = yForIndex(index, leftPeers.length); - nodes.push({ - id: `${neighbor.type}:${neighbor.id}`, - type: 'peer', - position: { x: COLUMN_X_LEFT - PEER_WIDTH / 2, y: y - 28 }, - data: { type: neighbor.type, projectId: neighbor.projectId, name: neighbor.name, side: 'left', both: false, externalProject: neighbor.projectId !== appProjectId, caption: captionFor(neighbor) }, - }); - edges.push({ - ...edgeLabelStyle(), - id: `edge-ingress-${neighbor.type}-${neighbor.id}`, - source: `${neighbor.type}:${neighbor.id}`, - target: 'center', - sourceHandle: 'source', - targetHandle: 'in-left', - label: aggregateLabels(neighbor.ingress), - markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.ingress, width: 16, height: 16 }, - style: { stroke: EDGE_COLORS.ingress, strokeWidth: 1.5 }, - }); - }); + const router = useRouter(); - rightPeers.forEach((neighbor, index) => { - const y = yForIndex(index, rightPeers.length); - const hasIngress = neighbor.ingress.length > 0; - nodes.push({ - id: `${neighbor.type}:${neighbor.id}`, - type: 'peer', - position: { x: COLUMN_X_RIGHT - PEER_WIDTH / 2, y: y - 28 }, - data: { type: neighbor.type, projectId: neighbor.projectId, name: neighbor.name, side: 'right', both: hasIngress, externalProject: neighbor.projectId !== appProjectId, caption: captionFor(neighbor) }, - }); - edges.push({ - ...edgeLabelStyle(), - id: `edge-egress-${neighbor.type}-${neighbor.id}`, - source: 'center', - target: `${neighbor.type}:${neighbor.id}`, - sourceHandle: 'out-right', - targetHandle: 'egress-in', - label: aggregateLabels(neighbor.egress), - markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.egress, width: 16, height: 16 }, - style: { stroke: EDGE_COLORS.egress, strokeWidth: 1.5 }, - }); - if (hasIngress) { - edges.push({ - ...edgeLabelStyle(), - id: `edge-ingress-reverse-${neighbor.type}-${neighbor.id}`, - source: `${neighbor.type}:${neighbor.id}`, - target: 'center', - sourceHandle: 'ingress-out', - targetHandle: 'in-right', - label: aggregateLabels(neighbor.ingress), - markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.ingress, width: 16, height: 16 }, - style: { stroke: EDGE_COLORS.ingress, strokeWidth: 1.5 }, - }); - } - }); + const projectNameById = useMemo(() => { + const map = new Map(); + for (const project of projects) { + map.set(project.id, project.name); + } + return map; + }, [projects]); + + const { nodes, edges, hasContent } = useMemo(() => { + const neighbors = collectNeighbors(rules, appId); + const ingressOnly = neighbors.filter((neighbor) => neighbor.ingress.length > 0 && neighbor.egress.length === 0); + const egressOnly = neighbors.filter((neighbor) => neighbor.egress.length > 0 && neighbor.ingress.length === 0); + const both = neighbors.filter((neighbor) => neighbor.ingress.length > 0 && neighbor.egress.length > 0); + const leftPeers = [...ingressOnly].sort((a, b) => a.name.localeCompare(b.name)); + const rightPeers = [...egressOnly, ...both].sort((a, b) => a.name.localeCompare(b.name)); + + const hasDomains = domainLabels.length > 0; + const hasContent = neighbors.length > 0 || allowInternetAccess || hasDomains; + + const nodes: (Node | Node | Node)[] = []; + const edges: Edge[] = []; + + nodes.push({ + id: 'center', + type: 'center', + position: { x: -CENTER_WIDTH / 2, y: -60 }, + data: { name: appName } + }); + + const captionFor = (neighbor: Neighbor) => { + const parts: string[] = []; + if (neighbor.type === 'AGENT') { + parts.push('Agent sandbox'); + } + if (neighbor.projectId !== appProjectId) { + parts.push(projectNameById.get(neighbor.projectId) ?? 'Other project'); + } + return parts.join(' · '); + }; - if (allowInternetAccess || hasDomains) { - nodes.push({ - id: 'internet', - type: 'internet', - position: { x: -48, y: INTERNET_Y - 48 }, - data: {}, - }); - if (allowInternetAccess) { - edges.push({ - id: 'edge-internet-egress', - source: 'center', - target: 'internet', - sourceHandle: 'out-internet', - targetHandle: 'target', - markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.internet, width: 16, height: 16 }, - style: { stroke: EDGE_COLORS.internet, strokeWidth: 1.5, strokeDasharray: '5 4' }, - }); - } - if (hasDomains) { - edges.push({ - id: 'edge-internet-ingress', - source: 'internet', - target: 'center', - sourceHandle: 'source', - targetHandle: 'in-internet', - label: aggregateLabels(domainLabels), - markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.ingress, width: 16, height: 16 }, - style: { stroke: EDGE_COLORS.ingress, strokeWidth: 1.5 }, - }); - } + const yForIndex = (index: number, count: number) => (index - (count - 1) / 2) * ROW_SPACING; + + leftPeers.forEach((neighbor, index) => { + const y = yForIndex(index, leftPeers.length); + nodes.push({ + id: `${neighbor.type}:${neighbor.id}`, + type: 'peer', + position: { x: COLUMN_X_LEFT - PEER_WIDTH / 2, y: y - 28 }, + data: { + type: neighbor.type, + projectId: neighbor.projectId, + name: neighbor.name, + side: 'left', + both: false, + externalProject: neighbor.projectId !== appProjectId, + caption: captionFor(neighbor) } - - return { nodes, edges, hasContent }; - }, [allowInternetAccess, appId, appName, appProjectId, domainLabels, projectNameById, rules]); - - if (!hasContent) { - return ( -
- -

No connections yet. Network policy rules will be visualized here.

-
- ); + }); + edges.push({ + ...edgeLabelStyle(), + id: `edge-ingress-${neighbor.type}-${neighbor.id}`, + source: `${neighbor.type}:${neighbor.id}`, + target: 'center', + sourceHandle: 'source', + targetHandle: 'in-left', + label: aggregateLabels(neighbor.ingress), + markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.ingress, width: 16, height: 16 }, + style: { stroke: EDGE_COLORS.ingress, strokeWidth: 1.5 } + }); + }); + + rightPeers.forEach((neighbor, index) => { + const y = yForIndex(index, rightPeers.length); + const hasIngress = neighbor.ingress.length > 0; + nodes.push({ + id: `${neighbor.type}:${neighbor.id}`, + type: 'peer', + position: { x: COLUMN_X_RIGHT - PEER_WIDTH / 2, y: y - 28 }, + data: { + type: neighbor.type, + projectId: neighbor.projectId, + name: neighbor.name, + side: 'right', + both: hasIngress, + externalProject: neighbor.projectId !== appProjectId, + caption: captionFor(neighbor) + } + }); + edges.push({ + ...edgeLabelStyle(), + id: `edge-egress-${neighbor.type}-${neighbor.id}`, + source: 'center', + target: `${neighbor.type}:${neighbor.id}`, + sourceHandle: 'out-right', + targetHandle: 'egress-in', + label: aggregateLabels(neighbor.egress), + markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.egress, width: 16, height: 16 }, + style: { stroke: EDGE_COLORS.egress, strokeWidth: 1.5 } + }); + if (hasIngress) { + edges.push({ + ...edgeLabelStyle(), + id: `edge-ingress-reverse-${neighbor.type}-${neighbor.id}`, + source: `${neighbor.type}:${neighbor.id}`, + target: 'center', + sourceHandle: 'ingress-out', + targetHandle: 'in-right', + label: aggregateLabels(neighbor.ingress), + markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.ingress, width: 16, height: 16 }, + style: { stroke: EDGE_COLORS.ingress, strokeWidth: 1.5 } + }); + } + }); + + if (allowInternetAccess || hasDomains) { + nodes.push({ + id: 'internet', + type: 'internet', + position: { x: -48, y: INTERNET_Y - 48 }, + data: {} + }); + if (allowInternetAccess) { + edges.push({ + id: 'edge-internet-egress', + source: 'center', + target: 'internet', + sourceHandle: 'out-internet', + targetHandle: 'target', + markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.internet, width: 16, height: 16 }, + style: { stroke: EDGE_COLORS.internet, strokeWidth: 1.5, strokeDasharray: '5 4' } + }); + } + if (hasDomains) { + edges.push({ + id: 'edge-internet-ingress', + source: 'internet', + target: 'center', + sourceHandle: 'source', + targetHandle: 'in-internet', + label: aggregateLabels(domainLabels), + markerEnd: { type: MarkerType.ArrowClosed, color: EDGE_COLORS.ingress, width: 16, height: 16 }, + style: { stroke: EDGE_COLORS.ingress, strokeWidth: 1.5 } + }); + } } + return { nodes, edges, hasContent }; + }, [allowInternetAccess, appId, appName, appProjectId, domainLabels, projectNameById, rules]); + + if (!hasContent) { return ( -
-
- { - if (node.type !== 'peer') return; - const [workloadType, workloadId] = String(node.id).split(':'); - const peer = node.data as PeerNodeData; - router.push(workloadType === 'AGENT' - ? PathBuilderUtils.projectAgentDrawer(peer.projectId, workloadId) - : PathBuilderUtils.projectAppDrawer(peer.projectId, workloadId)); - }} - > - - - -
- -
+
+ +

No connections yet. Network policy rules will be visualized here.

+
); + } + + return ( +
+
+ { + if (node.type !== 'peer') { + return; + } + const [workloadType, workloadId] = String(node.id).split(':'); + const peer = node.data as PeerNodeData; + router.push( + workloadType === 'AGENT' + ? PathBuilderUtils.projectAgentDrawer(peer.projectId, workloadId) + : PathBuilderUtils.projectAppDrawer(peer.projectId, workloadId) + ); + }} + > + + + +
+ +
+ ); } diff --git a/src/app/project/[projectId]/apps/details/source/app-source-wizard/app-source-wizard-dialog.tsx b/src/app/project/[projectId]/apps/details/source/app-source-wizard/app-source-wizard-dialog.tsx index 13262228..0bcb6741 100644 --- a/src/app/project/[projectId]/apps/details/source/app-source-wizard/app-source-wizard-dialog.tsx +++ b/src/app/project/[projectId]/apps/details/source/app-source-wizard/app-source-wizard-dialog.tsx @@ -1,508 +1,529 @@ 'use client'; -import { Button } from "@/components/ui/button"; -import { DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { useDialogContext } from "@/frontend/states/dialog-context"; -import { useConfirmDialog } from "@/frontend/states/zustand.states"; -import { Actions } from "@/frontend/utils/nextjs-actions.utils"; -import { Toast } from "@/frontend/utils/toast.utils"; -import { AppExtendedModel } from "@/shared/model/app-extended.model"; -import { AppBuildMethod, AppDockerfileDetectionModel, AppGitBranchesLookupModel, AppSourceInfoInputModel } from "@/shared/model/app-source-info.model"; -import { JsFramework, jsFrameworkPresets, jsFrameworkZodModel } from "@/shared/model/js-framework.model"; -import { ChevronLeft, Loader2, Rocket, Save } from "lucide-react"; -import { useRouter } from "next/navigation"; -import { useEffect, useState } from "react"; -import { toast } from "sonner"; -import { detectDockerfilePath, ensureGitSshPublicKey, generateOrRegenerateGitSshKey, getGitBranches, saveGeneralAppSourceInfo } from "../../configuration/actions"; -import { BuildMethodStep } from "../../configuration/app-source-wizard/build-method-step"; -import { ContainerImageStep } from "../../../../../workload-components/source-wizard/container-image-step"; -import { DockerfilePathStep } from "../../../../../workload-components/source-wizard/dockerfile-path-step"; -import { FrameworkConfigurationStep } from "./framework-configuration-step"; -import { FrameworkStep } from "./framework-step"; -import { GitBranchStep } from "../../../../../workload-components/source-wizard/git-branch-step"; -import { GitHttpsUrlStep } from "../../../../../workload-components/source-wizard/git-https-url-step"; -import { GitSshUrlStep } from "../../../../../workload-components/source-wizard/git-ssh-url-step"; -import { SourceSummaryStep } from "../../../../../workload-components/source-wizard/source-summary-step"; -import { SourceTypeStep } from "../../../../../workload-components/source-wizard/source-type-step"; -import { defaultDockerfilePath, sourceTypeLabels, SourceType, StepId } from "../../../../../workload-components/source-wizard/types"; -import { WizardProgress } from "../../../../../workload-components/source-wizard/wizard-progress"; -import { deploy } from "../../actions"; -import LoadingSpinner from "@/components/ui/loading-spinner"; - -export function AppSourceWizardDialog({ app, gitSshPublicKey }: { - app: AppExtendedModel; - gitSshPublicKey?: string; -}) { - const router = useRouter(); - const { closeDialog } = useDialogContext(); - const { openConfirmDialog } = useConfirmDialog(); - const [step, setStep] = useState('source'); - const [history, setHistory] = useState([]); - const [formData, setFormData] = useState(() => toSourceInput(app)); - const [publicKey, setPublicKey] = useState(gitSshPublicKey); - const [branches, setBranches] = useState([]); - const [isLoadingBranches, setIsLoadingBranches] = useState(false); - const [branchError, setBranchError] = useState(null); - const [isEnsuringKey, setIsEnsuringKey] = useState(false); - const [isDetectingDockerfile, setIsDetectingDockerfile] = useState(false); - const [dockerfileDetectionResult, setDockerfileDetectionResult] = useState<'detected' | 'not-found' | null>(null); - const [showGitToken, setShowGitToken] = useState(false); - const [showRegistryPassword, setShowRegistryPassword] = useState(false); - const [showButtonLoading, setShowButtonLoading] = useState(false); - - const canUseGitSources = app.appType === 'APP'; - const isGitSource = formData.sourceType === 'GIT' || formData.sourceType === 'GIT_SSH'; - const showGitCredentials = formData.sourceType === 'GIT' && !!formData.gitUrl?.trim(); - const showRegistryCredentials = formData.sourceType === 'CONTAINER' && !!formData.containerImageSource?.trim(); - const currentTitle = getStepTitle(step, formData.sourceType); - - const goTo = (nextStep: StepId) => { - setHistory((items) => [...items, step]); - setStep(nextStep); - }; - - const goBack = () => { - const previous = history[history.length - 1]; - if (!previous) { - return; - } - setHistory((items) => items.slice(0, -1)); - setStep(previous); - }; - - const updateFormData = (patch: Partial) => { - setFormData((current) => ({ ...current, ...patch })); - }; - - const chooseSourceType = (sourceType: SourceType) => { - setBranches([]); - setBranchError(null); - setDockerfileDetectionResult(null); - setFormData((current) => resetForSourceType(current, sourceType)); - }; - - const loadBranches = async () => { - if (!formData.gitUrl?.trim()) { - setBranchError('Enter a Git repository URL first.'); - return false; - } - - const inputData: AppGitBranchesLookupModel = formData.sourceType === 'GIT' - ? { - sourceType: 'GIT', - gitUrl: formData.gitUrl, - gitUsername: formData.gitUsername, - gitToken: formData.gitToken, - } - : { - sourceType: 'GIT_SSH', - gitUrl: formData.gitUrl, - }; - - setIsLoadingBranches(true); - setBranchError(null); - try { - const result = await Actions.run(() => getGitBranches(app.id, inputData)); - setBranches(result ?? []); - if (formData.gitBranch && !result?.includes(formData.gitBranch)) { - updateFormData({ gitBranch: '' }); - } - return true; - } catch (error) { - setBranches([]); - setBranchError(error instanceof Error ? error.message : 'Branches could not be loaded.'); - return false; - } finally { - setIsLoadingBranches(false); - } - }; - - const ensureSshKey = async () => { - if (publicKey || isEnsuringKey) { - return; - } - setIsEnsuringKey(true); - try { - const key = await Actions.run(() => ensureGitSshPublicKey(app.id)); - setPublicKey(key); - } finally { - setIsEnsuringKey(false); - } - }; - - useEffect(() => { - if (step === 'ssh-url') { - ensureSshKey(); - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [step, formData.gitUrl, publicKey]); - - const regenerateKey = async () => { - const confirmed = await openConfirmDialog({ - title: "Regenerate Deploy Key", - description: "This replaces the current app SSH key. Update the deploy key in your Git provider before deploying again.", - okButton: "Regenerate", - }); - if (!confirmed) { - return; - } - const key = await Actions.run(() => generateOrRegenerateGitSshKey(app.id)); - setPublicKey(key); - toast.success('Deploy key regenerated.'); - }; - - const copyPublicKey = () => { - if (!publicKey) { - return; - } - navigator.clipboard.writeText(publicKey); - toast.success('Copied to clipboard.'); - }; - - const runDockerfileDetection = async () => { - if (!isGitSource || !formData.gitUrl || !formData.gitBranch) { - return; - } - - const inputData: AppDockerfileDetectionModel = formData.sourceType === 'GIT' - ? { - sourceType: 'GIT', - gitUrl: formData.gitUrl, - gitBranch: formData.gitBranch, - gitUsername: formData.gitUsername, - gitToken: formData.gitToken, - } - : { - sourceType: 'GIT_SSH', - gitUrl: formData.gitUrl, - gitBranch: formData.gitBranch, - }; - - setIsDetectingDockerfile(true); - try { - const dockerfilePath = await Actions.run(() => detectDockerfilePath(app.id, inputData)); - updateFormData({ dockerfilePath: dockerfilePath || defaultDockerfilePath }); - setDockerfileDetectionResult(dockerfilePath ? 'detected' : 'not-found'); - } finally { - setIsDetectingDockerfile(false); - } - }; - - const selectGitBranch = (gitBranch: string) => { - updateFormData({ gitBranch }); - setDockerfileDetectionResult(null); - goTo('build-method'); - }; +import { Button } from '@/components/ui/button'; +import { DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; +import { useDialogContext } from '@/frontend/states/dialog-context'; +import { useConfirmDialog } from '@/frontend/states/zustand.states'; +import { Actions } from '@/frontend/utils/nextjs-actions.utils'; +import { Toast } from '@/frontend/utils/toast.utils'; +import { AppExtendedModel } from '@/shared/model/app-extended.model'; +import { AppBuildMethod, AppDockerfileDetectionModel, AppGitBranchesLookupModel, AppSourceInfoInputModel } from '@/shared/model/app-source-info.model'; +import { JsFramework, jsFrameworkPresets, jsFrameworkZodModel } from '@/shared/model/js-framework.model'; +import { ChevronLeft, Loader2, Rocket, Save } from 'lucide-react'; +import { useRouter } from 'next/navigation'; +import { useEffect, useState } from 'react'; +import { toast } from 'sonner'; +import { + detectDockerfilePath, + ensureGitSshPublicKey, + generateOrRegenerateGitSshKey, + getGitBranches, + saveGeneralAppSourceInfo +} from '../../configuration/actions'; +import { BuildMethodStep } from '../../configuration/app-source-wizard/build-method-step'; +import { ContainerImageStep } from '../../../../../workload-components/source-wizard/container-image-step'; +import { DockerfilePathStep } from '../../../../../workload-components/source-wizard/dockerfile-path-step'; +import { FrameworkConfigurationStep } from './framework-configuration-step'; +import { FrameworkStep } from './framework-step'; +import { GitBranchStep } from '../../../../../workload-components/source-wizard/git-branch-step'; +import { GitHttpsUrlStep } from '../../../../../workload-components/source-wizard/git-https-url-step'; +import { GitSshUrlStep } from '../../../../../workload-components/source-wizard/git-ssh-url-step'; +import { SourceSummaryStep } from '../../../../../workload-components/source-wizard/source-summary-step'; +import { SourceTypeStep } from '../../../../../workload-components/source-wizard/source-type-step'; +import { defaultDockerfilePath, sourceTypeLabels, SourceType, StepId } from '../../../../../workload-components/source-wizard/types'; +import { WizardProgress } from '../../../../../workload-components/source-wizard/wizard-progress'; +import { deploy } from '../../actions'; +import LoadingSpinner from '@/components/ui/loading-spinner'; + +export function AppSourceWizardDialog({ app, gitSshPublicKey }: { app: AppExtendedModel; gitSshPublicKey?: string }) { + const router = useRouter(); + const { closeDialog } = useDialogContext(); + const { openConfirmDialog } = useConfirmDialog(); + const [step, setStep] = useState('source'); + const [history, setHistory] = useState([]); + const [formData, setFormData] = useState(() => toSourceInput(app)); + const [publicKey, setPublicKey] = useState(gitSshPublicKey); + const [branches, setBranches] = useState([]); + const [isLoadingBranches, setIsLoadingBranches] = useState(false); + const [branchError, setBranchError] = useState(null); + const [isEnsuringKey, setIsEnsuringKey] = useState(false); + const [isDetectingDockerfile, setIsDetectingDockerfile] = useState(false); + const [dockerfileDetectionResult, setDockerfileDetectionResult] = useState<'detected' | 'not-found' | null>(null); + const [showGitToken, setShowGitToken] = useState(false); + const [showRegistryPassword, setShowRegistryPassword] = useState(false); + const [showButtonLoading, setShowButtonLoading] = useState(false); + + const canUseGitSources = app.appType === 'APP'; + const isGitSource = formData.sourceType === 'GIT' || formData.sourceType === 'GIT_SSH'; + const showGitCredentials = formData.sourceType === 'GIT' && !!formData.gitUrl?.trim(); + const showRegistryCredentials = formData.sourceType === 'CONTAINER' && !!formData.containerImageSource?.trim(); + const currentTitle = getStepTitle(step, formData.sourceType); + + const goTo = (nextStep: StepId) => { + setHistory((items) => [...items, step]); + setStep(nextStep); + }; + + const goBack = () => { + const previous = history[history.length - 1]; + if (!previous) { + return; + } + setHistory((items) => items.slice(0, -1)); + setStep(previous); + }; + + const updateFormData = (patch: Partial) => { + setFormData((current) => ({ ...current, ...patch })); + }; + + const chooseSourceType = (sourceType: SourceType) => { + setBranches([]); + setBranchError(null); + setDockerfileDetectionResult(null); + setFormData((current) => resetForSourceType(current, sourceType)); + }; + + const loadBranches = async () => { + if (!formData.gitUrl?.trim()) { + setBranchError('Enter a Git repository URL first.'); + return false; + } - const selectBuildMethod = async (buildMethod: AppBuildMethod) => { - updateFormData({ buildMethod }); - if (buildMethod === 'DOCKERFILE') { - goTo('dockerfile'); - await runDockerfileDetection(); - return; - } - if (buildMethod === 'FRAMEWORK') { - goTo('framework-selection'); - return; - } - goTo('summary'); - }; + const inputData: AppGitBranchesLookupModel = + formData.sourceType === 'GIT' + ? { + sourceType: 'GIT', + gitUrl: formData.gitUrl, + gitUsername: formData.gitUsername, + gitToken: formData.gitToken + } + : { + sourceType: 'GIT_SSH', + gitUrl: formData.gitUrl + }; + + setIsLoadingBranches(true); + setBranchError(null); + try { + const result = await Actions.run(() => getGitBranches(app.id, inputData)); + setBranches(result ?? []); + if (formData.gitBranch && !result?.includes(formData.gitBranch)) { + updateFormData({ gitBranch: '' }); + } + return true; + } catch (error) { + setBranches([]); + setBranchError(error instanceof Error ? error.message : 'Branches could not be loaded.'); + return false; + } finally { + setIsLoadingBranches(false); + } + }; - const selectFramework = (framework: JsFramework) => { - const preset = jsFrameworkPresets[framework]; - updateFormData({ - framework, - installCommand: preset.installCommand, - buildCommand: preset.buildCommand, - runCommand: preset.runCommand, - rootDirectory: preset.rootDirectory, - outputDirectory: preset.outputDirectory, - }); - goTo('framework-configuration'); - }; + const ensureSshKey = async () => { + if (publicKey || isEnsuringKey) { + return; + } + setIsEnsuringKey(true); + try { + const key = await Actions.run(() => ensureGitSshPublicKey(app.id)); + setPublicKey(key); + } finally { + setIsEnsuringKey(false); + } + }; - const next = async () => { - if (step === 'source') { - goTo(formData.sourceType === 'GIT' ? 'git-url' : formData.sourceType === 'GIT_SSH' ? 'ssh-url' : 'container-image'); - return; - } - if (step === 'git-url') { - if (await loadBranches()) { - goTo('branch'); - } - return; - } - if (step === 'ssh-url') { - if (await loadBranches()) { - goTo('branch'); - } - return; - } - if (step === 'dockerfile' || step === 'framework-configuration' || step === 'container-image') { - goTo('summary'); - } - }; + useEffect(() => { + if (step === 'ssh-url') { + ensureSshKey(); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [step, formData.gitUrl, publicKey]); + + const regenerateKey = async () => { + const confirmed = await openConfirmDialog({ + title: 'Regenerate Deploy Key', + description: 'This replaces the current app SSH key. Update the deploy key in your Git provider before deploying again.', + okButton: 'Regenerate' + }); + if (!confirmed) { + return; + } + const key = await Actions.run(() => generateOrRegenerateGitSshKey(app.id)); + setPublicKey(key); + toast.success('Deploy key regenerated.'); + }; + + const copyPublicKey = () => { + if (!publicKey) { + return; + } + navigator.clipboard.writeText(publicKey); + toast.success('Copied to clipboard.'); + }; - const save = async (deployAfterSave: boolean) => { - try { - setShowButtonLoading(true); - await Toast.fromAction(() => saveGeneralAppSourceInfo(null, formData, app.id), 'Source saved', 'Saving source...'); - if (deployAfterSave) { - await Toast.fromAction(() => deploy(app.id, true), 'Deployment started', 'Staring deployment...'); - closeDialog(true); - router.refresh(); - return; - } - - closeDialog(true); - router.refresh(); - } finally { - setShowButtonLoading(false); - } - }; + const runDockerfileDetection = async () => { + if (!isGitSource || !formData.gitUrl || !formData.gitBranch) { + return; + } - const nextDisabled = getNextDisabled(step, formData, publicKey, isLoadingBranches, isEnsuringKey, isDetectingDockerfile); - - return ( - <> - - {currentTitle} - - {step === 'summary' ? 'Review the app source before saving.' : ''} - - - -
- - {step === 'source' && ( - - )} - {step === 'git-url' && ( - - )} - {step === 'ssh-url' && ( - - )} - {step === 'branch' && ( - - )} - {step === 'build-method' && ( - - )} - {step === 'dockerfile' && ( - updateFormData({ dockerfilePath })} - onRetry={() => void runDockerfileDetection()} - /> - )} - {step === 'framework-selection' && ( - - )} - {step === 'framework-configuration' && formData.framework && ( - - )} - {step === 'container-image' && ( - - )} - {step === 'summary' && ( - - )} -
- - -
-
- {history.length > 0 && ( - - )} -
-
- {step === 'summary' ? ( - <> - - - - ) : step === 'branch' || step === 'build-method' || step === 'framework-selection' ? ( - null - ) : ( - - )} -
-
-
- - ); + const inputData: AppDockerfileDetectionModel = + formData.sourceType === 'GIT' + ? { + sourceType: 'GIT', + gitUrl: formData.gitUrl, + gitBranch: formData.gitBranch, + gitUsername: formData.gitUsername, + gitToken: formData.gitToken + } + : { + sourceType: 'GIT_SSH', + gitUrl: formData.gitUrl, + gitBranch: formData.gitBranch + }; + + setIsDetectingDockerfile(true); + try { + const dockerfilePath = await Actions.run(() => detectDockerfilePath(app.id, inputData)); + updateFormData({ dockerfilePath: dockerfilePath || defaultDockerfilePath }); + setDockerfileDetectionResult(dockerfilePath ? 'detected' : 'not-found'); + } finally { + setIsDetectingDockerfile(false); + } + }; + + const selectGitBranch = (gitBranch: string) => { + updateFormData({ gitBranch }); + setDockerfileDetectionResult(null); + goTo('build-method'); + }; + + const selectBuildMethod = async (buildMethod: AppBuildMethod) => { + updateFormData({ buildMethod }); + if (buildMethod === 'DOCKERFILE') { + goTo('dockerfile'); + await runDockerfileDetection(); + return; + } + if (buildMethod === 'FRAMEWORK') { + goTo('framework-selection'); + return; + } + goTo('summary'); + }; + + const selectFramework = (framework: JsFramework) => { + const preset = jsFrameworkPresets[framework]; + updateFormData({ + framework, + installCommand: preset.installCommand, + buildCommand: preset.buildCommand, + runCommand: preset.runCommand, + rootDirectory: preset.rootDirectory, + outputDirectory: preset.outputDirectory + }); + goTo('framework-configuration'); + }; + + const next = async () => { + if (step === 'source') { + goTo(formData.sourceType === 'GIT' ? 'git-url' : formData.sourceType === 'GIT_SSH' ? 'ssh-url' : 'container-image'); + return; + } + if (step === 'git-url') { + if (await loadBranches()) { + goTo('branch'); + } + return; + } + if (step === 'ssh-url') { + if (await loadBranches()) { + goTo('branch'); + } + return; + } + if (step === 'dockerfile' || step === 'framework-configuration' || step === 'container-image') { + goTo('summary'); + } + }; + + const save = async (deployAfterSave: boolean) => { + try { + setShowButtonLoading(true); + await Toast.fromAction(() => saveGeneralAppSourceInfo(null, formData, app.id), 'Source saved', 'Saving source...'); + if (deployAfterSave) { + await Toast.fromAction(() => deploy(app.id, true), 'Deployment started', 'Staring deployment...'); + closeDialog(true); + router.refresh(); + return; + } + + closeDialog(true); + router.refresh(); + } finally { + setShowButtonLoading(false); + } + }; + + const nextDisabled = getNextDisabled(step, formData, publicKey, isLoadingBranches, isEnsuringKey, isDetectingDockerfile); + + return ( + <> + + {currentTitle} + {step === 'summary' ? 'Review the app source before saving.' : ''} + + +
+ + {step === 'source' && } + {step === 'git-url' && ( + + )} + {step === 'ssh-url' && ( + + )} + {step === 'branch' && } + {step === 'build-method' && } + {step === 'dockerfile' && ( + updateFormData({ dockerfilePath })} + onRetry={() => void runDockerfileDetection()} + /> + )} + {step === 'framework-selection' && } + {step === 'framework-configuration' && formData.framework && ( + + )} + {step === 'container-image' && ( + + )} + {step === 'summary' && ( + + )} +
+ + +
+
+ {history.length > 0 && ( + + )} +
+
+ {step === 'summary' ? ( + <> + + + + ) : step === 'branch' || step === 'build-method' || step === 'framework-selection' ? null : ( + + )} +
+
+
+ + ); } function getStepTitle(step: StepId, sourceType: AppSourceInfoInputModel['sourceType']) { - if (step === 'source') return 'Choose source'; - if (step === 'git-url') return 'Connect Git HTTPS'; - if (step === 'ssh-url') return 'Connect Git SSH'; - if (step === 'branch') return 'Choose Git Branch'; - if (step === 'build-method') return 'Choose Build Method'; - if (step === 'dockerfile') return 'Confirm Dockerfile Path'; - if (step === 'framework-selection') return 'Choose Framework'; - if (step === 'framework-configuration') return 'Configure Framework'; - if (step === 'container-image') return 'Connect Docker Container Image'; - if (step === 'summary') return `${sourceTypeLabels[sourceType as SourceType]} Summary`; - return 'Connect App Source'; + if (step === 'source') { + return 'Choose source'; + } + if (step === 'git-url') { + return 'Connect Git HTTPS'; + } + if (step === 'ssh-url') { + return 'Connect Git SSH'; + } + if (step === 'branch') { + return 'Choose Git Branch'; + } + if (step === 'build-method') { + return 'Choose Build Method'; + } + if (step === 'dockerfile') { + return 'Confirm Dockerfile Path'; + } + if (step === 'framework-selection') { + return 'Choose Framework'; + } + if (step === 'framework-configuration') { + return 'Configure Framework'; + } + if (step === 'container-image') { + return 'Connect Docker Container Image'; + } + if (step === 'summary') { + return `${sourceTypeLabels[sourceType as SourceType]} Summary`; + } + return 'Connect App Source'; } -function getNextDisabled(step: StepId, formData: AppSourceInfoInputModel, publicKey: string | undefined, isLoadingBranches: boolean, isEnsuringKey: boolean, isDetectingDockerfile: boolean) { - if (isLoadingBranches || isEnsuringKey || isDetectingDockerfile) return true; - if (step === 'git-url') return !formData.gitUrl?.trim(); - if (step === 'ssh-url') return !formData.gitUrl?.trim() || !publicKey; - if (step === 'branch') return !formData.gitBranch; - if (step === 'dockerfile') return !formData.dockerfilePath?.trim(); - if (step === 'framework-configuration') return !formData.framework || !formData.buildCommand?.trim(); - if (step === 'container-image') return !formData.containerImageSource?.trim(); - return false; +function getNextDisabled( + step: StepId, + formData: AppSourceInfoInputModel, + publicKey: string | undefined, + isLoadingBranches: boolean, + isEnsuringKey: boolean, + isDetectingDockerfile: boolean +) { + if (isLoadingBranches || isEnsuringKey || isDetectingDockerfile) { + return true; + } + if (step === 'git-url') { + return !formData.gitUrl?.trim(); + } + if (step === 'ssh-url') { + return !formData.gitUrl?.trim() || !publicKey; + } + if (step === 'branch') { + return !formData.gitBranch; + } + if (step === 'dockerfile') { + return !formData.dockerfilePath?.trim(); + } + if (step === 'framework-configuration') { + return !formData.framework || !formData.buildCommand?.trim(); + } + if (step === 'container-image') { + return !formData.containerImageSource?.trim(); + } + return false; } function resetForSourceType(current: AppSourceInfoInputModel, sourceType: SourceType): AppSourceInfoInputModel { - if (sourceType === current.sourceType) { - return current; - } - if (sourceType === 'GIT') { - return { - sourceType, - buildMethod: 'RAILPACK', - gitUrl: '', - gitBranch: '', - gitUsername: '', - gitToken: '', - dockerfilePath: defaultDockerfilePath, - ...emptyFrameworkFields(), - }; - } - if (sourceType === 'GIT_SSH') { - return { - sourceType, - buildMethod: 'RAILPACK', - gitUrl: '', - gitBranch: '', - dockerfilePath: defaultDockerfilePath, - ...emptyFrameworkFields(), - }; - } + if (sourceType === current.sourceType) { + return current; + } + if (sourceType === 'GIT') { return { - sourceType, - buildMethod: 'RAILPACK', - containerImageSource: '', - containerRegistryUsername: '', - containerRegistryPassword: '', - dockerfilePath: defaultDockerfilePath, - ...emptyFrameworkFields(), + sourceType, + buildMethod: 'RAILPACK', + gitUrl: '', + gitBranch: '', + gitUsername: '', + gitToken: '', + dockerfilePath: defaultDockerfilePath, + ...emptyFrameworkFields() }; + } + if (sourceType === 'GIT_SSH') { + return { + sourceType, + buildMethod: 'RAILPACK', + gitUrl: '', + gitBranch: '', + dockerfilePath: defaultDockerfilePath, + ...emptyFrameworkFields() + }; + } + return { + sourceType, + buildMethod: 'RAILPACK', + containerImageSource: '', + containerRegistryUsername: '', + containerRegistryPassword: '', + dockerfilePath: defaultDockerfilePath, + ...emptyFrameworkFields() + }; } function emptyFrameworkFields() { - return { - framework: null, - installCommand: '', - buildCommand: '', - runCommand: '', - rootDirectory: './', - outputDirectory: '', - nodeVersion: '', - }; + return { + framework: null, + installCommand: '', + buildCommand: '', + runCommand: '', + rootDirectory: './', + outputDirectory: '', + nodeVersion: '' + }; } function toSourceInput(app: AppExtendedModel): AppSourceInfoInputModel { - const sourceType = app.appType === 'APP' - ? app.sourceType as SourceType - : 'CONTAINER'; - return { - sourceType, - buildMethod: (app.buildMethod as AppBuildMethod | undefined) ?? 'RAILPACK', - containerImageSource: app.containerImageSource ?? '', - containerRegistryUsername: app.containerRegistryUsername ?? '', - containerRegistryPassword: app.containerRegistryPassword ?? '', - gitUrl: app.gitUrl ?? '', - gitBranch: app.gitBranch ?? '', - gitUsername: app.gitUsername ?? '', - gitToken: app.gitToken ?? '', - dockerfilePath: app.dockerfilePath ?? defaultDockerfilePath, - framework: jsFrameworkZodModel.safeParse(app.framework).data ?? null, - installCommand: app.installCommand ?? '', - buildCommand: app.buildCommand ?? '', - runCommand: app.runCommand ?? '', - rootDirectory: app.rootDirectory ?? './', - outputDirectory: app.outputDirectory ?? '', - nodeVersion: app.nodeVersion ?? '', - }; + const sourceType = app.appType === 'APP' ? (app.sourceType as SourceType) : 'CONTAINER'; + return { + sourceType, + buildMethod: (app.buildMethod as AppBuildMethod | undefined) ?? 'RAILPACK', + containerImageSource: app.containerImageSource ?? '', + containerRegistryUsername: app.containerRegistryUsername ?? '', + containerRegistryPassword: app.containerRegistryPassword ?? '', + gitUrl: app.gitUrl ?? '', + gitBranch: app.gitBranch ?? '', + gitUsername: app.gitUsername ?? '', + gitToken: app.gitToken ?? '', + dockerfilePath: app.dockerfilePath ?? defaultDockerfilePath, + framework: jsFrameworkZodModel.safeParse(app.framework).data ?? null, + installCommand: app.installCommand ?? '', + buildCommand: app.buildCommand ?? '', + runCommand: app.runCommand ?? '', + rootDirectory: app.rootDirectory ?? './', + outputDirectory: app.outputDirectory ?? '', + nodeVersion: app.nodeVersion ?? '' + }; } diff --git a/src/app/project/[projectId]/overview/network-graph/connection-edge.tsx b/src/app/project/[projectId]/overview/network-graph/connection-edge.tsx index 4421f5d9..8ba88a0e 100644 --- a/src/app/project/[projectId]/overview/network-graph/connection-edge.tsx +++ b/src/app/project/[projectId]/overview/network-graph/connection-edge.tsx @@ -4,20 +4,18 @@ import { SmoothStepEdge, type EdgeProps } from '@xyflow/react'; import { ProjectNetworkGraphConnectionContextMenu } from './context-menus/project-network-graph-connection-context-menu'; type ConnectionEdgeData = { - onDelete?: () => void; - internalHostnames: { hostname: string; port: number }[]; + onDelete?: () => void; + internalHostnames: { hostname: string; port: number }[]; }; export function ConnectionEdge(props: EdgeProps) { - const data = props.data as ConnectionEdgeData | undefined; - if (!data) return ; - return ( - - - - ); + const data = props.data as ConnectionEdgeData | undefined; + if (!data) { + return ; + } + return ( + + + + ); } - diff --git a/src/app/project/[projectId]/overview/network-graph/context-menus/project-network-graph-canvas-context-menu.tsx b/src/app/project/[projectId]/overview/network-graph/context-menus/project-network-graph-canvas-context-menu.tsx index 58b0297d..9a4353d1 100644 --- a/src/app/project/[projectId]/overview/network-graph/context-menus/project-network-graph-canvas-context-menu.tsx +++ b/src/app/project/[projectId]/overview/network-graph/context-menus/project-network-graph-canvas-context-menu.tsx @@ -3,13 +3,13 @@ import type { ReactNode } from 'react'; import { Blocks, Bot, Database, File } from 'lucide-react'; import { - ContextMenu, - ContextMenuContent, - ContextMenuItem, - ContextMenuSub, - ContextMenuSubContent, - ContextMenuSubTrigger, - ContextMenuTrigger, + ContextMenu, + ContextMenuContent, + ContextMenuItem, + ContextMenuSub, + ContextMenuSubContent, + ContextMenuSubTrigger, + ContextMenuTrigger } from '@/components/ui/context-menu'; import { useDialog } from '@/frontend/states/zustand.states'; import { EditAppDialog } from '@/app/project/[projectId]/apps/create/edit-app-dialog'; @@ -17,74 +17,73 @@ import { CreateAgentDialog } from '@/app/project/[projectId]/agents/create/creat import ChooseTemplateDialog from '@/app/project/[projectId]/choose-template-dialog'; type ProjectNetworkGraphCanvasContextMenuProps = { - projectId: string; - canCreateApps: boolean; - canCreateAgents: boolean; - children: ReactNode; + projectId: string; + canCreateApps: boolean; + canCreateAgents: boolean; + children: ReactNode; }; -export function ProjectNetworkGraphCanvasContextMenu({ - projectId, - canCreateApps, - canCreateAgents, - children, -}: ProjectNetworkGraphCanvasContextMenuProps) { - const { openDialog } = useDialog(); - const openTemplateDialog = (templateType: 'database' | 'template' | 'agent-template') => { - openDialog(, { maxWidth: '1000px' }); - }; +export function ProjectNetworkGraphCanvasContextMenu({ projectId, canCreateApps, canCreateAgents, children }: ProjectNetworkGraphCanvasContextMenuProps) { + const { openDialog } = useDialog(); + const openTemplateDialog = (templateType: 'database' | 'template' | 'agent-template') => { + openDialog(, { maxWidth: '1000px' }); + }; - if (!canCreateApps && !canCreateAgents) return children; + if (!canCreateApps && !canCreateAgents) { + return children; + } - return ( - - - {children} - - - {canCreateApps && <> - - - - Create App - - - - - - Empty App - - - openTemplateDialog('template')}> - - App from Template - - - - openTemplateDialog('database')}> - - Create Database - - } - {canCreateAgents && - - - Create Agent Sandbox - - - - - - Empty Agent Sandbox - - - openTemplateDialog('agent-template')}> - - Agent Sandbox from Template - - - } - - - ); + return ( + + {children} + + {canCreateApps && ( + <> + + + + Create App + + + + + + Empty App + + + openTemplateDialog('template')}> + + App from Template + + + + openTemplateDialog('database')}> + + Create Database + + + )} + {canCreateAgents && ( + + + + Create Agent Sandbox + + + + + + Empty Agent Sandbox + + + openTemplateDialog('agent-template')}> + + Agent Sandbox from Template + + + + )} + + + ); } diff --git a/src/app/project/[projectId]/overview/network-graph/project-network-graph-drawer-session.ts b/src/app/project/[projectId]/overview/network-graph/project-network-graph-drawer-session.ts index 7649f89a..498c025c 100644 --- a/src/app/project/[projectId]/overview/network-graph/project-network-graph-drawer-session.ts +++ b/src/app/project/[projectId]/overview/network-graph/project-network-graph-drawer-session.ts @@ -2,16 +2,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { TabNavigationUtils } from '@/frontend/utils/tab-navigation.utils'; -import { - appDrawerTabValues, - AppDrawerNavigationUtils, - defaultAppDrawerTab, - type AppDrawerTab, -} from '@/shared/utils/app-drawer-navigation.utils'; -import { - defaultAgentDrawerTab, - type AgentDrawerTab, -} from '@/shared/utils/agent-drawer-navigation.utils'; +import { appDrawerTabValues, AppDrawerNavigationUtils, defaultAppDrawerTab, type AppDrawerTab } from '@/shared/utils/app-drawer-navigation.utils'; +import { defaultAgentDrawerTab, type AgentDrawerTab } from '@/shared/utils/agent-drawer-navigation.utils'; import type { NetworkGraphNode } from './project-network-graph-projection'; export const drawerTabValues = appDrawerTabValues; @@ -23,114 +15,136 @@ type QueryParams = Pick; type DrawerTarget = { kind: 'APP' | 'AGENT'; id: string }; export function useProjectNetworkGraphDrawerSession({ - searchParams, - appIds, - agentIds, + searchParams, + appIds, + agentIds }: { - searchParams: QueryParams; - appIds: Set; - agentIds: Set; + searchParams: QueryParams; + appIds: Set; + agentIds: Set; }) { - const [selectedNodeId, setSelectedNodeId] = useState(); - const [open, setOpen] = useState(false); - const requestedTab = searchParams.get('drawerTab'); - - const updateQuery = useCallback((target?: DrawerTarget, tab?: AppDrawerTab | AgentDrawerTab) => { - const params = new URLSearchParams(searchParams.toString()); - params.delete('drawerAppId'); - params.delete('drawerAgentId'); - params.delete('drawerTab'); - - if (target) { - params.set(target.kind === 'AGENT' ? 'drawerAgentId' : 'drawerAppId', target.id); - params.set('drawerTab', tab ?? (target.kind === 'AGENT' ? defaultAgentDrawerTab : defaultAppDrawerTab)); - } - - TabNavigationUtils.replaceQuery(params); - }, [searchParams]); - - useEffect(() => { - const requestedAppId = searchParams.get('drawerAppId'); - const requestedAgentId = searchParams.get('drawerAgentId'); - - if (requestedAppId) { - if (!appIds.has(requestedAppId)) { - updateQuery(); - return; - } - setSelectedNodeId(`APP:${requestedAppId}`); - return; - } - - if (requestedAgentId) { - if (!agentIds.has(requestedAgentId)) { - updateQuery(); - return; - } - setSelectedNodeId(`AGENT:${requestedAgentId}`); - } - }, [agentIds, appIds, searchParams, updateQuery]); - - useEffect(() => { - if (selectedNodeId) setOpen(true); - }, [selectedNodeId]); - - const selectNode = useCallback((node: NetworkGraphNode) => { - setSelectedNodeId(node.id); - if (selectedNodeId === node.id) setOpen(true); - if (node.kind === 'APP') { - updateQuery({ kind: 'APP', id: node.id.replace('APP:', '') }); - } else if (node.kind === 'AGENT') { - updateQuery({ kind: 'AGENT', id: node.id.replace('AGENT:', '') }); - } else { - updateQuery(); - } - }, [selectedNodeId, updateQuery]); - - const openAppTab = useCallback((appId: string, tab: DrawerTab) => { - const nodeId = `APP:${appId}`; - setSelectedNodeId(nodeId); - if (selectedNodeId === nodeId) setOpen(true); - updateQuery({ kind: 'APP', id: appId }, tab); - }, [selectedNodeId, updateQuery]); - - const openAgentTab = useCallback((agentId: string, tab: AgentDrawerTab) => { - const nodeId = `AGENT:${agentId}`; - setSelectedNodeId(nodeId); - if (selectedNodeId === nodeId) setOpen(true); - updateQuery({ kind: 'AGENT', id: agentId }, tab); - }, [selectedNodeId, updateQuery]); - - const onOpenChange = useCallback((nextOpen: boolean) => { - setOpen(nextOpen); - if (!nextOpen) { - updateQuery(); - } - }, [updateQuery]); - - const onOpenChangeComplete = useCallback((nextOpen: boolean) => { - // Keep the node mounted until Vaul finishes its exit animation. A click - // during that animation reopens it, so do not clear the new selection. - if (!nextOpen && !open) setSelectedNodeId(undefined); - }, [open]); - - return useMemo(() => ({ - selectedNodeId, - open, - requestedTab, - selectNode, - openAppTab, - openAgentTab, - onOpenChange, - onOpenChangeComplete, - }), [ - onOpenChange, - onOpenChangeComplete, - openAgentTab, - openAppTab, - open, - requestedTab, - selectNode, - selectedNodeId, - ]); + const [selectedNodeId, setSelectedNodeId] = useState(); + const [open, setOpen] = useState(false); + const requestedTab = searchParams.get('drawerTab'); + + const updateQuery = useCallback( + (target?: DrawerTarget, tab?: AppDrawerTab | AgentDrawerTab) => { + const params = new URLSearchParams(searchParams.toString()); + params.delete('drawerAppId'); + params.delete('drawerAgentId'); + params.delete('drawerTab'); + + if (target) { + params.set(target.kind === 'AGENT' ? 'drawerAgentId' : 'drawerAppId', target.id); + params.set('drawerTab', tab ?? (target.kind === 'AGENT' ? defaultAgentDrawerTab : defaultAppDrawerTab)); + } + + TabNavigationUtils.replaceQuery(params); + }, + [searchParams] + ); + + useEffect(() => { + const requestedAppId = searchParams.get('drawerAppId'); + const requestedAgentId = searchParams.get('drawerAgentId'); + + if (requestedAppId) { + if (!appIds.has(requestedAppId)) { + updateQuery(); + return; + } + setSelectedNodeId(`APP:${requestedAppId}`); + return; + } + + if (requestedAgentId) { + if (!agentIds.has(requestedAgentId)) { + updateQuery(); + return; + } + setSelectedNodeId(`AGENT:${requestedAgentId}`); + } + }, [agentIds, appIds, searchParams, updateQuery]); + + useEffect(() => { + if (selectedNodeId) { + setOpen(true); + } + }, [selectedNodeId]); + + const selectNode = useCallback( + (node: NetworkGraphNode) => { + setSelectedNodeId(node.id); + if (selectedNodeId === node.id) { + setOpen(true); + } + if (node.kind === 'APP') { + updateQuery({ kind: 'APP', id: node.id.replace('APP:', '') }); + } else if (node.kind === 'AGENT') { + updateQuery({ kind: 'AGENT', id: node.id.replace('AGENT:', '') }); + } else { + updateQuery(); + } + }, + [selectedNodeId, updateQuery] + ); + + const openAppTab = useCallback( + (appId: string, tab: DrawerTab) => { + const nodeId = `APP:${appId}`; + setSelectedNodeId(nodeId); + if (selectedNodeId === nodeId) { + setOpen(true); + } + updateQuery({ kind: 'APP', id: appId }, tab); + }, + [selectedNodeId, updateQuery] + ); + + const openAgentTab = useCallback( + (agentId: string, tab: AgentDrawerTab) => { + const nodeId = `AGENT:${agentId}`; + setSelectedNodeId(nodeId); + if (selectedNodeId === nodeId) { + setOpen(true); + } + updateQuery({ kind: 'AGENT', id: agentId }, tab); + }, + [selectedNodeId, updateQuery] + ); + + const onOpenChange = useCallback( + (nextOpen: boolean) => { + setOpen(nextOpen); + if (!nextOpen) { + updateQuery(); + } + }, + [updateQuery] + ); + + const onOpenChangeComplete = useCallback( + (nextOpen: boolean) => { + // Keep the node mounted until Vaul finishes its exit animation. A click + // during that animation reopens it, so do not clear the new selection. + if (!nextOpen && !open) { + setSelectedNodeId(undefined); + } + }, + [open] + ); + + return useMemo( + () => ({ + selectedNodeId, + open, + requestedTab, + selectNode, + openAppTab, + openAgentTab, + onOpenChange, + onOpenChangeComplete + }), + [onOpenChange, onOpenChangeComplete, openAgentTab, openAppTab, open, requestedTab, selectNode, selectedNodeId] + ); } diff --git a/src/app/project/[projectId]/overview/network-graph/project-network-graph-projection.ts b/src/app/project/[projectId]/overview/network-graph/project-network-graph-projection.ts index 9b766a66..04241a91 100644 --- a/src/app/project/[projectId]/overview/network-graph/project-network-graph-projection.ts +++ b/src/app/project/[projectId]/overview/network-graph/project-network-graph-projection.ts @@ -7,183 +7,212 @@ export type NetworkGraphNodeKind = WorkloadType | 'INTERNET'; export type NetworkGraphEdgeDirection = 'CONNECTION' | 'INGRESS' | 'EGRESS' | 'INTERNET_CONNECTION' | 'INTERNET_INGRESS' | 'INTERNET_EGRESS'; export type NetworkGraphNode = { - id: string; - kind: NetworkGraphNodeKind; - name: string; - projectId?: string; - external: boolean; - caption?: string; - appType?: string; + id: string; + kind: NetworkGraphNodeKind; + name: string; + projectId?: string; + external: boolean; + caption?: string; + appType?: string; }; export type NetworkGraphEdge = { - id: string; - source: string; - target: string; - direction: NetworkGraphEdgeDirection; - labels: string[]; - external: boolean; - complete?: boolean; - internetIngress?: boolean; - internetEgress?: boolean; - ruleProvenance: AppNetworkPolicyRuleProvenance[]; + id: string; + source: string; + target: string; + direction: NetworkGraphEdgeDirection; + labels: string[]; + external: boolean; + complete?: boolean; + internetIngress?: boolean; + internetEgress?: boolean; + ruleProvenance: AppNetworkPolicyRuleProvenance[]; }; export type ProjectNetworkGraphData = { nodes: NetworkGraphNode[]; edges: NetworkGraphEdge[] }; export function connectionDeletionProvenance( - edge: NetworkGraphEdge | undefined, - writableAppIds: ReadonlySet, + edge: NetworkGraphEdge | undefined, + writableAppIds: ReadonlySet ): AppNetworkPolicyRuleProvenance[] | undefined { - if (!edge || edge.direction.startsWith('INTERNET') || edge.ruleProvenance.length === 0) return undefined; - return edge.ruleProvenance.every(item => writableAppIds.has(item.ownerAppId)) - ? edge.ruleProvenance - : undefined; + if (!edge || edge.direction.startsWith('INTERNET') || edge.ruleProvenance.length === 0) { + return undefined; + } + return edge.ruleProvenance.every((item) => writableAppIds.has(item.ownerAppId)) ? edge.ruleProvenance : undefined; } function workloadNodeId(type: WorkloadType, id: string) { - return `${type}:${id}`; + return `${type}:${id}`; } function formatRuleLabel(port: number, protocol: string) { - return `${port}/${protocol.toUpperCase()}`; + return `${port}/${protocol.toUpperCase()}`; } function aggregateLabels(labels: string[]) { - return Array.from(new Set(labels)).sort((a, b) => { - const portA = parseInt(a, 10); - const portB = parseInt(b, 10); - return !Number.isNaN(portA) && !Number.isNaN(portB) ? portA - portB : a.localeCompare(b); - }); + return Array.from(new Set(labels)).sort((a, b) => { + const portA = parseInt(a, 10); + const portB = parseInt(b, 10); + return !Number.isNaN(portA) && !Number.isNaN(portB) ? portA - portB : a.localeCompare(b); + }); } function consolidateConnections(edges: NetworkGraphEdge[]) { - const internetGroups = new Map(); - for (const edge of edges.filter(edge => edge.direction.startsWith('INTERNET'))) { - const appId = edge.direction === 'INTERNET_INGRESS' ? edge.target : edge.source; - const group = internetGroups.get(appId) ?? { ingress: [], egress: [] }; - if (edge.direction === 'INTERNET_INGRESS') group.ingress.push(edge); - else group.egress.push(edge); - internetGroups.set(appId, group); + const internetGroups = new Map(); + for (const edge of edges.filter((edge) => edge.direction.startsWith('INTERNET'))) { + const appId = edge.direction === 'INTERNET_INGRESS' ? edge.target : edge.source; + const group = internetGroups.get(appId) ?? { ingress: [], egress: [] }; + if (edge.direction === 'INTERNET_INGRESS') { + group.ingress.push(edge); + } else { + group.egress.push(edge); } - const groups = new Map(); - for (const edge of edges.filter(edge => !edge.direction.startsWith('INTERNET'))) { - const key = `${edge.source}:${edge.target}`; - const group = groups.get(key) ?? { ingress: [], egress: [] }; - if (edge.direction === 'INGRESS') group.ingress.push(edge); - else group.egress.push(edge); - groups.set(key, group); + internetGroups.set(appId, group); + } + const groups = new Map(); + for (const edge of edges.filter((edge) => !edge.direction.startsWith('INTERNET'))) { + const key = `${edge.source}:${edge.target}`; + const group = groups.get(key) ?? { ingress: [], egress: [] }; + if (edge.direction === 'INGRESS') { + group.ingress.push(edge); + } else { + group.egress.push(edge); } - const internetConnections = Array.from(internetGroups.entries()).map(([appId, group]) => ({ - id: `INTERNET_CONNECTION:${appId}`, - source: appId, - target: 'INTERNET', - direction: 'INTERNET_CONNECTION' as const, - labels: aggregateLabels([...group.ingress, ...group.egress].flatMap(edge => edge.labels).filter(Boolean)), - external: false, - ruleProvenance: [], - internetIngress: group.ingress.length > 0, - internetEgress: group.egress.length > 0, - })); - return [...internetConnections, ...Array.from(groups.entries()).map(([key, group]) => { - const ingressLabels = aggregateLabels(group.ingress.flatMap(edge => edge.labels)); - const egressLabels = aggregateLabels(group.egress.flatMap(edge => edge.labels)); - const reference = group.egress[0] ?? group.ingress[0]; - return { - id: `CONNECTION:${key}`, - source: reference.source, - target: reference.target, - direction: 'CONNECTION' as const, - labels: aggregateLabels([...ingressLabels, ...egressLabels]), - external: reference.external, - ruleProvenance: [...group.ingress, ...group.egress].flatMap(edge => edge.ruleProvenance), - complete: ingressLabels.length > 0 - && ingressLabels.length === egressLabels.length - && ingressLabels.every((label, index) => label === egressLabels[index]), - }; - })]; + groups.set(key, group); + } + const internetConnections = Array.from(internetGroups.entries()).map(([appId, group]) => ({ + id: `INTERNET_CONNECTION:${appId}`, + source: appId, + target: 'INTERNET', + direction: 'INTERNET_CONNECTION' as const, + labels: aggregateLabels([...group.ingress, ...group.egress].flatMap((edge) => edge.labels).filter(Boolean)), + external: false, + ruleProvenance: [], + internetIngress: group.ingress.length > 0, + internetEgress: group.egress.length > 0 + })); + return [ + ...internetConnections, + ...Array.from(groups.entries()).map(([key, group]) => { + const ingressLabels = aggregateLabels(group.ingress.flatMap((edge) => edge.labels)); + const egressLabels = aggregateLabels(group.egress.flatMap((edge) => edge.labels)); + const reference = group.egress[0] ?? group.ingress[0]; + return { + id: `CONNECTION:${key}`, + source: reference.source, + target: reference.target, + direction: 'CONNECTION' as const, + labels: aggregateLabels([...ingressLabels, ...egressLabels]), + external: reference.external, + ruleProvenance: [...group.ingress, ...group.egress].flatMap((edge) => edge.ruleProvenance), + complete: + ingressLabels.length > 0 && ingressLabels.length === egressLabels.length && ingressLabels.every((label, index) => label === egressLabels[index]) + }; + }) + ]; } /** Projects effective App Network Policy Configuration and App Domain traffic into graph facts. */ export function buildProjectNetworkGraph(apps: AppExtendedModel[], agents: AgentExtendedModel[] = []): ProjectNetworkGraphData { - const projectId = apps[0]?.projectId ?? agents[0]?.projectId; - const internalWorkloadIds = new Set([...apps.map(app => app.id), ...agents.map(agent => agent.id)]); - const nodes = new Map(); - const edges = new Map(); - const addNode = (node: NetworkGraphNode) => { if (!nodes.has(node.id)) nodes.set(node.id, node); }; - const addEdge = ( - source: string, - target: string, - direction: NetworkGraphEdgeDirection, - label: string, - external: boolean, - ruleProvenance: AppNetworkPolicyRuleProvenance[] = [], - ) => { - const key = `${direction}:${source}:${target}`; - const edge = edges.get(key); - if (edge) { - edge.labels.push(label); - edge.ruleProvenance.push(...ruleProvenance); - } else { - edges.set(key, { id: key, source, target, direction, labels: [label], external, ruleProvenance }); + const projectId = apps[0]?.projectId ?? agents[0]?.projectId; + const internalWorkloadIds = new Set([...apps.map((app) => app.id), ...agents.map((agent) => agent.id)]); + const nodes = new Map(); + const edges = new Map(); + const addNode = (node: NetworkGraphNode) => { + if (!nodes.has(node.id)) { + nodes.set(node.id, node); + } + }; + const addEdge = ( + source: string, + target: string, + direction: NetworkGraphEdgeDirection, + label: string, + external: boolean, + ruleProvenance: AppNetworkPolicyRuleProvenance[] = [] + ) => { + const key = `${direction}:${source}:${target}`; + const edge = edges.get(key); + if (edge) { + edge.labels.push(label); + edge.ruleProvenance.push(...ruleProvenance); + } else { + edges.set(key, { id: key, source, target, direction, labels: [label], external, ruleProvenance }); + } + }; + + for (const app of apps) { + const appNodeId = workloadNodeId('APP', app.id); + addNode({ id: appNodeId, kind: 'APP', name: app.name, projectId: app.projectId, external: false, appType: app.appType }); + + if (app.useNetworkPolicy) { + for (const rule of app.appNetworkPolicy?.rules ?? []) { + const target = rule.targetApp ?? rule.targetAgent; + if (!target) { + continue; } - }; - - for (const app of apps) { - const appNodeId = workloadNodeId('APP', app.id); - addNode({ id: appNodeId, kind: 'APP', name: app.name, projectId: app.projectId, external: false, appType: app.appType }); - - if (app.useNetworkPolicy) { - for (const rule of app.appNetworkPolicy?.rules ?? []) { - const target = rule.targetApp ?? rule.targetAgent; - if (!target) continue; - const targetType: WorkloadType = rule.targetApp ? 'APP' : 'AGENT'; - const targetNodeId = workloadNodeId(targetType, target.id); - const external = !internalWorkloadIds.has(target.id); - addNode({ - id: targetNodeId, kind: targetType, name: target.name, projectId: target.projectId, external, - caption: external && target.projectId !== projectId ? 'Other project' : targetType === 'AGENT' ? 'Agent Sandbox' : undefined, - }); - const label = formatRuleLabel(rule.port, rule.protocol); - const ruleProvenance = [{ ownerAppId: app.id, ruleKey: rule.id }]; - if (rule.type === 'INGRESS') addEdge(targetNodeId, appNodeId, 'INGRESS', label, external, ruleProvenance); - else addEdge(appNodeId, targetNodeId, 'EGRESS', label, external, ruleProvenance); - } - if (app.appNetworkPolicy?.allowInternetAccess !== false) { - addNode({ id: 'INTERNET', kind: 'INTERNET', name: 'Internet', external: false }); - addEdge(appNodeId, 'INTERNET', 'INTERNET_EGRESS', '', false); - } + const targetType: WorkloadType = rule.targetApp ? 'APP' : 'AGENT'; + const targetNodeId = workloadNodeId(targetType, target.id); + const external = !internalWorkloadIds.has(target.id); + addNode({ + id: targetNodeId, + kind: targetType, + name: target.name, + projectId: target.projectId, + external, + caption: external && target.projectId !== projectId ? 'Other project' : targetType === 'AGENT' ? 'Agent Sandbox' : undefined + }); + const label = formatRuleLabel(rule.port, rule.protocol); + const ruleProvenance = [{ ownerAppId: app.id, ruleKey: rule.id }]; + if (rule.type === 'INGRESS') { + addEdge(targetNodeId, appNodeId, 'INGRESS', label, external, ruleProvenance); + } else { + addEdge(appNodeId, targetNodeId, 'EGRESS', label, external, ruleProvenance); } + } + if (app.appNetworkPolicy?.allowInternetAccess !== false) { + addNode({ id: 'INTERNET', kind: 'INTERNET', name: 'Internet', external: false }); + addEdge(appNodeId, 'INTERNET', 'INTERNET_EGRESS', '', false); + } + } - if (app.appDomains.length > 0) { - addNode({ id: 'INTERNET', kind: 'INTERNET', name: 'Internet', external: false }); - for (const domain of app.appDomains) addEdge('INTERNET', appNodeId, 'INTERNET_INGRESS', `${domain.hostname}:${domain.port}`, false); - } + if (app.appDomains.length > 0) { + addNode({ id: 'INTERNET', kind: 'INTERNET', name: 'Internet', external: false }); + for (const domain of app.appDomains) { + addEdge('INTERNET', appNodeId, 'INTERNET_INGRESS', `${domain.hostname}:${domain.port}`, false); + } } + } + + for (const agent of agents) { + const agentNodeId = workloadNodeId('AGENT', agent.id); + addNode({ id: agentNodeId, kind: 'AGENT', name: agent.name, projectId: agent.projectId, external: false, caption: 'Agent Sandbox' }); - for (const agent of agents) { - const agentNodeId = workloadNodeId('AGENT', agent.id); - addNode({ id: agentNodeId, kind: 'AGENT', name: agent.name, projectId: agent.projectId, external: false, caption: 'Agent Sandbox' }); - - if (agent.agentNetworkPolicy) { - for (const rule of agent.agentNetworkPolicy.rules) { - const targetApp = rule.targetApp; - if (!targetApp) continue; - const targetNodeId = workloadNodeId('APP', targetApp.id); - const external = !internalWorkloadIds.has(targetApp.id); - addNode({ - id: targetNodeId, kind: 'APP', name: targetApp.name, projectId: targetApp.projectId, external, - caption: external && targetApp.projectId !== projectId ? 'Other project' : undefined, - }); - addEdge(agentNodeId, targetNodeId, 'EGRESS', formatRuleLabel(rule.port, rule.protocol), external); - } - if (agent.agentNetworkPolicy.allowInternetAccess !== false) { - addNode({ id: 'INTERNET', kind: 'INTERNET', name: 'Internet', external: false }); - addEdge(agentNodeId, 'INTERNET', 'INTERNET_EGRESS', '', false); - } + if (agent.agentNetworkPolicy) { + for (const rule of agent.agentNetworkPolicy.rules) { + const targetApp = rule.targetApp; + if (!targetApp) { + continue; } + const targetNodeId = workloadNodeId('APP', targetApp.id); + const external = !internalWorkloadIds.has(targetApp.id); + addNode({ + id: targetNodeId, + kind: 'APP', + name: targetApp.name, + projectId: targetApp.projectId, + external, + caption: external && targetApp.projectId !== projectId ? 'Other project' : undefined + }); + addEdge(agentNodeId, targetNodeId, 'EGRESS', formatRuleLabel(rule.port, rule.protocol), external); + } + if (agent.agentNetworkPolicy.allowInternetAccess !== false) { + addNode({ id: 'INTERNET', kind: 'INTERNET', name: 'Internet', external: false }); + addEdge(agentNodeId, 'INTERNET', 'INTERNET_EGRESS', '', false); + } } + } - const rawEdges = Array.from(edges.values()).map(edge => ({ ...edge, labels: aggregateLabels(edge.labels) })); - return { nodes: Array.from(nodes.values()), edges: consolidateConnections(rawEdges) }; + const rawEdges = Array.from(edges.values()).map((edge) => ({ ...edge, labels: aggregateLabels(edge.labels) })); + return { nodes: Array.from(nodes.values()), edges: consolidateConnections(rawEdges) }; } diff --git a/src/app/project/[projectId]/overview/network-graph/project-network-graph.tsx b/src/app/project/[projectId]/overview/network-graph/project-network-graph.tsx index df4d18bc..7d6be31f 100644 --- a/src/app/project/[projectId]/overview/network-graph/project-network-graph.tsx +++ b/src/app/project/[projectId]/overview/network-graph/project-network-graph.tsx @@ -6,16 +6,16 @@ import { GraphLegend } from './graph-legend'; import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; import { useRouter, useSearchParams } from 'next/navigation'; import { - Background, - BackgroundVariant, - Controls, - MarkerType, - ReactFlow, - useNodesState, - type Node, - type NodeTypes, - type Connection, - type ReactFlowInstance, + Background, + BackgroundVariant, + Controls, + MarkerType, + ReactFlow, + useNodesState, + type Node, + type NodeTypes, + type Connection, + type ReactFlowInstance } from '@xyflow/react'; import '@xyflow/react/dist/style.css'; import { Cloud, Info, RotateCcw } from 'lucide-react'; @@ -43,10 +43,7 @@ import { deleteApp } from '@/app/project/[projectId]/actions'; import type { ProjectNetworkGraphPositions } from '@/shared/model/project-network-graph-layout.model'; import type { S3Target } from '@prisma/client'; import type { VolumeBackupExtendedModel } from '@/shared/model/volume-backup-extended.model'; -import { - type DrawerTab, - useProjectNetworkGraphDrawerSession, -} from './project-network-graph-drawer-session'; +import { type DrawerTab, useProjectNetworkGraphDrawerSession } from './project-network-graph-drawer-session'; import { AppDetailsDrawer } from '../../apps/details/app-details-drawer'; import { AgentSandboxDrawer } from '@/app/project/[projectId]/agents/details/agent-drawer'; import { deleteAgent } from '@/app/project/[projectId]/agents/details/agent-actions'; @@ -58,260 +55,293 @@ import { ProjectNetworkGraphAgentWorkloadNode } from './nodes/project-network-gr import { ProjectNetworkGraphInternetNode } from './nodes/project-network-graph-internet-node'; type ProjectNetworkGraphProps = { - apps: AppExtendedModel[]; - agents: AgentExtendedModel[]; - agentsAvailable: boolean; - projectId: string; - session: UserSession; - savedPositions: ProjectNetworkGraphPositions; - s3Targets: S3Target[]; - storageClasses: string[]; - runtimeClasses: string[]; - volumeBackupsByApp: Record; - gitSshPublicKeysByApp: Record; - agentTemplateInfoByAgent: Record; + apps: AppExtendedModel[]; + agents: AgentExtendedModel[]; + agentsAvailable: boolean; + projectId: string; + session: UserSession; + savedPositions: ProjectNetworkGraphPositions; + s3Targets: S3Target[]; + storageClasses: string[]; + runtimeClasses: string[]; + volumeBackupsByApp: Record; + gitSshPublicKeysByApp: Record; + agentTemplateInfoByAgent: Record; }; function stripWorkloadPrefix(nodeId: string | undefined) { - if (!nodeId) return undefined; - const separatorIndex = nodeId.indexOf(':'); - return separatorIndex >= 0 ? nodeId.slice(separatorIndex + 1) : nodeId; + if (!nodeId) { + return undefined; + } + const separatorIndex = nodeId.indexOf(':'); + return separatorIndex >= 0 ? nodeId.slice(separatorIndex + 1) : nodeId; } const nodeTypes = { - 'app-workload': ProjectNetworkGraphAppWorkloadNode, - 'agent-workload': ProjectNetworkGraphAgentWorkloadNode, - internet: ProjectNetworkGraphInternetNode, + 'app-workload': ProjectNetworkGraphAppWorkloadNode, + 'agent-workload': ProjectNetworkGraphAgentWorkloadNode, + internet: ProjectNetworkGraphInternetNode } satisfies NodeTypes; -function getInternalHostnames( - edge: NetworkGraphEdge, - drafts: Record, - apps: AppExtendedModel[], -) { - const hostnames = new Map(); - - for (const provenance of edge.ruleProvenance) { - const rule = drafts[provenance.ownerAppId]?.rules.find(item => item.key === provenance.ruleKey); - if (!rule) continue; +function getInternalHostnames(edge: NetworkGraphEdge, drafts: Record, apps: AppExtendedModel[]) { + const hostnames = new Map(); - const target = rule.type === 'INGRESS' - ? apps.find(app => app.id === provenance.ownerAppId) - : rule.targetType === 'APP' - ? { id: rule.targetId, projectId: rule.targetProjectId } - : undefined; - if (!target?.projectId) continue; + for (const provenance of edge.ruleProvenance) { + const rule = drafts[provenance.ownerAppId]?.rules.find((item) => item.key === provenance.ruleKey); + if (!rule) { + continue; + } - const hostname = InternalHostnameUtils.getInternalBaseUrlForApp(target, rule.port); - hostnames.set(hostname, { hostname, port: rule.port }); + const target = + rule.type === 'INGRESS' + ? apps.find((app) => app.id === provenance.ownerAppId) + : rule.targetType === 'APP' + ? { id: rule.targetId, projectId: rule.targetProjectId } + : undefined; + if (!target?.projectId) { + continue; } - return Array.from(hostnames.values()).sort((left, right) => left.port - right.port); + const hostname = InternalHostnameUtils.getInternalBaseUrlForApp(target, rule.port); + hostnames.set(hostname, { hostname, port: rule.port }); + } + + return Array.from(hostnames.values()).sort((left, right) => left.port - right.port); } const edgeTypes = { connection: ConnectionEdge }; export default function ProjectNetworkGraph(props: ProjectNetworkGraphProps) { - return ; + return ; } function ProjectNetworkGraphEditor({ - apps, - agents, - agentsAvailable, - projectId, - session, - savedPositions, - s3Targets, - storageClasses, - runtimeClasses, - volumeBackupsByApp, - gitSshPublicKeysByApp, - agentTemplateInfoByAgent, + apps, + agents, + agentsAvailable, + projectId, + session, + savedPositions, + s3Targets, + storageClasses, + runtimeClasses, + volumeBackupsByApp, + gitSshPublicKeysByApp, + agentTemplateInfoByAgent }: ProjectNetworkGraphProps) { - const router = useRouter(); - const searchParams = useSearchParams(); - const { openDialog } = useDialog(); - const { openConfirmDialog } = useConfirmDialog(); - const [drafts, setDrafts] = useState>(() => AppNetworkPolicyDraftUtils.collectionFromApps(apps)); - const [baseline, setBaseline] = useState>(() => AppNetworkPolicyDraftUtils.collectionFromApps(apps)); - const [saving, setSaving] = useState(false); - const [connectionSourceNodeId, setConnectionSourceNodeId] = useState(); - const [connectionTargetNodeId, setConnectionTargetNodeId] = useState(); - const [environmentAppId, setEnvironmentAppId] = useState(); - const [graphHeight, setGraphHeight] = useState(); - const graphContainerRef = useRef(null); - const drawerContentRef = useRef(null); - const reactFlowRef = useRef>(null); - const connectionTargetLeaveTimer = useRef | undefined>(undefined); - const graphApps = useMemo(() => apps.map(app => AppNetworkPolicyDraftUtils.applyToApp(app, drafts[app.id])), [apps, drafts]); - const canEditLayout = UserGroupUtils.sessionHasWriteAccessToProject(session, projectId); - const canCreateApps = UserGroupUtils.sessionCanCreateNewAppsForProject(session, projectId); - const canCreateAgents = agentsAvailable && UserGroupUtils.sessionCanCreateProjectWorkloadsForProject(session, projectId); - const { layout, saveNodePosition, resetLayout } = useProjectNetworkGraph(graphApps, agents, projectId, savedPositions); - const dirty = Object.keys(drafts).some(appId => !AppNetworkPolicyDraftUtils.equals(drafts[appId], baseline[appId])); - const localAppIds = useMemo(() => new Set(apps.map(app => app.id)), [apps]); - const localAgentIds = useMemo(() => new Set(agents.map(agent => agent.id)), [agents]); - const localWorkloadIds = useMemo(() => new Set([ - ...apps.map(app => app.id), - ...agents.map(agent => agent.id), - ]), [apps, agents]); - const drawerSession = useProjectNetworkGraphDrawerSession({ - searchParams, - appIds: localAppIds, - agentIds: localAgentIds, - }); - const { selectedNodeId } = drawerSession; - const writable = useCallback( - (appId: string) => UserGroupUtils.sessionHasWriteAccessForApp(session, appId), - [session], - ); - const writableAppIds = useMemo( - () => new Set(apps.filter(app => writable(app.id)).map(app => app.id)), - [apps, writable], - ); + const router = useRouter(); + const searchParams = useSearchParams(); + const { openDialog } = useDialog(); + const { openConfirmDialog } = useConfirmDialog(); + const [drafts, setDrafts] = useState>(() => AppNetworkPolicyDraftUtils.collectionFromApps(apps)); + const [baseline, setBaseline] = useState>(() => AppNetworkPolicyDraftUtils.collectionFromApps(apps)); + const [saving, setSaving] = useState(false); + const [connectionSourceNodeId, setConnectionSourceNodeId] = useState(); + const [connectionTargetNodeId, setConnectionTargetNodeId] = useState(); + const [environmentAppId, setEnvironmentAppId] = useState(); + const [graphHeight, setGraphHeight] = useState(); + const graphContainerRef = useRef(null); + const drawerContentRef = useRef(null); + const reactFlowRef = useRef>(null); + const connectionTargetLeaveTimer = useRef | undefined>(undefined); + const graphApps = useMemo(() => apps.map((app) => AppNetworkPolicyDraftUtils.applyToApp(app, drafts[app.id])), [apps, drafts]); + const canEditLayout = UserGroupUtils.sessionHasWriteAccessToProject(session, projectId); + const canCreateApps = UserGroupUtils.sessionCanCreateNewAppsForProject(session, projectId); + const canCreateAgents = agentsAvailable && UserGroupUtils.sessionCanCreateProjectWorkloadsForProject(session, projectId); + const { layout, saveNodePosition, resetLayout } = useProjectNetworkGraph(graphApps, agents, projectId, savedPositions); + const dirty = Object.keys(drafts).some((appId) => !AppNetworkPolicyDraftUtils.equals(drafts[appId], baseline[appId])); + const localAppIds = useMemo(() => new Set(apps.map((app) => app.id)), [apps]); + const localAgentIds = useMemo(() => new Set(agents.map((agent) => agent.id)), [agents]); + const localWorkloadIds = useMemo(() => new Set([...apps.map((app) => app.id), ...agents.map((agent) => agent.id)]), [apps, agents]); + const drawerSession = useProjectNetworkGraphDrawerSession({ + searchParams, + appIds: localAppIds, + agentIds: localAgentIds + }); + const { selectedNodeId } = drawerSession; + const writable = useCallback((appId: string) => UserGroupUtils.sessionHasWriteAccessForApp(session, appId), [session]); + const writableAppIds = useMemo(() => new Set(apps.filter((app) => writable(app.id)).map((app) => app.id)), [apps, writable]); - useLayoutEffect(() => { - const updateGraphHeight = () => { - const graphContainer = graphContainerRef.current; - if (!graphContainer) return; + useLayoutEffect(() => { + const updateGraphHeight = () => { + const graphContainer = graphContainerRef.current; + if (!graphContainer) { + return; + } - setGraphHeight(Math.max(0, window.innerHeight - graphContainer.getBoundingClientRect().top)); - }; - - updateGraphHeight(); - window.addEventListener('resize', updateGraphHeight); - return () => window.removeEventListener('resize', updateGraphHeight); - }, []); - const cancelConnectionTargetLeave = () => { - if (connectionTargetLeaveTimer.current) clearTimeout(connectionTargetLeaveTimer.current); + setGraphHeight(Math.max(0, window.innerHeight - graphContainer.getBoundingClientRect().top)); }; - const selectableTargets: NetworkPolicySelectableTarget[] = [ - ...apps.map(app => ({ - id: app.id, - name: app.name, - type: 'APP' as const, - appType: app.appType, - project: { id: app.projectId, name: app.project.name }, - })), - ...agents.map(agent => ({ - id: agent.id, - name: agent.name, - type: 'AGENT' as const, - project: { id: agent.projectId, name: agent.project.name }, - })), - ]; - const updateDraft = useCallback((appId: string, update: (draft: AppNetworkPolicyDraft) => AppNetworkPolicyDraft) => { - setDrafts(current => ({ ...current, [appId]: update(current[appId]) })); - }, []); - const openConnectionDialog = (sourceAppId: string, targetAppId: string) => { - const source = apps.find(app => app.id === sourceAppId); - const target = selectableTargets.find(item => item.id === targetAppId); - if (!source || !target || !writable(sourceAppId)) return; - openDialog( item.id !== sourceAppId)} - currentProject={{ id: source.projectId, name: source.project.name }} - initialTarget={target} - isDuplicate={rule => drafts[sourceAppId].rules.some(existing => NetworkPolicyRuleUtils.hasSameContent( - NetworkPolicyRuleUtils.fromEditRule(existing), NetworkPolicyRuleUtils.fromEditRule(rule), - ))} - onAdd={(rule: AppNetworkPolicyRuleEditModel) => updateDraft( - sourceAppId, - draft => AppNetworkPolicyDraftUtils.addRule(draft, rule, target), - )} - />, { maxWidth: 'max-w-md' }); - }; - const deleteConnection = useCallback((edgeId: string) => { - const edge = layout?.edges.find(item => item.id === edgeId); - const provenance = connectionDeletionProvenance(edge, writableAppIds); - if (!provenance) { return; } - setDrafts(current => AppNetworkPolicyDraftUtils.removeProvenance(current, provenance)); - }, [layout?.edges, writableAppIds]); - const deleteLocalApp = useCallback(async (appId: string) => { - if (!await openConfirmDialog({ - title: 'Delete App', - description: 'Are you sure you want to delete this app? All data will be lost and this action cannot be undone.', - })) return; - await Toast.fromAction(() => deleteApp(appId)); - }, [openConfirmDialog]); - const deleteLocalAgent = useCallback(async (agentId: string) => { - if (!await openConfirmDialog({ - title: 'Delete Agent Sandbox', - description: 'Are you sure you want to delete this Agent Sandbox? All data will be lost and this action cannot be undone.', - okButton: 'Delete Agent Sandbox', - })) return; - await Toast.fromAction(() => deleteAgent(agentId), 'Agent Sandbox deleted successfully.'); - }, [openConfirmDialog]); - const toggleInternetAccess = useCallback((appId: string) => { - updateDraft(appId, draft => ({ - ...draft, - allowInternetAccess: !draft.allowInternetAccess, - })); - }, [updateDraft]); - const toggleTraefikAccess = useCallback((appId: string) => { - updateDraft(appId, draft => ({ - ...draft, - allowTraefikAccess: !draft.allowTraefikAccess, - })); - }, [updateDraft]); - const saveChanges = async () => { - const changed = Object.values(drafts).filter(draft => !AppNetworkPolicyDraftUtils.equals(draft, baseline[draft.appId])); - if (!changed.length) { return; } - if (!await openConfirmDialog({ - title: 'Save & apply network policies?', - description: 'The changed network policies take effect immediately and will be deployed.', - okButton: 'Save & Apply', - cancelButton: 'Cancel' - })) { return; } - setSaving(true); - try { - await Toast.fromAction(async () => { - for (const draft of changed) { - const result = await saveAppNetworkPolicyConfiguration(undefined, AppNetworkPolicyDraftUtils.toConfiguration(draft)); - if (result.status !== 'success') return result; - } - return { status: 'success' as const }; - }, 'Network policies saved and applied.', 'Applying network policies...'); - setBaseline(drafts); - router.refresh(); - } finally { - setSaving(false); + updateGraphHeight(); + window.addEventListener('resize', updateGraphHeight); + return () => window.removeEventListener('resize', updateGraphHeight); + }, []); + const cancelConnectionTargetLeave = () => { + if (connectionTargetLeaveTimer.current) { + clearTimeout(connectionTargetLeaveTimer.current); + } + }; + const selectableTargets: NetworkPolicySelectableTarget[] = [ + ...apps.map((app) => ({ + id: app.id, + name: app.name, + type: 'APP' as const, + appType: app.appType, + project: { id: app.projectId, name: app.project.name } + })), + ...agents.map((agent) => ({ + id: agent.id, + name: agent.name, + type: 'AGENT' as const, + project: { id: agent.projectId, name: agent.project.name } + })) + ]; + + const updateDraft = useCallback((appId: string, update: (draft: AppNetworkPolicyDraft) => AppNetworkPolicyDraft) => { + setDrafts((current) => ({ ...current, [appId]: update(current[appId]) })); + }, []); + const openConnectionDialog = (sourceAppId: string, targetAppId: string) => { + const source = apps.find((app) => app.id === sourceAppId); + const target = selectableTargets.find((item) => item.id === targetAppId); + if (!source || !target || !writable(sourceAppId)) { + return; + } + openDialog( + item.id !== sourceAppId)} + currentProject={{ id: source.projectId, name: source.project.name }} + initialTarget={target} + isDuplicate={(rule) => + drafts[sourceAppId].rules.some((existing) => + NetworkPolicyRuleUtils.hasSameContent(NetworkPolicyRuleUtils.fromEditRule(existing), NetworkPolicyRuleUtils.fromEditRule(rule)) + ) } - }; - const discardChanges = () => { - setDrafts(baseline); - setConnectionSourceNodeId(undefined); - setConnectionTargetNodeId(undefined); - }; - const projectedNodes: Node[] = useMemo(() => (layout?.nodes ?? []).map(node => { + onAdd={(rule: AppNetworkPolicyRuleEditModel) => updateDraft(sourceAppId, (draft) => AppNetworkPolicyDraftUtils.addRule(draft, rule, target))} + />, + { maxWidth: 'max-w-md' } + ); + }; + const deleteConnection = useCallback( + (edgeId: string) => { + const edge = layout?.edges.find((item) => item.id === edgeId); + const provenance = connectionDeletionProvenance(edge, writableAppIds); + if (!provenance) { + return; + } + setDrafts((current) => AppNetworkPolicyDraftUtils.removeProvenance(current, provenance)); + }, + [layout?.edges, writableAppIds] + ); + const deleteLocalApp = useCallback( + async (appId: string) => { + if ( + !(await openConfirmDialog({ + title: 'Delete App', + description: 'Are you sure you want to delete this app? All data will be lost and this action cannot be undone.' + })) + ) { + return; + } + await Toast.fromAction(() => deleteApp(appId)); + }, + [openConfirmDialog] + ); + const deleteLocalAgent = useCallback( + async (agentId: string) => { + if ( + !(await openConfirmDialog({ + title: 'Delete Agent Sandbox', + description: 'Are you sure you want to delete this Agent Sandbox? All data will be lost and this action cannot be undone.', + okButton: 'Delete Agent Sandbox' + })) + ) { + return; + } + await Toast.fromAction(() => deleteAgent(agentId), 'Agent Sandbox deleted successfully.'); + }, + [openConfirmDialog] + ); + const toggleInternetAccess = useCallback( + (appId: string) => { + updateDraft(appId, (draft) => ({ + ...draft, + allowInternetAccess: !draft.allowInternetAccess + })); + }, + [updateDraft] + ); + const toggleTraefikAccess = useCallback( + (appId: string) => { + updateDraft(appId, (draft) => ({ + ...draft, + allowTraefikAccess: !draft.allowTraefikAccess + })); + }, + [updateDraft] + ); + const saveChanges = async () => { + const changed = Object.values(drafts).filter((draft) => !AppNetworkPolicyDraftUtils.equals(draft, baseline[draft.appId])); + if (!changed.length) { + return; + } + if ( + !(await openConfirmDialog({ + title: 'Save & apply network policies?', + description: 'The changed network policies take effect immediately and will be deployed.', + okButton: 'Save & Apply', + cancelButton: 'Cancel' + })) + ) { + return; + } + setSaving(true); + try { + await Toast.fromAction( + async () => { + for (const draft of changed) { + const result = await saveAppNetworkPolicyConfiguration(undefined, AppNetworkPolicyDraftUtils.toConfiguration(draft)); + if (result.status !== 'success') { + return result; + } + } + return { status: 'success' as const }; + }, + 'Network policies saved and applied.', + 'Applying network policies...' + ); + setBaseline(drafts); + router.refresh(); + } finally { + setSaving(false); + } + }; + const discardChanges = () => { + setDrafts(baseline); + setConnectionSourceNodeId(undefined); + setConnectionTargetNodeId(undefined); + }; + const projectedNodes: Node[] = useMemo( + () => + (layout?.nodes ?? []).map((node) => { const appId = node.kind === 'APP' ? node.id.replace('APP:', '') : undefined; - const app = appId ? apps.find(item => item.id === appId) : undefined; + const app = appId ? apps.find((item) => item.id === appId) : undefined; const draft = app ? drafts[app.id] : undefined; - const appRole = app - ? UserGroupUtils.getRolePermissionForApp(session, app.id) ?? undefined - : undefined; + const appRole = app ? (UserGroupUtils.getRolePermissionForApp(session, app.id) ?? undefined) : undefined; const agentId = node.kind === 'AGENT' ? node.id.replace('AGENT:', '') : undefined; - const agent = agentId ? agents.find(item => item.id === agentId) : undefined; - const agentRole = agent - ? UserGroupUtils.getRolePermissionForProjectWorkload(session, agent.id) ?? undefined - : undefined; + const agent = agentId ? agents.find((item) => item.id === agentId) : undefined; + const agentRole = agent ? (UserGroupUtils.getRolePermissionForProjectWorkload(session, agent.id) ?? undefined) : undefined; return { - id: node.id, - type: node.kind === 'INTERNET' - ? 'internet' - : node.kind === 'AGENT' - ? 'agent-workload' - : 'app-workload', - position: node.position, - data: { - ...node, - connectionInProgress: !!connectionSourceNodeId, - connectionTarget: node.id === connectionTargetNodeId, - selected: node.id === selectedNodeId, - appContextMenu: app && draft && appRole === RolePermissionEnum.READWRITE ? { + id: node.id, + type: node.kind === 'INTERNET' ? 'internet' : node.kind === 'AGENT' ? 'agent-workload' : 'app-workload', + position: node.position, + data: { + ...node, + connectionInProgress: !!connectionSourceNodeId, + connectionTarget: node.id === connectionTargetNodeId, + selected: node.id === selectedNodeId, + appContextMenu: + app && draft && appRole === RolePermissionEnum.READWRITE + ? { app, role: appRole, allowInternetAccess: draft.allowInternetAccess, @@ -319,275 +349,330 @@ function ProjectNetworkGraphEditor({ allowTraefikAccess: draft.allowTraefikAccess, onToggleTraefikAccess: () => toggleTraefikAccess(app.id), onOpenDrawerTab: (tab: DrawerTab) => { - drawerSession.openAppTab(app.id, tab); + drawerSession.openAppTab(app.id, tab); }, onShowEnvironment: () => { - setEnvironmentAppId(app.id); - drawerSession.openAppTab(app.id, 'settings'); + setEnvironmentAppId(app.id); + drawerSession.openAppTab(app.id, 'settings'); }, - onDelete: () => void deleteLocalApp(app.id), - } : undefined, - agentContextMenu: agent && agentRole === RolePermissionEnum.READWRITE ? { + onDelete: () => void deleteLocalApp(app.id) + } + : undefined, + agentContextMenu: + agent && agentRole === RolePermissionEnum.READWRITE + ? { agent, onOpenDrawerTab: (tab: AgentDrawerTab) => drawerSession.openAgentTab(agent.id, tab), - onDelete: () => void deleteLocalAgent(agent.id), - } : undefined, - connectedToSelection: !selectedNodeId || (layout?.edges ?? []).some(edge => - (edge.source === selectedNodeId && edge.target === node.id) - || (edge.target === selectedNodeId && edge.source === node.id), - ), - }, + onDelete: () => void deleteLocalAgent(agent.id) + } + : undefined, + connectedToSelection: + !selectedNodeId || + (layout?.edges ?? []).some( + (edge) => (edge.source === selectedNodeId && edge.target === node.id) || (edge.target === selectedNodeId && edge.source === node.id) + ) + } }; - }), [agents, apps, connectionSourceNodeId, connectionTargetNodeId, deleteLocalAgent, deleteLocalApp, drafts, drawerSession, layout?.edges, layout?.nodes, selectedNodeId, session, toggleInternetAccess, toggleTraefikAccess]); + }), + [ + agents, + apps, + connectionSourceNodeId, + connectionTargetNodeId, + deleteLocalAgent, + deleteLocalApp, + drafts, + drawerSession, + layout?.edges, + layout?.nodes, + selectedNodeId, + session, + toggleInternetAccess, + toggleTraefikAccess + ] + ); - const [nodes, setNodes, onNodesChange] = useNodesState(projectedNodes); - useEffect(() => setNodes(projectedNodes), [projectedNodes, setNodes]); + const [nodes, setNodes, onNodesChange] = useNodesState(projectedNodes); + useEffect(() => setNodes(projectedNodes), [projectedNodes, setNodes]); - const edges = useMemo(() => (layout?.edges ?? []).map(edge => { + const edges = useMemo( + () => + (layout?.edges ?? []).map((edge) => { const presentation = graphEdgePresentation(edge); const deletionProvenance = connectionDeletionProvenance(edge, writableAppIds); const internalHostnames = getInternalHostnames(edge, drafts, apps); return { - id: edge.id, - source: edge.source, - target: edge.target, - sourceHandle: presentation.sourceHandle, - targetHandle: presentation.targetHandle, - type: edge.direction === 'CONNECTION' && (deletionProvenance || internalHostnames.length > 0) - ? 'connection' - : 'smoothstep', - data: edge.direction === 'CONNECTION' && (deletionProvenance || internalHostnames.length > 0) - ? { - ...(deletionProvenance ? { onDelete: () => deleteConnection(edge.id) } : {}), - internalHostnames, + id: edge.id, + source: edge.source, + target: edge.target, + sourceHandle: presentation.sourceHandle, + targetHandle: presentation.targetHandle, + type: edge.direction === 'CONNECTION' && (deletionProvenance || internalHostnames.length > 0) ? 'connection' : 'smoothstep', + data: + edge.direction === 'CONNECTION' && (deletionProvenance || internalHostnames.length > 0) + ? { + ...(deletionProvenance ? { onDelete: () => deleteConnection(edge.id) } : {}), + internalHostnames } - : undefined, - pathOptions: { offset: 20 }, - markerStart: edge.internetIngress ? { type: MarkerType.ArrowClosed, color: presentation.color, width: 16, height: 16 } : undefined, - markerEnd: edge.direction === 'INTERNET_CONNECTION' - ? edge.internetEgress ? { type: MarkerType.ArrowClosed, color: presentation.color, width: 16, height: 16 } : undefined - : { type: MarkerType.ArrowClosed, color: presentation.color, width: 16, height: 16 }, - style: { - stroke: presentation.color, - strokeWidth: selectedNodeId && (edge.source === selectedNodeId || edge.target === selectedNodeId) ? 2.5 : 1.5, - strokeDasharray: presentation.dashed ? '5 4' : undefined, - opacity: selectedNodeId && edge.source !== selectedNodeId && edge.target !== selectedNodeId ? 0.2 : 1, - }, - label: presentation.label, - labelStyle: { fill: 'var(--muted-foreground)', fontSize: 10, fontWeight: 600 }, - labelBgStyle: { fill: 'var(--card)', fillOpacity: 0.9, stroke: 'var(--border)', strokeWidth: 1 }, - labelBgPadding: [6, 3] as [number, number], - labelBgBorderRadius: 6, + : undefined, + pathOptions: { offset: 20 }, + markerStart: edge.internetIngress ? { type: MarkerType.ArrowClosed, color: presentation.color, width: 16, height: 16 } : undefined, + markerEnd: + edge.direction === 'INTERNET_CONNECTION' + ? edge.internetEgress + ? { type: MarkerType.ArrowClosed, color: presentation.color, width: 16, height: 16 } + : undefined + : { type: MarkerType.ArrowClosed, color: presentation.color, width: 16, height: 16 }, + style: { + stroke: presentation.color, + strokeWidth: selectedNodeId && (edge.source === selectedNodeId || edge.target === selectedNodeId) ? 2.5 : 1.5, + strokeDasharray: presentation.dashed ? '5 4' : undefined, + opacity: selectedNodeId && edge.source !== selectedNodeId && edge.target !== selectedNodeId ? 0.2 : 1 + }, + label: presentation.label, + labelStyle: { fill: 'var(--muted-foreground)', fontSize: 10, fontWeight: 600 }, + labelBgStyle: { fill: 'var(--card)', fillOpacity: 0.9, stroke: 'var(--border)', strokeWidth: 1 }, + labelBgPadding: [6, 3] as [number, number], + labelBgBorderRadius: 6 }; - }), [apps, deleteConnection, drafts, layout?.edges, selectedNodeId, writableAppIds]); + }), + [apps, deleteConnection, drafts, layout?.edges, selectedNodeId, writableAppIds] + ); - const selectedNode = nodes.find(node => node.id === selectedNodeId)?.data as NetworkGraphNode | undefined; - const selectedApp = selectedNode?.kind === 'APP' ? apps.find(app => app.id === selectedNode.id.replace('APP:', '')) : undefined; - const selectedAppRole = selectedApp ? UserGroupUtils.getRolePermissionForApp(session, selectedApp.id) ?? undefined : undefined; - const selectedAgent = selectedNode?.kind === 'AGENT' ? agents.find(agent => agent.id === selectedNode.id.replace('AGENT:', '')) : undefined; - const selectedAgentRole = selectedAgent ? UserGroupUtils.getRolePermissionForProjectWorkload(session, selectedAgent.id) ?? undefined : undefined; + const selectedNode = nodes.find((node) => node.id === selectedNodeId)?.data as NetworkGraphNode | undefined; + const selectedApp = selectedNode?.kind === 'APP' ? apps.find((app) => app.id === selectedNode.id.replace('APP:', '')) : undefined; + const selectedAppRole = selectedApp ? (UserGroupUtils.getRolePermissionForApp(session, selectedApp.id) ?? undefined) : undefined; + const selectedAgent = selectedNode?.kind === 'AGENT' ? agents.find((agent) => agent.id === selectedNode.id.replace('AGENT:', '')) : undefined; + const selectedAgentRole = selectedAgent ? (UserGroupUtils.getRolePermissionForProjectWorkload(session, selectedAgent.id) ?? undefined) : undefined; - useEffect(() => { - if (!selectedNodeId || (selectedNode?.kind !== 'APP' && selectedNode?.kind !== 'AGENT')) return; - if (!window.matchMedia('(min-width: 1024px)').matches) return; + useEffect(() => { + if (!selectedNodeId || (selectedNode?.kind !== 'APP' && selectedNode?.kind !== 'AGENT')) { + return; + } + if (!window.matchMedia('(min-width: 1024px)').matches) { + return; + } - const animationFrame = requestAnimationFrame(() => { - const reactFlow = reactFlowRef.current; - const graphContainer = graphContainerRef.current; - const drawerContent = drawerContentRef.current; - const selectedReactFlowNode = reactFlow?.getNode(selectedNodeId); - if (!reactFlow || !graphContainer || !drawerContent || !selectedReactFlowNode) return; + const animationFrame = requestAnimationFrame(() => { + const reactFlow = reactFlowRef.current; + const graphContainer = graphContainerRef.current; + const drawerContent = drawerContentRef.current; + const selectedReactFlowNode = reactFlow?.getNode(selectedNodeId); + if (!reactFlow || !graphContainer || !drawerContent || !selectedReactFlowNode) { + return; + } - const graphBounds = graphContainer.getBoundingClientRect(); - const drawerWidth = drawerContent.getBoundingClientRect().width; - const nodeWidth = selectedReactFlowNode.measured?.width ?? 240; - const nodeHeight = selectedReactFlowNode.measured?.height ?? 68; - const viewport = getFocusedNodeViewport({ - node: { - x: selectedReactFlowNode.position.x, - y: selectedReactFlowNode.position.y, - width: nodeWidth, - height: nodeHeight, - }, - graphWidth: graphBounds.width, - graphHeight: graphBounds.height, - drawerWidth, - }); + const graphBounds = graphContainer.getBoundingClientRect(); + const drawerWidth = drawerContent.getBoundingClientRect().width; + const nodeWidth = selectedReactFlowNode.measured?.width ?? 240; + const nodeHeight = selectedReactFlowNode.measured?.height ?? 68; + const viewport = getFocusedNodeViewport({ + node: { + x: selectedReactFlowNode.position.x, + y: selectedReactFlowNode.position.y, + width: nodeWidth, + height: nodeHeight + }, + graphWidth: graphBounds.width, + graphHeight: graphBounds.height, + drawerWidth + }); - void reactFlow.setViewport(viewport, { duration: 300 }); - }); + void reactFlow.setViewport(viewport, { duration: 300 }); + }); - return () => cancelAnimationFrame(animationFrame); - }, [selectedNode, selectedNodeId]); + return () => cancelAnimationFrame(animationFrame); + }, [selectedNode, selectedNodeId]); - return ( -
-
+
+
+ + + + Legend + + } + /> + + + + + {canEditLayout && ( + } /> - - - - - {canEditLayout && } -
- - { reactFlowRef.current = instance; }} - nodes={nodes} - edges={edges} - onNodesChange={onNodesChange} - nodeTypes={nodeTypes} - edgeTypes={edgeTypes} - fitView - fitViewOptions={{ padding: 0.2, maxZoom: 1.1 }} - minZoom={0.3} - maxZoom={1.5} - zoomOnScroll - zoomOnPinch={false} - zoomOnDoubleClick={false} - preventScrolling - nodesDraggable={canEditLayout} - nodesConnectable - elementsSelectable={false} - isValidConnection={(connection: Connection) => { - const source = stripWorkloadPrefix(connection.source); - const target = stripWorkloadPrefix(connection.target); - return connection.sourceHandle === 'source-egress' - && connection.targetHandle === 'target-ingress' - && !!source - && !!target - && source !== target - && localAppIds.has(source) - && localWorkloadIds.has(target) - && writable(source); - }} - onConnect={(connection: Connection) => { - const source = stripWorkloadPrefix(connection.source); - const target = stripWorkloadPrefix(connection.target); - if (source && target) openConnectionDialog(source, target); - }} - onConnectStart={(_event, { nodeId, handleId }) => { - if (handleId === 'source-egress') { - cancelConnectionTargetLeave(); - setConnectionSourceNodeId(nodeId ?? undefined); - } - }} - onConnectEnd={() => { - cancelConnectionTargetLeave(); - setConnectionSourceNodeId(undefined); - setConnectionTargetNodeId(undefined); - }} - onPaneClick={() => { - }} - onNodeMouseEnter={(_event, node) => { - cancelConnectionTargetLeave(); - const source = stripWorkloadPrefix(connectionSourceNodeId); - const target = stripWorkloadPrefix(node.id); - if (source && target && source !== target && localAppIds.has(source) && localWorkloadIds.has(target) && writable(source)) { - setConnectionTargetNodeId(node.id); - } - }} - onNodeMouseLeave={(_event, node) => { - cancelConnectionTargetLeave(); - connectionTargetLeaveTimer.current = setTimeout(() => { - setConnectionTargetNodeId(current => current === node.id ? undefined : current); - }, 100); - }} - onNodeDragStop={canEditLayout ? (_event, node) => void saveNodePosition(node.id, node.position) : undefined} - style={{ - '--xy-controls-button-background-color': 'var(--secondary)', - '--xy-controls-button-background-color-hover': 'var(--accent)', - '--xy-controls-button-color': 'var(--secondary-foreground)', - '--xy-controls-button-border-color': 'var(--border)', - '--xy-controls-box-shadow': '0 1px 3px 0 rgb(0 0 0 / 0.1)', - } as CSSProperties} - onNodeClick={(_event, node) => { - const data = node.data as NetworkGraphNode; - if (data.kind === 'INTERNET') return; - drawerSession.selectNode(data); - }} - > - - - - - {dirty && ( - - - - - - - )} - {edges.length === 0 && nodes.length === 0 &&
-

No active network policy connections yet.

-
} - {selectedNode && selectedNode.kind === 'APP' && { - if (selectedApp) drawerSession.openAppTab(selectedApp.id, tab); - }} - openEnvironment={environmentAppId === selectedApp?.id} - onEnvironmentOpened={() => setEnvironmentAppId(undefined)} - />} - {selectedNode && selectedNode.kind === 'AGENT' && { - if (selectedAgent) drawerSession.openAgentTab(selectedAgent.id, tab); - }} - />} -
+ + Reset + + )}
- ); + + { + reactFlowRef.current = instance; + }} + nodes={nodes} + edges={edges} + onNodesChange={onNodesChange} + nodeTypes={nodeTypes} + edgeTypes={edgeTypes} + fitView + fitViewOptions={{ padding: 0.2, maxZoom: 1.1 }} + minZoom={0.3} + maxZoom={1.5} + zoomOnScroll + zoomOnPinch={false} + zoomOnDoubleClick={false} + preventScrolling + nodesDraggable={canEditLayout} + nodesConnectable + elementsSelectable={false} + isValidConnection={(connection: Connection) => { + const source = stripWorkloadPrefix(connection.source); + const target = stripWorkloadPrefix(connection.target); + return ( + connection.sourceHandle === 'source-egress' && + connection.targetHandle === 'target-ingress' && + !!source && + !!target && + source !== target && + localAppIds.has(source) && + localWorkloadIds.has(target) && + writable(source) + ); + }} + onConnect={(connection: Connection) => { + const source = stripWorkloadPrefix(connection.source); + const target = stripWorkloadPrefix(connection.target); + if (source && target) { + openConnectionDialog(source, target); + } + }} + onConnectStart={(_event, { nodeId, handleId }) => { + if (handleId === 'source-egress') { + cancelConnectionTargetLeave(); + setConnectionSourceNodeId(nodeId ?? undefined); + } + }} + onConnectEnd={() => { + cancelConnectionTargetLeave(); + setConnectionSourceNodeId(undefined); + setConnectionTargetNodeId(undefined); + }} + onPaneClick={() => {}} + onNodeMouseEnter={(_event, node) => { + cancelConnectionTargetLeave(); + const source = stripWorkloadPrefix(connectionSourceNodeId); + const target = stripWorkloadPrefix(node.id); + if (source && target && source !== target && localAppIds.has(source) && localWorkloadIds.has(target) && writable(source)) { + setConnectionTargetNodeId(node.id); + } + }} + onNodeMouseLeave={(_event, node) => { + cancelConnectionTargetLeave(); + connectionTargetLeaveTimer.current = setTimeout(() => { + setConnectionTargetNodeId((current) => (current === node.id ? undefined : current)); + }, 100); + }} + onNodeDragStop={canEditLayout ? (_event, node) => void saveNodePosition(node.id, node.position) : undefined} + style={ + { + '--xy-controls-button-background-color': 'var(--secondary)', + '--xy-controls-button-background-color-hover': 'var(--accent)', + '--xy-controls-button-color': 'var(--secondary-foreground)', + '--xy-controls-button-border-color': 'var(--border)', + '--xy-controls-box-shadow': '0 1px 3px 0 rgb(0 0 0 / 0.1)' + } as CSSProperties + } + onNodeClick={(_event, node) => { + const data = node.data as NetworkGraphNode; + if (data.kind === 'INTERNET') { + return; + } + drawerSession.selectNode(data); + }} + > + + + + + {dirty && ( + + + + + + + )} + {edges.length === 0 && nodes.length === 0 && ( +
+ +

No active network policy connections yet.

+
+ )} + {selectedNode && selectedNode.kind === 'APP' && ( + { + if (selectedApp) { + drawerSession.openAppTab(selectedApp.id, tab); + } + }} + openEnvironment={environmentAppId === selectedApp?.id} + onEnvironmentOpened={() => setEnvironmentAppId(undefined)} + /> + )} + {selectedNode && selectedNode.kind === 'AGENT' && ( + { + if (selectedAgent) { + drawerSession.openAgentTab(selectedAgent.id, tab); + } + }} + /> + )} +
+
+ ); } diff --git a/src/app/project/[projectId]/overview/network-graph/use-project-network-graph.ts b/src/app/project/[projectId]/overview/network-graph/use-project-network-graph.ts index 2fd8da0b..9eec7ecb 100644 --- a/src/app/project/[projectId]/overview/network-graph/use-project-network-graph.ts +++ b/src/app/project/[projectId]/overview/network-graph/use-project-network-graph.ts @@ -15,80 +15,92 @@ export type PositionedProjectNetworkGraph = Omit { - const layout = await elk.layout({ - id: 'root', - layoutOptions: { - 'elk.algorithm': 'layered', 'elk.direction': 'RIGHT', - 'elk.layered.nodePlacement.strategy': 'NETWORK_SIMPLEX', - 'elk.layered.crossingMinimization.strategy': 'LAYER_SWEEP', - 'elk.spacing.nodeNode': '70', 'elk.layered.spacing.nodeNodeBetweenLayers': '150', - }, - children: graph.nodes.map(node => ({ id: node.id, width: node.kind === 'INTERNET' ? 96 : 240, height: node.kind === 'INTERNET' ? 96 : 68 })), - edges: graph.edges.map(edge => ({ id: edge.id, sources: [edge.source], targets: [edge.target] })), - }); - const positions = new Map(layout.children?.map(node => [node.id, node]) ?? []); - return { ...graph, nodes: graph.nodes.map(node => ({ ...node, position: { x: positions.get(node.id)?.x ?? 0, y: positions.get(node.id)?.y ?? 0 } })) }; + const layout = await elk.layout({ + id: 'root', + layoutOptions: { + 'elk.algorithm': 'layered', + 'elk.direction': 'RIGHT', + 'elk.layered.nodePlacement.strategy': 'NETWORK_SIMPLEX', + 'elk.layered.crossingMinimization.strategy': 'LAYER_SWEEP', + 'elk.spacing.nodeNode': '70', + 'elk.layered.spacing.nodeNodeBetweenLayers': '150' + }, + children: graph.nodes.map((node) => ({ id: node.id, width: node.kind === 'INTERNET' ? 96 : 240, height: node.kind === 'INTERNET' ? 96 : 68 })), + edges: graph.edges.map((edge) => ({ id: edge.id, sources: [edge.source], targets: [edge.target] })) + }); + const positions = new Map(layout.children?.map((node) => [node.id, node]) ?? []); + return { ...graph, nodes: graph.nodes.map((node) => ({ ...node, position: { x: positions.get(node.id)?.x ?? 0, y: positions.get(node.id)?.y ?? 0 } })) }; } export function applySavedNetworkGraphPositions( - layout: PositionedProjectNetworkGraph, - savedPositions: ProjectNetworkGraphPositions, + layout: PositionedProjectNetworkGraph, + savedPositions: ProjectNetworkGraphPositions ): PositionedProjectNetworkGraph { - return { - ...layout, - nodes: layout.nodes.map(node => ({ - ...node, - position: savedPositions[node.id] ?? node.position, - })), - }; + return { + ...layout, + nodes: layout.nodes.map((node) => ({ + ...node, + position: savedPositions[node.id] ?? node.position + })) + }; } export function useProjectNetworkGraph( - apps: AppExtendedModel[], - agents: AgentExtendedModel[], - projectId: string, - savedPositions: ProjectNetworkGraphPositions, + apps: AppExtendedModel[], + agents: AgentExtendedModel[], + projectId: string, + savedPositions: ProjectNetworkGraphPositions ) { - const graph = useMemo(() => buildProjectNetworkGraph(apps, agents), [apps, agents]); - const [layout, setLayout] = useState(); - const requestId = useRef(0); - const persistedPositions = useRef(savedPositions); - const loadLayout = useCallback(async (useSavedPositions: boolean) => { - const id = ++requestId.current; - const nextLayout = await layoutGraph(graph); - if (id !== requestId.current) return; - const positions = useSavedPositions ? persistedPositions.current : {}; - setLayout(applySavedNetworkGraphPositions(nextLayout, positions)); - }, [graph]); + const graph = useMemo(() => buildProjectNetworkGraph(apps, agents), [apps, agents]); + const [layout, setLayout] = useState(); + const requestId = useRef(0); + const persistedPositions = useRef(savedPositions); + const loadLayout = useCallback( + async (useSavedPositions: boolean) => { + const id = ++requestId.current; + const nextLayout = await layoutGraph(graph); + if (id !== requestId.current) { + return; + } + const positions = useSavedPositions ? persistedPositions.current : {}; + setLayout(applySavedNetworkGraphPositions(nextLayout, positions)); + }, + [graph] + ); - useEffect(() => { - persistedPositions.current = savedPositions; - void loadLayout(true); - }, [loadLayout, savedPositions]); + useEffect(() => { + persistedPositions.current = savedPositions; + void loadLayout(true); + }, [loadLayout, savedPositions]); - const updateNodePosition = useCallback((id: string, position: NetworkGraphPosition) => { - setLayout(current => current && ({ ...current, nodes: current.nodes.map(node => node.id === id ? { ...node, position } : node) })); - }, []); - const saveNodePosition = useCallback(async (id: string, position: NetworkGraphPosition) => { - const previousPosition = layout?.nodes.find(node => node.id === id)?.position; - updateNodePosition(id, position); - const result = await saveProjectNetworkGraphPosition(projectId, { nodeId: id, ...position }); - if (result.status === 'success') { - persistedPositions.current = { ...persistedPositions.current, [id]: position }; - return; - } - if (previousPosition) updateNodePosition(id, previousPosition); - toast.error(result.message ?? 'Could not save the network graph layout.'); - }, [layout?.nodes, projectId, updateNodePosition]); - const resetLayout = useCallback(async () => { - const result = await resetProjectNetworkGraphLayout(projectId); - if (result.status !== 'success') { - toast.error(result.message ?? 'Could not reset the network graph layout.'); - return; - } - persistedPositions.current = {}; - await loadLayout(false); - }, [loadLayout, projectId]); + const updateNodePosition = useCallback((id: string, position: NetworkGraphPosition) => { + setLayout((current) => current && { ...current, nodes: current.nodes.map((node) => (node.id === id ? { ...node, position } : node)) }); + }, []); + const saveNodePosition = useCallback( + async (id: string, position: NetworkGraphPosition) => { + const previousPosition = layout?.nodes.find((node) => node.id === id)?.position; + updateNodePosition(id, position); + const result = await saveProjectNetworkGraphPosition(projectId, { nodeId: id, ...position }); + if (result.status === 'success') { + persistedPositions.current = { ...persistedPositions.current, [id]: position }; + return; + } + if (previousPosition) { + updateNodePosition(id, previousPosition); + } + toast.error(result.message ?? 'Could not save the network graph layout.'); + }, + [layout?.nodes, projectId, updateNodePosition] + ); + const resetLayout = useCallback(async () => { + const result = await resetProjectNetworkGraphLayout(projectId); + if (result.status !== 'success') { + toast.error(result.message ?? 'Could not reset the network graph layout.'); + return; + } + persistedPositions.current = {}; + await loadLayout(false); + }, [loadLayout, projectId]); - return { layout, saveNodePosition, resetLayout }; + return { layout, saveNodePosition, resetLayout }; } diff --git a/src/app/project/[projectId]/overview/project-overview.tsx b/src/app/project/[projectId]/overview/project-overview.tsx index e74ce51d..4d2ec73b 100644 --- a/src/app/project/[projectId]/overview/project-overview.tsx +++ b/src/app/project/[projectId]/overview/project-overview.tsx @@ -1,20 +1,20 @@ 'use client'; -import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs"; -import ProjectNetworkGraph from "./network-graph/project-network-graph"; -import { UserSession } from "@/shared/model/sim-session.model"; -import { useEffect, useState } from "react"; -import { useSearchParams } from "next/navigation"; -import { Table, Network, Container } from "lucide-react"; -import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "@/components/ui/empty"; -import { UserGroupUtils } from "@/shared/utils/role.utils"; -import CreateProjectActions from "../create-project-actions"; -import PageTitle from "@/components/custom/page-title"; -import { TabNavigationUtils } from "@/frontend/utils/tab-navigation.utils"; -import { AppExtendedModel } from "@/shared/model/app-extended.model"; -import { AgentExtendedModel } from "@/shared/model/agent-extended.model"; +import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'; +import ProjectNetworkGraph from './network-graph/project-network-graph'; +import { UserSession } from '@/shared/model/sim-session.model'; +import { useEffect, useState } from 'react'; +import { useSearchParams } from 'next/navigation'; +import { Table, Network, Container } from 'lucide-react'; +import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'; +import { UserGroupUtils } from '@/shared/utils/role.utils'; +import CreateProjectActions from '../create-project-actions'; +import PageTitle from '@/components/custom/page-title'; +import { TabNavigationUtils } from '@/frontend/utils/tab-navigation.utils'; +import { AppExtendedModel } from '@/shared/model/app-extended.model'; +import { AgentExtendedModel } from '@/shared/model/agent-extended.model'; import type { ProjectNetworkGraphPositions } from '@/shared/model/project-network-graph-layout.model'; -import { useDialog } from "@/frontend/states/zustand.states"; +import { useDialog } from '@/frontend/states/zustand.states'; import NewNetworkPolicyExplanationDialog from '../apps/create/new-network-policy-explanation-dialog'; import type { S3Target } from '@prisma/client'; import type { VolumeBackupExtendedModel } from '@/shared/model/volume-backup-extended.model'; @@ -22,159 +22,157 @@ import type { AgentSandboxTemplateInfo } from '@/shared/model/agent-sandbox-temp import WorkloadsTable from './workloads-table'; interface ProjectOverviewProps { - apps: AppExtendedModel[]; - agents: AgentExtendedModel[]; - agentsAvailable: boolean; - session: UserSession; - projectId: string; - projectName: string; - networkGraphPositions: ProjectNetworkGraphPositions; - showNewNetworkPolicyExplanation: boolean; - s3Targets: S3Target[]; - storageClasses: string[]; - runtimeClasses: string[]; - volumeBackupsByApp: Record; - gitSshPublicKeysByApp: Record; - agentTemplateInfoByAgent: Record; + apps: AppExtendedModel[]; + agents: AgentExtendedModel[]; + agentsAvailable: boolean; + session: UserSession; + projectId: string; + projectName: string; + networkGraphPositions: ProjectNetworkGraphPositions; + showNewNetworkPolicyExplanation: boolean; + s3Targets: S3Target[]; + storageClasses: string[]; + runtimeClasses: string[]; + volumeBackupsByApp: Record; + gitSshPublicKeysByApp: Record; + agentTemplateInfoByAgent: Record; } type ProjectOverviewTab = 'table' | 'graph'; function isProjectOverviewTab(value: string | null): value is ProjectOverviewTab { - return value === 'table' || value === 'graph'; + return value === 'table' || value === 'graph'; } function tabStorageKey() { - return `quickstack:project-overview-tab`; + return `quickstack:project-overview-tab`; } export default function AppProjectOverview({ - apps, - agents, - agentsAvailable, - session, - projectId, - projectName, - networkGraphPositions, - showNewNetworkPolicyExplanation, - s3Targets, - storageClasses, - runtimeClasses, - volumeBackupsByApp, - gitSshPublicKeysByApp, - agentTemplateInfoByAgent, + apps, + agents, + agentsAvailable, + session, + projectId, + projectName, + networkGraphPositions, + showNewNetworkPolicyExplanation, + s3Targets, + storageClasses, + runtimeClasses, + volumeBackupsByApp, + gitSshPublicKeysByApp, + agentTemplateInfoByAgent }: ProjectOverviewProps) { - const searchParams = useSearchParams(); - const { openDialog } = useDialog(); - const requestedTab = searchParams.get('tab'); - const [currentTab, setCurrentTab] = useState('graph'); + const searchParams = useSearchParams(); + const { openDialog } = useDialog(); + const requestedTab = searchParams.get('tab'); + const [currentTab, setCurrentTab] = useState('graph'); - useEffect(() => { - if (!showNewNetworkPolicyExplanation || apps.length === 0) { - return; - } - - void openDialog(, { - width: 'min(720px, calc(100vw - 2rem))', - maxWidth: '720px', - }); - }, [openDialog, showNewNetworkPolicyExplanation, apps.length]); - - useEffect(() => { - if (isProjectOverviewTab(requestedTab)) { - setCurrentTab(requestedTab); - return; - } - const savedTab = window.localStorage.getItem(tabStorageKey()); - setCurrentTab(isProjectOverviewTab(savedTab) ? savedTab : 'graph'); - }, [projectId, requestedTab]); - - const handleTabChange = (value: string) => { - if (!isProjectOverviewTab(value)) return; - setCurrentTab(value); - window.localStorage.setItem(tabStorageKey(), value); - const params = new URLSearchParams(searchParams.toString()); - params.set('tab', value); - TabNavigationUtils.replaceQuery(params); - }; + useEffect(() => { + if (!showNewNetworkPolicyExplanation || apps.length === 0) { + return; + } - const canCreate = UserGroupUtils.sessionCanCreateProjectWorkloadsForProject(session, projectId); - const hasWorkloads = apps.length > 0 || agents.length > 0; + void openDialog(, { + width: 'min(720px, calc(100vw - 2rem))', + maxWidth: '720px' + }); + }, [openDialog, showNewNetworkPolicyExplanation, apps.length]); - if (!hasWorkloads && !canCreate) { - return ( - <> - - - - - - - No Workloads - - No apps or agents available in this project. - - - - - ); + useEffect(() => { + if (isProjectOverviewTab(requestedTab)) { + setCurrentTab(requestedTab); + return; } + const savedTab = window.localStorage.getItem(tabStorageKey()); + setCurrentTab(isProjectOverviewTab(savedTab) ? savedTab : 'graph'); + }, [projectId, requestedTab]); - if (!hasWorkloads) { - return ( - <> - - - - - - - - - No Workloads yet - - Create your first App or Agent to get started. - - - - - ); + const handleTabChange = (value: string) => { + if (!isProjectOverviewTab(value)) { + return; } + setCurrentTab(value); + window.localStorage.setItem(tabStorageKey(), value); + const params = new URLSearchParams(searchParams.toString()); + params.set('tab', value); + TabNavigationUtils.replaceQuery(params); + }; + + const canCreate = UserGroupUtils.sessionCanCreateProjectWorkloadsForProject(session, projectId); + const hasWorkloads = apps.length > 0 || agents.length > 0; + if (!hasWorkloads && !canCreate) { return ( - - -
- - - - - - - - - {canCreate && } - - -
- -
-
- -
- + <> + + + + + + + No Workloads + No apps or agents available in this project. + + + ); + } + + if (!hasWorkloads) { + return ( + <> + + + + + + + + + No Workloads yet + Create your first App or Agent to get started. + + + + ); + } + + return ( + + +
+ + + + + +
+ + + {canCreate && } + + +
+ +
+
+ +
+ + ); } diff --git a/src/app/project/[projectId]/template-details-panel.tsx b/src/app/project/[projectId]/template-details-panel.tsx index dd41eaf4..20f5340a 100644 --- a/src/app/project/[projectId]/template-details-panel.tsx +++ b/src/app/project/[projectId]/template-details-panel.tsx @@ -5,59 +5,50 @@ import { Card, CardContent, CardFooter, CardHeader, CardTitle } from '@/componen import { Separator } from '@/components/ui/separator'; type TemplateDetails = { - name: string; - iconName?: string | null; - description?: string; - websiteUrl?: string; + name: string; + iconName?: string | null; + description?: string; + websiteUrl?: string; }; function getIconSource(iconName?: string | null): string | undefined { - if (!iconName) return undefined; - return iconName.startsWith('http://') || iconName.startsWith('https://') - ? iconName - : `/template-icons/${iconName}`; + if (!iconName) { + return undefined; + } + return iconName.startsWith('http://') || iconName.startsWith('https://') ? iconName : `/template-icons/${iconName}`; } export function TemplateDetailsPanel({ template }: { template: TemplateDetails }) { - const iconSource = getIconSource(template.iconName); + const iconSource = getIconSource(template.iconName); - return ( - - ); + return ( + + ); } diff --git a/src/app/projects/edit-project-dialog.tsx b/src/app/projects/edit-project-dialog.tsx index 9e8e12f5..5d34f4c7 100644 --- a/src/app/projects/edit-project-dialog.tsx +++ b/src/app/projects/edit-project-dialog.tsx @@ -1,12 +1,7 @@ -'use client' +'use client'; import { Button } from '@/components/ui/button'; -import { - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, -} from '@/components/ui/dialog'; +import { DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import { Input } from '@/components/ui/input'; import { Label } from '@/components/ui/label'; import { Toast } from '@/frontend/utils/toast.utils'; @@ -16,55 +11,48 @@ import { Project } from '@prisma/client'; import { useState } from 'react'; import { createProject } from './actions'; -function EditProjectForm({ existingItem }: { - existingItem?: Project; -}) { - const { closeDialog } = useDialogContext(); - const [name, setName] = useState(existingItem?.name ?? ''); +function EditProjectForm({ existingItem }: { existingItem?: Project }) { + const { closeDialog } = useDialogContext(); + const [name, setName] = useState(existingItem?.name ?? ''); - const submit = async () => { - if (!name.trim()) return; - await Toast.fromAction(() => createProject(name.trim(), existingItem?.id)); - closeDialog(); - }; + const submit = async () => { + if (!name.trim()) { + return; + } + await Toast.fromAction(() => createProject(name.trim(), existingItem?.id)); + closeDialog(); + }; - return <> - - {existingItem ? 'Edit Project' : 'Create Project'} - - {existingItem - ? 'Rename this Project.' - : 'Projects can contain both Apps and Agent Sandboxes.'} - - -
-
- - setName(event.target.value)} - /> -
+ return ( + <> + + {existingItem ? 'Edit Project' : 'Create Project'} + {existingItem ? 'Rename this Project.' : 'Projects can contain both Apps and Agent Sandboxes.'} + +
+
+ + setName(event.target.value)} />
- - - - - ; +
+ + + + + + ); } -export function EditProjectDialog({ children, existingItem }: { - children?: React.ReactNode; - existingItem?: Project; -}) { - const { openDialog } = useDialog(); +export function EditProjectDialog({ children, existingItem }: { children?: React.ReactNode; existingItem?: Project }) { + const { openDialog } = useDialog(); - const handleOpen = () => { - openDialog(, { maxWidth: '425px' }); - }; + const handleOpen = () => { + openDialog(, { maxWidth: '425px' }); + }; - return
{children}
; + return
{children}
; } diff --git a/src/app/settings/access/users/users-table.tsx b/src/app/settings/access/users/users-table.tsx index 7e99e0d3..2c3dbd92 100644 --- a/src/app/settings/access/users/users-table.tsx +++ b/src/app/settings/access/users/users-table.tsx @@ -1,171 +1,214 @@ 'use client'; -import { Button } from "@/components/ui/button"; -import { ChevronDown, EditIcon, KeyRound, Plus, Trash2, TrashIcon, UserPlus } from "lucide-react"; -import { Toast } from "@/frontend/utils/toast.utils"; -import { useConfirmDialog } from "@/frontend/states/zustand.states"; -import React from "react"; -import { SimpleDataTable } from "@/components/custom/simple-data-table"; -import { formatDateTime } from "@/frontend/utils/format.utils"; -import { UserExtended } from "@/shared/model/user-extended.model"; -import { deleteUser } from "./actions"; -import { UserGroupExtended, UserSession } from "@/shared/model/sim-session.model"; -import { SsoProviderUiModel } from "@/shared/model/sso-provider.model"; -import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuTrigger, -} from "@/components/ui/dropdown-menu"; -import { toast } from "sonner"; -import { Actions } from "@/frontend/utils/nextjs-actions.utils"; -import { useDialog } from "@/frontend/states/zustand.states"; -import { UserApiKeysDialog } from "./user-api-keys-dialog"; -import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; -import { SsoProviderLogo } from "@/components/custom/sso-provider-logo"; -import UserEditOverlay from "./user-edit-overlay"; -import UsersBulkRoleAssignment from "./users-table-bulk-role-assignment"; +import { Button } from '@/components/ui/button'; +import { ChevronDown, EditIcon, KeyRound, Plus, Trash2, TrashIcon, UserPlus } from 'lucide-react'; +import { Toast } from '@/frontend/utils/toast.utils'; +import { useConfirmDialog } from '@/frontend/states/zustand.states'; +import React from 'react'; +import { SimpleDataTable } from '@/components/custom/simple-data-table'; +import { formatDateTime } from '@/frontend/utils/format.utils'; +import { UserExtended } from '@/shared/model/user-extended.model'; +import { deleteUser } from './actions'; +import { UserGroupExtended, UserSession } from '@/shared/model/sim-session.model'; +import { SsoProviderUiModel } from '@/shared/model/sso-provider.model'; +import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'; +import { toast } from 'sonner'; +import { Actions } from '@/frontend/utils/nextjs-actions.utils'; +import { useDialog } from '@/frontend/states/zustand.states'; +import { UserApiKeysDialog } from './user-api-keys-dialog'; +import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'; +import { SsoProviderLogo } from '@/components/custom/sso-provider-logo'; +import UserEditOverlay from './user-edit-overlay'; +import UsersBulkRoleAssignment from './users-table-bulk-role-assignment'; -export default function UsersTable({ users, userGroups, session, ssoProviders }: { - users: UserExtended[]; - userGroups: UserGroupExtended[]; - session: UserSession; - ssoProviders: SsoProviderUiModel[]; +export default function UsersTable({ + users, + userGroups, + session, + ssoProviders +}: { + users: UserExtended[]; + userGroups: UserGroupExtended[]; + session: UserSession; + ssoProviders: SsoProviderUiModel[]; }) { + const { openConfirmDialog: openDialog } = useConfirmDialog(); + const { openDialog: openGenericDialog } = useDialog(); + const [selectedUsers, setSelectedUsers] = React.useState([]); + const [isRoleDialogOpen, setIsRoleDialogOpen] = React.useState(false); - const { openConfirmDialog: openDialog } = useConfirmDialog(); - const { openDialog: openGenericDialog } = useDialog(); - const [selectedUsers, setSelectedUsers] = React.useState([]); - const [isRoleDialogOpen, setIsRoleDialogOpen] = React.useState(false); + const asyncDeleteItem = async (id: string) => { + const confirm = await openDialog({ + title: 'Delete User', + description: 'Do you really want to delete this user?', + okButton: 'Delete' + }); + if (confirm) { + await Toast.fromAction(() => deleteUser(id), 'Deleting User...', 'User deleted successfully'); + } + }; - const asyncDeleteItem = async (id: string) => { - const confirm = await openDialog({ - title: "Delete User", - description: "Do you really want to delete this user?", - okButton: "Delete", - }); - if (confirm) { - await Toast.fromAction(() => deleteUser(id), 'Deleting User...', 'User deleted successfully'); - } - }; - - const handleBulkDelete = async () => { - // Filter out admin users from selected users - const deletableUsers = selectedUsers.filter(user => session.email !== user.email); + const handleBulkDelete = async () => { + // Filter out admin users from selected users + const deletableUsers = selectedUsers.filter((user) => session.email !== user.email); - if (deletableUsers.length === 0) { - toast.error("No deletable users selected (admins cannot be deleted)"); - return; - } + if (deletableUsers.length === 0) { + toast.error('No deletable users selected (admins cannot be deleted)'); + return; + } - const confirm = await openDialog({ - title: "Delete Selected Users", - description: `Do you really want to delete ${deletableUsers.length} user(s)?`, - okButton: "Delete", - }); + const confirm = await openDialog({ + title: 'Delete Selected Users', + description: `Do you really want to delete ${deletableUsers.length} user(s)?`, + okButton: 'Delete' + }); - if (confirm) { - try { - // Delete users one by one - for (const user of deletableUsers) { - await Actions.run(() => deleteUser(user.id)); - } - toast.success(`Successfully deleted ${deletableUsers.length} user(s)`); - } catch (error) { - toast.error("Error deleting users"); - console.error(error); - } + if (confirm) { + try { + // Delete users one by one + for (const user of deletableUsers) { + await Actions.run(() => deleteUser(user.id)); } - }; + toast.success(`Successfully deleted ${deletableUsers.length} user(s)`); + } catch (error) { + toast.error('Error deleting users'); + console.error(error); + } + } + }; - return <> - {item.email}{item.apiOnlyUser && API only}], - ['userGroup.name', 'Group', true], - ['oauthProviderIds', 'OAuth Providers', true, (item) => { - const providers = item.oauthProviderIds - .map((providerId) => ssoProviders.find((provider) => provider.id === providerId)) - .filter((provider): provider is SsoProviderUiModel => !!provider); + return ( + <> + ( + + {item.email} + {item.apiOnlyUser && API only} + + ) + ], + ['userGroup.name', 'Group', true], + [ + 'oauthProviderIds', + 'OAuth Providers', + true, + (item) => { + const providers = item.oauthProviderIds + .map((providerId) => ssoProviders.find((provider) => provider.id === providerId)) + .filter((provider): provider is SsoProviderUiModel => !!provider); - if (providers.length === 0) return "None"; + if (providers.length === 0) { + return 'None'; + } - return ( - -
- {providers.map((provider) => - provider.type !== "OIDC" ? ( - - - - } /> - {provider.name} - - ) : ( - {provider.name} - ), - )} -
-
- ); - }], - ["createdAt", "Created At", true, (item) => formatDateTime(item.createdAt)], - ["updatedAt", "Updated At", false, (item) => formatDateTime(item.updatedAt)], + return ( + +
+ {providers.map((provider) => + provider.type !== 'OIDC' ? ( + + + + + } + /> + {provider.name} + + ) : ( + {provider.name} + ) + )} +
+
+ ); + } + ], + ['createdAt', 'Created At', true, (item) => formatDateTime(item.createdAt)], + ['updatedAt', 'Updated At', false, (item) => formatDateTime(item.updatedAt)] + ]} + data={users} + showSelectCheckbox={true} + onRowSelectionUpdate={setSelectedUsers} + columnFilters={[ + ...userGroups.map((userGroup) => ({ + accessorKey: 'userGroup.name', + filterLabel: userGroup.name, + filterFunction: (item: UserExtended) => item.userGroupId === userGroup.id + })), + { + accessorKey: 'email', + filterLabel: 'API only', + filterFunction: (item: UserExtended) => item.apiOnlyUser + } ]} - data={users} - showSelectCheckbox={true} - onRowSelectionUpdate={setSelectedUsers} - columnFilters={[...userGroups.map((userGroup) => ({ - accessorKey: 'userGroup.name', - filterLabel: userGroup.name, - filterFunction: (item: UserExtended) => item.userGroupId === userGroup.id, - })), { - accessorKey: 'email', - filterLabel: 'API only', - filterFunction: (item: UserExtended) => item.apiOnlyUser, - }]} - actionCol={(item) => + actionCol={(item) => ( + <> +
+
+ + {session.email !== item.email && ( <> -
-
- - {session.email !== item.email && <> - - - - } -
- } - /> -
- - - - {selectedUsers.length > 0 && ( - - Actions } /> - - setIsRoleDialogOpen(true)}> - Assign Group - - - Delete Selected - - - - )} -
+ + + + + + )} +
+ + )} + /> +
+ + + + {selectedUsers.length > 0 && ( + + + {' '} + Actions + + } + /> + + setIsRoleDialogOpen(true)}> + Assign Group + + + Delete Selected + + + + )} +
- - ; + + + ); } diff --git a/src/app/settings/platform/storage/qs-system-backup-settings.tsx b/src/app/settings/platform/storage/qs-system-backup-settings.tsx index a99c2122..d15266e5 100644 --- a/src/app/settings/platform/storage/qs-system-backup-settings.tsx +++ b/src/app/settings/platform/storage/qs-system-backup-settings.tsx @@ -1,294 +1,280 @@ 'use client'; -import type { z } from "zod"; -import { SubmitButton } from "@/components/custom/submit-button"; -import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; -import { Form } from "@/components/ui/form"; -import { FormUtils } from "@/frontend/utils/form.utilts"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { useForm } from "react-hook-form"; -import { ServerActionResult } from "@/shared/model/server-action-error-return.model"; -import { useActionState, useEffect, useState } from "react"; -import { toast } from "sonner"; -import { listSystemBackups, runSystemBackupNow, setSystemBackupLocation, uploadAndRestoreSystemBackup, downloadSystemBackup } from "../../actions"; -import { S3Target } from "@prisma/client"; -import { SystemBackupLocationSettingsModel, systemBackupLocationSettingsZodModel } from "@/shared/model/system-backup-location-settings.model"; -import SelectFormField from "@/components/custom/select-form-field"; -import Link from "next/link"; -import { Button } from "@/components/ui/button"; -import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"; -import { FileArchive, Loader2, Play, Download, AlertTriangle } from "lucide-react"; -import { formatBytes, formatDateTime } from "@/frontend/utils/format.utils"; -import { Toast } from "@/frontend/utils/toast.utils"; -import { Constants } from "@/shared/utils/constants"; -import { Input } from "@/components/ui/input"; -import { Alert, AlertDescription } from "@/components/ui/alert"; -import { useConfirmDialog } from "@/frontend/states/zustand.states"; -import { Separator } from "@/components/ui/separator"; +import type { z } from 'zod'; +import { SubmitButton } from '@/components/custom/submit-button'; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'; +import { Form } from '@/components/ui/form'; +import { FormUtils } from '@/frontend/utils/form.utilts'; +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import { ServerActionResult } from '@/shared/model/server-action-error-return.model'; +import { useActionState, useEffect, useState } from 'react'; +import { toast } from 'sonner'; +import { listSystemBackups, runSystemBackupNow, setSystemBackupLocation, uploadAndRestoreSystemBackup, downloadSystemBackup } from '../../actions'; +import { S3Target } from '@prisma/client'; +import { SystemBackupLocationSettingsModel, systemBackupLocationSettingsZodModel } from '@/shared/model/system-backup-location-settings.model'; +import SelectFormField from '@/components/custom/select-form-field'; +import Link from 'next/link'; +import { Button } from '@/components/ui/button'; +import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'; +import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'; +import { FileArchive, Loader2, Play, Download, AlertTriangle } from 'lucide-react'; +import { formatBytes, formatDateTime } from '@/frontend/utils/format.utils'; +import { Toast } from '@/frontend/utils/toast.utils'; +import { Constants } from '@/shared/utils/constants'; +import { Input } from '@/components/ui/input'; +import { Alert, AlertDescription } from '@/components/ui/alert'; +import { useConfirmDialog } from '@/frontend/states/zustand.states'; +import { Separator } from '@/components/ui/separator'; const DEACTIVATED_VALUE = Constants.QS_SYSTEM_BACKUP_DEACTIVATED; -export default function QuickStackSystemBackupSettings({ - systemBackupLocation, - s3Targets -}: { - systemBackupLocation: string; - s3Targets: S3Target[]; -}) { - const [showBackupsDialog, setShowBackupsDialog] = useState(false); - const [backups, setBackups] = useState([]); - const [loadingBackups, setLoadingBackups] = useState(false); - const [runningBackup, setRunningBackup] = useState(false); - const [uploadingBackup, setUploadingBackup] = useState(false); - const [downloadingBackup, setDownloadingBackup] = useState(null); - const confirmDialog = useConfirmDialog(); +export default function QuickStackSystemBackupSettings({ systemBackupLocation, s3Targets }: { systemBackupLocation: string; s3Targets: S3Target[] }) { + const [showBackupsDialog, setShowBackupsDialog] = useState(false); + const [backups, setBackups] = useState([]); + const [loadingBackups, setLoadingBackups] = useState(false); + const [runningBackup, setRunningBackup] = useState(false); + const [uploadingBackup, setUploadingBackup] = useState(false); + const [downloadingBackup, setDownloadingBackup] = useState(null); + const confirmDialog = useConfirmDialog(); - const form = useForm, unknown, z.output>({ - resolver: zodResolver(systemBackupLocationSettingsZodModel), - defaultValues: { - systemBackupLocation: systemBackupLocation || DEACTIVATED_VALUE, - } - }); + const form = useForm, unknown, z.output>({ + resolver: zodResolver(systemBackupLocationSettingsZodModel), + defaultValues: { + systemBackupLocation: systemBackupLocation || DEACTIVATED_VALUE + } + }); - const [state, formAction] = useActionState((state: ServerActionResult, - payload: SystemBackupLocationSettingsModel) => - setSystemBackupLocation(state, payload), - FormUtils.getInitialFormState()); + const [state, formAction] = useActionState( + (state: ServerActionResult, payload: SystemBackupLocationSettingsModel) => setSystemBackupLocation(state, payload), + FormUtils.getInitialFormState() + ); - useEffect(() => { - if (state.status === 'success') { - toast.success('System backup settings updated successfully.'); - } - FormUtils.mapValidationErrorsToForm(state, form) - }, [form, state]); + useEffect(() => { + if (state.status === 'success') { + toast.success('System backup settings updated successfully.'); + } + FormUtils.mapValidationErrorsToForm(state, form); + }, [form, state]); - const handleViewBackups = async () => { - setShowBackupsDialog(true); - setLoadingBackups(true); - try { - const result = await listSystemBackups(); - if (result.status === 'success') { - setBackups(result.data || []); - } else { - toast.error(result.message || 'Failed to load backups'); - } - } catch { - toast.error('Failed to load backups'); - } finally { - setLoadingBackups(false); - } - }; + const handleViewBackups = async () => { + setShowBackupsDialog(true); + setLoadingBackups(true); + try { + const result = await listSystemBackups(); + if (result.status === 'success') { + setBackups(result.data || []); + } else { + toast.error(result.message || 'Failed to load backups'); + } + } catch { + toast.error('Failed to load backups'); + } finally { + setLoadingBackups(false); + } + }; - const handleRunBackup = async () => { - setRunningBackup(true); - try { - await Toast.fromAction(() => runSystemBackupNow()); - } finally { - setRunningBackup(false); - } - }; + const handleRunBackup = async () => { + setRunningBackup(true); + try { + await Toast.fromAction(() => runSystemBackupNow()); + } finally { + setRunningBackup(false); + } + }; - const handleFileUpload = async (event: React.ChangeEvent) => { - const file = event.target.files?.[0]; - if (!file) return; + const handleFileUpload = async (event: React.ChangeEvent) => { + const file = event.target.files?.[0]; + if (!file) { + return; + } - const confirmed = await confirmDialog.openConfirmDialog({ - title: 'Restore System Backup', - description: 'This will replace your current database with the one from the backup file. This action cannot be undone. Make sure you have a recent backup before proceeding. You will need to restart QuickStack after restoration.', - okButton: 'Restore Backup', - cancelButton: 'Cancel' - }); + const confirmed = await confirmDialog.openConfirmDialog({ + title: 'Restore System Backup', + description: + 'This will replace your current database with the one from the backup file. This action cannot be undone. Make sure you have a recent backup before proceeding. You will need to restart QuickStack after restoration.', + okButton: 'Restore Backup', + cancelButton: 'Cancel' + }); - if (!confirmed) { - event.target.value = ''; // Reset file input - return; - } + if (!confirmed) { + event.target.value = ''; // Reset file input + return; + } - setUploadingBackup(true); - try { - const formData = new FormData(); - formData.append('backupFile', file); + setUploadingBackup(true); + try { + const formData = new FormData(); + formData.append('backupFile', file); - const result = await uploadAndRestoreSystemBackup(formData); + const result = await uploadAndRestoreSystemBackup(formData); - if (result.status === 'success') { - toast.success(result.message || 'Backup restored successfully. Please restart QuickStack.'); - setShowBackupsDialog(false); - } else { - toast.error(result.message || 'Failed to restore backup'); - } - } catch { - toast.error('Failed to restore backup'); - } finally { - setUploadingBackup(false); - event.target.value = ''; // Reset file input - } - }; + if (result.status === 'success') { + toast.success(result.message || 'Backup restored successfully. Please restart QuickStack.'); + setShowBackupsDialog(false); + } else { + toast.error(result.message || 'Failed to restore backup'); + } + } catch { + toast.error('Failed to restore backup'); + } finally { + setUploadingBackup(false); + event.target.value = ''; // Reset file input + } + }; - const handleDownloadBackup = async (backupKey: string) => { - setDownloadingBackup(backupKey); - try { - await Toast.fromAction(() => downloadSystemBackup(backupKey)).then(x => { - if (x.status === 'success' && x.data) { - window.open('/api/volume-data-download?fileName=' + x.data); - } - }); - } finally { - setDownloadingBackup(null); + const handleDownloadBackup = async (backupKey: string) => { + setDownloadingBackup(backupKey); + try { + await Toast.fromAction(() => downloadSystemBackup(backupKey)).then((x) => { + if (x.status === 'success' && x.data) { + window.open('/api/volume-data-download?fileName=' + x.data); } - }; - - return <> - - - System Backup Location - - Configure where QuickStack system files should be backed up (App configurations, QuickStack settings...). - Select an S3 storage target to enable automatic system backups, or deactivate to disable system backups. - - - -
- form.handleSubmit((data) => { - return formAction(data); - })()}> -
- - S3 Storage Locations can be configured here. - } - values={[ - [DEACTIVATED_VALUE, Constants.QS_SYSTEM_BACKUP_DEACTIVATED], - ...s3Targets.map((target) => - [target.id, `S3: ${target.name}`]) - ] as [string, string][]} - /> -
- Save Settings - {state?.message &&

{state.message}

} -
-
- - + }); + } finally { + setDownloadingBackup(null); + } + }; - - -
-

Backup Operations

-
- - -
+ return ( + <> + + + System Backup Location + + Configure where QuickStack system files should be backed up (App configurations, QuickStack settings...). Select an S3 storage target to enable + automatic system backups, or deactivate to disable system backups. + + + +
+ + form.handleSubmit((data) => { + return formAction(data); + })() + } + > +
+ + S3 Storage Locations can be configured{' '} + + here + + . + + } + values={ + [[DEACTIVATED_VALUE, Constants.QS_SYSTEM_BACKUP_DEACTIVATED], ...s3Targets.map((target) => [target.id, `S3: ${target.name}`])] as [ + string, + string + ][] + } + /> +
+ Save Settings + {state?.message &&

{state.message}

}
- - +
+ + - - - - System Backups - - All available QuickStack system backups from your configured S3 storage - - + - - - -
-

Upload and Restore Backup

-

- You can upload a system backup file (.tar.gz) to restore your QuickStack instance. - The system will automatically extract and replace the database. You will need to restart QuickStack after restoration. -

-
- - {uploadingBackup && ( -
- - Restoring backup... -
- )} -
-
-
-
+
+

Backup Operations

+
+ + +
+
+
+
- {loadingBackups ? ( -
- -
- ) : backups.length === 0 ? ( -
- No backups found + + + + System Backups + All available QuickStack system backups from your configured S3 storage + + + + + +
+

Upload and Restore Backup

+

+ You can upload a system backup file (.tar.gz) to restore your QuickStack instance. The system will automatically extract and replace the + database. You will need to restart QuickStack after restoration. +

+
+ + {uploadingBackup && ( +
+ + Restoring backup...
- ) : ( -
- - - Backup Date - Size - S3 Key - Actions - - - - {backups.map((backup: any, index: number) => ( - - {formatDateTime(backup.date)} - {formatBytes(backup.sizeBytes)} - {backup.key} - - - - - ))} - -
- )} - - + )} +
+
+ + - ; + {loadingBackups ? ( +
+ +
+ ) : backups.length === 0 ? ( +
No backups found
+ ) : ( + + + + Backup Date + Size + S3 Key + Actions + + + + {backups.map((backup: any, index: number) => ( + + {formatDateTime(backup.date)} + {formatBytes(backup.sizeBytes)} + {backup.key} + + + + + ))} + +
+ )} + + + + ); } diff --git a/src/app/settings/platform/updates/cluster-addon-details-dialog.tsx b/src/app/settings/platform/updates/cluster-addon-details-dialog.tsx index 8701a3db..05ca2bbc 100644 --- a/src/app/settings/platform/updates/cluster-addon-details-dialog.tsx +++ b/src/app/settings/platform/updates/cluster-addon-details-dialog.tsx @@ -2,187 +2,165 @@ import { Alert, AlertDescription } from '@/components/ui/alert'; import { Button } from '@/components/ui/button'; -import { - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, -} from '@/components/ui/dialog'; -import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuTrigger, -} from '@/components/ui/dropdown-menu'; +import { DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; +import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'; import { useDialogContext } from '@/frontend/states/dialog-context'; import { useConfirmDialog } from '@/frontend/states/zustand.states'; import { Toast } from '@/frontend/utils/toast.utils'; -import { - CheckCircle2, - CircleAlert, - Download, - ExternalLink, - LoaderCircle, - MoreHorizontal, - RefreshCw, - Trash2, -} from 'lucide-react'; +import { CheckCircle2, CircleAlert, Download, ExternalLink, LoaderCircle, MoreHorizontal, RefreshCw, Trash2 } from 'lucide-react'; import Link from 'next/link'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; -import { - installClusterAddon, - uninstallClusterAddon, - updateClusterAddon, -} from '../../actions'; +import { installClusterAddon, uninstallClusterAddon, updateClusterAddon } from '../../actions'; import type { ClusterAddonUpdateInfo } from './cluster-addon-update-info'; const statusLabel: Record = { - notInstalled: 'Not installed', - installing: 'Installing', - ready: 'Installed', - updating: 'Updating', - uninstalling: 'Uninstalling', - failed: 'Error', + notInstalled: 'Not installed', + installing: 'Installing', + ready: 'Installed', + updating: 'Updating', + uninstalling: 'Uninstalling', + failed: 'Error' }; export function ClusterAddonDetailsDialog({ addon }: { addon: ClusterAddonUpdateInfo }) { - const { closeDialog } = useDialogContext(); - const { openConfirmDialog } = useConfirmDialog(); - const router = useRouter(); - const [loading, setLoading] = useState(false); + const { closeDialog } = useDialogContext(); + const { openConfirmDialog } = useConfirmDialog(); + const router = useRouter(); + const [loading, setLoading] = useState(false); - const busy = ['installing', 'updating', 'uninstalling'].includes(addon.status); - const canInstall = addon.status === 'notInstalled' - || (addon.status === 'failed' && !addon.installedVersion); - const canUpdate = addon.status === 'ready' && !!addon.availableVersion; - const canRemove = addon.canUninstall - && (addon.status === 'ready' || addon.status === 'failed') - && !!addon.installedVersion; + const busy = ['installing', 'updating', 'uninstalling'].includes(addon.status); + const canInstall = addon.status === 'notInstalled' || (addon.status === 'failed' && !addon.installedVersion); + const canUpdate = addon.status === 'ready' && !!addon.availableVersion; + const canRemove = addon.canUninstall && (addon.status === 'ready' || addon.status === 'failed') && !!addon.installedVersion; - const runOperation = async (operation: 'install' | 'update' | 'remove') => { - const version = operation === 'update' ? ` to ${addon.availableVersion}` : ''; - const actionLabel = operation === 'remove' - ? 'Remove' - : operation === 'install' - ? 'Install' - : 'Update'; + const runOperation = async (operation: 'install' | 'update' | 'remove') => { + const version = operation === 'update' ? ` to ${addon.availableVersion}` : ''; + const actionLabel = operation === 'remove' ? 'Remove' : operation === 'install' ? 'Install' : 'Update'; - const confirmed = await openConfirmDialog({ - title: `${actionLabel} ${addon.displayName}`, - description: operation === 'remove' - ? `Do you want to remove ${addon.displayName}? QuickStack will delete the add-on's Kubernetes resources from this cluster. This cannot be undone.` - : addon.updateWarning - ?
-

{`Do you want to ${operation} ${addon.displayName}${version}? QuickStack will apply the add-on's Kubernetes resources to this cluster.`}

-
-

- {addon.updateWarning.title} -

-
    - {addon.updateWarning.items.map((item) =>
  • {item}
  • )} -
-
-
- : `Do you want to ${operation} ${addon.displayName}${version}? QuickStack will apply the add-on's Kubernetes resources to this cluster.`, - okButton: actionLabel, - }); + const confirmed = await openConfirmDialog({ + title: `${actionLabel} ${addon.displayName}`, + description: + operation === 'remove' ? ( + `Do you want to remove ${addon.displayName}? QuickStack will delete the add-on's Kubernetes resources from this cluster. This cannot be undone.` + ) : addon.updateWarning ? ( +
+

{`Do you want to ${operation} ${addon.displayName}${version}? QuickStack will apply the add-on's Kubernetes resources to this cluster.`}

+
+

{addon.updateWarning.title}

+
    + {addon.updateWarning.items.map((item) => ( +
  • {item}
  • + ))} +
+
+
+ ) : ( + `Do you want to ${operation} ${addon.displayName}${version}? QuickStack will apply the add-on's Kubernetes resources to this cluster.` + ), + okButton: actionLabel + }); - if (!confirmed) return; + if (!confirmed) { + return; + } - try { - setLoading(true); - await Toast.fromAction( - () => operation === 'install' - ? installClusterAddon(addon.id) - : operation === 'update' - ? updateClusterAddon(addon.id) - : uninstallClusterAddon(addon.id), - undefined, - `${operation === 'install' ? 'Installing' : operation === 'update' ? 'Updating' : 'Removing'} ${addon.displayName}...`, - ); - router.refresh(); - closeDialog(); - } finally { - setLoading(false); - } - }; + try { + setLoading(true); + await Toast.fromAction( + () => + operation === 'install' ? installClusterAddon(addon.id) : operation === 'update' ? updateClusterAddon(addon.id) : uninstallClusterAddon(addon.id), + undefined, + `${operation === 'install' ? 'Installing' : operation === 'update' ? 'Updating' : 'Removing'} ${addon.displayName}...` + ); + router.refresh(); + closeDialog(); + } finally { + setLoading(false); + } + }; - return ( - <> - -
-
- {addon.displayName} - {addon.description} -
- - {busy && } - {statusLabel[addon.status]} - -
-
-
-
-

Installed version

-

{addon.installedVersion ?? '—'}

-
- {addon.message && ( - - - {addon.message} - - )} - {canUpdate && ( -
-
-
- -

Next Version Available

-
-

{addon.availableVersion}

- -
-
- )} + return ( + <> + +
+
+ {addon.displayName} + {addon.description} +
+ + {busy && } + {statusLabel[addon.status]} + +
+
+
+
+

Installed version

+

{addon.installedVersion ?? '—'}

+
+ {addon.message && ( + + + {addon.message} + + )} + {canUpdate && ( +
+
+
+ +

Next Version Available

+
+

{addon.availableVersion}

+
- - -
- {canInstall && ( - - )} - {addon.status === 'ready' && !addon.availableVersion && ( - - - Up to date - - )} - {canRemove && ( - - - - Add-on actions - } /> - - runOperation('remove')}> - - Remove - - - - )} -
-
- - ); +
+ )} +
+ + +
+ {canInstall && ( + + )} + {addon.status === 'ready' && !addon.availableVersion && ( + + + Up to date + + )} + {canRemove && ( + + + + Add-on actions + + } + /> + + runOperation('remove')}> + + Remove + + + + )} +
+
+ + ); } diff --git a/src/components/custom/app-monitoring-history.tsx b/src/components/custom/app-monitoring-history.tsx index 0787153b..a25a16e0 100644 --- a/src/components/custom/app-monitoring-history.tsx +++ b/src/components/custom/app-monitoring-history.tsx @@ -87,7 +87,9 @@ export function HistoryChart({ formatValue(value, true)} /> { - if (!active || !payload?.length) return null; + if (!active || !payload?.length) { + return null; + } const item = payload[0]; return (
@@ -167,7 +169,9 @@ export default function AppMonitoringHistoryView({ appId, currentUsage }: { appI field.onChange(e.target.value ? `${e.target.value}.${domainSuffix}` : '')} - onBlur={field.onBlur} - name={field.name} - /> + const domainFields = (quickstack = false) => ( +
+ { + if (quickstack) { + const prefixValue = getQuickstackPrefix(field.value || ''); + return ( + + Domain Prefix + +
+ field.onChange(e.target.value ? `${e.target.value}.${domainSuffix}` : '')} + onBlur={field.onBlur} + name={field.name} + /> - - - .{domainSuffix}} /> - -

This ist the quickstack.me
domain for your instance.

-
-
-
-
-
- -
- ); - } - return ( - - Hostname - - - - - - ); - }} - /> - ( - - App Port - - - - - - )} - /> - - {values.useSsl && } -
- ); + + + .{domainSuffix}} /> + +

+ This ist the quickstack.me
+ domain for your instance. +

+
+
+
+
+ + + + ); + } + return ( + + Hostname + + + + + + ); + }} + /> + ( + + App Port + + + + + + )} + /> + + {values.useSsl && } +
+ ); - return ( - <> - - {existingDomain ? 'Edit Domain' : 'Create Domain'} - Configure a custom domain for external access. - -
- form.handleSubmit((data) => formAction(data))()}> - setActiveTab(value as 'custom' | 'quickstack')} className="w-full"> - - Custom Domain - {!!domainSuffix && quickstack.me Domain} - - {domainFields()} - {domainFields(true)} - -
-

{state.message}

- Save -
-
- - - ); + return ( + <> + + {existingDomain ? 'Edit Domain' : 'Create Domain'} + Configure a custom domain for external access. + +
+ form.handleSubmit((data) => formAction(data))()}> + setActiveTab(value as 'custom' | 'quickstack')} className="w-full"> + + Custom Domain + {!!domainSuffix && quickstack.me Domain} + + + {domainFields()} + + + {domainFields(true)} + + +
+

{state.message}

+ Save +
+
+ + + ); } diff --git a/src/components/custom/input-dialog.tsx b/src/components/custom/input-dialog.tsx index f1251864..c30c60cb 100644 --- a/src/components/custom/input-dialog.tsx +++ b/src/components/custom/input-dialog.tsx @@ -1,18 +1,11 @@ -'use client' +'use client'; -import { Button } from "@/components/ui/button" -import { - Dialog, - DialogContent, - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, -} from "@/components/ui/dialog" -import React, { useEffect } from "react"; -import { Input } from "../ui/input"; -import { Label } from "../ui/label"; -import { useInputDialog } from "@/frontend/states/zustand.states"; +import { Button } from '@/components/ui/button'; +import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; +import React, { useEffect } from 'react'; +import { Input } from '../ui/input'; +import { Label } from '../ui/label'; +import { useInputDialog } from '@/frontend/states/zustand.states'; export function InputDialog() { const { isDialogOpen, data, closeDialog } = useInputDialog(); @@ -31,15 +24,11 @@ export function InputDialog() { {data.title} - {data.description && - {data.description} - } + {data.description && {data.description}}
- {data.fieldName && } + {data.fieldName && } { @@ -53,15 +42,23 @@ export function InputDialog() {
- - + +
- ) + ); } /* @@ -158,4 +155,4 @@ export function InputDialog({ ) } -*/ \ No newline at end of file +*/ diff --git a/src/components/custom/sso-provider-logo.tsx b/src/components/custom/sso-provider-logo.tsx index 5e6d1777..999c37a2 100644 --- a/src/components/custom/sso-provider-logo.tsx +++ b/src/components/custom/sso-provider-logo.tsx @@ -1,30 +1,17 @@ -import Image from "next/image"; -import { SsoProviderType } from "@/shared/model/sso-provider.model"; +import Image from 'next/image'; +import { SsoProviderType } from '@/shared/model/sso-provider.model'; const logoByType: Partial> = { - GOOGLE: "/sso-provider-logos/google.png", - AZURE_AD: "/sso-provider-logos/entra.svg", - GITHUB: "/sso-provider-logos/github.svg", + GOOGLE: '/sso-provider-logos/google.png', + AZURE_AD: '/sso-provider-logos/entra.svg', + GITHUB: '/sso-provider-logos/github.svg' }; -export function SsoProviderLogo({ - type, - className, -}: { - type: SsoProviderType; - className?: string; -}) { +export function SsoProviderLogo({ type, className }: { type: SsoProviderType; className?: string }) { const src = logoByType[type]; - if (!src) return null; + if (!src) { + return null; + } - return ( - - ); + return ; } diff --git a/src/components/ui/calendar.tsx b/src/components/ui/calendar.tsx index 57272617..11ee2516 100644 --- a/src/components/ui/calendar.tsx +++ b/src/components/ui/calendar.tsx @@ -1,37 +1,32 @@ -"use client" +'use client'; -import * as React from "react" -import { cn } from "cn" -import { - DayPicker, - getDefaultClassNames, - type DayButton, - type Locale, -} from "react-day-picker" +import * as React from 'react'; +import { cn } from 'cn'; +import { DayPicker, getDefaultClassNames, type DayButton, type Locale } from 'react-day-picker'; -import { Button, buttonVariants } from "@/components/ui/button" -import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from "lucide-react" +import { Button, buttonVariants } from '@/components/ui/button'; +import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from 'lucide-react'; function Calendar({ className, classNames, showOutsideDays = true, - captionLayout = "label", - buttonVariant = "ghost", + captionLayout = 'label', + buttonVariant = 'ghost', locale, formatters, components, ...props }: React.ComponentProps & { - buttonVariant?: React.ComponentProps["variant"] + buttonVariant?: React.ComponentProps['variant']; }) { - const defaultClassNames = getDefaultClassNames() + const defaultClassNames = getDefaultClassNames(); return ( svg]:rotate-180`, String.raw`rtl:**:[.rdp-button\_previous>svg]:rotate-180`, className @@ -39,183 +34,118 @@ function Calendar({ captionLayout={captionLayout} locale={locale} formatters={{ - formatMonthDropdown: (date) => - date.toLocaleString(locale?.code, { month: "short" }), - ...formatters, + formatMonthDropdown: (date) => date.toLocaleString(locale?.code, { month: 'short' }), + ...formatters }} classNames={{ - root: cn("w-fit", defaultClassNames.root), - months: cn( - "relative flex flex-col gap-4 md:flex-row", - defaultClassNames.months - ), - month: cn("flex w-full flex-col gap-4", defaultClassNames.month), - nav: cn( - "absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1", - defaultClassNames.nav - ), + root: cn('w-fit', defaultClassNames.root), + months: cn('relative flex flex-col gap-4 md:flex-row', defaultClassNames.months), + month: cn('flex w-full flex-col gap-4', defaultClassNames.month), + nav: cn('absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1', defaultClassNames.nav), button_previous: cn( buttonVariants({ variant: buttonVariant }), - "size-(--cell-size) p-0 select-none aria-disabled:opacity-50", + 'size-(--cell-size) p-0 select-none aria-disabled:opacity-50', defaultClassNames.button_previous ), button_next: cn( buttonVariants({ variant: buttonVariant }), - "size-(--cell-size) p-0 select-none aria-disabled:opacity-50", + 'size-(--cell-size) p-0 select-none aria-disabled:opacity-50', defaultClassNames.button_next ), - month_caption: cn( - "flex h-(--cell-size) w-full items-center justify-center px-(--cell-size)", - defaultClassNames.month_caption - ), - dropdowns: cn( - "flex h-(--cell-size) w-full items-center justify-center gap-1.5 text-sm font-medium", - defaultClassNames.dropdowns - ), - dropdown_root: cn( - "relative rounded-(--cell-radius)", - defaultClassNames.dropdown_root - ), - dropdown: cn( - "absolute inset-0 bg-popover opacity-0", - defaultClassNames.dropdown - ), + month_caption: cn('flex h-(--cell-size) w-full items-center justify-center px-(--cell-size)', defaultClassNames.month_caption), + dropdowns: cn('flex h-(--cell-size) w-full items-center justify-center gap-1.5 text-sm font-medium', defaultClassNames.dropdowns), + dropdown_root: cn('relative rounded-(--cell-radius)', defaultClassNames.dropdown_root), + dropdown: cn('absolute inset-0 bg-popover opacity-0', defaultClassNames.dropdown), caption_label: cn( - "font-medium select-none", - captionLayout === "label" - ? "text-sm" - : "flex items-center gap-1 rounded-(--cell-radius) text-sm [&>svg]:size-3.5 [&>svg]:text-muted-foreground", + 'font-medium select-none', + captionLayout === 'label' ? 'text-sm' : 'flex items-center gap-1 rounded-(--cell-radius) text-sm [&>svg]:size-3.5 [&>svg]:text-muted-foreground', defaultClassNames.caption_label ), - month_grid: cn("w-full border-collapse", defaultClassNames.month_grid), - weekdays: cn("flex", defaultClassNames.weekdays), - weekday: cn( - "flex-1 rounded-(--cell-radius) text-[0.8rem] font-normal text-muted-foreground select-none", - defaultClassNames.weekday - ), - week: cn("mt-2 flex w-full", defaultClassNames.week), - week_number_header: cn( - "w-(--cell-size) select-none", - defaultClassNames.week_number_header - ), - week_number: cn( - "text-[0.8rem] text-muted-foreground select-none", - defaultClassNames.week_number - ), + month_grid: cn('w-full border-collapse', defaultClassNames.month_grid), + weekdays: cn('flex', defaultClassNames.weekdays), + weekday: cn('flex-1 rounded-(--cell-radius) text-[0.8rem] font-normal text-muted-foreground select-none', defaultClassNames.weekday), + week: cn('mt-2 flex w-full', defaultClassNames.week), + week_number_header: cn('w-(--cell-size) select-none', defaultClassNames.week_number_header), + week_number: cn('text-[0.8rem] text-muted-foreground select-none', defaultClassNames.week_number), day: cn( - "group/day relative aspect-square h-full w-full rounded-(--cell-radius) p-0 text-center select-none [&:last-child[data-selected=true]_button]:rounded-r-(--cell-radius)", + 'group/day relative aspect-square h-full w-full rounded-(--cell-radius) p-0 text-center select-none [&:last-child[data-selected=true]_button]:rounded-r-(--cell-radius)', props.showWeekNumber - ? "[&:nth-child(2)[data-selected=true]_button]:rounded-l-(--cell-radius)" - : "[&:first-child[data-selected=true]_button]:rounded-l-(--cell-radius)", + ? '[&:nth-child(2)[data-selected=true]_button]:rounded-l-(--cell-radius)' + : '[&:first-child[data-selected=true]_button]:rounded-l-(--cell-radius)', defaultClassNames.day ), range_start: cn( - "relative isolate z-0 rounded-l-(--cell-radius) bg-muted after:absolute after:inset-y-0 after:right-0 after:w-4 after:bg-muted", + 'relative isolate z-0 rounded-l-(--cell-radius) bg-muted after:absolute after:inset-y-0 after:right-0 after:w-4 after:bg-muted', defaultClassNames.range_start ), - range_middle: cn("rounded-none", defaultClassNames.range_middle), + range_middle: cn('rounded-none', defaultClassNames.range_middle), range_end: cn( - "relative isolate z-0 rounded-r-(--cell-radius) bg-muted after:absolute after:inset-y-0 after:left-0 after:w-4 after:bg-muted", + 'relative isolate z-0 rounded-r-(--cell-radius) bg-muted after:absolute after:inset-y-0 after:left-0 after:w-4 after:bg-muted', defaultClassNames.range_end ), - today: cn( - "rounded-(--cell-radius) bg-muted text-foreground data-[selected=true]:rounded-none", - defaultClassNames.today - ), - outside: cn( - "text-muted-foreground aria-selected:text-muted-foreground", - defaultClassNames.outside - ), - disabled: cn( - "text-muted-foreground opacity-50", - defaultClassNames.disabled - ), - hidden: cn("invisible", defaultClassNames.hidden), - ...classNames, + today: cn('rounded-(--cell-radius) bg-muted text-foreground data-[selected=true]:rounded-none', defaultClassNames.today), + outside: cn('text-muted-foreground aria-selected:text-muted-foreground', defaultClassNames.outside), + disabled: cn('text-muted-foreground opacity-50', defaultClassNames.disabled), + hidden: cn('invisible', defaultClassNames.hidden), + ...classNames }} components={{ Root: ({ className, rootRef, ...props }) => { - return ( -
- ) + return
; }, Chevron: ({ className, orientation, ...props }) => { - if (orientation === "left") { - return ( - - ) + if (orientation === 'left') { + return ; } - if (orientation === "right") { - return ( - - ) + if (orientation === 'right') { + return ; } - return ( - - ) + return ; }, - DayButton: ({ ...props }) => ( - - ), + DayButton: ({ ...props }) => , WeekNumber: ({ children, ...props }) => { return ( -
- {children} -
+
{children}
- ) + ); }, - ...components, + ...components }} {...props} /> - ) + ); } -function CalendarDayButton({ - className, - day, - modifiers, - locale, - ...props -}: React.ComponentProps & { locale?: Partial }) { - const defaultClassNames = getDefaultClassNames() +function CalendarDayButton({ className, day, modifiers, locale, ...props }: React.ComponentProps & { locale?: Partial }) { + const defaultClassNames = getDefaultClassNames(); - const ref = React.useRef(null) + const ref = React.useRef(null); React.useEffect(() => { - if (modifiers.focused) ref.current?.focus() - }, [modifiers.focused]) + if (modifiers.focused) { + ref.current?.focus(); + } + }, [modifiers.focused]); return (