Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: backend not sending build directive for projects (#3691)
Kyle Mendell53017c67cf91
diff --git a/backend/internal/project/project_details.go b/backend/internal/project/project_details.goindex fe186419d..07dcc7c64 100644--- a/backend/internal/project/project_details.go+++ b/backend/internal/project/project_details.go@@ -216,7 +216,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringresp.UpdatedAt = proj.UpdatedAt.Format(time.RFC3339)resp.IsArchived = proj.IsArchivedresp.ArchivedAt = proj.ArchivedAt- resp.HasBuildDirective = false+ resp.HasBuildDirective = proj.BuildImageRefsJSON != nil && len(projects.ParseImageRefsJSON(*proj.BuildImageRefsJSON)) > 0resp.DirName = mo.PointerToOption(proj.DirName).OrEmpty()resp.RelativePath = getProjectRelativePathInternal(projectsDir, proj.Path)resp.GitOpsManagedBy = proj.GitOpsManagedBydiff --git a/backend/internal/project/project_listing.go b/backend/internal/project/project_listing.goindex f24bba13e..beb267d07 100644--- a/backend/internal/project/project_listing.go+++ b/backend/internal/project/project_listing.go@@ -805,6 +805,7 @@ func (s *ProjectService) fetchProjectStatusConcurrently(ctx context.Context, proresults[i].DirName = mo.PointerToOption(p.DirName).OrEmpty()results[i].RelativePath = getProjectRelativePathInternal(projectsDir, p.Path)results[i].GitOpsManagedBy = p.GitOpsManagedBy+ results[i].HasBuildDirective = p.BuildImageRefsJSON != nil && len(projects.ParseImageRefsJSON(*p.BuildImageRefsJSON)) > 0meta := s.ProjectMetadata(ctx, p, metaEnv)applyResolvedProjectIconInternal(&results[i], iconcatalog.Resolve(IconCatalogForContext(ctx), meta.ProjectIcon))results[i].URLs = meta.ProjectURLS@@ -837,6 +838,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir stringresp.DirName = mo.PointerToOption(p.DirName).OrEmpty()resp.RelativePath = getProjectRelativePathInternal(projectsDir, p.Path)resp.GitOpsManagedBy = p.GitOpsManagedBy+ resp.HasBuildDirective = p.BuildImageRefsJSON != nil && len(projects.ParseImageRefsJSON(*p.BuildImageRefsJSON)) > 0meta := s.ProjectMetadata(ctx, p, metaEnv)applyResolvedProjectIconInternal(&resp, iconcatalog.Resolve(IconCatalogForContext(ctx), meta.ProjectIcon))resp.URLs = meta.ProjectURLSdiff --git a/backend/internal/project/service_test.go b/backend/internal/project/service_test.goindex 4a4c6ff85..ab8041a4a 100644--- a/backend/internal/project/service_test.go+++ b/backend/internal/project/service_test.go@@ -7186,3 +7186,31 @@ func TestProjectService_RecoverProjectRenameJournals_ClearsJournalWhenTargetPresrequire.FileExists(t, filepath.Join(oldPath, "compose.yaml"))require.NoDirExists(t, newPath)}++func TestProjectService_MapProjectToDto_SeedsHasBuildDirectiveFromPersistedRefs(t *testing.T) {+ ctx := context.Background()+ db := setupProjectTestDB(t)+ settingsService, err := newSettingsServiceForTestInternal(t, ctx, db)+ require.NoError(t, err)++ svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load())+ metaEnv := &projectMetadataEnvInternal{projectsDirectory: t.TempDir()}++ now := time.Now()+ tests := []struct {+ name string+ buildImageRefsJSON *string+ want bool+ }{+ {name: "build refs persisted", buildImageRefsJSON: new(`["demo-worker"]`), want: true},+ {name: "no build services", buildImageRefsJSON: new(`[]`), want: false},+ {name: "refs never resolved", buildImageRefsJSON: nil, want: false},+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ p := Project{ID: tt.name, Name: tt.name, Path: t.TempDir(), UpdatedAt: &now, BuildImageRefsJSON: tt.buildImageRefsJSON}+ assert.Equal(t, tt.want, svc.mapProjectToDto(ctx, metaEnv.projectsDirectory, p, nil, "", nil, metaEnv).HasBuildDirective)+ })+ }+}