fix summary 2.5 columns (#507)

gobitfly · Jun 20, 2024 · 2d726fa · 2d726fa
1 parent b19c72b
commit 2d726fa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/backend/pkg/api/enums/enums.go b/backend/pkg/api/enums/enums.go
@@ -25,11 +25,11 @@ var _ EnumFactory[VDBSummaryColumn] = VDBSummaryColumn(0)
 
 const (
 	VDBSummaryGroup VDBSummaryColumn = iota
-	VDBSummaryEfficiencyDay
-	VDBSummaryEfficiencyWeek
-	VDBSummaryEfficiencyMonth
-	VDBSummaryEfficiencyTotal
-	VDBSummaryValidators // Sort by count, not by index
+	VDBSummaryValidators
+	VDBSummaryEfficiency
+	VDBSummaryAttestations
+	VDBSummaryProposals
+	VDBSummaryReward
 )
 
 func (c VDBSummaryColumn) Int() int {
@@ -40,35 +40,35 @@ func (VDBSummaryColumn) NewFromString(s string) VDBSummaryColumn {
 	switch s {
 	case "group_id":
 		return VDBSummaryGroup
-	case "efficiency_last_24h":
-		return VDBSummaryEfficiencyDay
-	case "efficiency_last_7d":
-		return VDBSummaryEfficiencyWeek
-	case "efficiency_last_30d":
-		return VDBSummaryEfficiencyMonth
-	case "efficiency_all_time":
-		return VDBSummaryEfficiencyTotal
 	case "validators":
 		return VDBSummaryValidators
+	case "efficiency":
+		return VDBSummaryEfficiency
+	case "attestations":
+		return VDBSummaryAttestations
+	case "proposals":
+		return VDBSummaryProposals
+	case "reward":
+		return VDBSummaryReward
 	default:
 		return VDBSummaryColumn(-1)
 	}
 }
 
 var VDBSummaryColumns = struct {
-	Group           VDBSummaryColumn
-	EfficiencyDay   VDBSummaryColumn
-	EfficiencyWeek  VDBSummaryColumn
-	EfficiencyMonth VDBSummaryColumn
-	EfficiencyTotal VDBSummaryColumn
-	Validators      VDBSummaryColumn
+	Group        VDBSummaryColumn
+	Validators   VDBSummaryColumn
+	Efficiency   VDBSummaryColumn
+	Attestations VDBSummaryColumn
+	Proposals    VDBSummaryColumn
+	Reward       VDBSummaryColumn
 }{
 	VDBSummaryGroup,
-	VDBSummaryEfficiencyDay,
-	VDBSummaryEfficiencyWeek,
-	VDBSummaryEfficiencyMonth,
-	VDBSummaryEfficiencyTotal,
 	VDBSummaryValidators,
+	VDBSummaryEfficiency,
+	VDBSummaryAttestations,
+	VDBSummaryProposals,
+	VDBSummaryReward,
 }
 
 // ----------------

diff --git a/backend/pkg/api/router.go b/backend/pkg/api/router.go
@@ -218,7 +218,7 @@ func addValidatorDashboardRoutes(hs *handlers.HandlerService, publicRouter, inte
 	internalDashboardRouter := internalRouter.PathPrefix(vdbPath).Subrouter()
 	// add middleware to check if user has access to dashboard
 	if !cfg.Frontend.Debug {
-		publicDashboardRouter.Use(hs.GetVDBAuthMiddleware(hs.GetUserIdByApiKey))
+		publicDashboardRouter.Use(hs.GetVDBAuthMiddleware(hs.GetUserIdByApiKey), hs.VDBPublicApiCheckMiddleware)
 		internalDashboardRouter.Use(hs.GetVDBAuthMiddleware(hs.GetUserIdBySession), GetAuthMiddleware(cfg.ApiKeySecret))
 	}