Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: cleanup podman ui to match the existing ui
Kyle Mendell7f06db1250ac
diff --git a/backend/internal/podman/children/pods/service.go b/backend/internal/podman/children/pods/service.goindex d8db776c9..18d71cf73 100644--- a/backend/internal/podman/children/pods/service.go+++ b/backend/internal/podman/children/pods/service.go@@ -105,7 +105,35 @@ func (s *Service) Inspect(ctx context.Context, nameOrID string) (podmantypes.Podif err != nil {return podmantypes.PodInspect{}, err}- return rt.Client.PodInspect(ctx, nameOrID)+ pod, err := rt.Client.PodInspect(ctx, nameOrID)+ if err != nil {+ return podmantypes.PodInspect{}, err+ }+ containers, err := rt.Client.ContainerList(ctx, nil, []string{pod.ID})+ if err != nil {+ return podmantypes.PodInspect{}, fmt.Errorf("list containers for pod %s: %w", pod.ID, err)+ }++ for i, member := range pod.Containers {+ index := slices.IndexFunc(containers, func(c podmantypes.Container) bool {+ return c.ID == member.ID+ })+ if index < 0 {+ continue+ }+ pod.Containers[i] = podmantypes.PodInspectContainer{+ ID: member.ID,+ Name: member.Name,+ State: member.State,+ Image: containers[index].Image,+ Status: containers[index].Status,+ Created: containers[index].Created,+ ExitCode: containers[index].ExitCode,+ IsInfra: containers[index].IsInfra,+ Ports: containers[index].Ports,+ }+ }+ return pod, nil}func (s *Service) Create(ctx context.Context, req podmantypes.PodCreateRequest) (string, error) {diff --git a/backend/internal/podman/children/pods/service_test.go b/backend/internal/podman/children/pods/service_test.goindex 24a5531b0..b603e0c09 100644--- a/backend/internal/podman/children/pods/service_test.go+++ b/backend/internal/podman/children/pods/service_test.go@@ -6,6 +6,7 @@ import ("net/http""net/http/httptest""testing"+ "time"podmantypes "github.com/getarcaneapp/arcane/types/v2/podman""github.com/stretchr/testify/assert"@@ -277,3 +278,96 @@ func TestCreateRejectsInvalidOptions(t *testing.T) {})}}++func TestInspectMergesContainerDetails(t *testing.T) {+ tests := []struct {+ name string+ listStatus int+ want []podmantypes.PodInspectContainer+ wantErr bool+ }{+ {+ name: "merges list details by id",+ listStatus: http.StatusOK,+ want: []podmantypes.PodInspectContainer{+ {+ ID: "infra1",+ Name: "web-infra",+ State: "running",+ Image: "localhost/podman-pause:5.4.0",+ Status: "Up 2 minutes",+ Created: time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC),+ IsInfra: true,+ Ports: []podmantypes.PodPortMapping{+ {+ ContainerPort: 80,+ HostPort: 8080,+ Protocol: "tcp",+ Range: 1,+ },+ },+ },+ {+ ID: "app1",+ Name: "web-app",+ State: "exited",+ Image: "docker.io/library/nginx:latest",+ Status: "Exited (1) 1 minute ago",+ Created: time.Date(2026, 10, 1, 12, 1, 0, 0, time.UTC),+ ExitCode: 1,+ Ports: []podmantypes.PodPortMapping{},+ },+ {+ ID: "gone1",+ Name: "web-gone",+ State: "removing",+ },+ },+ },+ {+ name: "container list failure",+ listStatus: http.StatusInternalServerError,+ wantErr: true,+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ w.Header().Set("Content-Type", "application/json")+ switch r.URL.Path {+ case "/v4.0.0/libpod/pods/web/json":+ _, _ = w.Write([]byte(`{"Id":"pod123","Name":"web","Containers":[+ {"Id":"infra1","Name":"web-infra","State":"running"},+ {"Id":"app1","Name":"web-app","State":"exited"},+ {"Id":"gone1","Name":"web-gone","State":"removing"}+ ]}`))+ case "/v4.0.0/libpod/containers/json":+ assert.JSONEq(t, `{"pod":["pod123"]}`, r.URL.Query().Get("filters"))+ w.WriteHeader(tt.listStatus)+ _, _ = w.Write([]byte(`[+ {"Id":"app1","Image":"docker.io/library/nginx:latest","Status":"Exited (1) 1 minute ago","Created":"2026-10-01T12:01:00Z","ExitCode":1},+ {"Id":"infra1","Image":"localhost/podman-pause:5.4.0","Status":"Up 2 minutes","Created":"2026-10-01T12:00:00Z","IsInfra":true,+ "Ports":[{"container_port":80,"host_port":8080,"range":1,"protocol":"tcp"}]}+ ]`))+ default:+ http.NotFound(w, r)+ }+ }))+ t.Cleanup(server.Close)+ client, err := podman.NewClient(server.URL)+ require.NoError(t, err)++ svc := NewService(func(context.Context) (podman.Runtime, error) {+ return podman.Runtime{Client: client}, nil+ })+ pod, err := svc.Inspect(t.Context(), "web")+ if tt.wantErr {+ require.Error(t, err)+ return+ }+ require.NoError(t, err)+ assert.Equal(t, tt.want, pod.Containers)+ })+ }+}diff --git a/backend/internal/podman/service.go b/backend/internal/podman/service.goindex cddf8be7e..1128fad16 100644--- a/backend/internal/podman/service.go+++ b/backend/internal/podman/service.go@@ -139,7 +139,10 @@ func (s *Service) ContainerUnitAction(ctx context.Context, containerRef string,return false, nil}- unit := containers[index].Labels[podmantypes.SystemdUnitLabel]+ unit := podmantypes.QuadletUnit(containers[index].Labels)+ if unit == "" {+ return false, nil+ }managed, err := s.quadletManaged(ctx, rt, unit)if err != nil {return true, fmt.Errorf("verify quadlet unit %s for container %s: %w", unit, containerRef, err)@@ -151,7 +154,7 @@ func (s *Service) ContainerUnitAction(ctx context.Context, containerRef string,}func (s *Service) GuardQuadletManaged(ctx context.Context, labels map[string]string) error {- unit := labels[podmantypes.SystemdUnitLabel]+ unit := podmantypes.QuadletUnit(labels)if unit == "" {return nil}diff --git a/backend/internal/system/children/upgrade/service.go b/backend/internal/system/children/upgrade/service.goindex 160b0e978..639ded4ed 100644--- a/backend/internal/system/children/upgrade/service.go+++ b/backend/internal/system/children/upgrade/service.go@@ -206,7 +206,7 @@ func (s *Service) CanUpgrade(ctx context.Context) (bool, error) {if inspectErr != nil {return false, errors.New("arcane is not running in a Docker container")}- if unit := kit.FromPtr(self.Config).Labels[podman.SystemdUnitLabel]; unit != "" {+ if unit := podman.QuadletUnit(kit.FromPtr(self.Config).Labels); unit != "" {return false, fmt.Errorf("arcane runs from the Quadlet unit %s; update it with podman auto-update instead", unit)}return true, nil@@ -329,7 +329,7 @@ func (s *Service) prepareUpgrade(ctx context.Context, user usertypes.Actor, targif err != nil {return nil, err}- if unit := kit.FromPtr(current.Config).Labels[podman.SystemdUnitLabel]; unit != "" {+ if unit := podman.QuadletUnit(kit.FromPtr(current.Config).Labels); unit != "" {return nil, fmt.Errorf("systemd unit %s: %w", unit, common.ErrContainerQuadletManaged)}diff --git a/backend/internal/updater/service.go b/backend/internal/updater/service.goindex 12d298f3b..fc141687d 100644--- a/backend/internal/updater/service.go+++ b/backend/internal/updater/service.go@@ -77,7 +77,7 @@ var (updateLabelPolicy = updater.LabelPolicy{IsUpdateDisabledFunc: func(l map[string]string) bool {- return labels.IsUpdateDisabled(l) || l[podman.SystemdUnitLabel] != ""+ return labels.IsUpdateDisabled(l) || podman.QuadletUnit(l) != ""},})diff --git a/backend/pkg/libarcane/podman/client.go b/backend/pkg/libarcane/podman/client.goindex ba9755782..f99b6dcf8 100644--- a/backend/pkg/libarcane/podman/client.go+++ b/backend/pkg/libarcane/podman/client.go@@ -112,6 +112,11 @@ func (c *Client) Info(ctx context.Context) (podmantypes.Info, error) {return c.doJSON[podmantypes.Info](ctx, request{method: http.MethodGet, path: "/info"})}+type containerResponse struct {+ podmantypes.Container+ Ports []PodPortMapping `json:"Ports"`+}+func (c *Client) ContainerList(ctx context.Context, labels, pods []string) ([]podmantypes.Container, error) {query, err := filtersQuery(url.Values{"all": {"true"}}, map[string][]string{"label": labels,@@ -121,11 +126,40 @@ func (c *Client) ContainerList(ctx context.Context, labels, pods []string) ([]poreturn nil, err}- return c.doJSON[[]podmantypes.Container](ctx, request{+ raw, err := c.doJSON[[]containerResponse](ctx, request{method: http.MethodGet,path: "/containers/json",query: query,})+ if err != nil {+ return nil, err+ }++ containers := make([]podmantypes.Container, 0, len(raw))+ for _, item := range raw {+ ports := make([]podmantypes.PodPortMapping, 0, len(item.Ports))+ for _, port := range item.Ports {+ ports = append(ports, podmantypes.PodPortMapping(port))+ }+ containers = append(containers, podmantypes.Container{+ ID: item.ID,+ Names: item.Names,+ Image: item.Image,+ ImageID: item.ImageID,+ State: item.State,+ Status: item.Status,+ Created: item.Created,+ StartedAt: item.StartedAt,+ ExitCode: item.ExitCode,+ Exited: item.Exited,+ Labels: item.Labels,+ Pod: item.Pod,+ PodName: item.PodName,+ IsInfra: item.IsInfra,+ Ports: ports,+ })+ }+ return containers, nil}func (c *Client) doJSON[T any](ctx context.Context, req request) (T, error) {diff --git a/backend/pkg/libarcane/podman/client_test.go b/backend/pkg/libarcane/podman/client_test.goindex 7a289e3eb..cfee3e069 100644--- a/backend/pkg/libarcane/podman/client_test.go+++ b/backend/pkg/libarcane/podman/client_test.go@@ -140,7 +140,7 @@ func TestClientContainerList(t *testing.T) {assert.Equal(t, "/v4.0.0/libpod/containers/json", r.URL.Path)assert.Equal(t, "true", r.URL.Query().Get("all"))assert.JSONEq(t, `{"label":["PODMAN_SYSTEMD_UNIT=web.service"]}`, r.URL.Query().Get("filters"))- _, _ = w.Write([]byte(`[{"Id":"abc","Names":["web"],"Labels":{"PODMAN_SYSTEMD_UNIT":"web.service"},"PodName":"","IsInfra":false}]`))+ _, _ = w.Write([]byte(`[{"Id":"abc","Names":["web"],"Labels":{"PODMAN_SYSTEMD_UNIT":"web.service"},"PodName":"","IsInfra":false,"Ports":[{"host_ip":"127.0.0.1","container_port":80,"host_port":8080,"range":1,"protocol":"tcp"}]}]`))})containers, err := client.ContainerList(t.Context(), []string{podmantypes.SystemdUnitLabel + "=web.service"}, nil)@@ -148,6 +148,15 @@ func TestClientContainerList(t *testing.T) {require.Len(t, containers, 1)assert.Equal(t, "abc", containers[0].ID)assert.Equal(t, "web.service", containers[0].Labels[podmantypes.SystemdUnitLabel])+ assert.Equal(t, []podmantypes.PodPortMapping{+ {+ ContainerPort: 80,+ HostPort: 8080,+ HostIP: "127.0.0.1",+ Protocol: "tcp",+ Range: 1,+ },+ }, containers[0].Ports)}func TestClientErrorClassification(t *testing.T) {diff --git a/backend/pkg/libarcane/podman/pods.go b/backend/pkg/libarcane/podman/pods.goindex d6601faba..c9f36cfe9 100644--- a/backend/pkg/libarcane/podman/pods.go+++ b/backend/pkg/libarcane/podman/pods.go@@ -168,8 +168,95 @@ func (c *Client) PodList(ctx context.Context, filters map[string][]string) ([]po})}+type podInfraConfigResponse struct {+ podmantypes.PodInfraConfig+ PidNS string `json:"pid_ns"`+ UtsNS string `json:"uts_ns"`+}++type podInspectResponse struct {+ podmantypes.PodInspect+ InfraConfig *podInfraConfigResponse `json:"InfraConfig"`+ CPUPeriod uint64 `json:"cpu_period"`+ CPUQuota int64 `json:"cpu_quota"`+ CPUShares uint64 `json:"cpu_shares"`+ CPUSetCPUs string `json:"cpuset_cpus"`+ CPUSetMems string `json:"cpuset_mems"`+ MemoryLimit uint64 `json:"memory_limit"`+ MemorySwap uint64 `json:"memory_swap"`+ BlkioWeight uint64 `json:"blkio_weight"`+ BlkioWeightDevices []podmantypes.PodWeightDevice `json:"blkio_weight_device"`+ DeviceReadBps []podmantypes.PodThrottleDevice `json:"device_read_bps"`+ DeviceWriteBps []podmantypes.PodThrottleDevice `json:"device_write_bps"`+ VolumesFrom []string `json:"volumes_from"`+ SecurityOpts []string `json:"security_opt"`+}+func (c *Client) PodInspect(ctx context.Context, nameOrID string) (podmantypes.PodInspect, error) {- return c.doJSON[podmantypes.PodInspect](ctx, request{method: http.MethodGet, path: "/pods/" + url.PathEscape(nameOrID) + "/json"})+ raw, err := c.doJSON[podInspectResponse](ctx, request{method: http.MethodGet, path: "/pods/" + url.PathEscape(nameOrID) + "/json"})+ if err != nil {+ return podmantypes.PodInspect{}, err+ }++ return podmantypes.PodInspect{+ ID: raw.ID,+ Name: raw.Name,+ Namespace: raw.Namespace,+ Created: raw.Created,+ State: raw.State,+ CreateCommand: raw.CreateCommand,+ ExitPolicy: raw.ExitPolicy,+ RestartPolicy: raw.RestartPolicy,+ Hostname: raw.Hostname,+ Labels: raw.Labels,+ CreateCgroup: raw.CreateCgroup,+ CgroupParent: raw.CgroupParent,+ CgroupPath: raw.CgroupPath,+ CreateInfra: raw.CreateInfra,+ InfraContainerID: raw.InfraContainerID,+ InfraConfig: func() *podmantypes.PodInfraConfig {+ if raw.InfraConfig == nil {+ return nil+ }+ return &podmantypes.PodInfraConfig{+ PortBindings: raw.InfraConfig.PortBindings,+ HostNetwork: raw.InfraConfig.HostNetwork,+ StaticIP: raw.InfraConfig.StaticIP,+ StaticMAC: raw.InfraConfig.StaticMAC,+ NoManageResolvConf: raw.InfraConfig.NoManageResolvConf,+ DNSServer: raw.InfraConfig.DNSServer,+ DNSSearch: raw.InfraConfig.DNSSearch,+ DNSOption: raw.InfraConfig.DNSOption,+ NoManageHostname: raw.InfraConfig.NoManageHostname,+ NoManageHosts: raw.InfraConfig.NoManageHosts,+ HostAdd: raw.InfraConfig.HostAdd,+ HostsFile: raw.InfraConfig.HostsFile,+ Networks: raw.InfraConfig.Networks,+ NetworkOptions: raw.InfraConfig.NetworkOptions,+ PidNS: raw.InfraConfig.PidNS,+ UserNS: raw.InfraConfig.UserNS,+ UtsNS: raw.InfraConfig.UtsNS,+ }+ }(),+ SharedNamespaces: raw.SharedNamespaces,+ NumContainers: raw.NumContainers,+ Containers: raw.Containers,+ CPUPeriod: raw.CPUPeriod,+ CPUQuota: raw.CPUQuota,+ CPUShares: raw.CPUShares,+ CPUSetCPUs: raw.CPUSetCPUs,+ CPUSetMems: raw.CPUSetMems,+ MemoryLimit: raw.MemoryLimit,+ MemorySwap: raw.MemorySwap,+ BlkioWeight: raw.BlkioWeight,+ BlkioWeightDevices: raw.BlkioWeightDevices,+ DeviceReadBps: raw.DeviceReadBps,+ DeviceWriteBps: raw.DeviceWriteBps,+ Mounts: raw.Mounts,+ Devices: raw.Devices,+ VolumesFrom: raw.VolumesFrom,+ SecurityOpts: raw.SecurityOpts,+ }, nil}func (c *Client) PodCreate(ctx context.Context, spec PodSpec) (string, error) {diff --git a/backend/pkg/libarcane/podman/pods_test.go b/backend/pkg/libarcane/podman/pods_test.goindex 7f1b0ad4a..31a9db2f2 100644--- a/backend/pkg/libarcane/podman/pods_test.go+++ b/backend/pkg/libarcane/podman/pods_test.go@@ -6,6 +6,7 @@ import ("net/http""testing"+ podmantypes "github.com/getarcaneapp/arcane/types/v2/podman""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")@@ -103,7 +104,24 @@ func TestClientPodListAndInspect(t *testing.T) {case "/v4.0.0/libpod/pods/web/json":_, _ = w.Write([]byte(`{"Id":"pod123","Name":"web","State":"Running","InfraContainerID":"infra1","NumContainers":2,- "SharedNamespaces":["net","ipc"],"Containers":[{"Id":"abc","Name":"web-app","State":"running"}]+ "SharedNamespaces":["net","ipc"],"Containers":[{"Id":"abc","Name":"web-app","State":"running"}],+ "CreateCommand":["podman","pod","create"],"ExitPolicy":"continue","RestartPolicy":"always",+ "CreateCgroup":true,"CgroupParent":"machine.slice","CgroupPath":"machine.slice/pod.slice",+ "cpu_period":100000,"cpu_quota":50000,"cpu_shares":512,"cpuset_cpus":"0-1","cpuset_mems":"0",+ "memory_limit":536870912,"memory_swap":1073741824,"blkio_weight":300,+ "blkio_weight_device":[{"Path":"/dev/sda","Weight":200}],+ "device_read_bps":[{"Path":"/dev/sda","Rate":1048576}],+ "device_write_bps":[{"Path":"/dev/sdb","Rate":2097152}],+ "mounts":[{"Type":"bind","Source":"/srv","Destination":"/data","Options":["rbind"],"RW":true,"Propagation":"rprivate","SubPath":"sub"}],+ "devices":[{"PathOnHost":"/dev/fuse","PathInContainer":"/dev/fuse","CgroupPermissions":"rwm"}],+ "volumes_from":["seed:ro"],"security_opt":["label=disable"],+ "InfraConfig":{+ "PortBindings":{"80/tcp":[{"HostIp":"","HostPort":"8080"}]},"HostNetwork":false,+ "StaticIP":"10.88.0.5","StaticMAC":"aa:bb:cc:dd:ee:ff","NoManageResolvConf":true,+ "DNSServer":["1.1.1.1"],"DNSSearch":["lan"],"DNSOption":["ndots:2"],"NoManageHostname":true,+ "NoManageHosts":true,"HostAdd":["db:10.0.0.2"],"HostsFile":"/etc/hosts.base","Networks":["frontend"],+ "NetworkOptions":{"pasta":["-T","8080"]},"pid_ns":"host","userns":"keep-id","uts_ns":"private"+ }}`))default:http.NotFound(w, r)@@ -122,4 +140,59 @@ func TestClientPodListAndInspect(t *testing.T) {assert.Equal(t, "infra1", pod.InfraContainerID)assert.Equal(t, uint(2), pod.NumContainers)assert.Equal(t, []string{"net", "ipc"}, pod.SharedNamespaces)+ assert.Equal(t, []string{"podman", "pod", "create"}, pod.CreateCommand)+ assert.Equal(t, "continue", pod.ExitPolicy)+ assert.Equal(t, "always", pod.RestartPolicy)+ assert.True(t, pod.CreateCgroup)+ assert.Equal(t, "machine.slice", pod.CgroupParent)+ assert.Equal(t, "machine.slice/pod.slice", pod.CgroupPath)+ assert.Equal(t, uint64(100000), pod.CPUPeriod)+ assert.Equal(t, int64(50000), pod.CPUQuota)+ assert.Equal(t, uint64(512), pod.CPUShares)+ assert.Equal(t, "0-1", pod.CPUSetCPUs)+ assert.Equal(t, "0", pod.CPUSetMems)+ assert.Equal(t, uint64(536870912), pod.MemoryLimit)+ assert.Equal(t, uint64(1073741824), pod.MemorySwap)+ assert.Equal(t, uint64(300), pod.BlkioWeight)+ assert.Equal(t, []podmantypes.PodWeightDevice{{Path: "/dev/sda", Weight: 200}}, pod.BlkioWeightDevices)+ assert.Equal(t, []podmantypes.PodThrottleDevice{{Path: "/dev/sda", Rate: 1048576}}, pod.DeviceReadBps)+ assert.Equal(t, []podmantypes.PodThrottleDevice{{Path: "/dev/sdb", Rate: 2097152}}, pod.DeviceWriteBps)+ assert.Equal(t, []podmantypes.PodMount{+ {+ Type: "bind",+ Source: "/srv",+ Destination: "/data",+ Options: []string{"rbind"},+ RW: true,+ Propagation: "rprivate",+ SubPath: "sub",+ },+ }, pod.Mounts)+ assert.Equal(t, []podmantypes.PodDevice{+ {+ PathOnHost: "/dev/fuse",+ PathInContainer: "/dev/fuse",+ CgroupPermissions: "rwm",+ },+ }, pod.Devices)+ assert.Equal(t, []string{"seed:ro"}, pod.VolumesFrom)+ assert.Equal(t, []string{"label=disable"}, pod.SecurityOpts)+ assert.Equal(t, &podmantypes.PodInfraConfig{+ PortBindings: map[string][]podmantypes.PodPortBinding{"80/tcp": {{HostPort: "8080"}}},+ StaticIP: "10.88.0.5",+ StaticMAC: "aa:bb:cc:dd:ee:ff",+ NoManageResolvConf: true,+ DNSServer: []string{"1.1.1.1"},+ DNSSearch: []string{"lan"},+ DNSOption: []string{"ndots:2"},+ NoManageHostname: true,+ NoManageHosts: true,+ HostAdd: []string{"db:10.0.0.2"},+ HostsFile: "/etc/hosts.base",+ Networks: []string{"frontend"},+ NetworkOptions: map[string][]string{"pasta": {"-T", "8080"}},+ PidNS: "host",+ UserNS: "keep-id",+ UtsNS: "private",+ }, pod.InfraConfig)}diff --git a/backend/pkg/scheduler/auto_heal_job.go b/backend/pkg/scheduler/auto_heal_job.goindex 615b729c8..6491f51da 100644--- a/backend/pkg/scheduler/auto_heal_job.go+++ b/backend/pkg/scheduler/auto_heal_job.go@@ -244,7 +244,7 @@ func (j *AutoHealJob) processCandidateInternal(}}containerName := docker.ContainerNameFromNames(candidate.Names)- if unit := candidate.Labels[podman.SystemdUnitLabel]; unit != "" {+ if unit := podman.QuadletUnit(candidate.Labels); unit != "" {slog.DebugContext(ctx, "auto-heal skipping quadlet-managed container", "container", containerName, "unit", unit)return schedulertypes.TargetOutcome{ResourceType: "container",diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex c79f67827..6f14f7cb9 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -4165,30 +4165,42 @@"podman_pod_invalid_rows": "Complete or remove the highlighted rows.","podman_pod_no_containers": "This pod has no containers","podman_pod_not_running": "The pod is not running.",+ "podman_pod_namespace": "Namespace",+ "podman_pod_cgroup_path": "Cgroup path",+ "podman_pod_infra_container_id": "Infra container ID",+ "podman_pod_create_command": "Create command",+ "podman_pod_host_network": "Host network",+ "podman_pod_section_cpu": "CPU",+ "podman_pod_section_memory": "Memory",+ "podman_pod_cpu_period": "CPU period",+ "podman_pod_cpu_quota": "CPU quota",+ "podman_pod_mount_source": "Source",+ "podman_pod_device_host_path": "Host path",+ "podman_pod_no_network_config": "This pod has no infra network configuration.",+ "podman_pod_no_resources": "This pod has no resource limits, mounts, or devices configured.",+ "podman_pod_stats_description": "Live resource usage of each container in the pod. Refreshes every few seconds.",+ "podman_pod_processes_description": "Processes running in the pod's containers, as reported by Podman. Refreshes every few seconds.",+ "podman_pod_inspect_description": "Full JSON output of podman pod inspect","podman_quadlet": "quadlet","podman_quadlets_title": "Quadlets","podman_quadlets_subtitle": "Systemd units that run Podman containers, pods, and kube workloads","podman_quadlets_total": "Total quadlets","podman_quadlets_unsupported": "Quadlet management requires Podman 5.8 or later.",+ "podman_environments_unavailable": "None of the shown environments run Podman.","podman_quadlet_install": "Install quadlet",- "podman_quadlet_install_description": "Install a quadlet file. Podman reloads systemd so the unit becomes available.","podman_quadlet_install_failed": "Failed to install {name}","podman_quadlet_install_success": "{name} installed","podman_quadlet_template": "Template","podman_quadlet_app": "Application","podman_quadlet_app_description": "Group this quadlet with related files under one application.",- "podman_quadlet_extra_file": "Additional file",- "podman_quadlet_extra_files": "Additional files",- "podman_quadlet_extra_files_description": "Files installed beside the quadlet, such as env files or a Containerfile.",+ "podman_quadlet_name_placeholder": "my-app",+ "podman_quadlet_files": "Files",+ "podman_quadlet_path": "Path","podman_quadlet_update_files_description": "Files to install or replace beside the quadlet when you save, such as its kube YAML.",- "podman_quadlet_add_file": "Add file",- "podman_quadlet_file_name_placeholder": "File name, for example app.env","podman_quadlet_no_containers": "No containers are running for this quadlet","podman_kube_title": "Kube",- "podman_kube_subtitle": "Play, tear down, and generate Kubernetes YAML with Podman","podman_kube_yaml": "Kubernetes YAML","podman_kube_play": "Play",- "podman_kube_play_description": "Create pods, containers, and volumes from the YAML, or tear them down.","podman_kube_play_failed": "Failed to play Kubernetes YAML","podman_kube_play_success": "Created {count} pod(s)","podman_kube_down_failed": "Failed to tear down Kubernetes YAML",@@ -4205,8 +4217,6 @@"podman_kube_generate_names": "Pods, containers, or volumes","podman_kube_generate_service": "Also generate a service","podman_kube_generate_failed": "Failed to generate Kubernetes YAML",- "podman_kube_generated": "Generated YAML",- "podman_kube_use_generated": "Use in editor","podman_secrets_title": "Secrets","podman_secrets_subtitle": "Podman secrets available to containers on this host","podman_secrets_driver_placeholder": "file",diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav.svelteindex d65ed818a..7e2de0068 100644--- a/frontend/src/lib/components/mobile-nav/mobile-nav.svelte+++ b/frontend/src/lib/components/mobile-nav/mobile-nav.svelte@@ -40,7 +40,7 @@const navigationSettings = $derived(navigation.settings);const currentEnvId = $derived(environmentStore.selected?.id || '0');const swarmItems = $derived(getSwarmNavigationItems(swarmEnabled, currentEnvId));- const podmanItems = $derived(getPodmanNavigationItems(podmanStatuses, currentEnvId));+ const podmanItems = $derived(getPodmanNavigationItems(podmanStatuses));const pinnedItems = $derived.by(() => {if (!navigationSettings?.pinnedItems) return [];diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelteindex c5848bab5..b30bfdc8f 100644--- a/frontend/src/lib/components/sidebar/sidebar.svelte+++ b/frontend/src/lib/components/sidebar/sidebar.svelte@@ -73,12 +73,7 @@);const swarmItems = $derived(filterByPermissions(swarmItemsRaw, effectiveUser ?? null, currentEnvId, permissionsManifest));const podmanItems = $derived(- filterByPermissions(- getPodmanNavigationItems(podmanStatuses, currentEnvId),- effectiveUser ?? null,- currentEnvId,- permissionsManifest- )+ filterByPermissions(getPodmanNavigationItems(podmanStatuses), effectiveUser ?? null, currentEnvId, permissionsManifest));const settingsItems = $derived(filterByPermissions(navigationItems.settingsItems, effectiveUser ?? null, currentEnvId, permissionsManifest)diff --git a/frontend/src/lib/config/navigation-config.ts b/frontend/src/lib/config/navigation-config.tsindex be06d4f56..c1ee5be12 100644--- a/frontend/src/lib/config/navigation-config.ts+++ b/frontend/src/lib/config/navigation-config.ts@@ -398,16 +398,12 @@ export function getSwarmNavigationItems(swarmEnabled: boolean | undefined, currereturn navigationItems.swarmItems.filter((item) => item.url === '/swarm/cluster');}-const podmanListUrls = ['/podman/pods', '/podman/quadlets'];--export function getPodmanNavigationItems(statuses: Record<string, PodmanStatus>, currentEnvId: string): NavigationItem[] {+export function getPodmanNavigationItems(statuses: Record<string, PodmanStatus>): NavigationItem[] {const shown = environmentStore.shown.flatMap((env) => statuses[env.id] ?? []);if (shown.length === 0) return [];- const selected = statuses[currentEnvId];- return navigationItems.podmanItems.filter((item) => {- if (item.url === '/podman/quadlets') return shown.some((status) => status.quadletsSupported);- return !!selected || podmanListUrls.includes(item.url);- });+ return navigationItems.podmanItems.filter(+ (item) => item.url !== '/podman/quadlets' || shown.some((status) => status.quadletsSupported)+ );}export const DEFAULT_LANDING_PAGE = '/dashboard';@@ -450,7 +446,7 @@ export function getAvailableMobileNavItems(options?: {flatItems.push(...swarmItems);}- flatItems.push(...getPodmanNavigationItems(options?.podmanStatuses ?? {}, options?.currentEnvId ?? '0'));+ flatItems.push(...getPodmanNavigationItems(options?.podmanStatuses ?? {}));if (navigationItems.settingsItems) {const settingsTopLevel = navigationItems.settingsItems.filter((item) => !item.items);diff --git a/frontend/src/lib/services/podman-service.ts b/frontend/src/lib/services/podman-service.tsindex 8c4be600b..bd62dd2d2 100644--- a/frontend/src/lib/services/podman-service.ts+++ b/frontend/src/lib/services/podman-service.ts@@ -53,8 +53,8 @@ class PodmanService extends BaseAPIService {return this.handleResponse(this.api.get(`/environments/${envId}/podman/info`, config));}- async runAutoUpdate(options: PodmanAutoUpdateOptions = {}): Promise<PodmanAutoUpdateResult> {- const envId = await this.environmentId();+ async runAutoUpdate(options: PodmanAutoUpdateOptions = {}, environmentId?: string): Promise<PodmanAutoUpdateResult> {+ const envId = await this.environmentId(environmentId);return this.handleResponse(this.api.post(`/environments/${envId}/podman/autoupdate`, options));}@@ -133,8 +133,8 @@ class PodmanService extends BaseAPIService {return this.handleResponse(this.api.get(`/environments/${envId}/podman/quadlets/${encodeURIComponent(name)}/file`));}- async installQuadlet(request: PodmanQuadletInstallRequest): Promise<PodmanQuadletInstallReport> {- const envId = await this.environmentId();+ async installQuadlet(request: PodmanQuadletInstallRequest, environmentId?: string): Promise<PodmanQuadletInstallReport> {+ const envId = await this.environmentId(environmentId);return this.handleResponse(this.api.post(`/environments/${envId}/podman/quadlets`, request));}@@ -157,8 +157,8 @@ class PodmanService extends BaseAPIService {return this.handleResponse(this.api.post(`/environments/${envId}/podman/quadlets/${encodeURIComponent(name)}/${action}`, {}));}- async kubePlay(request: PodmanKubePlayRequest): Promise<PodmanKubePlayReport> {- const envId = await this.environmentId();+ async kubePlay(request: PodmanKubePlayRequest, environmentId?: string): Promise<PodmanKubePlayReport> {+ const envId = await this.environmentId(environmentId);return this.handleResponse(this.api.post(`/environments/${envId}/podman/kube/play`, request));}@@ -167,8 +167,8 @@ class PodmanService extends BaseAPIService {return this.handleResponse(this.api.post(`/environments/${envId}/podman/kube/down`, request));}- async kubeGenerate(request: PodmanKubeGenerateRequest): Promise<PodmanKubeGenerateResponse> {- const envId = await this.environmentId();+ async kubeGenerate(request: PodmanKubeGenerateRequest, environmentId?: string): Promise<PodmanKubeGenerateResponse> {+ const envId = await this.environmentId(environmentId);return this.handleResponse(this.api.post(`/environments/${envId}/podman/kube/generate`, request));}diff --git a/frontend/src/lib/types/podman.ts b/frontend/src/lib/types/podman.tsindex bca6da215..4e2c78ece 100644--- a/frontend/src/lib/types/podman.ts+++ b/frontend/src/lib/types/podman.ts@@ -150,13 +150,62 @@ export interface PodmanPodPortBinding {export interface PodmanPodInfraConfig {portBindings?: Record<string, PodmanPodPortBinding[]>;hostNetwork: boolean;+ staticIp?: string;+ staticMac?: string;+ noManageResolvConf: boolean;+ dnsServer?: string[];+ dnsSearch?: string[];+ dnsOption?: string[];+ noManageHostname: boolean;+ noManageHosts: boolean;+ hostAdd?: string[];+ hostsFile?: string;networks?: string[];+ networkOptions?: Record<string, string[]>;+ pidNs?: string;+ userNs?: string;+ utsNs?: string;}export interface PodmanPodInspectContainer {id: string;name: string;state: string;+ image?: string;+ status?: string;+ created: string;+ exitCode: number;+ isInfra: boolean;+ ports?: PodmanPodPortMapping[];+}++export interface PodmanPodMount {+ type: string;+ name?: string;+ source?: string;+ destination: string;+ driver?: string;+ mode?: string;+ options?: string[];+ rw: boolean;+ propagation?: string;+ subPath?: string;+}++export interface PodmanPodDevice {+ pathOnHost: string;+ pathInContainer: string;+ cgroupPermissions?: string;+}++export interface PodmanPodWeightDevice {+ path: string;+ weight: number;+}++export interface PodmanPodThrottleDevice {+ path: string;+ rate: number;}export interface PodmanPodInspect {@@ -165,14 +214,35 @@ export interface PodmanPodInspect {namespace?: string;created: string;state: string;+ createCommand?: string[];+ exitPolicy?: string;+ restartPolicy?: string;hostname?: string;labels?: Record<string, string>;+ createCgroup: boolean;+ cgroupParent?: string;+ cgroupPath?: string;createInfra: boolean;infraContainerId?: string;infraConfig?: PodmanPodInfraConfig;sharedNamespaces?: string[];numContainers: number;containers: PodmanPodInspectContainer[] | null;+ cpuPeriod?: number;+ cpuQuota?: number;+ cpuShares?: number;+ cpusetCpus?: string;+ cpusetMems?: string;+ memoryLimit?: number;+ memorySwap?: number;+ blkioWeight?: number;+ blkioWeightDevices?: PodmanPodWeightDevice[];+ deviceReadBps?: PodmanPodThrottleDevice[];+ deviceWriteBps?: PodmanPodThrottleDevice[];+ mounts?: PodmanPodMount[];+ devices?: PodmanPodDevice[];+ volumesFrom?: string[];+ securityOpts?: string[];}export interface PodmanPodPortMapping {diff --git a/frontend/src/lib/utils/podman.ts b/frontend/src/lib/utils/podman.tsindex 9c3318105..785e35f22 100644--- a/frontend/src/lib/utils/podman.ts+++ b/frontend/src/lib/utils/podman.ts@@ -14,7 +14,9 @@ export function podmanStateVariant(state: string | undefined): PodmanStateVarianexport function quadletUnitHref(labels: Record<string, string> | null | undefined, environmentId: string): string | undefined {const unit = labels?.[PODMAN_SYSTEMD_UNIT_LABEL];- return unit ? environmentHref(`/podman/quadlets?unit=${encodeURIComponent(unit)}`, environmentId) : undefined;+ return unit && !unit.startsWith('podman-compose@')+ ? environmentHref(`/podman/quadlets?unit=${encodeURIComponent(unit)}`, environmentId)+ : undefined;}export function shownPodmanEnvironments(diff --git a/frontend/src/routes/(app)/podman/autoupdate/+page.svelte b/frontend/src/routes/(app)/podman/autoupdate/+page.svelteindex 41552526e..4e074f6d4 100644--- a/frontend/src/routes/(app)/podman/autoupdate/+page.svelte+++ b/frontend/src/routes/(app)/podman/autoupdate/+page.svelte@@ -2,43 +2,46 @@import { toast } from 'svelte-sonner';import { ArcaneButton } from '#lib/components/arcane-button/index.js';+ import EnvironmentDestinationSelect from '#lib/components/form/environment-destination-select.svelte';import LabeledSwitch from '#lib/components/form/labeled-switch.svelte';import { DetailSection, KeyValueCard, KeyValueGrid } from '#lib/components/resource-detail/index.js';import EmptyState from '#lib/components/states/empty-state.svelte';import { Badge } from '#lib/components/ui/badge/index.js';- import * as Card from '#lib/components/ui/card/index.js';import * as Table from '#lib/components/ui/table/index.js';- import { useEnvironmentRefresh } from '#lib/hooks/use-environment-refresh.svelte.js';import { AlertIcon, InfoIcon, UpdateIcon } from '#lib/icons/index.js';import { ResourcePageLayout } from '#lib/layouts/index.js';import { m } from '#lib/paraglide/messages.js';import { podmanService } from '#lib/services/podman-service.js';import type { PodmanAutoUpdateResult } from '#lib/types/podman.js';import { handleApiResultWithCallbacks } from '#lib/utils/api.js';+ import { destinationEnvironmentId } from '#lib/utils/environments.js';import { withOccurrenceKeys } from '#lib/utils/formatting.js';+ import { shownPodmanEnvironments } from '#lib/utils/podman.js';import { tryCatch } from '#lib/utils/try-catch.js';let { data } = $props();- const status = $derived(data.podmanStatus);+ const podmanEnvs = $derived(shownPodmanEnvironments(data.podmanStatuses));+ let picked = $state('');+ const environmentId = $derived(destinationEnvironmentId(picked, 'podman:autoupdate', podmanEnvs));+ const status = $derived(data.podmanStatuses[environmentId]);const mode = $derived(status?.autoUpdateMode ?? 'unavailable');let dryRun = $state(false);let rollback = $state(true);let running = $state(false);let result = $state<PodmanAutoUpdateResult | null>(null);- let session = 0;- useEnvironmentRefresh(() => {- session += 1;+ $effect(() => {+ void environmentId;result = null;});async function handleRun() {- const started = session;+ const targetId = environmentId;running = true;await handleApiResultWithCallbacks({- result: await tryCatch(podmanService.runAutoUpdate(mode === 'rest' ? { dryRun, rollback } : {})),+ result: await tryCatch(podmanService.runAutoUpdate(mode === 'rest' ? { dryRun, rollback } : {}, targetId)),message: m.podman_autoupdate_failed(),setLoadingState: (value) => (running = value),onSuccess: (response) => {@@ -47,15 +50,24 @@} else {toast.success(m.podman_autoupdate_success());}- if (started !== session) return;+ if (targetId !== environmentId) return;result = response;}});}</script>-<ResourcePageLayout title={m.auto_update()} subtitle={m.podman_autoupdate_subtitle()} icon={UpdateIcon} environmentPicker>+<ResourcePageLayout title={m.auto_update()} subtitle={m.podman_autoupdate_subtitle()} icon={UpdateIcon}>{#snippet mainContent()}+ {#if podmanEnvs.length > 0}+ <div class="mb-4 flex justify-end">+ <EnvironmentDestinationSelect+ bind:value={() => environmentId, (value) => (picked = value)}+ permission="podman:autoupdate"+ environments={podmanEnvs}+ />+ </div>+ {/if}{#if mode === 'unavailable'}<EmptyStateicon={UpdateIcon}@@ -64,34 +76,27 @@/>{:else}<div class="space-y-4">- <Card.Root>- <Card.Header>- <Card.Title>{m.podman_autoupdate_run()}</Card.Title>- <Card.Description>- {mode === 'rest' ? m.podman_autoupdate_rest_description() : m.podman_autoupdate_systemd_description()}- </Card.Description>- </Card.Header>- <Card.Content>- <div class="space-y-4">- {#if mode === 'rest'}- <LabeledSwitch- id="autoupdate-dry-run"- label={m.podman_autoupdate_dry_run()}- description={m.podman_autoupdate_dry_run_description()}- bind:checked={dryRun}- />- <LabeledSwitch id="autoupdate-rollback" label={m.podman_autoupdate_rollback()} bind:checked={rollback} />- {/if}- <ArcaneButton- action="update"- customLabel={m.podman_autoupdate_run()}- onclick={handleRun}- loading={running}- disabled={running}- />- </div>- </Card.Content>- </Card.Root>+ <p class="text-sm text-muted-foreground">+ {mode === 'rest' ? m.podman_autoupdate_rest_description() : m.podman_autoupdate_systemd_description()}+ </p>+ <div class="flex flex-wrap items-center gap-x-6 gap-y-3">+ {#if mode === 'rest'}+ <LabeledSwitch+ id="autoupdate-dry-run"+ label={m.podman_autoupdate_dry_run()}+ description={m.podman_autoupdate_dry_run_description()}+ bind:checked={dryRun}+ />+ <LabeledSwitch id="autoupdate-rollback" label={m.podman_autoupdate_rollback()} bind:checked={rollback} />+ {/if}+ <ArcaneButton+ action="update"+ customLabel={m.podman_autoupdate_run()}+ onclick={handleRun}+ loading={running}+ disabled={running}+ />+ </div>{#if result}{#if result.unit}diff --git a/frontend/src/routes/(app)/podman/kube/+page.svelte b/frontend/src/routes/(app)/podman/kube/+page.svelteindex 10f643643..a7c6d285c 100644--- a/frontend/src/routes/(app)/podman/kube/+page.svelte+++ b/frontend/src/routes/(app)/podman/kube/+page.svelte@@ -1,67 +1,127 @@<script lang="ts">- import { useQueryClient } from '@tanstack/svelte-query';+ import { createQuery, useQueryClient } from '@tanstack/svelte-query';import { toast } from 'svelte-sonner';import { ArcaneButton } from '#lib/components/arcane-button/index.js';import CodePanel from '#lib/components/code-panel.svelte';import { openConfirmDialog } from '#lib/components/confirm-dialog/index.js';+ import EnvironmentDestinationSelect from '#lib/components/form/environment-destination-select.svelte';import LabeledSwitch from '#lib/components/form/labeled-switch.svelte';+ import SearchableSelect from '#lib/components/form/searchable-select.svelte';import SelectWithLabel from '#lib/components/form/select-with-label.svelte';- import TextInputWithLabel from '#lib/components/form/text-input-with-label.svelte';- import * as Card from '#lib/components/ui/card/index.js';- import { useEnvironmentRefresh } from '#lib/hooks/use-environment-refresh.svelte.js';- import { LayersIcon } from '#lib/icons/index.js';- import { ResourcePageLayout } from '#lib/layouts/index.js';+ import EmptyState from '#lib/components/states/empty-state.svelte';+ import { Badge } from '#lib/components/ui/badge/index.js';+ import * as ButtonGroup from '#lib/components/ui/button-group/index.js';+ import { Checkbox } from '#lib/components/ui/checkbox/index.js';+ import * as DropdownMenu from '#lib/components/ui/dropdown-menu/index.js';+ import { Label } from '#lib/components/ui/label/index.js';+ import { ResponsiveDialog } from '#lib/components/ui/responsive-dialog/index.js';+ import { ArrowDownIcon, ArrowLeftIcon, CloseIcon, LayersIcon, TerminalIcon, TrashIcon } from '#lib/icons/index.js';import { m } from '#lib/paraglide/messages.js';import { queryKeys } from '#lib/query/query-keys.js';+ import { containerService } from '#lib/services/container-service.js';+ import { networkService } from '#lib/services/network-service.js';import { podmanService } from '#lib/services/podman-service.js';- import { environmentStore } from '#lib/stores/environment.store.svelte.js';+ import { volumeService } from '#lib/services/volume-service.js';import { PODMAN_KUBE_GENERATE_TYPES, type PodmanKubeGenerateType } from '#lib/types/podman.js';import { handleApiResultWithCallbacks } from '#lib/utils/api.js';- import { parseList } from '#lib/utils/form-parsers.js';+ import { templateBtnClass } from '#lib/utils/compose-flow.js';+ import { destinationEnvironmentId } from '#lib/utils/environments.js';import { withOccurrenceKeys } from '#lib/utils/formatting.js';+ import { shownPodmanEnvironments } from '#lib/utils/podman.js';import { tryCatch } from '#lib/utils/try-catch.js';+ let { data } = $props();const queryClient = useQueryClient();+ const podmanEnvs = $derived(shownPodmanEnvironments(data.podmanStatuses));+ let picked = $state('');+ const environmentId = $derived(destinationEnvironmentId(picked, 'podman:kube', podmanEnvs));+let yaml = $state('');let start = $state(true);let replace = $state(false);- let networks = $state('');- let generateNames = $state('');+ let networks = $state<string[]>([]);+ let generateOpen = $state(false);+ let generateNames = $state<string[]>([]);let generateType = $state<PodmanKubeGenerateType>('pod');let generateService = $state(false);- let generated = $state('');let resultLines = $state<string[]>([]);let loading = $state({ play: false, down: false, generate: false });- let session = 0;- useEnvironmentRefresh(() => {- session += 1;+ type PickerItem = { value: string; label: string; hint?: string };++ const listAll = { pagination: { page: 1, limit: -1 } };++ const networksQuery = createQuery(() => ({+ queryKey: [...queryKeys.podman.environment(environmentId), 'kube', 'networks'],+ queryFn: () => networkService.getNetworksForEnvironment(environmentId, listAll),+ enabled: podmanEnvs.length > 0+ }));++ const networkItems = $derived<PickerItem[]>(+ (networksQuery.data?.data ?? []).map((network) => ({ value: network.name, label: network.name }))+ );++ const generateSourcesQuery = createQuery(() => ({+ queryKey: [...queryKeys.podman.environment(environmentId), 'kube', 'generate-sources'],+ queryFn: async () => {+ const [pods, containers, volumes] = await Promise.all([+ podmanService.getPods(environmentId, listAll),+ containerService.getContainersForEnvironment(environmentId, listAll),+ volumeService.getVolumesForEnvironment(environmentId, listAll)+ ]);+ return [+ ...pods.data.map((pod) => ({ value: pod.name, label: pod.name, hint: m.podman_pod() })),+ ...containers.data.map((container) => {+ const name = container.names[0]?.replace(/^\//, '') ?? container.id;+ return { value: name, label: name, hint: m.resource_container() };+ }),+ ...volumes.data.map((volume) => ({ value: volume.name, label: volume.name, hint: m.resource_volume() }))+ ].filter((item, index, all) => all.findIndex((other) => other.value === item.value) === index);+ },+ enabled: generateOpen+ }));++ $effect(() => {+ void environmentId;resultLines = [];- generated = '';+ networks = [];+ generateNames = [];});- async function invalidatePods() {- await queryClient.invalidateQueries({ queryKey: queryKeys.podman.environment(environmentStore.selected?.id ?? '0') });+ function toggleValue(selected: string[], value: string) {+ return selected.includes(value) ? selected.filter((entry) => entry !== value) : [...selected, value];+ }++ async function invalidatePods(targetId: string) {+ await Promise.all([+ queryClient.invalidateQueries({ queryKey: queryKeys.podman.environment(targetId) }),+ queryClient.invalidateQueries({ queryKey: ['podman-pods'] })+ ]);}async function handlePlay() {- const started = session;if (!yaml.trim()) {toast.error(m.common_field_required({ field: m.podman_kube_yaml() }));return;}- const networkList = parseList(networks);+ const targetId = environmentId;loading.play = true;await handleApiResultWithCallbacks({result: await tryCatch(- podmanService.kubePlay({ yaml, start, replace, networks: networkList.length > 0 ? networkList : undefined })+ podmanService.kubePlay({ yaml, start, replace, networks: networks.length > 0 ? networks : undefined }, targetId)),message: m.podman_kube_play_failed(),setLoadingState: (value) => (loading.play = value),onSuccess: async (report) => {- if (started !== session) return;+ if ((report.pods ?? []).some((pod) => (pod.containerErrors ?? []).length > 0)) {+ toast.error(m.podman_kube_play_partial({ count: report.pods?.length ?? 0 }));+ } else {+ toast.success(m.podman_kube_play_success({ count: report.pods?.length ?? 0 }));+ }+ await invalidatePods(targetId);+ if (targetId !== environmentId) return;resultLines = [...(report.pods ?? []).flatMap((pod) => [m.podman_kube_pod_created({ id: pod.id.slice(0, 12), count: pod.containers?.length ?? 0 }),@@ -69,23 +129,16 @@]),...(report.volumes ?? []).map((volume) => volume.name)];- if ((report.pods ?? []).some((pod) => (pod.containerErrors ?? []).length > 0)) {- toast.error(m.podman_kube_play_partial({ count: report.pods?.length ?? 0 }));- } else {- toast.success(m.podman_kube_play_success({ count: report.pods?.length ?? 0 }));- }- await invalidatePods();}});}- async function handleDown() {+ function handleDown() {if (!yaml.trim()) {toast.error(m.common_field_required({ field: m.podman_kube_yaml() }));return;}- const started = session;- const environmentId = await environmentStore.getCurrentEnvironmentId();+ const targetId = environmentId;const downYaml = yaml;openConfirmDialog({title: m.common_down(),@@ -95,19 +148,16 @@label: m.common_down(),destructive: true,action: async (checkboxStates) => {- if (started !== session) return;loading.down = true;await handleApiResultWithCallbacks({- result: await tryCatch(- podmanService.kubeDown({ yaml: downYaml, force: checkboxStates['force'] === true }, environmentId)- ),+ result: await tryCatch(podmanService.kubeDown({ yaml: downYaml, force: checkboxStates['force'] === true }, targetId)),message: m.podman_kube_down_failed(),setLoadingState: (value) => (loading.down = value),onSuccess: async (report) => {- if (started !== session) return;- resultLines = (report.rmReport ?? []).map((pod) => m.podman_kube_pod_removed({ id: pod.id.slice(0, 12) }));toast.success(m.podman_kube_down_success({ count: report.rmReport?.length ?? 0 }));- await invalidatePods();+ await invalidatePods(targetId);+ if (targetId !== environmentId) return;+ resultLines = (report.rmReport ?? []).map((pod) => m.podman_kube_pod_removed({ id: pod.id.slice(0, 12) }));}});}@@ -116,125 +166,202 @@}async function handleGenerate() {- const started = session;- const names = parseList(generateNames);- if (names.length === 0) {+ if (generateNames.length === 0) {toast.error(m.common_field_required({ field: m.podman_kube_generate_names() }));return;}+ const targetId = environmentId;loading.generate = true;await handleApiResultWithCallbacks({- result: await tryCatch(podmanService.kubeGenerate({ names, type: generateType, service: generateService || undefined })),+ result: await tryCatch(+ podmanService.kubeGenerate({ names: generateNames, type: generateType, service: generateService || undefined }, targetId)+ ),message: m.podman_kube_generate_failed(),setLoadingState: (value) => (loading.generate = value),onSuccess: (response) => {- if (started !== session) return;- generated = response.yaml;+ if (targetId !== environmentId) return;+ yaml = response.yaml;+ generateOpen = false;}});}</script>-<ResourcePageLayout title={m.podman_kube_title()} subtitle={m.podman_kube_subtitle()} icon={LayersIcon} environmentPicker>- {#snippet mainContent()}- <div class="grid gap-4 xl:grid-cols-2">- <div class="space-y-4">- <CodePanel title={m.podman_kube_yaml()} language="yaml" validationMode="none" bind:value={yaml} autoHeight />- <Card.Root>- <Card.Header>- <Card.Title>{m.podman_kube_play()}</Card.Title>- <Card.Description>{m.podman_kube_play_description()}</Card.Description>- </Card.Header>- <Card.Content>- <div class="space-y-4">- <LabeledSwitch id="kube-start" label={m.podman_kube_start()} bind:checked={start} />- <LabeledSwitch id="kube-replace" label={m.podman_kube_replace()} bind:checked={replace} />- <TextInputWithLabel- id="kube-networks"- label={m.resource_networks_cap()}- description={m.podman_comma_separated()}- bind:value={networks}- />- <div class="flex flex-wrap gap-2">- <ArcaneButton- action="deploy"- customLabel={m.podman_kube_play()}- onclick={handlePlay}- loading={loading.play}- disabled={loading.play || loading.down}- />- <ArcaneButton- action="remove"- customLabel={m.common_down()}- onclick={handleDown}- loading={loading.down}- disabled={loading.play || loading.down}- />- </div>- {#if resultLines.length > 0}- <ul class="space-y-1 rounded-lg border p-3 font-mono text-xs">- {#each withOccurrenceKeys(resultLines) as line (line.key)}- <li>{line.value}</li>- {/each}- </ul>- {/if}- </div>- </Card.Content>- </Card.Root>+{#snippet multiSelect(+ id: string,+ items: PickerItem[],+ selected: string[],+ isLoading: boolean,+ setSelected: (value: string[]) => void+)}+ <div class="flex min-w-0 flex-wrap items-center gap-1.5">+ <SearchableSelect+ triggerId={id}+ items={items.map((item) => ({ ...item, selected: selected.includes(item.value) }))}+ closeOnSelect={false}+ {isLoading}+ onSelect={(value) => setSelected(toggleValue(selected, value))}+ class="min-w-48"+ />+ {#each selected as name (name)}+ <Badge variant="secondary" mono>+ {name}+ <button+ type="button"+ aria-label={m.common_remove()}+ onclick={() => setSelected(selected.filter((entry) => entry !== name))}+ >+ <CloseIcon class="size-3" />+ </button>+ </Badge>+ {/each}+ </div>+{/snippet}++<div class="flex h-full min-h-0 flex-col bg-background">+ <div class="sticky top-0 mb-2 border-b">+ <div class="mx-auto flex h-16 max-w-full items-center justify-between gap-4 px-6">+ <div class="flex items-center gap-4">+ <ArcaneButton+ action="base"+ tone="ghost"+ size="sm"+ href="/podman/pods"+ class="gap-2 bg-transparent"+ icon={ArrowLeftIcon}+ customLabel={m.common_back()}+ />+ <div class="hidden h-4 w-px bg-border sm:block"></div>+ <div class="hidden items-center gap-2 sm:flex">+ <LayersIcon class="size-4 text-muted-foreground" />+ <h1 class="text-sm font-semibold">{m.podman_kube_title()}</h1>+ </div></div>- <div class="space-y-4">- <Card.Root>- <Card.Header>- <Card.Title>{m.podman_kube_generate()}</Card.Title>- <Card.Description>{m.podman_kube_generate_description()}</Card.Description>- </Card.Header>- <Card.Content>- <div class="space-y-4">- <TextInputWithLabel- id="kube-generate-names"- label={m.podman_kube_generate_names()}- description={m.podman_comma_separated()}- bind:value={generateNames}- />- <SelectWithLabel- id="kube-generate-type"- label={m.common_type()}- bind:value={() => generateType, (value) => (generateType = value as PodmanKubeGenerateType)}- options={PODMAN_KUBE_GENERATE_TYPES.map((type) => ({ label: type, value: type }))}- />- <LabeledSwitch id="kube-generate-service" label={m.podman_kube_generate_service()} bind:checked={generateService} />- <div class="flex flex-wrap gap-2">- <ArcaneButton- action="create"- customLabel={m.podman_kube_generate()}- onclick={handleGenerate}- loading={loading.generate}- disabled={loading.generate}- />- {#if generated}+ {#if podmanEnvs.length > 0}+ <div class="flex items-center gap-2">+ <EnvironmentDestinationSelect+ bind:value={() => environmentId, (value) => (picked = value)}+ permission="podman:kube"+ environments={podmanEnvs}+ />+ <ButtonGroup.Root>+ <ArcaneButton+ action="deploy"+ tone="ghost"+ class={`${templateBtnClass} gap-2 rounded-r-none`}+ customLabel={m.podman_kube_play()}+ onclick={handlePlay}+ loading={loading.play}+ disabled={loading.play || loading.down || !yaml.trim()}+ />+ <DropdownMenu.Root>+ <DropdownMenu.Trigger>+ {#snippet child({ props })}<ArcaneButton+ {...props}action="base"- tone="outline"- customLabel={m.podman_kube_use_generated()}- onclick={() => (yaml = generated)}+ tone="ghost"+ class={`${templateBtnClass} -ml-px rounded-l-none px-2`}+ icon={ArrowDownIcon}/>- {/if}- </div>- </div>- </Card.Content>- </Card.Root>- {#if generated}- <CodePanel- title={m.podman_kube_generated()}- language="yaml"- validationMode="none"- value={generated}- readOnly- autoHeight- />- {/if}+ {/snippet}+ </DropdownMenu.Trigger>+ <DropdownMenu.Content align="end" class="min-w-55">+ <DropdownMenu.Group>+ <DropdownMenu.Item disabled={loading.play || loading.down} onclick={() => (generateOpen = true)}>+ <TerminalIcon class="size-4" />+ {m.podman_kube_generate()}+ </DropdownMenu.Item>+ <DropdownMenu.Separator />+ <DropdownMenu.Item disabled={loading.play || loading.down || !yaml.trim()} onclick={handleDown}>+ <TrashIcon class="size-4" />+ {m.common_down()}+ </DropdownMenu.Item>+ </DropdownMenu.Group>+ </DropdownMenu.Content>+ </DropdownMenu.Root>+ </ButtonGroup.Root>+ </div>+ {/if}+ </div>+ </div>++ {#if podmanEnvs.length === 0}+ <div class="mx-auto w-full max-w-full px-6 py-6">+ <EmptyState icon={LayersIcon} title={m.common_unavailable()} description={m.podman_environments_unavailable()} />+ </div>+ {:else}+ <div class="flex min-h-0 flex-1 flex-col gap-3">+ <div class="flex shrink-0 flex-wrap items-center gap-x-6 gap-y-3">+ <div class="flex items-center gap-2">+ <Checkbox id="kube-start" checked={start} onCheckedChange={(checked) => (start = checked === true)} />+ <Label for="kube-start" weight="normal">{m.podman_kube_start()}</Label>+ </div>+ <div class="flex items-center gap-2">+ <Checkbox id="kube-replace" checked={replace} onCheckedChange={(checked) => (replace = checked === true)} />+ <Label for="kube-replace" weight="normal">{m.podman_kube_replace()}</Label>+ </div>+ <div class="flex min-w-72 items-center gap-2">+ <Label for="kube-networks" weight="normal" class="shrink-0">{m.resource_networks_cap()}</Label>+ {@render multiSelect('kube-networks', networkItems, networks, networksQuery.isLoading, (value) => (networks = value))}+ </div>+ </div>++ {#if resultLines.length > 0}+ <ul class="shrink-0 space-y-1 font-mono text-xs text-muted-foreground">+ {#each withOccurrenceKeys(resultLines) as line (line.key)}+ <li>{line.value}</li>+ {/each}+ </ul>+ {/if}++ <div class="flex min-h-0 flex-1 flex-col">+ <CodePanel+ open={true}+ title={m.podman_kube_yaml()}+ language="yaml"+ validationMode="none"+ bind:value={yaml}+ fileId="podman:kube:yaml"+ /></div></div>+ {/if}+</div>++<ResponsiveDialog+ bind:open={generateOpen}+ title={m.podman_kube_generate()}+ description={m.podman_kube_generate_description()}+ contentClass="sm:max-w-lg"+>+ <div class="space-y-4">+ <div class="space-y-2">+ <Label for="kube-generate-names">{m.podman_kube_generate_names()}</Label>+ {@render multiSelect(+ 'kube-generate-names',+ generateSourcesQuery.data ?? [],+ generateNames,+ generateSourcesQuery.isLoading,+ (value) => (generateNames = value)+ )}+ </div>+ <SelectWithLabel+ id="kube-generate-type"+ label={m.common_type()}+ bind:value={() => generateType, (value) => (generateType = value as PodmanKubeGenerateType)}+ options={PODMAN_KUBE_GENERATE_TYPES.map((type) => ({ label: type, value: type }))}+ />+ <LabeledSwitch id="kube-generate-service" label={m.podman_kube_generate_service()} bind:checked={generateService} />+ </div>+ {#snippet footer()}+ <ArcaneButton+ action="create"+ customLabel={m.podman_kube_generate()}+ onclick={handleGenerate}+ loading={loading.generate}+ disabled={loading.generate || generateNames.length === 0}+ />{/snippet}-</ResourcePageLayout>+</ResponsiveDialog>diff --git a/frontend/src/routes/(app)/podman/pods/[id]/+page.svelte b/frontend/src/routes/(app)/podman/pods/[id]/+page.svelteindex c4f644c5e..8596f71dc 100644--- a/frontend/src/routes/(app)/podman/pods/[id]/+page.svelte+++ b/frontend/src/routes/(app)/podman/pods/[id]/+page.svelte@@ -2,24 +2,39 @@import { goto } from '$app/navigation';import { createQuery, useQueryClient } from '@tanstack/svelte-query';+ import ActionButtonGroup from '#lib/components/action-button-group/action-button-group.svelte';import type { ActionButton } from '#lib/components/action-button-group/types.js';- import { DetailSection, KeyValueCard, KeyValueGrid } from '#lib/components/resource-detail/index.js';- import EmptyState from '#lib/components/states/empty-state.svelte';+ import EnvironmentCell from '#lib/components/arcane-table/cells/environment-cell.svelte';+ import ResourceNotFound from '#lib/components/resource-not-found.svelte';import * as Alert from '#lib/components/ui/alert/index.js';import { Badge } from '#lib/components/ui/badge/index.js';- import * as Table from '#lib/components/ui/table/index.js';- import MonoCell from '#lib/components/vulnerability/mono-cell.svelte';- import { AlertTriangleIcon, ContainersIcon, InfoIcon, LayoutListIcon, StatsIcon } from '#lib/icons/index.js';- import { ResourceDetailLayout } from '#lib/layouts/index.js';+ import * as Tabs from '#lib/components/ui/tabs/index.js';+ import { useUrlTab } from '#lib/hooks/use-url-tab.svelte.js';+ import {+ AlertTriangleIcon,+ ContainersIcon,+ InfoIcon,+ InspectIcon,+ LayoutListIcon,+ NetworksIcon,+ StatsIcon,+ CpuIcon+ } from '#lib/icons/index.js';+ import TabbedPageLayout from '#lib/layouts/tabbed-page-layout.svelte';import { m } from '#lib/paraglide/messages.js';import { queryKeys } from '#lib/query/query-keys.js';import { podmanService, type PodmanPodAction } from '#lib/services/podman-service.js';import { extractApiErrorMessage } from '#lib/utils/api.js';import { hasPermission } from '#lib/utils/auth.js';- import { environmentHref } from '#lib/utils/environments.js';- import { formatDateTime, withOccurrenceKeys } from '#lib/utils/formatting.js';import { podmanStateVariant } from '#lib/utils/podman.js';+ import PodContainers from '../components/pod-containers.svelte';+ import PodInspect from '../components/pod-inspect.svelte';+ import PodNetwork from '../components/pod-network.svelte';+ import PodOverview from '../components/pod-overview.svelte';+ import PodProcesses from '../components/pod-processes.svelte';+ import PodResources from '../components/pod-resources.svelte';+ import PodStats from '../components/pod-stats.svelte';import { confirmRemovePod, podActionLabels, runPodAction } from '../pod-actions';let { data } = $props();@@ -34,26 +49,9 @@retry: false}));const pod = $derived(podQuery.data ?? data.pod);- const members = $derived(pod.containers ?? []);const isRunning = $derived(pod.state.toLowerCase() === 'running');const canManage = $derived(hasPermission('podman:pods', envId));- const statsQuery = createQuery(() => ({- queryKey: queryKeys.podman.podStats(envId, pod.name),- queryFn: () => podmanService.getPodStats([pod.name], envId),- enabled: isRunning,- refetchInterval: 5000,- retry: false- }));-- const topQuery = createQuery(() => ({- queryKey: queryKeys.podman.podTop(envId, pod.id),- queryFn: () => podmanService.getPodTop(pod.id, envId),- enabled: isRunning,- refetchInterval: 5000,- retry: false- }));-let pendingAction = $state<PodmanPodAction | null>(null);async function refresh() {@@ -94,149 +92,93 @@: []);- const portBindings = $derived(- Object.entries(pod.infraConfig?.portBindings ?? {}).flatMap(([containerPort, bindings]) =>- (bindings ?? []).map((binding) => `${binding.hostIp ? `${binding.hostIp}:` : ''}${binding.hostPort} → ${containerPort}`)- )- );+ const urlTab = useUrlTab({+ tabs: () => [+ { value: 'overview', label: m.common_overview(), icon: InfoIcon },+ { value: 'containers', label: m.containers(), icon: ContainersIcon },+ { value: 'network', label: m.resource_networks_cap(), icon: NetworksIcon },+ { value: 'resources', label: m.common_resources(), icon: CpuIcon },+ { value: 'stats', label: m.containers_nav_metrics(), icon: StatsIcon },+ { value: 'processes', label: m.containers_processes_title(), icon: LayoutListIcon },+ { value: 'inspect', label: m.common_inspect(), icon: InspectIcon }+ ],+ defaultTab: () => 'overview'+ });</script>-<ResourceDetailLayout- backUrl="/podman/pods"- backLabel={m.podman_pods_title()}- title={pod.name}- subtitle={`${m.common_id()}: ${pod.id.slice(0, 12)}`}- {actions}->- {#snippet badges()}- <Badge variant={podmanStateVariant(pod.state)} minWidth="20">{pod.state}</Badge>- {/snippet}-- {#if podQuery.isError}- <Alert.Root variant="destructive">- <AlertTriangleIcon class="size-4" />- <Alert.Title>{m.podman_updates_paused()}</Alert.Title>- <Alert.Description>{extractApiErrorMessage(podQuery.error)}</Alert.Description>- </Alert.Root>- {/if}-- <DetailSection title={m.common_overview()} icon={InfoIcon}>- <KeyValueGrid>- <KeyValueCard label={m.common_id()}>{pod.id}</KeyValueCard>- <KeyValueCard label={m.common_created()}>{formatDateTime(pod.created) || pod.created}</KeyValueCard>- {#if pod.hostname}- <KeyValueCard label={m.hostname()}>{pod.hostname}</KeyValueCard>- {/if}- <KeyValueCard label={m.podman_pod_infra()}>{pod.createInfra ? m.common_yes() : m.common_no()}</KeyValueCard>- {#if pod.sharedNamespaces?.length}- <KeyValueCard label={m.podman_pod_shared_namespaces()}>{pod.sharedNamespaces.join(', ')}</KeyValueCard>- {/if}- {#if pod.infraConfig?.networks?.length}- <KeyValueCard label={m.resource_networks_cap()}>{pod.infraConfig.networks.join(', ')}</KeyValueCard>+{#if pod}+ <TabbedPageLayout+ backUrl="/podman/pods"+ backLabel={m.common_back()}+ tabItems={urlTab.items}+ selectedTab={urlTab.value}+ onTabChange={urlTab.select}+ >+ {#snippet headerInfo()}+ <div class="flex flex-wrap items-center gap-x-2 gap-y-1">+ <h1 class="max-w-40 min-w-0 truncate text-lg font-semibold sm:max-w-56 md:max-w-72 lg:max-w-88" title={pod.name}>+ {pod.name}+ </h1>+ <Badge variant={podmanStateVariant(pod.state)} minWidth="20">{pod.state}</Badge>+ <EnvironmentCell value={envId} />+ </div>+ {/snippet}++ {#snippet headerActions()}+ {#if actions.length > 0}+ <ActionButtonGroup buttons={actions} />{/if}- {#if portBindings.length > 0}- <KeyValueCard label={m.common_ports()}>{portBindings.join(', ')}</KeyValueCard>+ {/snippet}++ {#snippet subHeader()}+ {#if podQuery.isError}+ <Alert.Root variant="destructive" class="mt-3">+ <AlertTriangleIcon class="size-4" />+ <Alert.Title>{m.podman_updates_paused()}</Alert.Title>+ <Alert.Description>{extractApiErrorMessage(podQuery.error)}</Alert.Description>+ </Alert.Root>{/if}- </KeyValueGrid>- </DetailSection>-- <DetailSection title={m.containers()} icon={ContainersIcon}>- {#if members.length === 0}- <EmptyState icon={ContainersIcon} title={m.podman_pod_no_containers()} variant="plain" />- {:else}- <div class="divide-y rounded-lg border">- {#each members as member (member.id)}- <div class="flex items-center justify-between gap-3 p-3">- <a class="min-w-0 truncate font-medium hover:underline" href={environmentHref(`/containers/${member.id}`, envId)}- >{member.name}</a- >- <div class="flex items-center gap-2">- {#if member.id === pod.infraContainerId}- <Badge variant="gray" size="sm">{m.podman_pod_infra()}</Badge>- {/if}- <Badge variant={podmanStateVariant(member.state)} size="sm">{member.state}</Badge>- </div>- </div>- {/each}- </div>- {/if}- </DetailSection>-- <DetailSection title={m.containers_resource_metrics()} icon={StatsIcon}>- {#if !isRunning}- <EmptyState icon={StatsIcon} title={m.common_unavailable()} description={m.podman_pod_not_running()} variant="plain" />- {:else if statsQuery.isError}- <EmptyState- icon={StatsIcon}- title={m.common_load_failed({ resource: m.containers_resource_metrics() })}- description={extractApiErrorMessage(statsQuery.error)}- actionLabel={m.common_retry()}- onAction={() => statsQuery.refetch()}- variant="plain"- />- {:else}- <div class="overflow-x-auto rounded-lg border">- <Table.Root aria-label={m.containers_resource_metrics()}>- <Table.Header>- <Table.Row>- <Table.Head scope="col">{m.common_name()}</Table.Head>- <Table.Head scope="col">{m.cpu_usage()}</Table.Head>- <Table.Head scope="col">{m.memory_usage()}</Table.Head>- <Table.Head scope="col">{m.containers_block_io()}</Table.Head>- <Table.Head scope="col">{m.containers_network_io()}</Table.Head>- <Table.Head scope="col">{m.podman_pids()}</Table.Head>- </Table.Row>- </Table.Header>- <Table.Body>- {#each statsQuery.data ?? [] as stat (stat.cid)}- <Table.Row>- <Table.Cell>{stat.name}</Table.Cell>- <Table.Cell><MonoCell value={stat.cpu} /></Table.Cell>- <Table.Cell><MonoCell value={stat.memUsage} /></Table.Cell>- <Table.Cell><MonoCell value={stat.blockIo} /></Table.Cell>- <Table.Cell><MonoCell value={stat.netIo} /></Table.Cell>- <Table.Cell><MonoCell value={stat.pids} /></Table.Cell>- </Table.Row>- {/each}- </Table.Body>- </Table.Root>- </div>- {/if}- </DetailSection>-- <DetailSection title={m.containers_processes_title()} icon={LayoutListIcon}>- {#if !isRunning}- <EmptyState icon={LayoutListIcon} title={m.common_unavailable()} description={m.podman_pod_not_running()} variant="plain" />- {:else if topQuery.isError}- <EmptyState- icon={LayoutListIcon}- title={m.common_load_failed({ resource: m.containers_processes_title() })}- description={extractApiErrorMessage(topQuery.error)}- actionLabel={m.common_retry()}- onAction={() => topQuery.refetch()}- variant="plain"- />- {:else if topQuery.data}- <div class="overflow-x-auto rounded-lg border">- <Table.Root aria-label={m.containers_processes_title()}>- <Table.Header>- <Table.Row>- {#each withOccurrenceKeys(topQuery.data.titles) as title (title.key)}- <Table.Head scope="col">{title.value}</Table.Head>- {/each}- </Table.Row>- </Table.Header>- <Table.Body>- {#each topQuery.data.processes ?? [] as cells (JSON.stringify(cells))}- <Table.Row>- {#each withOccurrenceKeys(cells) as cell (cell.key)}- <Table.Cell><MonoCell value={cell.value} /></Table.Cell>- {/each}- </Table.Row>- {/each}- </Table.Body>- </Table.Root>- </div>- {/if}- </DetailSection>-</ResourceDetailLayout>+ {/snippet}++ {#snippet tabContent(activeTab)}+ <Tabs.Content value="overview" class="h-full">+ <PodOverview {pod} />+ </Tabs.Content>++ <Tabs.Content value="containers" class="h-full">+ <PodContainers {pod} {envId} />+ </Tabs.Content>++ <Tabs.Content value="network" class="h-full">+ <PodNetwork infraConfig={pod.infraConfig} />+ </Tabs.Content>++ <Tabs.Content value="resources" class="h-full">+ <PodResources {pod} />+ </Tabs.Content>++ <Tabs.Content value="stats" class="h-full">+ {#if activeTab === 'stats'}+ <PodStats podName={pod.name} {envId} {isRunning} />+ {/if}+ </Tabs.Content>++ <Tabs.Content value="processes" class="h-full">+ {#if activeTab === 'processes'}+ <PodProcesses podId={pod.id} {envId} {isRunning} />+ {/if}+ </Tabs.Content>++ <Tabs.Content value="inspect" class="h-full">+ <PodInspect {pod} />+ </Tabs.Content>+ {/snippet}+ </TabbedPageLayout>+{:else}+ <ResourceNotFound+ resource={m.podman_pod()}+ resourceListTitle={m.podman_pods_title()}+ backHref="/podman/pods"+ onRetry={() => podQuery.refetch()}+ />+{/if}diff --git a/frontend/src/routes/(app)/podman/pods/components/pod-containers.svelte b/frontend/src/routes/(app)/podman/pods/components/pod-containers.sveltenew file mode 100644index 000000000..6c15cc2fe--- /dev/null+++ b/frontend/src/routes/(app)/podman/pods/components/pod-containers.svelte@@ -0,0 +1,78 @@+<script lang="ts">+ import { PortBadge } from '#lib/components/badges/index.js';+ import EmptyState from '#lib/components/states/empty-state.svelte';+ import { Badge } from '#lib/components/ui/badge/index.js';+ import * as Card from '#lib/components/ui/card/index.js';+ import * as Table from '#lib/components/ui/table/index.js';+ import { ContainersIcon } from '#lib/icons/index.js';+ import { m } from '#lib/paraglide/messages.js';+ import type { PodmanPodInspect } from '#lib/types/podman.js';+ import { environmentHref } from '#lib/utils/environments.js';+ import { podmanStateVariant } from '#lib/utils/podman.js';++ interface Props {+ pod: PodmanPodInspect;+ envId: string;+ }++ let { pod, envId }: Props = $props();++ const members = $derived(pod.containers ?? []);+</script>++<Card.Root>+ <Card.Header icon={ContainersIcon}>+ <Card.Title>+ <h2>{m.containers()}</h2>+ </Card.Title>+ </Card.Header>+ {#if members.length === 0}+ <EmptyState icon={ContainersIcon} title={m.podman_pod_no_containers()} />+ {:else}+ <div class="overflow-x-auto rounded-b-lg">+ <Table.Root aria-label={m.containers()}>+ <Table.Header>+ <Table.Row>+ <Table.Head scope="col">{m.common_name()}</Table.Head>+ <Table.Head scope="col">{m.common_image()}</Table.Head>+ <Table.Head scope="col">{m.common_state()}</Table.Head>+ <Table.Head scope="col">{m.common_status()}</Table.Head>+ <Table.Head scope="col">{m.common_ports()}</Table.Head>+ </Table.Row>+ </Table.Header>+ <Table.Body>+ {#each members as member (member.id)}+ <Table.Row>+ <Table.Cell>+ <div class="flex items-center gap-2">+ <a+ class="min-w-0 truncate font-medium hover:underline"+ href={environmentHref(`/containers/${member.id}`, envId)}>{member.name}</a+ >+ {#if member.isInfra || member.id === pod.infraContainerId}+ <Badge variant="gray" size="sm">{m.podman_pod_infra()}</Badge>+ {/if}+ </div>+ </Table.Cell>+ <Table.Cell><span class="font-mono text-xs break-all">{member.image ?? ''}</span></Table.Cell>+ <Table.Cell>+ <Badge variant={podmanStateVariant(member.state)} size="sm">{member.state}</Badge>+ </Table.Cell>+ <Table.Cell><span class="text-muted-foreground">{member.status ?? ''}</span></Table.Cell>+ <Table.Cell>+ <PortBadge+ ports={(member.ports ?? []).map((port) => ({+ ip: port.hostIp,+ privatePort: port.containerPort,+ publicPort: port.hostPort,+ type: port.protocol || 'tcp'+ }))}+ />+ </Table.Cell>+ </Table.Row>+ {/each}+ </Table.Body>+ </Table.Root>+ </div>+ {/if}+</Card.Root>diff --git a/frontend/src/routes/(app)/podman/pods/components/pod-inspect.svelte b/frontend/src/routes/(app)/podman/pods/components/pod-inspect.sveltenew file mode 100644index 000000000..ff294e70e--- /dev/null+++ b/frontend/src/routes/(app)/podman/pods/components/pod-inspect.svelte@@ -0,0 +1,34 @@+<script lang="ts">+ import * as Card from '#lib/components/ui/card/index.js';+ import { CopyButton } from '#lib/components/ui/copy-button/index.js';+ import { CodeIcon } from '#lib/icons/index.js';+ import { m } from '#lib/paraglide/messages.js';+ import type { PodmanPodInspect } from '#lib/types/podman.js';++ interface Props {+ pod: PodmanPodInspect;+ }++ let { pod }: Props = $props();++ const json = $derived(JSON.stringify(pod, null, 2));+</script>++<Card.Root>+ <Card.Header icon={CodeIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.containers_inspect_title()}</h2>+ </Card.Title>+ <Card.Description>{m.podman_pod_inspect_description()}</Card.Description>+ </div>+ <div class="ml-auto">+ <CopyButton text={json} variant="outline" size="default">+ {m.common_copy_json()}+ </CopyButton>+ </div>+ </Card.Header>+ <div>+ <pre class="overflow-auto rounded-b-lg bg-muted/40 p-4 font-mono text-xs leading-relaxed"><code>{json}</code></pre>+ </div>+</Card.Root>diff --git a/frontend/src/routes/(app)/podman/pods/components/pod-network.svelte b/frontend/src/routes/(app)/podman/pods/components/pod-network.sveltenew file mode 100644index 000000000..10ff8c410--- /dev/null+++ b/frontend/src/routes/(app)/podman/pods/components/pod-network.svelte@@ -0,0 +1,90 @@+<script lang="ts">+ import { DetailSection, KeyValueCard, KeyValueGrid } from '#lib/components/resource-detail/index.js';+ import EmptyState from '#lib/components/states/empty-state.svelte';+ import { GlobeIcon, NetworksIcon, SettingsIcon } from '#lib/icons/index.js';+ import { m } from '#lib/paraglide/messages.js';+ import type { PodmanPodInfraConfig } from '#lib/types/podman.js';++ interface Props {+ infraConfig: PodmanPodInfraConfig | undefined;+ }++ let { infraConfig }: Props = $props();++ const yesNo = (value: boolean) => (value ? m.common_yes() : m.common_no());++ const networking = $derived(+ [+ { label: m.podman_pod_host_network(), value: infraConfig ? yesNo(infraConfig.hostNetwork) : undefined },+ { label: m.resource_networks_cap(), value: infraConfig?.networks?.join(', ') },+ { label: m.containers_ip_address(), value: infraConfig?.staticIp },+ { label: m.containers_mac_address(), value: infraConfig?.staticMac }+ ].flatMap((entry) => (entry.value ? [{ label: entry.label, value: entry.value }] : []))+ );++ const portBindings = $derived(+ Object.entries(infraConfig?.portBindings ?? {}).map(([containerPort, bindings]) => ({+ containerPort,+ hosts: (bindings ?? []).map(+ (binding) => `${binding.hostIp ? `${binding.hostIp}:` : ''}${binding.hostPort} → ${containerPort}`+ )+ }))+ );++ const dnsHosts = $derived(+ [+ { label: m.podman_pod_dns_servers(), value: infraConfig?.dnsServer?.join(', ') },+ { label: m.podman_pod_dns_search(), value: infraConfig?.dnsSearch?.join(', ') },+ { label: m.podman_pod_dns_options(), value: infraConfig?.dnsOption?.join(', ') },+ { label: m.podman_pod_add_hosts(), value: infraConfig?.hostAdd?.join(', ') },+ { label: m.podman_pod_hosts_file(), value: infraConfig?.hostsFile },+ { label: m.podman_pod_no_resolv_conf(), value: infraConfig ? yesNo(infraConfig.noManageResolvConf) : undefined },+ { label: m.podman_pod_no_hosts(), value: infraConfig ? yesNo(infraConfig.noManageHosts) : undefined },+ { label: m.podman_pod_no_hostname(), value: infraConfig ? yesNo(infraConfig.noManageHostname) : undefined }+ ].flatMap((entry) => (entry.value ? [{ label: entry.label, value: entry.value }] : []))+ );++ const networkOptions = $derived(Object.entries(infraConfig?.networkOptions ?? {}));+</script>++{#if !infraConfig}+ <EmptyState icon={NetworksIcon} title={m.podman_pod_no_network_config()} />+{:else}+ <div class="space-y-6">+ <DetailSection title={m.podman_pod_section_networking()} icon={NetworksIcon}>+ <KeyValueGrid>+ {#each networking as entry (entry.label)}+ <KeyValueCard label={entry.label} valueTitle={m.common_click_to_select()}>{entry.value}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>++ {#if portBindings.length > 0}+ <DetailSection title={m.common_port_mappings()} icon={GlobeIcon}>+ <KeyValueGrid>+ {#each portBindings as binding (binding.containerPort)}+ <KeyValueCard label={binding.containerPort}>{binding.hosts.join(', ')}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>+ {/if}++ <DetailSection title={m.podman_pod_section_dns_hosts()} icon={GlobeIcon}>+ <KeyValueGrid>+ {#each dnsHosts as entry (entry.label)}+ <KeyValueCard label={entry.label} valueTitle={m.common_click_to_select()}>{entry.value}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>++ {#if networkOptions.length > 0}+ <DetailSection title={m.podman_pod_network_options()} icon={SettingsIcon}>+ <KeyValueGrid>+ {#each networkOptions as [key, values] (key)}+ <KeyValueCard label={key}>{values.join(', ')}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>+ {/if}+ </div>+{/if}diff --git a/frontend/src/routes/(app)/podman/pods/components/pod-overview.svelte b/frontend/src/routes/(app)/podman/pods/components/pod-overview.sveltenew file mode 100644index 000000000..60a334bb0--- /dev/null+++ b/frontend/src/routes/(app)/podman/pods/components/pod-overview.svelte@@ -0,0 +1,79 @@+<script lang="ts">+ import {+ DetailMetaStrip,+ DetailSection,+ KeyValueCard,+ KeyValueGrid,+ type DetailMetaItem+ } from '#lib/components/resource-detail/index.js';+ import { Badge } from '#lib/components/ui/badge/index.js';+ import { BoxIcon, ClockIcon, ContainersIcon, InfoIcon, RestartIcon, TagIcon, TerminalIcon } from '#lib/icons/index.js';+ import { m } from '#lib/paraglide/messages.js';+ import type { PodmanPodInspect } from '#lib/types/podman.js';+ import { formatDateTime } from '#lib/utils/formatting.js';+ import { podmanStateVariant } from '#lib/utils/podman.js';++ interface Props {+ pod: PodmanPodInspect;+ }++ let { pod }: Props = $props();++ const metaItems = $derived<DetailMetaItem[]>([+ { icon: ClockIcon, label: m.common_created(), value: formatDateTime(pod.created) || pod.created },+ { icon: ContainersIcon, label: m.containers(), value: String(pod.numContainers) },+ { icon: BoxIcon, label: m.podman_pod_infra(), value: pod.createInfra ? m.common_yes() : m.common_no() },+ ...(pod.restartPolicy ? [{ icon: RestartIcon, label: m.common_restart_policy(), value: pod.restartPolicy }] : [])+ ]);++ const details = $derived(+ [+ { label: m.common_id(), value: pod.id },+ { label: m.hostname(), value: pod.hostname },+ { label: m.podman_pod_namespace(), value: pod.namespace },+ { label: m.podman_pod_exit_policy(), value: pod.exitPolicy },+ { label: m.podman_pod_cgroup_parent(), value: pod.cgroupParent },+ { label: m.podman_pod_cgroup_path(), value: pod.cgroupPath },+ { label: m.podman_pod_shared_namespaces(), value: pod.sharedNamespaces?.join(', ') },+ { label: m.podman_pod_pid_namespace(), value: pod.infraConfig?.pidNs },+ { label: m.podman_pod_user_namespace(), value: pod.infraConfig?.userNs },+ { label: m.podman_pod_uts_namespace(), value: pod.infraConfig?.utsNs },+ { label: m.podman_pod_infra_container_id(), value: pod.infraContainerId }+ ].flatMap((entry) => (entry.value ? [{ label: entry.label, value: entry.value }] : []))+ );++ const labels = $derived(Object.entries(pod.labels ?? {}));+ const createCommand = $derived(pod.createCommand?.join(' ') ?? '');+</script>++<div class="space-y-6">+ <DetailMetaStrip items={metaItems}>+ <Badge variant={podmanStateVariant(pod.state)} minWidth="20">{pod.state}</Badge>+ </DetailMetaStrip>++ <DetailSection title={m.common_overview()} icon={InfoIcon}>+ <KeyValueGrid>+ {#each details as entry (entry.label)}+ <KeyValueCard label={entry.label} valueTitle={m.common_click_to_select()}>{entry.value}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>++ {#if labels.length > 0}+ <DetailSection title={m.common_labels()} icon={TagIcon}>+ <KeyValueGrid>+ {#each labels as [key, value] (key)}+ <KeyValueCard label={key} valueTitle={m.common_click_to_select()}>{value}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>+ {/if}++ {#if createCommand}+ <DetailSection title={m.podman_pod_create_command()} icon={TerminalIcon}>+ <pre class="overflow-auto rounded-lg bg-muted/40 p-4 font-mono text-xs leading-relaxed whitespace-pre-wrap"><code+ >{createCommand}</code+ ></pre>+ </DetailSection>+ {/if}+</div>diff --git a/frontend/src/routes/(app)/podman/pods/components/pod-processes.svelte b/frontend/src/routes/(app)/podman/pods/components/pod-processes.sveltenew file mode 100644index 000000000..668d66c47--- /dev/null+++ b/frontend/src/routes/(app)/podman/pods/components/pod-processes.svelte@@ -0,0 +1,89 @@+<script lang="ts">+ import { createQuery } from '@tanstack/svelte-query';++ import { ArcaneButton } from '#lib/components/arcane-button/index.js';+ import EmptyState from '#lib/components/states/empty-state.svelte';+ import * as Card from '#lib/components/ui/card/index.js';+ import Spinner from '#lib/components/ui/spinner/spinner.svelte';+ import * as Table from '#lib/components/ui/table/index.js';+ import MonoCell from '#lib/components/vulnerability/mono-cell.svelte';+ import { LayoutListIcon } from '#lib/icons/index.js';+ import { m } from '#lib/paraglide/messages.js';+ import { queryKeys } from '#lib/query/query-keys.js';+ import { podmanService } from '#lib/services/podman-service.js';+ import { extractApiErrorMessage } from '#lib/utils/api.js';+ import { withOccurrenceKeys } from '#lib/utils/formatting.js';++ interface Props {+ podId: string;+ envId: string;+ isRunning: boolean;+ }++ let { podId, envId, isRunning }: Props = $props();++ const topQuery = createQuery(() => ({+ queryKey: queryKeys.podman.podTop(envId, podId),+ queryFn: () => podmanService.getPodTop(podId, envId),+ enabled: isRunning,+ refetchInterval: 5000,+ retry: false+ }));++ const processes = $derived(topQuery.data?.processes ?? []);+</script>++<Card.Root>+ <Card.Header icon={LayoutListIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.containers_processes_title()}</h2>+ </Card.Title>+ <Card.Description>{m.podman_pod_processes_description()}</Card.Description>+ </div>+ {#if isRunning}+ <div class="ml-auto">+ <ArcaneButton action="refresh" size="sm" disabled={topQuery.isFetching} onclick={() => topQuery.refetch()} />+ </div>+ {/if}+ </Card.Header>+ {#if !isRunning}+ <EmptyState icon={LayoutListIcon} title={m.common_unavailable()} description={m.podman_pod_not_running()} />+ {:else if topQuery.isError}+ <EmptyState+ icon={LayoutListIcon}+ title={m.common_load_failed({ resource: m.containers_processes_title() })}+ description={extractApiErrorMessage(topQuery.error)}+ actionLabel={m.common_retry()}+ onAction={() => topQuery.refetch()}+ />+ {:else if topQuery.isPending}+ <div class="flex items-center justify-center gap-2 py-12 text-sm text-muted-foreground" role="status" aria-live="polite">+ <Spinner tone="muted" />+ <span>{m.common_loading()}</span>+ </div>+ {:else if processes.length === 0}+ <EmptyState icon={LayoutListIcon} title={m.containers_processes_empty()} />+ {:else}+ <div class="overflow-x-auto rounded-b-lg">+ <Table.Root aria-label={m.containers_processes_title()}>+ <Table.Header>+ <Table.Row>+ {#each withOccurrenceKeys(topQuery.data?.titles ?? []) as title (title.key)}+ <Table.Head scope="col">{title.value}</Table.Head>+ {/each}+ </Table.Row>+ </Table.Header>+ <Table.Body>+ {#each processes as cells (JSON.stringify(cells))}+ <Table.Row>+ {#each withOccurrenceKeys(cells) as cell (cell.key)}+ <Table.Cell><MonoCell value={cell.value} /></Table.Cell>+ {/each}+ </Table.Row>+ {/each}+ </Table.Body>+ </Table.Root>+ </div>+ {/if}+</Card.Root>diff --git a/frontend/src/routes/(app)/podman/pods/components/pod-resources.svelte b/frontend/src/routes/(app)/podman/pods/components/pod-resources.sveltenew file mode 100644index 000000000..8ef64ab6f--- /dev/null+++ b/frontend/src/routes/(app)/podman/pods/components/pod-resources.svelte@@ -0,0 +1,179 @@+<script lang="ts">+ import { DetailSection, KeyValueCard, KeyValueGrid } from '#lib/components/resource-detail/index.js';+ import EmptyState from '#lib/components/states/empty-state.svelte';+ import * as Table from '#lib/components/ui/table/index.js';+ import { CpuIcon, HammerIcon, MemoryStickIcon, SecurityIcon, StatsIcon, VolumesIcon } from '#lib/icons/index.js';+ import { m } from '#lib/paraglide/messages.js';+ import type { PodmanPodInspect } from '#lib/types/podman.js';+ import { bytes } from '#lib/utils/formatting.js';++ interface Props {+ pod: PodmanPodInspect;+ }++ let { pod }: Props = $props();++ const cpu = $derived(+ [+ { label: m.podman_pod_cpu_period(), value: pod.cpuPeriod ? String(pod.cpuPeriod) : undefined },+ { label: m.podman_pod_cpu_quota(), value: pod.cpuQuota ? String(pod.cpuQuota) : undefined },+ { label: m.cpu_shares(), value: pod.cpuShares ? String(pod.cpuShares) : undefined },+ { label: m.podman_pod_cpuset_cpus(), value: pod.cpusetCpus },+ { label: m.podman_pod_cpuset_mems(), value: pod.cpusetMems }+ ].flatMap((entry) => (entry.value ? [{ label: entry.label, value: entry.value }] : []))+ );++ const memory = $derived(+ [+ { label: m.podman_pod_memory(), value: pod.memoryLimit ? (bytes.format(pod.memoryLimit) ?? undefined) : undefined },+ { label: m.podman_pod_memory_swap(), value: pod.memorySwap ? (bytes.format(pod.memorySwap) ?? undefined) : undefined }+ ].flatMap((entry) => (entry.value ? [{ label: entry.label, value: entry.value }] : []))+ );++ const throttle = (rate: number) => `${bytes.format(rate) ?? rate}/s`;++ const blkio = $derived(+ [+ { label: m.podman_pod_blkio_weight(), values: pod.blkioWeight ? [String(pod.blkioWeight)] : [] },+ {+ label: m.podman_pod_blkio_weight_devices(),+ values: (pod.blkioWeightDevices ?? []).map((device) => `${device.path} → ${device.weight}`)+ },+ {+ label: m.podman_pod_device_read_bps(),+ values: (pod.deviceReadBps ?? []).map((device) => `${device.path} → ${throttle(device.rate)}`)+ },+ {+ label: m.podman_pod_device_write_bps(),+ values: (pod.deviceWriteBps ?? []).map((device) => `${device.path} → ${throttle(device.rate)}`)+ }+ ].filter((entry) => entry.values.length > 0)+ );++ const mounts = $derived(pod.mounts ?? []);+ const devices = $derived(pod.devices ?? []);+ const volumesFrom = $derived(pod.volumesFrom ?? []);+ const securityOpts = $derived(pod.securityOpts ?? []);+ const isEmpty = $derived(+ cpu.length === 0 &&+ memory.length === 0 &&+ blkio.length === 0 &&+ mounts.length === 0 &&+ devices.length === 0 &&+ volumesFrom.length === 0 &&+ securityOpts.length === 0+ );+</script>++{#if isEmpty}+ <EmptyState icon={StatsIcon} title={m.podman_pod_no_resources()} />+{:else}+ <div class="space-y-6">+ {#if cpu.length > 0}+ <DetailSection title={m.podman_pod_section_cpu()} icon={CpuIcon}>+ <KeyValueGrid>+ {#each cpu as entry (entry.label)}+ <KeyValueCard label={entry.label}>{entry.value}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>+ {/if}++ {#if memory.length > 0}+ <DetailSection title={m.podman_pod_section_memory()} icon={MemoryStickIcon}>+ <KeyValueGrid>+ {#each memory as entry (entry.label)}+ <KeyValueCard label={entry.label}>{entry.value}</KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>+ {/if}++ {#if blkio.length > 0}+ <DetailSection title={m.containers_block_io()} icon={StatsIcon}>+ <KeyValueGrid>+ {#each blkio as entry (entry.label)}+ <KeyValueCard label={entry.label} stacked>+ {#each entry.values as value (value)}+ <span>{value}</span>+ {/each}+ </KeyValueCard>+ {/each}+ </KeyValueGrid>+ </DetailSection>+ {/if}++ {#if mounts.length > 0 || volumesFrom.length > 0}+ <DetailSection title={m.swarm_service_form_mounts()} icon={VolumesIcon}>+ {#if mounts.length > 0}+ <div class="overflow-x-auto rounded-lg border">+ <Table.Root aria-label={m.swarm_service_form_mounts()}>+ <Table.Header>+ <Table.Row>+ <Table.Head scope="col">{m.common_type()}</Table.Head>+ <Table.Head scope="col">{m.podman_pod_mount_source()}</Table.Head>+ <Table.Head scope="col">{m.destination()}</Table.Head>+ <Table.Head scope="col">{m.common_rw()}</Table.Head>+ <Table.Head scope="col">{m.podman_pod_volume_options()}</Table.Head>+ </Table.Row>+ </Table.Header>+ <Table.Body>+ {#each mounts as mount (mount.destination)}+ <Table.Row>+ <Table.Cell>{mount.type}</Table.Cell>+ <Table.Cell><span class="font-mono text-xs break-all">{mount.name || mount.source || ''}</span></Table.Cell>+ <Table.Cell><span class="font-mono text-xs break-all">{mount.destination}</span></Table.Cell>+ <Table.Cell>{mount.rw ? m.common_yes() : m.common_no()}</Table.Cell>+ <Table.Cell><span class="font-mono text-xs">{mount.options?.join(', ') ?? ''}</span></Table.Cell>+ </Table.Row>+ {/each}+ </Table.Body>+ </Table.Root>+ </div>+ {/if}+ {#if volumesFrom.length > 0}+ <KeyValueGrid>+ <KeyValueCard label={m.podman_pod_volumes_from()}>{volumesFrom.join(', ')}</KeyValueCard>+ </KeyValueGrid>+ {/if}+ </DetailSection>+ {/if}++ {#if devices.length > 0}+ <DetailSection title={m.podman_pod_devices()} icon={HammerIcon}>+ <div class="overflow-x-auto rounded-lg border">+ <Table.Root aria-label={m.podman_pod_devices()}>+ <Table.Header>+ <Table.Row>+ <Table.Head scope="col">{m.podman_pod_device_host_path()}</Table.Head>+ <Table.Head scope="col">{m.container_path()}</Table.Head>+ <Table.Head scope="col">{m.permissions()}</Table.Head>+ </Table.Row>+ </Table.Header>+ <Table.Body>+ {#each devices as device (device.pathInContainer)}+ <Table.Row>+ <Table.Cell><span class="font-mono text-xs break-all">{device.pathOnHost}</span></Table.Cell>+ <Table.Cell><span class="font-mono text-xs break-all">{device.pathInContainer}</span></Table.Cell>+ <Table.Cell><span class="font-mono text-xs">{device.cgroupPermissions ?? ''}</span></Table.Cell>+ </Table.Row>+ {/each}+ </Table.Body>+ </Table.Root>+ </div>+ </DetailSection>+ {/if}++ {#if securityOpts.length > 0}+ <DetailSection title={m.common_security()} icon={SecurityIcon}>+ <KeyValueGrid>+ <KeyValueCard label={m.podman_pod_security_opt()} stacked>+ {#each securityOpts as option (option)}+ <span>{option}</span>+ {/each}+ </KeyValueCard>+ </KeyValueGrid>+ </DetailSection>+ {/if}+ </div>+{/if}diff --git a/frontend/src/routes/(app)/podman/pods/components/pod-stats.svelte b/frontend/src/routes/(app)/podman/pods/components/pod-stats.sveltenew file mode 100644index 000000000..ade49c287--- /dev/null+++ b/frontend/src/routes/(app)/podman/pods/components/pod-stats.svelte@@ -0,0 +1,90 @@+<script lang="ts">+ import { createQuery } from '@tanstack/svelte-query';++ import { ArcaneButton } from '#lib/components/arcane-button/index.js';+ import EmptyState from '#lib/components/states/empty-state.svelte';+ import * as Card from '#lib/components/ui/card/index.js';+ import Spinner from '#lib/components/ui/spinner/spinner.svelte';+ import * as Table from '#lib/components/ui/table/index.js';+ import MonoCell from '#lib/components/vulnerability/mono-cell.svelte';+ import { StatsIcon } from '#lib/icons/index.js';+ import { m } from '#lib/paraglide/messages.js';+ import { queryKeys } from '#lib/query/query-keys.js';+ import { podmanService } from '#lib/services/podman-service.js';+ import { extractApiErrorMessage } from '#lib/utils/api.js';++ interface Props {+ podName: string;+ envId: string;+ isRunning: boolean;+ }++ let { podName, envId, isRunning }: Props = $props();++ const statsQuery = createQuery(() => ({+ queryKey: queryKeys.podman.podStats(envId, podName),+ queryFn: () => podmanService.getPodStats([podName], envId),+ enabled: isRunning,+ refetchInterval: 5000,+ retry: false+ }));+</script>++<Card.Root>+ <Card.Header icon={StatsIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>+ <h2>{m.containers_resource_metrics()}</h2>+ </Card.Title>+ <Card.Description>{m.podman_pod_stats_description()}</Card.Description>+ </div>+ {#if isRunning}+ <div class="ml-auto">+ <ArcaneButton action="refresh" size="sm" disabled={statsQuery.isFetching} onclick={() => statsQuery.refetch()} />+ </div>+ {/if}+ </Card.Header>+ {#if !isRunning}+ <EmptyState icon={StatsIcon} title={m.common_unavailable()} description={m.podman_pod_not_running()} />+ {:else if statsQuery.isError}+ <EmptyState+ icon={StatsIcon}+ title={m.common_load_failed({ resource: m.containers_resource_metrics() })}+ description={extractApiErrorMessage(statsQuery.error)}+ actionLabel={m.common_retry()}+ onAction={() => statsQuery.refetch()}+ />+ {:else if statsQuery.isPending}+ <div class="flex items-center justify-center gap-2 py-12 text-sm text-muted-foreground" role="status" aria-live="polite">+ <Spinner tone="muted" />+ <span>{m.common_loading()}</span>+ </div>+ {:else}+ <div class="overflow-x-auto rounded-b-lg">+ <Table.Root aria-label={m.containers_resource_metrics()}>+ <Table.Header>+ <Table.Row>+ <Table.Head scope="col">{m.common_name()}</Table.Head>+ <Table.Head scope="col">{m.cpu_usage()}</Table.Head>+ <Table.Head scope="col">{m.memory_usage()}</Table.Head>+ <Table.Head scope="col">{m.containers_block_io()}</Table.Head>+ <Table.Head scope="col">{m.containers_network_io()}</Table.Head>+ <Table.Head scope="col">{m.podman_pids()}</Table.Head>+ </Table.Row>+ </Table.Header>+ <Table.Body>+ {#each statsQuery.data ?? [] as stat (stat.cid)}+ <Table.Row>+ <Table.Cell>{stat.name}</Table.Cell>+ <Table.Cell><MonoCell value={stat.cpu} /></Table.Cell>+ <Table.Cell><MonoCell value={stat.memUsage} /></Table.Cell>+ <Table.Cell><MonoCell value={stat.blockIo} /></Table.Cell>+ <Table.Cell><MonoCell value={stat.netIo} /></Table.Cell>+ <Table.Cell><MonoCell value={stat.pids} /></Table.Cell>+ </Table.Row>+ {/each}+ </Table.Body>+ </Table.Root>+ </div>+ {/if}+</Card.Root>diff --git a/frontend/src/routes/(app)/podman/quadlets/+page.svelte b/frontend/src/routes/(app)/podman/quadlets/+page.svelteindex ccc869690..a123c1fd1 100644--- a/frontend/src/routes/(app)/podman/quadlets/+page.svelte+++ b/frontend/src/routes/(app)/podman/quadlets/+page.svelte@@ -23,7 +23,7 @@const pageState = new ResourceListPageState(untrack(() => data.requestOptions));const quadletEnvironments = $derived(shownPodmanEnvironments(data.podmanStatuses, (status) => status.quadletsSupported));- const canInstall = $derived(hasPermission('podman:quadlets', pageState.envId) && !!data.podmanStatus?.quadletsSupported);+ const canInstall = $derived(quadletEnvironments.some((env) => hasPermission('podman:quadlets', env.id)));const quadletsQuery = createQuery(() => {const queryScope = pageState.scope;diff --git a/frontend/src/routes/(app)/podman/quadlets/[name]/+page.svelte b/frontend/src/routes/(app)/podman/quadlets/[name]/+page.svelteindex 094b21ed7..44cae2136 100644--- a/frontend/src/routes/(app)/podman/quadlets/[name]/+page.svelte+++ b/frontend/src/routes/(app)/podman/quadlets/[name]/+page.svelte@@ -3,19 +3,23 @@import { createQuery, useQueryClient } from '@tanstack/svelte-query';import { toast } from 'svelte-sonner';+ import ActionButtonGroup from '#lib/components/action-button-group/action-button-group.svelte';import type { ActionButton } from '#lib/components/action-button-group/types.js';- import CodePanel from '#lib/components/code-panel.svelte';- import { DetailSection, KeyValueCard, KeyValueGrid } from '#lib/components/resource-detail/index.js';+ import { ArcaneButton } from '#lib/components/arcane-button/index.js';+ import EnvironmentCell from '#lib/components/arcane-table/cells/environment-cell.svelte';+ import { DetailMetaStrip, DetailSection, KeyValueCard, KeyValueGrid } from '#lib/components/resource-detail/index.js';import EmptyState from '#lib/components/states/empty-state.svelte';import * as Alert from '#lib/components/ui/alert/index.js';import { Badge } from '#lib/components/ui/badge/index.js';import * as Card from '#lib/components/ui/card/index.js';- import { AlertTriangleIcon, BoxIcon, ContainersIcon, InfoIcon } from '#lib/icons/index.js';- import { ResourceDetailLayout } from '#lib/layouts/index.js';+ import * as Select from '#lib/components/ui/select/index.js';+ import * as Tabs from '#lib/components/ui/tabs/index.js';+ import { useUrlTab } from '#lib/hooks/use-url-tab.svelte.js';+ import { AlertTriangleIcon, BoxIcon, CodeIcon, ContainersIcon, FileTextIcon, InfoIcon } from '#lib/icons/index.js';+ import TabbedPageLayout from '#lib/layouts/tabbed-page-layout.svelte';import { m } from '#lib/paraglide/messages.js';import { queryKeys } from '#lib/query/query-keys.js';import { podmanService, type PodmanQuadletAction } from '#lib/services/podman-service.js';- import type { PodmanQuadletFile } from '#lib/types/podman.js';import { extractApiErrorMessage, handleApiResultWithCallbacks } from '#lib/utils/api.js';import { hasPermission } from '#lib/utils/auth.js';import { environmentHref } from '#lib/utils/environments.js';@@ -23,7 +27,10 @@import { tryCatch } from '#lib/utils/try-catch.js';import ContainerLogsPanel from '../../../containers/components/container-logs-panel.svelte';- import QuadletExtraFiles from '../components/quadlet-extra-files.svelte';+ import QuadletWorkspaceEditor, {+ createQuadletWorkspace,+ quadletWorkspaceFiles+ } from '../components/quadlet-workspace-editor.svelte';import { confirmRemoveQuadlet, quadletActionLabels, runQuadletAction } from '../quadlet-actions';let { data } = $props();@@ -48,25 +55,36 @@const canEdit = $derived(hasPermission('podman:quadlets', envId));const canLifecycle = $derived(hasPermission('podman:quadlets:lifecycle', envId) && !quadlet.template);+ const canViewLogs = $derived(hasPermission('containers:logs', envId));let content = $derived(data.file.content);- let extraFiles = $state<PodmanQuadletFile[]>([]);+ let workspace = $state.raw(createQuadletWorkspace());let saving = $state(false);let pendingAction = $state<PodmanQuadletAction | null>(null);let selectedContainerId = $state('');let autoScrollLogs = $state(true);const selectedContainer = $derived(containers.find((container) => container.id === selectedContainerId) ?? containers[0]);+ const urlTab = useUrlTab({+ tabs: () => [+ { value: 'overview', label: m.common_overview(), icon: InfoIcon },+ { value: 'files', label: m.podman_quadlet_files(), icon: CodeIcon },+ { value: 'containers', label: m.containers(), icon: ContainersIcon },+ { value: 'logs', label: m.common_logs(), icon: FileTextIcon, visible: canViewLogs && containers.length > 0 }+ ],+ defaultTab: () => 'overview'+ });+async function refresh() {await queryClient.invalidateQueries({ queryKey: queryKeys.podman.quadlet(envId, quadlet.name) });}async function handleSave() {- const files = extraFiles.filter((file) => file.name.trim());+ const extraFiles = quadletWorkspaceFiles(workspace);saving = true;await handleApiResultWithCallbacks({result: await tryCatch(- podmanService.updateQuadlet(quadlet.name, { content, extraFiles: files.length > 0 ? files : undefined }, envId)+ podmanService.updateQuadlet(quadlet.name, { content, extraFiles: extraFiles.length > 0 ? extraFiles : undefined }, envId)),message: m.common_update_failed({ resource: quadlet.name }),setLoadingState: (value) => (saving = value),@@ -79,7 +97,7 @@return;}toast.success(m.common_update_success({ resource: quadlet.name }));- extraFiles = [];+ workspace = createQuadletWorkspace();await refresh();}});@@ -111,15 +129,6 @@: []),...(canEdit? [- {- id: 'save',- action: 'save' as const,- placement: 'secondary' as const,- label: m.common_save(),- loading: saving,- disabled: saving,- onclick: handleSave- },{id: 'remove',action: 'remove' as const,@@ -132,117 +141,190 @@]: [])]);++ const metaItems = $derived([+ { icon: InfoIcon, label: m.podman_unit(), value: quadlet.unitName || '-', mono: true },+ ...(quadlet.unitStatus+ ? [+ { label: m.podman_unit_load_state(), value: quadlet.unitStatus.loadState },+ {+ label: m.podman_unit_active_state(),+ value: `${quadlet.unitStatus.activeState} (${quadlet.unitStatus.subState})`+ }+ ]+ : []),+ ...(quadlet.app ? [{ icon: BoxIcon, label: m.podman_quadlet_app(), value: quadlet.app }] : [])+ ]);</script>-<ResourceDetailLayout+<TabbedPageLayoutbackUrl="/podman/quadlets"- backLabel={m.podman_quadlets_title()}- title={quadlet.name}- subtitle={quadlet.path}- {actions}+ backLabel={m.common_back()}+ tabItems={urlTab.items}+ selectedTab={urlTab.value}+ onTabChange={urlTab.select}>- {#snippet badges()}- <Badge variant={podmanStateVariant(quadlet.status)} minWidth="20">{quadlet.status}</Badge>- <Badge variant="gray" size="sm">.{quadlet.type}</Badge>- {#if quadlet.template}- <Badge variant="gray" size="sm">{m.podman_quadlet_template()}</Badge>+ {#snippet headerInfo()}+ <div class="flex flex-wrap items-center gap-x-2 gap-y-1">+ <h1 class="max-w-40 min-w-0 truncate text-lg font-semibold sm:max-w-56 md:max-w-72 lg:max-w-88" title={quadlet.name}>+ {quadlet.name}+ </h1>+ <Badge variant={podmanStateVariant(quadlet.status)} minWidth="20">{quadlet.status}</Badge>+ <EnvironmentCell value={envId} />+ {#if quadlet.template}+ <Badge variant="gray" size="sm">{m.podman_quadlet_template()}</Badge>+ {/if}+ {#each podNames as podName (podName)}+ <Badge variant="purple" size="sm" href={environmentHref(`/podman/pods/${encodeURIComponent(podName)}`, envId)}+ >{podName}</Badge+ >+ {/each}+ </div>+ {/snippet}++ {#snippet headerActions()}+ {#if actions.length > 0}+ <ActionButtonGroup buttons={actions} />{/if}- {#if quadlet.app}- <Badge variant="blue" size="sm">{quadlet.app}</Badge>+ {/snippet}++ {#snippet subHeader()}+ {#if quadletQuery.isError}+ <Alert.Root variant="destructive" class="mt-3">+ <AlertTriangleIcon class="size-4" />+ <Alert.Title>{m.podman_updates_paused()}</Alert.Title>+ <Alert.Description>{extractApiErrorMessage(quadletQuery.error)}</Alert.Description>+ </Alert.Root>+ {/if}+ {#if canLifecycle && !systemdAvailable && status?.systemdReason}+ <p class="mt-2 text-sm text-muted-foreground">{status.systemdReason}</p>{/if}- {#each podNames as podName (podName)}- <Badge variant="purple" size="sm" href={environmentHref(`/podman/pods/${encodeURIComponent(podName)}`, envId)}- >{podName}</Badge- >- {/each}{/snippet}- {#if quadletQuery.isError}- <Alert.Root variant="destructive">- <AlertTriangleIcon class="size-4" />- <Alert.Title>{m.podman_updates_paused()}</Alert.Title>- <Alert.Description>{extractApiErrorMessage(quadletQuery.error)}</Alert.Description>- </Alert.Root>- {/if}-- {#if canLifecycle && !systemdAvailable && status?.systemdReason}- <p class="text-sm text-muted-foreground">{status.systemdReason}</p>- {/if}-- <DetailSection title={m.podman_unit()} icon={InfoIcon}>- <KeyValueGrid>- <KeyValueCard label={m.podman_unit()}>{quadlet.unitName || '-'}</KeyValueCard>- {#if quadlet.unitStatus}- <KeyValueCard label={m.podman_unit_load_state()}>{quadlet.unitStatus.loadState}</KeyValueCard>- <KeyValueCard label={m.podman_unit_active_state()}>- {quadlet.unitStatus.activeState} ({quadlet.unitStatus.subState})- </KeyValueCard>- {#if quadlet.unitStatus.description}- <KeyValueCard label={m.common_description()}>{quadlet.unitStatus.description}</KeyValueCard>- {/if}- {/if}- </KeyValueGrid>- </DetailSection>-- <CodePanel title={quadlet.name} language="systemd" validationMode="none" bind:value={content} readOnly={!canEdit} autoHeight />-- {#if canEdit}- <Card.Root>- <Card.Header>- <Card.Title>{m.podman_quadlet_extra_files()}</Card.Title>- <Card.Description>{m.podman_quadlet_update_files_description()}</Card.Description>- </Card.Header>- <Card.Content>- <QuadletExtraFiles bind:files={extraFiles} disabled={saving} />- </Card.Content>- </Card.Root>- {/if}-- <DetailSection title={m.containers()} icon={ContainersIcon}>- {#if containers.length === 0}- <EmptyState icon={ContainersIcon} title={m.podman_quadlet_no_containers()} variant="plain" />- {:else}- <div class="divide-y rounded-lg border">- {#each containers as container (container.id)}- <div class="flex items-center justify-between gap-3 p-3">- <button- type="button"- class="min-w-0 truncate text-left font-medium hover:underline"- onclick={() => (selectedContainerId = container.id)}- >- {container.names[0] ?? container.id.slice(0, 12)}- </button>- <div class="flex items-center gap-2">- {#if container.podName}- <Badge- variant="purple"- size="sm"- href={environmentHref(`/podman/pods/${encodeURIComponent(container.podName)}`, envId)}- >- <BoxIcon class="size-3" />- {container.podName}- </Badge>- {/if}- <Badge variant={podmanStateVariant(container.state)} size="sm">{container.state}</Badge>- <a- class="text-xs text-muted-foreground hover:underline"- href={environmentHref(`/containers/${container.id}`, envId)}>{m.common_inspect()}</a- >- </div>+ {#snippet tabContent(activeTab)}+ <Tabs.Content value="overview" class="h-full">+ <div class="space-y-4">+ <DetailMetaStrip items={metaItems} />+ <DetailSection title={m.podman_unit()} icon={InfoIcon}>+ <KeyValueGrid>+ {#if quadlet.unitStatus?.description}+ <KeyValueCard label={m.common_description()}>{quadlet.unitStatus.description}</KeyValueCard>+ {/if}+ <KeyValueCard label={m.podman_quadlet_path()}>{quadlet.path}</KeyValueCard>+ {#if quadlet.app}+ <KeyValueCard label={m.podman_quadlet_app()}>{quadlet.app}</KeyValueCard>+ {/if}+ <KeyValueCard label={m.common_type()}>.{quadlet.type}</KeyValueCard>+ </KeyValueGrid>+ </DetailSection>+ </div>+ </Tabs.Content>++ <Tabs.Content value="files" class="h-full">+ <div class="flex h-full min-h-128 flex-col gap-3">+ {#if canEdit}+ <div class="flex shrink-0 items-center justify-between gap-3">+ <p class="text-sm text-muted-foreground">{m.podman_quadlet_update_files_description()}</p>+ <ArcaneButton+ action="save"+ customLabel={m.common_save()}+ onclick={handleSave}+ loading={saving}+ disabled={saving || !content.trim()}+ /></div>- {/each}+ {/if}+ <QuadletWorkspaceEditor+ {workspace}+ mainFileName={quadlet.name}+ bind:content+ fileId={`podman:quadlets:${envId}:${quadlet.name}`}+ environmentId={envId}+ disabled={saving}+ readOnly={!canEdit}+ /></div>+ </Tabs.Content>++ <Tabs.Content value="containers" class="h-full">+ {#if containers.length === 0}+ <EmptyState icon={ContainersIcon} title={m.podman_quadlet_no_containers()} variant="plain" />+ {:else}+ <Card.Root>+ <div class="divide-y">+ {#each containers as container (container.id)}+ <div class="flex items-center justify-between gap-3 px-4 py-3">+ <div class="flex min-w-0 items-center gap-3">+ <ContainersIcon class="size-4 shrink-0 text-muted-foreground" />+ <div class="min-w-0">+ <a+ class="block truncate font-medium hover:underline"+ href={environmentHref(`/containers/${container.id}`, envId)}+ >+ {container.names[0] ?? container.id.slice(0, 12)}+ </a>+ <p class="truncate font-mono text-xs text-muted-foreground">{container.image}</p>+ </div>+ </div>+ <div class="flex shrink-0 items-center gap-2">+ {#if container.podName}+ <Badge+ variant="purple"+ size="sm"+ href={environmentHref(`/podman/pods/${encodeURIComponent(container.podName)}`, envId)}+ >+ <BoxIcon class="size-3" />+ {container.podName}+ </Badge>+ {/if}+ <Badge variant={podmanStateVariant(container.state)} size="sm">{container.state}</Badge>+ {#if canViewLogs}+ <ArcaneButton+ action="base"+ tone="ghost"+ size="sm"+ customLabel={m.common_logs()}+ onclick={() => {+ selectedContainerId = container.id;+ urlTab.select('logs');+ }}+ />+ {/if}+ </div>+ </div>+ {/each}+ </div>+ </Card.Root>+ {/if}+ </Tabs.Content>++ {#if canViewLogs && selectedContainer}+ <Tabs.Content value="logs" class="h-full">+ <div class="flex h-full flex-col gap-3">+ {#if containers.length > 1}+ <Select.Root type="single" bind:value={() => selectedContainer.id, (id) => (selectedContainerId = id)}>+ <Select.Trigger class="h-8 w-64">+ <span class="truncate">{selectedContainer.names[0] ?? selectedContainer.id.slice(0, 12)}</span>+ </Select.Trigger>+ <Select.Content>+ {#each containers as container (container.id)}+ <Select.Item value={container.id}>{container.names[0] ?? container.id.slice(0, 12)}</Select.Item>+ {/each}+ </Select.Content>+ </Select.Root>+ {/if}+ {#if activeTab === 'logs'}+ {#key `${envId}:${selectedContainer.id}`}+ <ContainerLogsPanel+ containerId={selectedContainer.id}+ environmentId={envId}+ isRunning={selectedContainer.state === 'running'}+ bind:autoScroll={autoScrollLogs}+ />+ {/key}+ {/if}+ </div>+ </Tabs.Content>{/if}- </DetailSection>-- {#if selectedContainer && hasPermission('containers:logs', envId)}- {#key selectedContainer.id}- <ContainerLogsPanel- containerId={selectedContainer.id}- environmentId={envId}- isRunning={selectedContainer.state === 'running'}- bind:autoScroll={autoScrollLogs}- />- {/key}- {/if}-</ResourceDetailLayout>+ {/snippet}+</TabbedPageLayout>diff --git a/frontend/src/routes/(app)/podman/quadlets/components/quadlet-extra-files.svelte b/frontend/src/routes/(app)/podman/quadlets/components/quadlet-extra-files.sveltedeleted file mode 100644index 10dc75dcf..000000000--- a/frontend/src/routes/(app)/podman/quadlets/components/quadlet-extra-files.svelte+++ /dev/null@@ -1,32 +0,0 @@-<script lang="ts">- import CodePanel from '#lib/components/code-panel.svelte';- import RowListEditor from '#lib/components/form/row-list-editor.svelte';- import { Input } from '#lib/components/ui/input/index.js';- import { m } from '#lib/paraglide/messages.js';- import type { PodmanQuadletFile } from '#lib/types/podman.js';- import { workspaceFileLanguage } from '#lib/utils/workspace-files.js';-- let {- files = $bindable([]),- disabled = false- }: {- files?: PodmanQuadletFile[];- disabled?: boolean;- } = $props();-</script>--<RowListEditor bind:rows={files} createRow={() => ({ name: '', content: '' })} {disabled} addLabel={m.podman_quadlet_add_file()}>- {#snippet children(file)}- <div class="min-w-0 flex-1 space-y-2">- <Input placeholder={m.podman_quadlet_file_name_placeholder()} bind:value={file.name} {disabled} />- <CodePanel- title={file.name || m.podman_quadlet_extra_file()}- language={workspaceFileLanguage(file.name)}- validationMode="none"- bind:value={file.content}- readOnly={disabled}- autoHeight- />- </div>- {/snippet}-</RowListEditor>diff --git a/frontend/src/routes/(app)/podman/quadlets/components/quadlet-workspace-editor.svelte b/frontend/src/routes/(app)/podman/quadlets/components/quadlet-workspace-editor.sveltenew file mode 100644index 000000000..951c335f7--- /dev/null+++ b/frontend/src/routes/(app)/podman/quadlets/components/quadlet-workspace-editor.svelte@@ -0,0 +1,135 @@+<script lang="ts" module>+ import { WorkspaceDraftState } from '#lib/components/workspace-editor/workspace-draft-state.svelte.js';+ import type { PodmanQuadletFile } from '#lib/types/podman.js';+ import { planWorkspaceFileCreate, planWorkspaceFileMove, planWorkspaceFileRename } from '#lib/utils/workspace-files.js';++ export function createQuadletWorkspace(files: PodmanQuadletFile[] = []): WorkspaceDraftState {+ return new WorkspaceDraftState({+ initialFiles: files.map((file) => ({ relativePath: file.name, isDirectory: false })),+ initialContents: Object.fromEntries(files.map((file) => [file.name, file.content])),+ initialOpenTabs: ['main'],+ initialSelection: 'main',+ fallbackTab: 'main',+ pendingEntries: false,+ allowBinary: false,+ isFixedTab: (key) => key === 'main',+ planCreate: planWorkspaceFileCreate,+ planRename: planWorkspaceFileRename,+ planMove: planWorkspaceFileMove+ });+ }++ export function quadletWorkspaceFiles(workspace: WorkspaceDraftState): PodmanQuadletFile[] {+ return workspace.files+ .filter((file) => !file.isDirectory)+ .map((file) => ({ name: file.relativePath, content: workspace.contents[file.relativePath] ?? '' }));+ }+</script>++<script lang="ts">+ import CodePanel from '#lib/components/code-panel.svelte';+ import EditorTabStrip from '#lib/components/editor-tab-strip.svelte';+ import ResizableSplit from '#lib/components/resizable-split.svelte';+ import WorkspaceFileTreePanel from '#lib/components/workspace-file-tree-panel.svelte';+ import { useEnvironmentSettings } from '#lib/hooks/use-environment-settings.svelte.js';+ import { m } from '#lib/paraglide/messages.js';+ import { cn } from '#lib/utils.js';+ import { composeTreeSplitProps } from '#lib/utils/compose-flow.js';+ import { validateWorkspaceFileName, workspaceFileBasename, workspaceFileLanguage } from '#lib/utils/workspace-files.js';++ let {+ workspace,+ mainFileName,+ content = $bindable(''),+ fileId,+ environmentId,+ disabled = false,+ readOnly = false,+ class: className+ }: {+ workspace: WorkspaceDraftState;+ mainFileName: string;+ content?: string;+ fileId: string;+ environmentId: string;+ disabled?: boolean;+ readOnly?: boolean;+ class?: string;+ } = $props();++ const environmentSettings = useEnvironmentSettings(() => environmentId);+ const maxFileSizeMb = $derived(environmentSettings.current?.projectWorkspaceMaxFileSizeMb ?? 10);+ const editable = $derived(!disabled && !readOnly);+ const activeTab = $derived(workspace.activeTab);+ const leadingRows = $derived([{ key: 'main', label: mainFileName, iconClass: 'text-info', locked: true }]);+ const tabs = $derived(+ workspace.validOpenTabs.map((key) => ({+ key,+ label: key === 'main' ? mainFileName : workspaceFileBasename(key.slice(5)),+ title: key === 'main' ? mainFileName : key.slice(5),+ iconClass: key === 'main' ? 'text-info' : 'text-muted-foreground',+ pending: false+ }))+ );++ let treeWidth = $state<number | null>(null);+</script>++<div class={cn('flex min-h-0 flex-1 flex-col overflow-hidden rounded-lg border border-border bg-card', className)}>+ <ResizableSplit+ class="min-h-0 flex-1"+ {...composeTreeSplitProps}+ bind:size={treeWidth}+ ariaLabel={m.compose_editor_resize_files_panel()}+ persistKey="arcane.podman.quadlet.split"+ >+ {#snippet first()}+ <WorkspaceFileTreePanel+ {leadingRows}+ entries={workspace.entries}+ selectedFile={workspace.selectedKey}+ disabled={!editable}+ onSelect={workspace.openTab}+ onCreateFile={editable ? workspace.createFile : undefined}+ onUpload={editable ? (parentPath, files) => workspace.uploadFile(parentPath, files, maxFileSizeMb) : undefined}+ validateName={(name) => validateWorkspaceFileName(name)}+ onRename={editable ? workspace.rename : undefined}+ onDelete={editable ? workspace.remove : undefined}+ />+ {/snippet}++ {#snippet second()}+ <div class="flex h-full min-h-0 flex-1 flex-col">+ <EditorTabStrip {tabs} activeKey={activeTab} onSelect={workspace.openTab} onClose={workspace.closeTab} />+ <div class="flex min-h-0 flex-1 flex-col">+ {#key activeTab}+ {#if activeTab === 'main'}+ <CodePanel+ variant="plain"+ open={true}+ title={mainFileName}+ language="systemd"+ validationMode="none"+ bind:value={content}+ readOnly={!editable}+ fileId={`${fileId}:main`}+ />+ {:else if activeTab.startsWith('file:')}+ {@const relativePath = activeTab.slice(5)}+ <CodePanel+ variant="plain"+ open={true}+ title={relativePath}+ language={workspaceFileLanguage(relativePath)}+ validationMode="none"+ bind:value={workspace.contents[relativePath]}+ readOnly={!editable}+ fileId={`${fileId}:file:${relativePath}`}+ />+ {/if}+ {/key}+ </div>+ </div>+ {/snippet}+ </ResizableSplit>+</div>diff --git a/frontend/src/routes/(app)/podman/quadlets/new/+page.svelte b/frontend/src/routes/(app)/podman/quadlets/new/+page.svelteindex cfdcb56c2..af3989695 100644--- a/frontend/src/routes/(app)/podman/quadlets/new/+page.svelte+++ b/frontend/src/routes/(app)/podman/quadlets/new/+page.svelte@@ -1,26 +1,33 @@<script lang="ts">import { goto } from '$app/navigation';+ import { useQueryClient } from '@tanstack/svelte-query';import { toast } from 'svelte-sonner';import { ArcaneButton } from '#lib/components/arcane-button/index.js';- import CodePanel from '#lib/components/code-panel.svelte';- import SelectWithLabel from '#lib/components/form/select-with-label.svelte';- import TextInputWithLabel from '#lib/components/form/text-input-with-label.svelte';+ import EnvironmentDestinationSelect from '#lib/components/form/environment-destination-select.svelte';import EmptyState from '#lib/components/states/empty-state.svelte';- import * as Card from '#lib/components/ui/card/index.js';+ import { Input } from '#lib/components/ui/input/index.js';+ import { Label } from '#lib/components/ui/label/index.js';+ import * as Select from '#lib/components/ui/select/index.js';import { ArrowLeftIcon, FileTextIcon } from '#lib/icons/index.js';import { m } from '#lib/paraglide/messages.js';+ import { queryKeys } from '#lib/query/query-keys.js';import { podmanService } from '#lib/services/podman-service.js';- import { PODMAN_QUADLET_TYPES, type PodmanQuadletFile, type PodmanQuadletType } from '#lib/types/podman.js';+ import { PODMAN_QUADLET_TYPES, type PodmanQuadletType } from '#lib/types/podman.js';import { handleApiResultWithCallbacks } from '#lib/utils/api.js';+ import { hasPermission } from '#lib/utils/auth.js';+ import { destinationEnvironmentId, environmentHref } from '#lib/utils/environments.js';+ import { shownPodmanEnvironments } from '#lib/utils/podman.js';import { tryCatch } from '#lib/utils/try-catch.js';- import QuadletExtraFiles from '../components/quadlet-extra-files.svelte';+ import EditableName from '../../../projects/components/editable-name.svelte';+ import QuadletWorkspaceEditor, {+ createQuadletWorkspace,+ quadletWorkspaceFiles+ } from '../components/quadlet-workspace-editor.svelte';let { data } = $props();-- const status = $derived(data.podmanStatus);- const appsSupported = $derived(status?.quadletAppsSupported === true);+ const queryClient = useQueryClient();const templates: Record<PodmanQuadletType, string> = {container: '[Unit]\nDescription=\n\n[Container]\nImage=\n\n[Install]\nWantedBy=default.target\n',@@ -33,16 +40,24 @@artifact: '[Artifact]\nArtifact=\n'};+ const podmanEnvironments = $derived(shownPodmanEnvironments(data.podmanStatuses));+ const quadletEnvironments = $derived(shownPodmanEnvironments(data.podmanStatuses, (status) => status.quadletsSupported));+ const installEnvironments = $derived(quadletEnvironments.filter((env) => hasPermission('podman:quadlets', env.id)));+ let picked = $state('');+ const environmentId = $derived(destinationEnvironmentId(picked, 'podman:quadlets', installEnvironments));+ const status = $derived(data.podmanStatuses[environmentId]);+ const appsSupported = $derived(status?.quadletAppsSupported === true);+let baseName = $state('');+ let nameInputRef = $state<HTMLInputElement | null>(null);let quadletType = $state<PodmanQuadletType>('container');let content = $state(templates.container);- let kubeYaml = $state('');let app = $state('');- let extraFiles = $state<PodmanQuadletFile[]>([]);let submitting = $state(false);+ const workspace = createQuadletWorkspace();const fileName = $derived(`${baseName.trim()}.${quadletType}`);- const kubeFileName = $derived(`${baseName.trim()}.yaml`);+ const canSubmit = $derived(!!baseName.trim() && !!content.trim() && !submitting);function handleTypeChange(value: string) {const next = value as PodmanQuadletType;@@ -51,124 +66,156 @@}async function handleSubmit() {- if (!baseName.trim()) {- toast.error(m.common_field_required({ field: m.common_name() }));- return;- }- const files = [- ...(quadletType === 'kube' && kubeYaml.trim() ? [{ name: kubeFileName, content: kubeYaml }] : []),- ...(appsSupported ? extraFiles.filter((file) => file.name.trim()) : [])- ];+ const installEnvironmentId = environmentId;+ const installFileName = fileName;+ const extraFiles = quadletWorkspaceFiles(workspace);submitting = true;await handleApiResultWithCallbacks({result: await tryCatch(- podmanService.installQuadlet({- name: fileName,- content,- extraFiles: files.length > 0 ? files : undefined,- app: appsSupported && app.trim() ? app.trim() : undefined- })+ podmanService.installQuadlet(+ {+ name: installFileName,+ content,+ extraFiles: extraFiles.length > 0 ? extraFiles : undefined,+ app: appsSupported && app.trim() ? app.trim() : undefined+ },+ installEnvironmentId+ )),- message: m.podman_quadlet_install_failed({ name: fileName }),+ message: m.podman_quadlet_install_failed({ name: installFileName }),setLoadingState: (value) => (submitting = value),onSuccess: async (report) => {const errors = Object.entries(report.quadletErrors ?? {});if (errors.length > 0) {- toast.error(m.podman_quadlet_install_failed({ name: fileName }), {+ toast.error(m.podman_quadlet_install_failed({ name: installFileName }), {description: errors.map(([name, error]) => `${name}: ${error}`).join('\n')});return;}- toast.success(m.podman_quadlet_install_success({ name: fileName }));- await goto(`/podman/quadlets/${encodeURIComponent(fileName)}`);+ toast.success(m.podman_quadlet_install_success({ name: installFileName }));+ await Promise.all([+ queryClient.invalidateQueries({ queryKey: queryKeys.podman.environment(installEnvironmentId) }),+ queryClient.invalidateQueries({ queryKey: ['podman-quadlets'] })+ ]);+ await goto(environmentHref(`/podman/quadlets/${encodeURIComponent(installFileName)}`, installEnvironmentId));}});}</script>-<div class="flex min-h-0 flex-col bg-background">- <div class="sticky top-0 z-10 border-b bg-background">- <div class="mx-auto flex h-16 w-full max-w-full items-center gap-4 px-6">- <ArcaneButton- action="base"- tone="ghost"- size="sm"- href="/podman/quadlets"- class="gap-2 bg-transparent"- icon={ArrowLeftIcon}- customLabel={m.common_back()}- />- <div class="hidden h-4 w-px bg-border sm:block"></div>- <h1 class="flex-1 text-base font-semibold">{m.podman_quadlet_install()}</h1>- {#if status?.quadletsSupported}+{#snippet nameField(variant: 'inline' | 'block')}+ <EditableName+ bind:value={baseName}+ bind:ref={nameInputRef}+ {variant}+ originalValue=""+ placeholder={m.podman_quadlet_name_placeholder()}+ canEdit={!submitting}+ class={variant === 'inline' ? 'hidden sm:block' : undefined}+ />+{/snippet}++<div class="flex h-full min-h-0 flex-col bg-background">+ <div class="sticky top-0 mb-2 border-b">+ <div class="mx-auto flex h-16 max-w-full items-center justify-between gap-4 px-6">+ <div class="flex items-center gap-4"><ArcaneButton- action="create"- customLabel={m.podman_quadlet_install()}- onclick={handleSubmit}- loading={submitting}- disabled={submitting}+ action="base"+ tone="ghost"+ size="sm"+ href="/podman/quadlets"+ class="gap-2 bg-transparent"+ icon={ArrowLeftIcon}+ customLabel={m.common_back()}/>+ <div class="hidden h-4 w-px bg-border sm:block"></div>+ {#if quadletEnvironments.length > 0}+ <div class="hidden items-center gap-3 sm:flex">+ {@render nameField('inline')}+ </div>+ {:else}+ <h1 class="text-base font-semibold">{m.podman_quadlet_install()}</h1>+ {/if}+ </div>++ {#if quadletEnvironments.length > 0}+ <div class="flex items-center gap-2">+ <EnvironmentDestinationSelect+ bind:value={() => environmentId, (value) => (picked = value)}+ permission="podman:quadlets"+ environments={installEnvironments}+ />+ {#if installEnvironments.length > 0}+ <ArcaneButton+ action="create"+ customLabel={m.podman_quadlet_install()}+ loadingLabel={m.common_action_creating()}+ onclick={handleSubmit}+ loading={submitting}+ disabled={!canSubmit}+ />+ {/if}+ </div>{/if}</div></div>- <div class="mx-auto w-full max-w-full space-y-6 px-6 py-6">- {#if !status?.quadletsSupported}- <EmptyState icon={FileTextIcon} title={m.common_unavailable()} description={m.podman_quadlets_unsupported()} />- {:else}- <Card.Root>- <Card.Header>- <Card.Title>{m.common_details_title({ resource: m.podman_quadlet() })}</Card.Title>- <Card.Description>{m.podman_quadlet_install_description()}</Card.Description>- </Card.Header>- <Card.Content>- <div class="grid gap-4 md:grid-cols-2">- <TextInputWithLabel- id="quadlet-name"- label={m.common_name()}- helpText={fileName}- bind:value={baseName}- required- disabled={submitting}- />- <SelectWithLabel- id="quadlet-type"- label={m.common_type()}- value={quadletType}- options={PODMAN_QUADLET_TYPES.map((type) => ({ label: `.${type}`, value: type }))}- onValueChange={handleTypeChange}- disabled={submitting}- />+ {#if quadletEnvironments.length === 0}+ <div class="mx-auto w-full max-w-full px-6 py-6">+ <EmptyState+ icon={FileTextIcon}+ title={m.common_unavailable()}+ description={podmanEnvironments.length === 0 ? m.podman_environments_unavailable() : m.podman_quadlets_unsupported()}+ />+ </div>+ {:else}+ <div class="flex min-h-0 flex-1 overflow-hidden">+ <div class="mx-auto h-full w-full max-w-full min-w-0">+ <div class="flex h-full min-h-0 flex-col gap-3">+ <div class="block flex-shrink-0 py-4 sm:hidden">+ {@render nameField('block')}+ </div>++ <div class="flex shrink-0 flex-wrap items-center gap-x-6 gap-y-3">+ <div class="flex items-center gap-2">+ <Label for="quadlet-type" weight="normal" class="shrink-0">{m.common_type()}</Label>+ <Select.Root type="single" value={quadletType} onValueChange={handleTypeChange} disabled={submitting}>+ <Select.Trigger id="quadlet-type" class="h-8 min-w-32">+ <span class="truncate">.{quadletType}</span>+ </Select.Trigger>+ <Select.Content>+ {#each PODMAN_QUADLET_TYPES as type (type)}+ <Select.Item value={type}>.{type}</Select.Item>+ {/each}+ </Select.Content>+ </Select.Root>+ </div>{#if appsSupported}- <TextInputWithLabel- id="quadlet-app"- label={m.podman_quadlet_app()}- description={m.podman_quadlet_app_description()}- bind:value={app}- disabled={submitting}- />+ <div class="flex items-center gap-2">+ <Label for="quadlet-app" weight="normal" class="shrink-0" title={m.podman_quadlet_app_description()}>+ {m.podman_quadlet_app()}+ </Label>+ <Input+ id="quadlet-app"+ class="h-8 w-72"+ placeholder={m.podman_quadlet_app_description()}+ bind:value={app}+ disabled={submitting}+ />+ </div>{/if}</div>- </Card.Content>- </Card.Root>-- <CodePanel title={fileName} language="systemd" validationMode="none" bind:value={content} autoHeight />- {#if quadletType === 'kube'}- <CodePanel title={kubeFileName} language="yaml" validationMode="none" bind:value={kubeYaml} autoHeight />- {/if}-- {#if appsSupported}- <Card.Root>- <Card.Header>- <Card.Title>{m.podman_quadlet_extra_files()}</Card.Title>- <Card.Description>{m.podman_quadlet_extra_files_description()}</Card.Description>- </Card.Header>- <Card.Content>- <QuadletExtraFiles bind:files={extraFiles} disabled={submitting} />- </Card.Content>- </Card.Root>- {/if}- {/if}- </div>+ <QuadletWorkspaceEditor+ {workspace}+ mainFileName={fileName}+ bind:content+ fileId="podman:quadlets:new"+ {environmentId}+ disabled={submitting}+ />+ </div>+ </div>+ </div>+ {/if}</div>diff --git a/types/podman/labels.go b/types/podman/labels.goindex 5205f35e9..bb38804e3 100644--- a/types/podman/labels.go+++ b/types/podman/labels.go@@ -1,3 +1,13 @@package podman+import "strings"+const SystemdUnitLabel = "PODMAN_SYSTEMD_UNIT"++func QuadletUnit(labels map[string]string) string {+ unit := labels[SystemdUnitLabel]+ if strings.HasPrefix(unit, "podman-compose@") {+ return ""+ }+ return unit+}diff --git a/types/podman/pod.go b/types/podman/pod.goindex 84017779a..3593bcb08 100644--- a/types/podman/pod.go+++ b/types/podman/pod.go@@ -34,31 +34,101 @@ type PodPortBinding struct {}type PodInfraConfig struct {- PortBindings map[string][]PodPortBinding `json:"portBindings,omitempty"`- HostNetwork bool `json:"hostNetwork"`- Networks []string `json:"networks,omitempty"`+ PortBindings map[string][]PodPortBinding `json:"portBindings,omitempty"`+ HostNetwork bool `json:"hostNetwork"`+ StaticIP string `json:"staticIp,omitempty"`+ StaticMAC string `json:"staticMac,omitempty"`+ NoManageResolvConf bool `json:"noManageResolvConf"`+ DNSServer []string `json:"dnsServer,omitempty"`+ DNSSearch []string `json:"dnsSearch,omitempty"`+ DNSOption []string `json:"dnsOption,omitempty"`+ NoManageHostname bool `json:"noManageHostname"`+ NoManageHosts bool `json:"noManageHosts"`+ HostAdd []string `json:"hostAdd,omitempty"`+ HostsFile string `json:"hostsFile,omitempty"`+ Networks []string `json:"networks,omitempty"`+ NetworkOptions map[string][]string `json:"networkOptions,omitempty"`+ PidNS string `json:"pidNs,omitempty"`+ UserNS string `json:"userNs,omitempty"`+ UtsNS string `json:"utsNs,omitempty"`}type PodInspectContainer struct {- ID string `json:"id"`- Name string `json:"name"`- State string `json:"state"`+ ID string `json:"id"`+ Name string `json:"name"`+ State string `json:"state"`+ Image string `json:"image,omitempty"`+ Status string `json:"status,omitempty"`+ Created time.Time `json:"created"`+ ExitCode int32 `json:"exitCode"`+ IsInfra bool `json:"isInfra"`+ Ports []PodPortMapping `json:"ports,omitempty"`+}++type PodMount struct {+ Type string `json:"type"`+ Name string `json:"name,omitempty"`+ Source string `json:"source,omitempty"`+ Destination string `json:"destination"`+ Driver string `json:"driver,omitempty"`+ Mode string `json:"mode,omitempty"`+ Options []string `json:"options,omitempty"`+ RW bool `json:"rw"`+ Propagation string `json:"propagation,omitempty"`+ SubPath string `json:"subPath,omitempty"`+}++type PodDevice struct {+ PathOnHost string `json:"pathOnHost"`+ PathInContainer string `json:"pathInContainer"`+ CgroupPermissions string `json:"cgroupPermissions,omitempty"`+}++type PodWeightDevice struct {+ Path string `json:"path"`+ Weight uint16 `json:"weight"`+}++type PodThrottleDevice struct {+ Path string `json:"path"`+ Rate uint64 `json:"rate"`}type PodInspect struct {- ID string `json:"id"`- Name string `json:"name"`- Namespace string `json:"namespace,omitempty"`- Created time.Time `json:"created"`- State string `json:"state"`- Hostname string `json:"hostname,omitempty"`- Labels map[string]string `json:"labels,omitempty"`- CreateInfra bool `json:"createInfra"`- InfraContainerID string `json:"infraContainerId,omitempty"`- InfraConfig *PodInfraConfig `json:"infraConfig,omitempty"`- SharedNamespaces []string `json:"sharedNamespaces,omitempty"`- NumContainers uint `json:"numContainers"`- Containers []PodInspectContainer `json:"containers"`+ ID string `json:"id"`+ Name string `json:"name"`+ Namespace string `json:"namespace,omitempty"`+ Created time.Time `json:"created"`+ State string `json:"state"`+ CreateCommand []string `json:"createCommand,omitempty"`+ ExitPolicy string `json:"exitPolicy,omitempty"`+ RestartPolicy string `json:"restartPolicy,omitempty"`+ Hostname string `json:"hostname,omitempty"`+ Labels map[string]string `json:"labels,omitempty"`+ CreateCgroup bool `json:"createCgroup"`+ CgroupParent string `json:"cgroupParent,omitempty"`+ CgroupPath string `json:"cgroupPath,omitempty"`+ CreateInfra bool `json:"createInfra"`+ InfraContainerID string `json:"infraContainerId,omitempty"`+ InfraConfig *PodInfraConfig `json:"infraConfig,omitempty"`+ SharedNamespaces []string `json:"sharedNamespaces,omitempty"`+ NumContainers uint `json:"numContainers"`+ Containers []PodInspectContainer `json:"containers"`+ CPUPeriod uint64 `json:"cpuPeriod,omitempty"`+ CPUQuota int64 `json:"cpuQuota,omitempty"`+ CPUShares uint64 `json:"cpuShares,omitempty"`+ CPUSetCPUs string `json:"cpusetCpus,omitempty"`+ CPUSetMems string `json:"cpusetMems,omitempty"`+ MemoryLimit uint64 `json:"memoryLimit,omitempty"`+ MemorySwap uint64 `json:"memorySwap,omitempty"`+ BlkioWeight uint64 `json:"blkioWeight,omitempty"`+ BlkioWeightDevices []PodWeightDevice `json:"blkioWeightDevices,omitempty"`+ DeviceReadBps []PodThrottleDevice `json:"deviceReadBps,omitempty"`+ DeviceWriteBps []PodThrottleDevice `json:"deviceWriteBps,omitempty"`+ Mounts []PodMount `json:"mounts,omitempty"`+ Devices []PodDevice `json:"devices,omitempty"`+ VolumesFrom []string `json:"volumesFrom,omitempty"`+ SecurityOpts []string `json:"securityOpts,omitempty"`}type PodPortMapping struct {@@ -187,4 +257,5 @@ type Container struct {Pod string `json:"pod,omitempty"`PodName string `json:"podName,omitempty"`IsInfra bool `json:"isInfra"`+ Ports []PodPortMapping `json:"ports,omitempty"`}