chore: correct order within page result (#6847)

srikanthccv · amlannandy · commit 883e0ff80111 · 2025-01-21T17:25:00.000+05:30
diff --git a/pkg/query-service/app/inframetrics/clusters.go b/pkg/query-service/app/inframetrics/clusters.go
@@ -338,5 +338,7 @@ func (p *ClustersRepo) GetClusterList(ctx context.Context, req model.ClusterList
 	resp.Total = len(allClusterGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/daemonsets.go b/pkg/query-service/app/inframetrics/daemonsets.go
@@ -440,5 +440,7 @@ func (d *DaemonSetsRepo) GetDaemonSetList(ctx context.Context, req model.DaemonS
 	resp.Total = len(allDaemonSetGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/deployments.go b/pkg/query-service/app/inframetrics/deployments.go
@@ -440,5 +440,7 @@ func (d *DeploymentsRepo) GetDeploymentList(ctx context.Context, req model.Deplo
 	resp.Total = len(allDeploymentGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/jobs.go b/pkg/query-service/app/inframetrics/jobs.go
@@ -494,5 +494,7 @@ func (d *JobsRepo) GetJobList(ctx context.Context, req model.JobListRequest) (mo
 	resp.Total = len(allJobGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/namespaces.go b/pkg/query-service/app/inframetrics/namespaces.go
@@ -341,5 +341,7 @@ func (p *NamespacesRepo) GetNamespaceList(ctx context.Context, req model.Namespa
 	resp.Total = len(allNamespaceGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/nodes.go b/pkg/query-service/app/inframetrics/nodes.go
@@ -19,7 +19,7 @@ var (
 
 	nodeAttrsToEnrich = []string{"k8s_node_name", "k8s_node_uid", "k8s_cluster_name"}
 
-	k8sNodeUIDAttrKey = "k8s_node_uid"
+	k8sNodeGroupAttrKey = "k8s_node_name"
 
 	queryNamesForNodes = map[string][]string{
 		"cpu":                {"A"},
@@ -125,7 +125,7 @@ func (p *NodesRepo) getMetadataAttributes(ctx context.Context, req model.NodeLis
 			}
 		}
 
-		nodeUID := stringData[k8sNodeUIDAttrKey]
+		nodeUID := stringData[k8sNodeGroupAttrKey]
 		if _, ok := nodeAttrs[nodeUID]; !ok {
 			nodeAttrs[nodeUID] = map[string]string{}
 		}
@@ -220,7 +220,7 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)
 	}
 
 	if req.GroupBy == nil {
-		req.GroupBy = []v3.AttributeKey{{Key: k8sNodeUIDAttrKey}}
+		req.GroupBy = []v3.AttributeKey{{Key: k8sNodeGroupAttrKey}}
 		resp.Type = model.ResponseTypeList
 	} else {
 		resp.Type = model.ResponseTypeGroupedList
@@ -306,7 +306,7 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)
 				NodeMemoryAllocatable: -1,
 			}
 
-			if nodeUID, ok := row.Data[k8sNodeUIDAttrKey].(string); ok {
+			if nodeUID, ok := row.Data[k8sNodeGroupAttrKey].(string); ok {
 				record.NodeUID = nodeUID
 			}
 
@@ -354,5 +354,6 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)
 	resp.Total = len(allNodeGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/nodes_query.go b/pkg/query-service/app/inframetrics/nodes_query.go
@@ -20,7 +20,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -46,7 +46,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -72,7 +72,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -98,7 +98,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -132,7 +132,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -166,7 +166,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
diff --git a/pkg/query-service/app/inframetrics/pods.go b/pkg/query-service/app/inframetrics/pods.go
@@ -404,5 +404,7 @@ func (p *PodsRepo) GetPodList(ctx context.Context, req model.PodListRequest) (mo
 	resp.Total = len(allPodGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/pvcs.go b/pkg/query-service/app/inframetrics/pvcs.go
@@ -374,5 +374,7 @@ func (p *PvcsRepo) GetPvcList(ctx context.Context, req model.VolumeListRequest)
 	resp.Total = len(allVolumeGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/app/inframetrics/statefulsets.go b/pkg/query-service/app/inframetrics/statefulsets.go
@@ -440,5 +440,7 @@ func (d *StatefulSetsRepo) GetStatefulSetList(ctx context.Context, req model.Sta
 	resp.Total = len(allStatefulSetGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }
diff --git a/pkg/query-service/model/infra.go b/pkg/query-service/model/infra.go

Original file line number	Diff line number	Diff line change
`@@ -338,5 +338,7 @@ func (p *ClustersRepo) GetClusterList(ctx context.Context, req model.ClusterList`
`338`	`338`	`resp.Total = len(allClusterGroups)`
`339`	`339`	`resp.Records = records`
`340`	`340`
	`341`	`+ resp.SortBy(req.OrderBy)`
	`342`	`+`
`341`	`343`	`return resp, nil`
`342`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -440,5 +440,7 @@ func (d *DaemonSetsRepo) GetDaemonSetList(ctx context.Context, req model.DaemonS`
`440`	`440`	`resp.Total = len(allDaemonSetGroups)`
`441`	`441`	`resp.Records = records`
`442`	`442`
	`443`	`+ resp.SortBy(req.OrderBy)`
	`444`	`+`
`443`	`445`	`return resp, nil`
`444`	`446`	`}`
Original file line number	Diff line number	Diff line change
`@@ -440,5 +440,7 @@ func (d *DeploymentsRepo) GetDeploymentList(ctx context.Context, req model.Deplo`
`440`	`440`	`resp.Total = len(allDeploymentGroups)`
`441`	`441`	`resp.Records = records`
`442`	`442`
	`443`	`+ resp.SortBy(req.OrderBy)`
	`444`	`+`
`443`	`445`	`return resp, nil`
`444`	`446`	`}`
Original file line number	Diff line number	Diff line change
`@@ -494,5 +494,7 @@ func (d *JobsRepo) GetJobList(ctx context.Context, req model.JobListRequest) (mo`
`494`	`494`	`resp.Total = len(allJobGroups)`
`495`	`495`	`resp.Records = records`
`496`	`496`
	`497`	`+ resp.SortBy(req.OrderBy)`
	`498`	`+`
`497`	`499`	`return resp, nil`
`498`	`500`	`}`
Original file line number	Diff line number	Diff line change
`@@ -341,5 +341,7 @@ func (p *NamespacesRepo) GetNamespaceList(ctx context.Context, req model.Namespa`
`341`	`341`	`resp.Total = len(allNamespaceGroups)`
`342`	`342`	`resp.Records = records`
`343`	`343`
	`344`	`+ resp.SortBy(req.OrderBy)`
	`345`	`+`
`344`	`346`	`return resp, nil`
`345`	`347`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ var (`
`19`	`19`
`20`	`20`	`nodeAttrsToEnrich = []string{"k8s_node_name", "k8s_node_uid", "k8s_cluster_name"}`
`21`	`21`
`22`		`- k8sNodeUIDAttrKey = "k8s_node_uid"`
	`22`	`+ k8sNodeGroupAttrKey = "k8s_node_name"`
`23`	`23`
`24`	`24`	`queryNamesForNodes = map[string][]string{`
`25`	`25`	`"cpu": {"A"},`
`@@ -125,7 +125,7 @@ func (p *NodesRepo) getMetadataAttributes(ctx context.Context, req model.NodeLis`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- nodeUID := stringData[k8sNodeUIDAttrKey]`
	`128`	`+ nodeUID := stringData[k8sNodeGroupAttrKey]`
`129`	`129`	`if _, ok := nodeAttrs[nodeUID]; !ok {`
`130`	`130`	`nodeAttrs[nodeUID] = map[string]string{}`
`131`	`131`	`}`
`@@ -220,7 +220,7 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`if req.GroupBy == nil {`
`223`		`- req.GroupBy = []v3.AttributeKey{{Key: k8sNodeUIDAttrKey}}`
	`223`	`+ req.GroupBy = []v3.AttributeKey{{Key: k8sNodeGroupAttrKey}}`
`224`	`224`	`resp.Type = model.ResponseTypeList`
`225`	`225`	`} else {`
`226`	`226`	`resp.Type = model.ResponseTypeGroupedList`
`@@ -306,7 +306,7 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)`
`306`	`306`	`NodeMemoryAllocatable: -1,`
`307`	`307`	`}`
`308`	`308`
`309`		`- if nodeUID, ok := row.Data[k8sNodeUIDAttrKey].(string); ok {`
	`309`	`+ if nodeUID, ok := row.Data[k8sNodeGroupAttrKey].(string); ok {`
`310`	`310`	`record.NodeUID = nodeUID`
`311`	`311`	`}`
`312`	`312`
`@@ -354,5 +354,6 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)`
`354`	`354`	`resp.Total = len(allNodeGroups)`
`355`	`355`	`resp.Records = records`
`356`	`356`
	`357`	`+ resp.SortBy(req.OrderBy)`
`357`	`358`	`return resp, nil`
`358`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -404,5 +404,7 @@ func (p *PodsRepo) GetPodList(ctx context.Context, req model.PodListRequest) (mo`
`404`	`404`	`resp.Total = len(allPodGroups)`
`405`	`405`	`resp.Records = records`
`406`	`406`
	`407`	`+ resp.SortBy(req.OrderBy)`
	`408`	`+`
`407`	`409`	`return resp, nil`
`408`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -374,5 +374,7 @@ func (p *PvcsRepo) GetPvcList(ctx context.Context, req model.VolumeListRequest)`
`374`	`374`	`resp.Total = len(allVolumeGroups)`
`375`	`375`	`resp.Records = records`
`376`	`376`
	`377`	`+ resp.SortBy(req.OrderBy)`
	`378`	`+`
`377`	`379`	`return resp, nil`
`378`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -440,5 +440,7 @@ func (d *StatefulSetsRepo) GetStatefulSetList(ctx context.Context, req model.Sta`
`440`	`440`	`resp.Total = len(allStatefulSetGroups)`
`441`	`441`	`resp.Records = records`
`442`	`442`
	`443`	`+ resp.SortBy(req.OrderBy)`
	`444`	`+`
`443`	`445`	`return resp, nil`
`444`	`446`	`}`