(BEDS-1100) API: Incorporate dashboard archival status into notification endpoints

backend/pkg/api/data_access/notifications.go

@@ -1564,6 +1564,7 @@ func (d *DataAccessService) GetNotificationSettingsDashboards(ctx context.Contex
 	// Get the validator dashboards
 	valDashboards := []struct {
 		DashboardId   uint64         `db:"dashboard_id"`
+		IsArchived    bool           `db:"is_archived"`
 		DashboardName string         `db:"dashboard_name"`
 		GroupId       uint64         `db:"group_id"`
 		GroupName     string         `db:"group_name"`
@@ -1575,6 +1576,7 @@ func (d *DataAccessService) GetNotificationSettingsDashboards(ctx context.Contex
 		err := d.alloyReader.SelectContext(ctx, &valDashboards, `
 			SELECT
 				d.id AS dashboard_id,
+				d.is_archived IS NOT NULL AS is_archived,
 				d.name AS dashboard_name,
 				g.id AS group_id,
 				g.name AS group_name,
@@ -1731,6 +1733,7 @@ func (d *DataAccessService) GetNotificationSettingsDashboards(ctx context.Contex
 
 		// Set general info
 		resultMap[key].IsAccountDashboard = false
+		resultMap[key].IsArchived = valDashboard.IsArchived
 		resultMap[key].DashboardId = valDashboard.DashboardId
 		resultMap[key].DashboardName = valDashboard.DashboardName
 		resultMap[key].GroupId = valDashboard.GroupId

backend/pkg/api/handlers/middlewares.go

@@ -156,7 +156,7 @@ func (h *HandlerService) VDBArchivedCheckMiddleware(next http.Handler) http.Hand
 			return
 		}
 		if dashboard.IsArchived {
-			handleErr(w, r, newForbiddenErr("dashboard with id %v is archived", dashboardId))
+			handleErr(w, r, newForbiddenErr("dashboard with id %s is archived", mux.Vars(r)["dashboard_id"]))
 			return
 		}
 		next.ServeHTTP(w, r)

backend/pkg/api/router.go

@@ -361,10 +361,21 @@ func addNotificationRoutes(hs *handlers.HandlerService, publicRouter, internalRo
 	dashboardSettingsEndpoints := []endpoint{
 		{http.MethodGet, "/validator-dashboards/{dashboard_id}/groups/{group_id}/epochs/{epoch}", hs.PublicGetUserNotificationsValidatorDashboard, hs.InternalGetUserNotificationsValidatorDashboard},
 		{http.MethodGet, "/account-dashboards/{dashboard_id}/groups/{group_id}/epochs/{epoch}", hs.PublicGetUserNotificationsAccountDashboard, hs.InternalGetUserNotificationsAccountDashboard},
+	}
+	addEndpointsToRouters(dashboardSettingsEndpoints, publicDashboardNotificationSettingsRouter, internalDashboardNotificationSettingsRouter)
+
+	publicActiveDashboardNotificationSettingsRouter := publicDashboardNotificationSettingsRouter.NewRoute().Subrouter()
+	internalActiveDashboardNotificationSettingsRouter := internalDashboardNotificationSettingsRouter.NewRoute().Subrouter()
+	// TODO add archivedCheck middleware to account dashboard endpoints once they are implemented
+	if !debug {
+		publicActiveDashboardNotificationSettingsRouter.Use(hs.VDBArchivedCheckMiddleware)
+		internalActiveDashboardNotificationSettingsRouter.Use(hs.VDBArchivedCheckMiddleware)
+	}
+	activeDashboardSettingsEndpoints := []endpoint{
 		{http.MethodPut, "/settings/validator-dashboards/{dashboard_id}/groups/{group_id}", hs.PublicPutUserNotificationSettingsValidatorDashboard, hs.InternalPutUserNotificationSettingsValidatorDashboard},
 		{http.MethodPut, "/settings/account-dashboards/{dashboard_id}/groups/{group_id}", hs.PublicPutUserNotificationSettingsAccountDashboard, hs.InternalPutUserNotificationSettingsAccountDashboard},
 	}
-	addEndpointsToRouters(dashboardSettingsEndpoints, publicDashboardNotificationSettingsRouter, internalDashboardNotificationSettingsRouter)
+	addEndpointsToRouters(activeDashboardSettingsEndpoints, publicActiveDashboardNotificationSettingsRouter, internalActiveDashboardNotificationSettingsRouter)
 }
 
 func addEndpointsToRouters(endpoints []endpoint, publicRouter *mux.Router, internalRouter *mux.Router) {

backend/pkg/api/types/notifications.go

@@ -216,6 +216,7 @@ type PutUserNotificationSettingsAccountDashboardResponse ApiDataResponse[Notific
 
 type NotificationSettingsDashboardsTableRow struct {
 	IsAccountDashboard bool   `json:"is_account_dashboard"` // if false it's a validator dashboard
+	IsArchived         bool   `json:"is_archived"`
 	DashboardId        uint64 `json:"dashboard_id"`
 	DashboardName      string `json:"dashboard_name"`
 	GroupId            uint64 `json:"group_id"`

frontend/types/api/notifications.ts

@@ -208,6 +208,7 @@ export interface NotificationSettingsAccountDashboard {
 export type PutUserNotificationSettingsAccountDashboardResponse = ApiDataResponse<NotificationSettingsAccountDashboard>;
 export interface NotificationSettingsDashboardsTableRow {
   is_account_dashboard: boolean; // if false it's a validator dashboard
+  is_archived: boolean;
   dashboard_id: number /* uint64 */;
   dashboard_name: string;
   group_id: number /* uint64 */;