From 364cba3100f780b447a69a322a0e0abc9511751e Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 25 Sep 2025 18:57:54 +0200 Subject: [PATCH] Add formated tables for tenantnamespaces Signed-off-by: Andrei Kvapil --- .../controller/dashboard/static_refactored.go | 38 ++++--------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/internal/controller/dashboard/static_refactored.go b/internal/controller/dashboard/static_refactored.go index 8e74c5d7..67ea72ed 100644 --- a/internal/controller/dashboard/static_refactored.go +++ b/internal/controller/dashboard/static_refactored.go @@ -357,6 +357,12 @@ func CreateAllCustomColumnsOverrides() []*dashboardv1alpha1.CustomColumnsOverrid createStringColumn("Memory", ".status.resources.memory"), createStringColumn("Operational", ".status.operational"), }), + + // Stock cluster core cozystack io v1alpha1 tenantnamespaces + createCustomColumnsOverride("stock-cluster-/core.cozystack.io/v1alpha1/tenantnamespaces", []any{ + createCustomColumnWithJsonPath("Name", ".metadata.name", "TN", "tenantnamespace", getColorForType("tenantnamespace"), "/openapi-ui/{2}/{reqsJsonPath[0]['.metadata.name']['-']}/factory/marketplace"), + createTimestampColumn("Created", ".metadata.creationTimestamp"), + }), } } @@ -1445,36 +1451,8 @@ func CreateAllNavigations() []*dashboardv1alpha1.Navigation { // CreateAllTableUriMappings creates all table URI mapping resources using helper functions func CreateAllTableUriMappings() []*dashboardv1alpha1.TableUriMapping { - return []*dashboardv1alpha1.TableUriMapping{ - // Stock namespace default apps cozystack io v1alpha1 virtualmachines yaml - createTableUriMapping("virtualmachine-details", map[string]any{ - "tableUri": "/openapi-ui/{clusterName}/{namespace}/builtin-table/virtualmachines", - "resourceUri": "/openapi-ui/{clusterName}/{namespace}/builtin-table/virtualmachines", - }), - - // Namespaces - createTableUriMapping("namespaces", map[string]any{ - "id": "stock-cluster-/core.cozystack.io/v1alpha1/tenantnamespaces", - "keysToParse": []any{"metadata", "name"}, - "pathToNavigate": "/openapi-ui/{clusterName}/~recordValue~/factory/marketplace", - }), - - // Stock cluster networking k8s io v1 ingress details - createTableUriMapping("stock-cluster-networking.k8s.io.v1.ingress-details", map[string]any{ - "keysToParse": ".metadata.name", - "keysToParseSecond": ".metadata.namespace", - "id": "stock-cluster-/networking.k8s.io/v1/ingresses", - "pathToNavigate": "/openapi-ui/{clusterName}/~recordValueSecond~/factory/kube-ingress-details/~recordValue~", - }), - - // Stock namespace networking k8s io v1 ingress details - createTableUriMapping("stock-namespace-networking.k8s.io.v1.ingress-details", map[string]any{ - "keysToParse": ".metadata.name", - "keysToParseSecond": ".metadata.namespace", - "id": "stock-namespace-/networking.k8s.io/v1/ingresses", - "pathToNavigate": "/openapi-ui/{clusterName}/~recordValueSecond~/factory/kube-ingress-details/~recordValue~", - }), - } + // links are now handled through CustomFormsPrefills + return []*dashboardv1alpha1.TableUriMapping{} } // ---------------- Additional helper functions for missing resource types ----------------