refactor(api): removed undefined from json response

Author: remoterami

backend/pkg/api/data_access/dummy.go

@@ -379,8 +379,8 @@ func (*DummyService) GetValidatorDashboardGroupSummary(ctx context.Context, dash
 	return getDummyStruct[t.VDBGroupSummaryData](ctx)
 }
 
-func (*DummyService) GetValidatorDashboardSummaryChart(ctx context.Context, dashboardId t.VDBId, groupIds []int64, efficiency enums.VDBSummaryChartEfficiencyType, aggregation enums.ChartAggregation, afterTs uint64, beforeTs uint64) (*t.ChartData[int, *float64], error) {
-	return getDummyStruct[t.ChartData[int, *float64]](ctx)
+func (*DummyService) GetValidatorDashboardSummaryChart(ctx context.Context, dashboardId t.VDBId, groupIds []int64, efficiency enums.VDBSummaryChartEfficiencyType, aggregation enums.ChartAggregation, afterTs uint64, beforeTs uint64) (*t.ChartData[int, float64], error) {
+	return getDummyStruct[t.ChartData[int, float64]](ctx)
 }
 
 func (*DummyService) GetValidatorDashboardSummaryValidators(ctx context.Context, dashboardId t.VDBId, groupId int64) (*t.VDBGeneralSummaryValidators, error) {

backend/pkg/api/data_access/vdb.go

@@ -48,7 +48,7 @@ type ValidatorDashboardRepository interface {
 
 	GetValidatorDashboardSummary(ctx context.Context, dashboardId t.VDBId, period enums.TimePeriod, cursor string, colSort t.Sort[enums.VDBSummaryColumn], search string, limit uint64, protocolModes t.VDBProtocolModes) ([]t.VDBSummaryTableRow, *t.Paging, error)
 	GetValidatorDashboardGroupSummary(ctx context.Context, dashboardId t.VDBId, groupId int64, period enums.TimePeriod, protocolModes t.VDBProtocolModes) (*t.VDBGroupSummaryData, error)
-	GetValidatorDashboardSummaryChart(ctx context.Context, dashboardId t.VDBId, groupIds []int64, efficiencyType enums.VDBSummaryChartEfficiencyType, aggregation enums.ChartAggregation, afterTs uint64, beforeTs uint64) (*t.ChartData[int, *float64], error)
+	GetValidatorDashboardSummaryChart(ctx context.Context, dashboardId t.VDBId, groupIds []int64, efficiencyType enums.VDBSummaryChartEfficiencyType, aggregation enums.ChartAggregation, afterTs uint64, beforeTs uint64) (*t.ChartData[int, float64], error)
 	GetValidatorDashboardSummaryValidators(ctx context.Context, dashboardId t.VDBId, groupId int64) (*t.VDBGeneralSummaryValidators, error)
 	GetValidatorDashboardSyncSummaryValidators(ctx context.Context, dashboardId t.VDBId, groupId int64, period enums.TimePeriod) (*t.VDBSyncSummaryValidators, error)
 	GetValidatorDashboardSlashingsSummaryValidators(ctx context.Context, dashboardId t.VDBId, groupId int64, period enums.TimePeriod) (*t.VDBSlashingsSummaryValidators, error)

backend/pkg/api/data_access/vdb_rewards.go

@@ -855,10 +855,11 @@ func (d *DataAccessService) GetValidatorDashboardRewardsChart(ctx context.Contex
 	for _, epoch := range epochList {
 		result.Categories = append(result.Categories, epoch)
 		for idx, series := range result.Series {
+			d := epochData[epoch][uint64(series.Id)]
 			if series.Property == "el" {
-				result.Series[idx].Data = append(result.Series[idx].Data, epochData[epoch][uint64(series.Id)].El)
+				result.Series[idx].Data = append(result.Series[idx].Data, &d.El)
 			} else if series.Property == "cl" {
-				result.Series[idx].Data = append(result.Series[idx].Data, epochData[epoch][uint64(series.Id)].Cl)
+				result.Series[idx].Data = append(result.Series[idx].Data, &d.Cl)
 			} else {
 				return nil, fmt.Errorf("unknown series property: %s", series.Property)
 			}

backend/pkg/api/data_access/vdb_summary.go

@@ -838,8 +838,8 @@ func calcEfficiency(dividend, divisor decimal.Decimal) float64 {
 
 // for summary charts: series id is group id, no stack
 
-func (d *DataAccessService) GetValidatorDashboardSummaryChart(ctx context.Context, dashboardId t.VDBId, groupIds []int64, efficiency enums.VDBSummaryChartEfficiencyType, aggregation enums.ChartAggregation, afterTs uint64, beforeTs uint64) (*t.ChartData[int, *float64], error) {
-	ret := &t.ChartData[int, *float64]{}
+func (d *DataAccessService) GetValidatorDashboardSummaryChart(ctx context.Context, dashboardId t.VDBId, groupIds []int64, efficiency enums.VDBSummaryChartEfficiencyType, aggregation enums.ChartAggregation, afterTs uint64, beforeTs uint64) (*t.ChartData[int, float64], error) {
+	ret := &t.ChartData[int, float64]{}
 
 	if len(groupIds) == 0 { // short circuit if no groups are selected
 		return ret, nil
@@ -1018,11 +1018,11 @@ func (d *DataAccessService) GetValidatorDashboardSummaryChart(ctx context.Contex
 	for _, ts := range tsArray {
 		ret.Categories = append(ret.Categories, uint64(ts.Unix()))
 	}
-	ret.Series = make([]t.ChartSeries[int, *float64], 0, len(groupsArray))
+	ret.Series = make([]t.ChartSeries[int, float64], 0, len(groupsArray))
 
-	seriesMap := make(map[int64]*t.ChartSeries[int, *float64])
+	seriesMap := make(map[int64]*t.ChartSeries[int, float64])
 	for _, group := range groupsArray {
-		series := t.ChartSeries[int, *float64]{
+		series := t.ChartSeries[int, float64]{
 			Id:   int(group),
 			Data: make([]*float64, 0, len(tsMap)),
 		}

backend/pkg/api/types/common.go

@@ -72,13 +72,13 @@ type PercentageDetails[T any] struct {
 	MaxValue   T       `json:"max_value"`
 }
 
-type ChartSeries[I int | string, D *float64 | float64 | decimal.Decimal] struct {
+type ChartSeries[I int | string, D float64 | decimal.Decimal] struct {
 	Id       I      `json:"id"`                                      // id may be a string or an int
 	Property string `json:"property,omitempty" tstype:"'el' | 'cl'"` // for stacking bar charts
-	Data     []D    `json:"data"`                                    // y-axis values
+	Data     []*D   `json:"data" tstype:"(D | null)[]"`              // y-axis values
 }
 
-type ChartData[I int | string, D *float64 | float64 | decimal.Decimal] struct {
+type ChartData[I int | string, D float64 | decimal.Decimal] struct {
 	Categories []uint64            `json:"categories"` // x-axis
 	Series     []ChartSeries[I, D] `json:"series"`
 }

backend/pkg/api/types/validator_dashboard.go

@@ -114,7 +114,7 @@ type VDBGroupSummaryData struct {
 }
 type GetValidatorDashboardGroupSummaryResponse ApiDataResponse[VDBGroupSummaryData]
 
-type GetValidatorDashboardSummaryChartResponse ApiDataResponse[ChartData[int, *float64]] // line chart, series id is group id
+type GetValidatorDashboardSummaryChartResponse ApiDataResponse[ChartData[int, float64]] // line chart, series id is group id
 
 // ------------------------------------------------------------
 // Summary Validators

frontend/types/api/common.ts

@@ -59,12 +59,12 @@ export interface PercentageDetails<T extends any> {
   min_value: T;
   max_value: T;
 }
-export interface ChartSeries<I extends number /* int */ | string, D extends number /* float64 */ | undefined | number /* float64 */ | string /* decimal.Decimal */> {
+export interface ChartSeries<I extends number /* int */ | string, D extends number /* float64 */ | string /* decimal.Decimal */> {
   id: I; // id may be a string or an int
   property?: 'el' | 'cl'; // for stacking bar charts
-  data: D[]; // y-axis values
+  data: (D | null)[]; // y-axis values
 }
-export interface ChartData<I extends number /* int */ | string, D extends number /* float64 */ | undefined | number /* float64 */ | string /* decimal.Decimal */> {
+export interface ChartData<I extends number /* int */ | string, D extends number /* float64 */ | string /* decimal.Decimal */> {
   categories: number /* uint64 */[]; // x-axis
   series: ChartSeries<I, D>[];
 }

frontend/types/api/validator_dashboard.ts

@@ -94,7 +94,7 @@ export interface VDBGroupSummaryData {
   };
 }
 export type GetValidatorDashboardGroupSummaryResponse = ApiDataResponse<VDBGroupSummaryData>;
-export type GetValidatorDashboardSummaryChartResponse = ApiDataResponse<ChartData<number /* int */, number /* float64 */ | undefined>>; // line chart, series id is group id
+export type GetValidatorDashboardSummaryChartResponse = ApiDataResponse<ChartData<number /* int */, number /* float64 */>>; // line chart, series id is group id
 /**
  * ------------------------------------------------------------
  * Summary Validators