Update UI: Allow to shortcut search to show already received results

Closes #914
theotherp · Jan 22, 2024 · f4ae0c7 · f4ae0c7
1 parent 5cec4be
commit f4ae0c7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -1,5 +1,6 @@
 #@formatter:off
 -   version: "v5.3.7"
+    date: "2024-01-22"
     changes:
       -   type: "feature"
           text: "When you're making a search in the UI you can now choose to show the already received results. Until now you had to either wait, possibly until an indexer ran into a timeout or cancel without seeing any results at all. See #914"

diff --git a/core/src/main/resources/static/js/nzbhydra.js b/core/src/main/resources/static/js/nzbhydra.js
@@ -11506,6 +11506,7 @@ function SearchUpdateModalInstanceCtrl($scope, $interval, SearchService, $uibMod
     $scope.indexersSelected = 0;
     $scope.indexersFinished = 0;
     $scope.buttonText = "Cancel";
+    $scope.buttonTooltip = "Cancel search and return to search mask";
     $scope.btnType = "btn-danger";
 
     var socket = new SockJS(bootstrapped.baseUrl + 'websocket');
@@ -11526,6 +11527,7 @@ function SearchUpdateModalInstanceCtrl($scope, $interval, SearchService, $uibMod
             }
             if ($scope.indexersFinished > 0) {
                 $scope.buttonText = "Show results";
+                $scope.buttonTooltip = "Show results that have already been loaded";
                 $scope.btnType = "btn-warning";
             }
             if (data.messages) {

diff --git a/core/src/main/resources/static/js/nzbhydra.js.map b/core/src/main/resources/static/js/nzbhydra.js.map
diff --git a/core/src/main/resources/static/js/templates.js b/core/src/main/resources/static/js/templates.js
diff --git a/core/ui-src/html/search-state.html b/core/ui-src/html/search-state.html
@@ -1,13 +1,14 @@
 <div class="modal-header">
   <h3 style="display: inline-block" class="modal-title">Searching... please wait</h3>
   <button class="btn {{btnType}}" type="button" ng-click="shortcutSearch()"
-          uib-tooltip="Show results that have already been loaded"
+          uib-tooltip="{{buttonTooltip}}"
           tooltip-placement="top"
           tooltip-trigger="mouseenter"
           style="position: absolute; right: 18px"
   >{{buttonText}}
   </button>
 </div>
+
 <div class="modal-body" style="text-align: left;">
   <img src="static/img/spinner.gif" ng-if="!messages && !indexerSelectionFinished"/>
 

diff --git a/core/ui-src/js/search-controller.js b/core/ui-src/js/search-controller.js
@@ -425,6 +425,7 @@ function SearchUpdateModalInstanceCtrl($scope, $interval, SearchService, $uibMod
     $scope.indexersSelected = 0;
     $scope.indexersFinished = 0;
     $scope.buttonText = "Cancel";
+    $scope.buttonTooltip = "Cancel search and return to search mask";
     $scope.btnType = "btn-danger";
 
     var socket = new SockJS(bootstrapped.baseUrl + 'websocket');
@@ -445,6 +446,7 @@ function SearchUpdateModalInstanceCtrl($scope, $interval, SearchService, $uibMod
             }
             if ($scope.indexersFinished > 0) {
                 $scope.buttonText = "Show results";
+                $scope.buttonTooltip = "Show results that have already been loaded";
                 $scope.btnType = "btn-warning";
             }
             if (data.messages) {