From d846e076df452686ea70faccf1d6128afc127d4b Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Tue, 21 Mar 2023 18:49:17 +0100 Subject: dashboard: provide correct coverage URLs for the Admin page For the Admin page, we query all managers from all namespaces. That was not supported by queryLatestManagerAssets, so we always returned the fallback coverage URLs. Make queryLatestManagerAssets support ns="". --- dashboard/app/asset_storage.go | 8 +++++--- dashboard/app/index.yaml | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dashboard/app/asset_storage.go b/dashboard/app/asset_storage.go index a8492a3e8..10926dfa2 100644 --- a/dashboard/app/asset_storage.go +++ b/dashboard/app/asset_storage.go @@ -473,9 +473,11 @@ func queryLatestManagerAssets(c context.Context, ns string, assetType dashapi.As period time.Duration) (map[string]Asset, error) { var builds []*Build startTime := timeNow(c).Add(-period) - _, err := db.NewQuery("Build"). - Filter("Namespace=", ns). - Filter("Assets.Type=", assetType). + query := db.NewQuery("Build") + if ns != "" { + query = query.Filter("Namespace=", ns) + } + _, err := query.Filter("Assets.Type=", assetType). Filter("Assets.CreateDate>", startTime). Order("Assets.CreateDate"). GetAll(c, &builds) diff --git a/dashboard/app/index.yaml b/dashboard/app/index.yaml index bcadc37e8..813a82df9 100644 --- a/dashboard/app/index.yaml +++ b/dashboard/app/index.yaml @@ -144,6 +144,11 @@ indexes: - name: Assets.Type - name: Assets.CreateDate +- kind: Build + properties: + - name: Assets.Type + - name: Assets.CreateDate + - kind: Build properties: - name: Namespace -- cgit mrf-deployment