More API and Healthcheckk work

models/door43metadata/search.go

@@ -71,7 +71,6 @@ type SearchCatalogOptions struct {
 	MetadataVersions []string
 	Topics           []string
 	InvertedTopics   []string
-	Healthchecks     []string
 	ShowIngredients  util.OptionalBool
 	Languages        []string
 	LanguageIsGL     util.OptionalBool
@@ -132,7 +131,6 @@ func SearchCatalogCondition(opts *SearchCatalogOptions) builder.Cond {
 		GetMetadataTypeCond(opts.MetadataTypes, opts.PartialMatch),
 		GetTopicCond(opts.Topics, opts.PartialMatch),
 		GetInvertedTopicCond(opts.InvertedTopics, opts.PartialMatch),
-		GetHealthcheckCond(opts.Healthchecks),
 		GetTagCond(opts.Tags),
 		repoCond,
 		ownerCond,

models/repo/repo_dcs.go

@@ -5,14 +5,21 @@ package repo
 
 import (
 	"context"
+	"net/url"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/door43metadata"
 	"code.gitea.io/gitea/modules/dcs"
+	"code.gitea.io/gitea/modules/setting"
 
 	"xorm.io/builder"
 )
 
+// HealthcheckURL the api url for a repo's healthcheck
+func (repo *Repository) RepoHealthcheckURL() string {
+	return setting.AppURL + "api/v1/repos/" + url.PathEscape(repo.OwnerName) + "/" + url.PathEscape(repo.Name) + "/healthcheck"
+}
+
 // LoadLatestDMs loads the latest DMs
 func (repo *Repository) LoadLatestDMs(ctx context.Context) error {
 	if repo.LatestProdDM == nil {

modules/structs/catalog.go

@@ -44,6 +44,7 @@ type CatalogEntry struct {
 	Books                  []string      `json:"books,omitempty"`
 	IsValid                bool          `json:"is_valid"`
 	ValidationErrorsURL    string        `json:"validation_errors_url"`
+	HealthcheckSeverity    string        `json:"healthcheck_severity"`
 }
 
 // Ingredient is a single project of a resource

modules/structs/repo.go

@@ -107,6 +107,8 @@ type Repository struct {
 	// swagger:strfmt date-time
 	MirrorUpdated time.Time     `json:"mirror_updated,omitempty"`
 	RepoTransfer  *RepoTransfer `json:"repo_transfer"`
+	// topics
+	Topics []string `json:"topics"` // DCS Customizations
 	// language from the manifest
 	MetadataType string `json:"metadata_type"` // DCS Customiations
 	// language from the manifest
@@ -137,6 +139,10 @@ type Repository struct {
 	CatalogStages *CatalogStages `json:"catalog"` // DCS Customiations
 	// content format
 	ContentFormat string `json:"content_format"` // DCS Customizaitons
+	// healthcheck severity
+	HealthcheckSeverity string `json:"healthcheck_severity"` // DCS Customizations
+	// healthcheck URL
+	HealthcheckURL string `json:"healthcheck_url"` // DCS Customizations
 }
 
 // CreateRepoOption options when creating repository

routers/api/v1/catalog/catalog.go

@@ -178,19 +178,11 @@ func Search(ctx *context.APIContext) {
 	//     type: string
 	// - name: invertedTopic
 	//   in: query
-	//   description: Inverted topic. Repos that do NOT have this topic will be returned. Multiple values are ANDed.
+	//   description: Inverted topic. Entries with a repository that do NOT have this topic will be returned. Multiple values are ANDed.
 	//   type: array
 	//   collectionFormat: multi
 	//   items:
 	//     type: string
-	// - name: healthcheck
-	//   in: query
-	//   description: Healthcheck severity. Options are error, warning, info, success. Multiple values are ORed.
-	//   type: array
-	//   collectionFormat: multi
-	//   items:
-	//     type: string
-	//     enum: [error,warning,info,success]
 	// - name: partialMatch
 	//   in: query
 	//   description: if true, subject, owner and repo search fields will use partial match (LIKE) when querying the catalog, default is false
@@ -1024,7 +1016,6 @@ func searchCatalog(ctx *context.APIContext) {
 		MetadataVersions: metadataVersions,
 		Topics:           QueryStrings(ctx, "topic"),
 		InvertedTopics:   QueryStrings(ctx, "invertedTopic"),
-		Healthchecks:     QueryStrings(ctx, "healthcheck"),
 		PartialMatch:     ctx.FormBool("partialMatch"),
 	}
 

routers/api/v1/repo/repo.go

@@ -166,12 +166,12 @@ func Search(ctx *context.APIContext) {
 	//     type: string
 	// - name: invertedTopic
 	//   in: query
-	//   description: Inverted topic. Repos that do NOT have this topic will be returned. Multiple values are ANDed.
+	//   description: Inverted topic. Repositories that do NOT have this topic will be returned. Multiple values are ANDed.
 	//   type: array
 	//   collectionFormat: multi
 	//   items:
 	//     type: string
-	// - name: healthcheck
+	// - name: healthcheckSeverity
 	//   in: query
 	//   description: Healthcheck severity. Options are error, warning, info, success. Multiple values are ORed.
 	//   type: array
@@ -253,7 +253,7 @@ func Search(ctx *context.APIContext) {
 		MetadataVersions: catalog.QueryStrings(ctx, "metadataVersion"),
 		Topics:           catalog.QueryStrings(ctx, "topic"),
 		InvertedTopics:   catalog.QueryStrings(ctx, "invertedTopic"),
-		Healthchecks:     catalog.QueryStrings(ctx, "healthcheck"),
+		Healthchecks:     catalog.QueryStrings(ctx, "healthcheckSeverity"),
 		LanguageIsGL:     ctx.FormOptionalBool("is_gl"),
 		PartialMatch:     ctx.FormBool("partialMatch"),
 		/*** END DCS Customizations ***/

routers/web/dcs/catalog.go

@@ -147,7 +147,6 @@ func RenderCatalogSearch(ctx *context.Context, opts *CatalogSearchOptions) {
 		MetadataVersions: searchMap["metadata_version"],
 		Topics:           searchMap["topic"],
 		InvertedTopics:   searchMap["topic_inverted"],
-		Healthchecks:     searchMap["healthcheck"],
 		Tags:             searchMap["tag"],
 		CheckingLevels:   searchMap["checking_level"],
 	})

services/convert/repository_dcs.go

@@ -27,6 +27,8 @@ func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, apiRepo *api.Re
 	apiRepo.LanguageIsGL = dm.LanguageIsGL
 	apiRepo.CheckingLevel = dm.CheckingLevel
 	apiRepo.ContentFormat = dm.ContentFormat
+	apiRepo.HealthcheckSeverity = dm.HealthcheckSeverity.String()
+	apiRepo.HealthcheckURL = repo.RepoHealthcheckURL()
 	apiRepo.MetadataType = dm.MetadataType
 	apiRepo.MetadataVersion = dm.MetadataVersion
 	apiRepo.Ingredients = dm.Ingredients
@@ -35,5 +37,6 @@ func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, apiRepo *api.Re
 		PreProduction: ToCatalogStage(ctx, repo.LatestPreprodDM),
 		Latest:        ToCatalogStage(ctx, repo.DefaultBranchDM),
 	}
+	apiRepo.Topics = repo.Topics
 	return apiRepo
 }

templates/repo/dcs_healthcheck_list.tmpl

@@ -25,9 +25,11 @@
 							<div class="item-text">
 								{{RenderMarkdownToHtml $.Context $issue.Details}}
 							</div>
-							<div class="item-text">
-								{{RenderMarkdownToHtml $.Context $issue.Suggestion}}
-							</div>
+							{{if eq .Door43Metadata.RefType "branch"}}
+								<div class="item-text">
+									{{RenderMarkdownToHtml $.Context $issue.Suggestion}}
+								</div>
+							{{end}}
 						</div>
 					{{end}}
 				</div>

templates/shared/searchbuilder.tmpl

@@ -79,6 +79,7 @@
     const qInput = document.querySelector('[name="q"]');
     const advancedSearchContainer = document.getElementById('search-builder');
     const catalogOnlyFields = ['stage', 'tag'];
+    const repoOnlyFields = ['healthcheck'];
     const searchFields = [
         { name: 'query', tooltip: 'queries repo name, owner, description & topics. Allows partial match' },
         { name: 'lang', tooltip: 'language code, e.g. en, fr' },
@@ -135,6 +136,9 @@
             if (!isCatalogSearch && catalogOnlyFields.includes(fieldObj.name)) {
                 inputGroup.style.display = 'none';
             }
+            if (isCatalogSearch && repoOnlyFields.includes(fieldObj.name)) {
+                inputGroup.style.display = 'none';
+            }
             advancedSearchContainer.appendChild(inputGroup);
         });