Merge pull request #66 from HumairAK/RHOAIENG-8225-bug-fix

UPSTREAM: <carry>: use asc artifact ordering by default.
opendatahub-io · Jul 18, 2024 · bbfb589 · bbfb589
2 parents 7d7659c + 41c133e
commit bbfb589
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/backend/api/v2beta1/artifacts.proto b/backend/api/v2beta1/artifacts.proto
@@ -87,7 +87,7 @@ message ListArtifactRequest {
 
   // Optional. Ordering field. [default = ID]
   Field order_by_field = 2;
-  // Optional. Can be either "asc" (ascending) or "dsc" (descending). [default = asc]
+  // Optional. Can be either "asc" (ascending) or "desc" (descending). [default = asc]
   string order_by = 3;
 
   // Optional. The next_page_token value returned from a previous List request, if any.

diff --git a/backend/api/v2beta1/go_client/artifacts.pb.go b/backend/api/v2beta1/go_client/artifacts.pb.go
diff --git a/backend/api/v2beta1/swagger/artifacts.swagger.json b/backend/api/v2beta1/swagger/artifacts.swagger.json
@@ -52,7 +52,7 @@
           },
           {
             "name": "order_by",
-            "description": "Optional. Can be either \"asc\" (ascending) or \"dsc\" (descending). [default = asc].",
+            "description": "Optional. Can be either \"asc\" (ascending) or \"desc\" (descending). [default = asc].",
             "in": "query",
             "required": false,
             "type": "string"

diff --git a/backend/api/v2beta1/swagger/kfp_api_single_file.swagger.json b/backend/api/v2beta1/swagger/kfp_api_single_file.swagger.json
@@ -62,7 +62,7 @@
           },
           {
             "name": "order_by",
-            "description": "Optional. Can be either \"asc\" (ascending) or \"dsc\" (descending). [default = asc].",
+            "description": "Optional. Can be either \"asc\" (ascending) or \"desc\" (descending). [default = asc].",
             "in": "query",
             "required": false,
             "type": "string"

diff --git a/backend/src/apiserver/server/artifact_server.go b/backend/src/apiserver/server/artifact_server.go
@@ -82,13 +82,8 @@ func (s *ArtifactServer) ListArtifacts(ctx context.Context, r *apiv2beta1.ListAr
 	orderByField := r.OrderByField.String()
 
 	orderByAsc := true
-	switch r.OrderBy {
-	case "asc":
-		orderByAsc = true
-	case "dsc":
+	if r.OrderBy == "desc" {
 		orderByAsc = false
-	default:
-		return nil, util.Wrap(err, "Invalid value for order_by, valid values are 'asc' or 'dsc'.")
 	}
 
 	maxResultSize := r.MaxResultSize

diff --git a/backend/src/apiserver/server/artifact_server_test.go b/backend/src/apiserver/server/artifact_server_test.go
@@ -190,7 +190,7 @@ func TestListArtifacts(t *testing.T) {
 			artifactRequest: &apiv2beta1.ListArtifactRequest{
 				MaxResultSize: 2,
 				Namespace:     "test-namespace",
-				OrderBy:       "dsc",
+				OrderBy:       "desc",
 			},
 			expectedArtifacts: []*apiv2beta1.Artifact{artifact1, artifact0},
 			wantErr:           false,
@@ -200,7 +200,7 @@ func TestListArtifacts(t *testing.T) {
 			artifactRequest: &apiv2beta1.ListArtifactRequest{
 				MaxResultSize: 2,
 				Namespace:     "",
-				OrderBy:       "dsc",
+				OrderBy:       "desc",
 			},
 			expectedArtifacts: []*apiv2beta1.Artifact{artifact1, artifact0},
 			wantErr:           true,