improved source filter

Signed-off-by: Frank Jogeleit <[email protected]>

Author: fjogeleit

backend/pkg/server/api/handler.go

@@ -51,6 +51,18 @@ func (h *Handler) ListPolicySources(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, details)
 }
 
+func (h *Handler) ListNamespaces(ctx *gin.Context) {
+	namespaces, err := h.service.Namespaces(ctx, ctx.Param("cluster"), ctx.Request.URL.Query())
+	if err != nil {
+		zap.L().Error("failed to list namespaces", zap.String("cluster", ctx.Param("cluster")), zap.Error(err))
+
+		ctx.AbortWithStatus(http.StatusInternalServerError)
+		return
+	}
+
+	ctx.JSON(http.StatusOK, namespaces)
+}
+
 func (h *Handler) CreateException(ctx *gin.Context) {
 	req := service.ExceptionRequest{
 		Cluster:  ctx.Param("cluster"),
@@ -224,7 +236,7 @@ func (h *Handler) Dashboard(ctx *gin.Context) {
 	var namespaces []string
 	g.Go(func() error {
 		var err error
-		namespaces, err = endpoints.Core.ListNamespaces(ctx, url.Values{
+		namespaces, err = h.service.Namespaces(ctx, ctx.Param("cluster"), url.Values{
 			"sources":    query["sources"],
 			"kinds":      query["kinds"],
 			"categories": query["categories"],

backend/pkg/server/server.go

@@ -69,6 +69,7 @@ func (s *Server) RegisterAPI(c *api.Config, customBoards map[string]api.CustomBo
 	s.api.GET("config/:cluster/resource/:id", handler.GetResourceDetails)
 	s.api.POST("config/:cluster/resource/:id/exception", handler.CreateException)
 	s.api.GET("config/:cluster/policy-sources", handler.ListPolicySources)
+	s.api.GET("config/:cluster/namespaces", handler.ListNamespaces)
 	s.api.GET("config/:cluster/:source/policy/details", handler.GetPolicyDetails)
 	s.api.GET("config/:cluster/:source/policies", handler.Policies)
 	s.api.GET("config/:cluster/:source/policy-report", handler.PolicyReport)

backend/pkg/service/service.go

@@ -47,6 +47,21 @@ func (s *Service) plugin(cluster, p string) (*plugin.Client, bool) {
 	return c, ok
 }
 
+func (s *Service) Namespaces(ctx context.Context, cluster string, query url.Values) ([]string, error) {
+	client, err := s.core(cluster)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(query["sources"]) == 1 {
+		config := s.configs[query["sources"][0]]
+
+		query["status"] = config.EnabledResults()
+	}
+
+	return client.ListNamespaces(ctx, query)
+}
+
 func (s *Service) PolicyDetails(ctx context.Context, cluster, source, policy string, query url.Values) (any, error) {
 	client, err := s.core(cluster)
 	if err != nil {
@@ -56,7 +71,10 @@ func (s *Service) PolicyDetails(ctx context.Context, cluster, source, policy str
 	query.Set("sources", source)
 	query.Set("policies", policy)
 
-	config := s.configs[source]
+	config, ok := s.configs[source]
+	if ok {
+		query["status"] = config.EnabledResults()
+	}
 
 	g := &errgroup.Group{}
 
@@ -355,6 +373,15 @@ func (s *Service) Dashboard(ctx context.Context, cluster string, sources []strin
 	combinedFilter, namespaceFilter, clusterFilter := BuildFilters(query)
 	combinedFilter.Set("namespaced", strconv.FormatBool(!clusterScope))
 
+	if len(sources) == 1 {
+		config, ok := s.configs[sources[0]]
+		if ok {
+			combinedFilter["status"] = config.EnabledResults()
+			namespaceFilter["status"] = config.EnabledResults()
+			clusterFilter["status"] = config.EnabledResults()
+		}
+	}
+
 	namespaceResults := make(map[string]core.NamespaceStatusCounts, len(sources))
 	clusterResults := make(map[string]map[string]int, len(sources))
 	showResults := make([]string, 0, len(sources))

frontend/modules/core/api.ts

@@ -93,7 +93,7 @@ export class CoreAPI {
   }
 
   namespaces (filter?: Filter) {
-    return exec<string[]>(`/proxy/${this.cluster}/core/v1/namespaces`, { baseURL: this.baseURL, params: { ...filter } })
+    return exec<string[]>(`/api/config/${this.cluster}/namespaces`, { baseURL: this.baseURL, params: { ...filter } })
   }
 
   namespacedKinds (sources?: string[]) {

frontend/modules/core/composables/api.ts

@@ -1,7 +1,5 @@
 import { CoreAPI } from "../api";
 
-type CancelFunc = (reason?: string) => void
-
 type Callback<T> = (api: CoreAPI) => Promise<T>
 
 export type APIResult<T> = {