OP-20612,OP-20610,OP-20654: Adding sortOrder param for Approvals, pol…

…icy, Verification History pages (#389)
spinnaker · Jun 30, 2023 · e37bf58 · e37bf58
1 parent 1c2142f
commit e37bf58
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/...eb/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy b/...eb/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy
@@ -291,9 +291,10 @@ class OpsmxAutopilotController {
                           @RequestParam(value = "noOfDays", required = false) Integer noOfDays,
                           @RequestParam(value = "search", required = false) String search,
                           @RequestParam(value = "verificationType", required = false) String verificationType,
-                          @RequestParam(value = "status", required = false) String status) {
+                          @RequestParam(value = "status", required = false) String status,
+                          @RequestParam(value = "sortOrder", required = false) String sortOrder) {
 
-    return opsmxAutopilotService.getAutoResponse6(type, source, source1, source2, source3,pageNo,pageLimit,noOfDays,search,verificationType,status)
+    return opsmxAutopilotService.getAutoResponse6(type, source, source1, source2, source3,pageNo,pageLimit,noOfDays,search,verificationType,status,sortOrder)
   }
 
   @ApiOperation(value = "Endpoint for autopilot rest services")

diff --git a/...b/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxVisibilityController.groovy b/...b/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxVisibilityController.groovy
@@ -139,9 +139,10 @@ class OpsmxVisibilityController {
                                 @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                 @RequestParam(value = "pageLimit", required = false) Integer pageLimit,
                                 @RequestParam(value = "search", required = false) String search,
-                                @RequestParam(value = "status", required = false) String status) {
+                                @RequestParam(value = "status", required = false) String status,
+                                @RequestParam(value = "sortOrder", required = false) String sortOrder){
 
-    return opsmxVisibilityService.getVisibilityResponse5(version, type, source, source1, source2, approvalgateinstances,noOfDays,pageNo,pageLimit,search,status)
+    return opsmxVisibilityService.getVisibilityResponse5(version, type, source, source1, source2, approvalgateinstances, noOfDays, pageNo, pageLimit, search, status, sortOrder)
   }
 
   @ApiOperation(value = "Endpoint for visibility rest services")

diff --git a/...src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy b/...src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy
@@ -137,7 +137,8 @@ interface OpsmxAutopilotService {
                           @Query("noOfDays") Integer noOfDays,
                           @Query("search") String search,
                           @Query("verificationType") String verificationType,
-                          @Query("status") String status)
+                          @Query("status") String status,
+                          @Query("sortOrder") String sortOrder)
 
   @GET("/autopilot/{type}/{source}/{source1}/{source2}/{source3}/{source4}")
   Object getAutoResponse7(@Path('type') String type,

diff --git a/...rc/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxVisibilityService.groovy b/...rc/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxVisibilityService.groovy
@@ -70,7 +70,8 @@ interface OpsmxVisibilityService {
                                 @Query("pageNo") Integer pageNo,
                                 @Query("pageLimit") Integer pageLimit,
                                 @Query("search") String search,
-                                @Query("status") String status)
+                                @Query("status") String status,
+                                @Query("sortOrder") String sortOrder)
 
   @GET("/visibilityservice/{version}/{type}/{source}/{source1}/{source2}/{source3}")
   Object getVisibilityResponse6(@Path('version') String version,

diff --git a/...main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy b/...main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy
@@ -51,8 +51,9 @@ class OpsmxAuditClientServiceController {
                                  @RequestParam(value = "pageNo",required = false) Integer page,
                                  @RequestParam(value = "size", required = false) Integer size,
                                  @RequestParam(value = "policyStatus",required = false) String policyStatus,
-                                 @RequestParam(value = "search", required = false) String search) {
-    return opsmxAuditClientService.getAuditClientResponse1(version, type,applicationName,noOfDays,page,size,policyStatus,search)
+                                 @RequestParam(value = "search", required = false) String search,
+                                 @RequestParam(value = "sortOrder", required = false) String sortOrder) {
+    return opsmxAuditClientService.getAuditClientResponse1(version, type,applicationName,noOfDays,page,size,policyStatus,search,sortOrder)
   }
 
   @ApiOperation(value = "Endpoint for audit-client rest services")

diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy
@@ -32,7 +32,8 @@ interface OpsmxAuditClientService {
                                  @Query("pageNo") Integer page,
                                  @Query("size") Integer size,
                                  @Query("policyStatus") String policyStatus,
-                                 @Query("search") String search)
+                                 @Query("search") String search,
+                                 @Query("sortOrder") String sortOrder)
 
   @GET("/auditclientservice/{version}/{type}/{source}")
   Object getDeliveryInsightCharts(@Path('version') String version,