Don't exclude file objects when performing a list query and rollup is turned off, otherwise can't list children in works (#1343)

Author: bbpennel

web-access-app/src/main/java/edu/unc/lib/boxc/web/access/controllers/SearchActionController.java

@@ -101,7 +101,7 @@ Map<String, Object> listJson(@PathVariable("pid") String pid, HttpServletRequest
         SearchRequest searchRequest = generateSearchRequest(request);
         searchRequest.setRootPid(PIDs.get(pid));
         searchRequest.setApplyCutoffs(true);
-        setDefaultRollup(searchRequest);
+        setDefaultRollup(searchRequest, true);
         SearchResultResponse resultResponse = queryLayer.performSearch(searchRequest);
         populateThumbnailUrls(searchRequest, resultResponse);
         return getResults(resultResponse, "list", request);
@@ -136,7 +136,7 @@ private Map<String, Object> searchJsonRequest(HttpServletRequest request, String
             searchRequest.setRootPid(PIDs.get(pid));
         }
         searchRequest.setApplyCutoffs(false);
-        setDefaultRollup(searchRequest);
+        setDefaultRollup(searchRequest, false);
 
         SearchResultResponse resultResponse = queryLayer.performSearch(searchRequest);
         populateThumbnailUrls(searchRequest, resultResponse);
@@ -161,12 +161,12 @@ private Map<String, Object> searchJsonRequest(HttpServletRequest request, String
         return getResults(resultResponse, "search", request);
     }
 
-    private void setDefaultRollup(SearchRequest searchRequest) {
+    private void setDefaultRollup(SearchRequest searchRequest, boolean isListing) {
         if (searchRequest.getSearchState().getRollup() == null) {
             var enableRollup = shouldEnableRollup(searchRequest);
             LOG.debug("Rollup not specified in request, determine rollup should be set to {}", enableRollup);
             searchRequest.getSearchState().setRollup(enableRollup);
-            if (!enableRollup) {
+            if (!enableRollup && !isListing) {
                 searchRequest.getSearchState().getResourceTypes().remove(ResourceType.File.name());
             }
         }