From 0e1fe127221d5ccf5366c473718d9c0d016bf113 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Sun, 22 Nov 2020 22:42:54 +0000 Subject: [PATCH] Clear bottom table if there are no results, GitLab issue #52 --- webui/src/main/java/com/muwire/webui/SearchServlet.java | 4 ++-- webui/src/main/js/search.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/webui/src/main/java/com/muwire/webui/SearchServlet.java b/webui/src/main/java/com/muwire/webui/SearchServlet.java index e9accdb0..50a8e31f 100644 --- a/webui/src/main/java/com/muwire/webui/SearchServlet.java +++ b/webui/src/main/java/com/muwire/webui/SearchServlet.java @@ -149,7 +149,7 @@ public class SearchServlet extends HttpServlet { } SearchResults searchResults = searchManager.getResults().get(uuid); - Set results = searchResults.getBySender().get(sender); + Set results = searchResults.getBySender().getOrDefault(sender, Collections.emptySet()); List resultsFromSender = new ArrayList<>(); results.forEach(result -> { ResultStatus resultStatus = ResultStatus.AVAILABLE; @@ -234,7 +234,7 @@ public class SearchServlet extends HttpServlet { Set resultSet = searchResults.getByInfoHash(infoHash); if (resultSet == null) - return; + resultSet = Collections.emptySet(); List sendersForResult = new ArrayList<>(); resultSet.forEach(event -> { diff --git a/webui/src/main/js/search.js b/webui/src/main/js/search.js index fd283f43..72482ccc 100644 --- a/webui/src/main/js/search.js +++ b/webui/src/main/js/search.js @@ -787,6 +787,8 @@ function refreshSender(searchUUID) { var topTableDiv = document.getElementById("topTableSender") topTableDiv.innerHTML = tableHtml + var bottomTableDiv = document.getElementById("bottomTableSender") + bottomTableDiv.innerText = "" if (currentSender != null) refreshResultsFromSender(currentSender) } @@ -809,6 +811,8 @@ function refreshFile(searchUUID) { var topTableDiv = document.getElementById("topTableFile") topTableDiv.innerHTML = tableHtml + var bottomTableDiv = document.getElementById("bottomTableFile") + bottomTableDiv.innerText = "" if (currentResult != null) refreshSendersForResult(currentResult) }