Merge pull request #2008 from HubSpot/request_id_listing

Make the request id global search include all but deleted requests
HubSpot · Sep 6, 2019 · b5cafde · b5cafde
2 parents d20b4e1 + 676b8ee
commit b5cafde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/resources/RequestResource.java b/SingularityService/src/main/java/com/hubspot/singularity/resources/RequestResource.java
@@ -710,9 +710,11 @@ public List<SingularityRequestParent> getActiveRequests(
   public List<String> getAllRequestIds(
       @Parameter(hidden = true) @Auth SingularityUser user,
       @Parameter(description = "Fetched a cached version of this data to limit expensive operations") @QueryParam("useWebCache") Boolean useWebCache,
-      @Parameter(description = "Filter to request ids that match this string (case insensitive)") @QueryParam("requestIdLike") String requestIdLike) {
+      @Parameter(description = "Filter to request ids that match this string (case insensitive)") @QueryParam("requestIdLike") String requestIdLike,
+      @Parameter(description = "Filter by request state") @QueryParam("state") Set<RequestState> states) {
     List<String> allIds = filterAutorized(Lists.newArrayList(requestManager.getRequests(useWebCache(useWebCache))), SingularityAuthorizationScope.READ, user)
         .stream()
+        .filter((r) -> states == null || states.isEmpty() || states.contains(r.getState()))
         .map((r) -> r.getRequest().getId())
         .collect(Collectors.toList());
     if (requestIdLike == null) {

diff --git a/SingularityUI/app/actions/api/requests.es6 b/SingularityUI/app/actions/api/requests.es6
@@ -7,7 +7,7 @@ export const FetchRequests = buildApiAction(
 
 export const FetchRequestIds = buildApiAction(
   'FETCH_REQUESTS',
-  {url: '/requests/ids/active?useWebCache=true'}
+  {url: '/requests/ids?useWebCache=true&state=ACTIVE&state=PAUSED&state=SYSTEM_COOLDOWN&state=FINISHED&state=DEPLOYING_TO_UNPAUSE'}
 );
 
 export const FetchRequestsInState = buildApiAction(