Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: surface registry fetch errors in GET /templates/registries (#2342) (#2355)
Giulio Savini1bab88bd1060
diff --git a/backend/internal/huma/handlers/templates.go b/backend/internal/huma/handlers/templates.goindex 4141dba25..d97fe3852 100644--- a/backend/internal/huma/handlers/templates.go+++ b/backend/internal/huma/handlers/templates.go@@ -705,6 +705,16 @@ func (h *TemplateHandler) GetRegistries(ctx context.Context, _ *GetTemplateRegisreturn nil, huma.Error500InternalServerError((&common.RegistryFetchError{Err: mapErr}).Error())}+ // Overlay the last fetch error from the in-memory tracker so the UI can+ // display why a registry is not returning templates without requiring the+ // user to check server logs.+ fetchErrors := h.templateService.GetRegistryFetchErrors()+ for i := range out {+ if msg, ok := fetchErrors[out[i].ID]; ok {+ out[i].LastFetchError = &msg+ }+ }+return &GetTemplateRegistriesOutput{Body: base.ApiResponse[[]template.TemplateRegistry]{Success: true,diff --git a/backend/internal/services/template_service.go b/backend/internal/services/template_service.goindex d3ea32a9b..63ab6aef8 100644--- a/backend/internal/services/template_service.go+++ b/backend/internal/services/template_service.go@@ -55,6 +55,7 @@ type TemplateService struct {registryMu sync.RWMutexregistryFetchMeta map[string]*registryFetchMeta+ registryErrors map[string]string // last fetch error per registry ID, cleared on successfsSyncMu sync.MutexlastFsSync time.Time@@ -91,6 +92,7 @@ func NewTemplateService(ctx context.Context, db *database.DB, httpClient *http.CsettingsService: settingsService,remoteCache: remoteCache{},registryFetchMeta: make(map[string]*registryFetchMeta),+ registryErrors: make(map[string]string),}service.safeHTTPClient = service.newSafeHTTPClientInternal()return service@@ -404,6 +406,18 @@ func (s *TemplateService) GetRegistries(ctx context.Context) ([]models.TemplateRreturn registries, nil}+// GetRegistryFetchErrors returns a snapshot of the last fetch error per registry ID.+// An absent entry means the registry fetched successfully (or has never been attempted).+func (s *TemplateService) GetRegistryFetchErrors() map[string]string {+ s.registryMu.RLock()+ defer s.registryMu.RUnlock()+ out := make(map[string]string, len(s.registryErrors))+ for k, v := range s.registryErrors {+ out[k] = v+ }+ return out+}+func (s *TemplateService) CreateRegistry(ctx context.Context, registry *models.TemplateRegistry) error {// Hydrate metadata if neededif registry.Name == "" || registry.Description == "" {@@ -534,9 +548,16 @@ func (s *TemplateService) loadRemoteTemplates(ctx context.Context) ([]models.ComremoteTemplates, err := s.fetchRegistryTemplates(groupCtx, ®)if err != nil {slog.WarnContext(groupCtx, "failed to fetch templates from registry", "registry", reg.Name, "url", reg.URL, "error", err)+ s.registryMu.Lock()+ s.registryErrors[reg.ID] = err.Error()+ s.registryMu.Unlock()return nil // Don't fail the whole group if one registry fails}+ s.registryMu.Lock()+ delete(s.registryErrors, reg.ID)+ s.registryMu.Unlock()+mu.Lock()defer mu.Unlock()for _, template := range remoteTemplates {diff --git a/frontend/src/lib/types/template.type.ts b/frontend/src/lib/types/template.type.tsindex ee925e8b0..9e284df56 100644--- a/frontend/src/lib/types/template.type.ts+++ b/frontend/src/lib/types/template.type.ts@@ -6,6 +6,7 @@ export interface TemplateRegistry {description: string;createdAt?: string;updatedAt?: string;+ lastFetchError?: string;}export interface Template {diff --git a/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte b/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelteindex 51591122d..8e1fe9cc8 100644--- a/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte+++ b/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte@@ -7,7 +7,7 @@import { Snippet } from '$lib/components/ui/snippet';import { m } from '$lib/paraglide/messages';import type { TemplateRegistry } from '$lib/types/template.type';- import { TrashIcon, RegistryIcon, CommunityIcon, RefreshIcon, ExternalLinkIcon, AddIcon } from '$lib/icons';+ import { TrashIcon, RegistryIcon, CommunityIcon, RefreshIcon, ExternalLinkIcon, AddIcon, AlertTriangleIcon } from '$lib/icons';let {registries,@@ -76,6 +76,12 @@{#if registry.description}<p class="text-muted-foreground mt-1 text-sm">{registry.description}</p>{/if}+ {#if registry.lastFetchError}+ <div class="mt-2 flex items-start gap-1.5 rounded-md border border-destructive/30 bg-destructive/10 px-2 py-1.5">+ <AlertTriangleIcon class="text-destructive mt-0.5 size-3.5 shrink-0" />+ <p class="text-destructive text-xs break-all">{registry.lastFetchError}</p>+ </div>+ {/if}</div><div class="flex items-center gap-2 self-end sm:self-center"><Switchdiff --git a/types/template/template.go b/types/template/template.goindex b0813ca3e..4cdbb7a23 100644--- a/types/template/template.go+++ b/types/template/template.go@@ -114,6 +114,11 @@ type TemplateRegistry struct {//// Required: trueEnabled bool `json:"enabled"`++ // LastFetchError is the error message from the most recent failed fetch, if any.+ //+ // Required: false+ LastFetchError *string `json:"lastFetchError,omitempty"`}// TemplateContent contains a template with its associated content and metadata.