Merge branch 'master' into fix-gracefully-no-app-dir-results

uPortal-Attic · Jun 7, 2018 · 96a468e · 96a468e
2 parents 8db6136 + 58473d3
commit 96a468e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to
 
 * Hide app directory search loading indicator when search returns zero results
   (#826)
+* Gracefully handle case where directory search JSON URL is bad, as is the case
+  in naive localhost demo against stub data (#825)
 
 ## [8.2.0][] - 2018-06-22
 

diff --git a/web/src/main/webapp/my-app/search/controllers.js b/web/src/main/webapp/my-app/search/controllers.js
@@ -119,15 +119,24 @@ define([
                   results.errors[1] &&
                   results.errors[1].error_msg) {
                 if (results.errors[0].code == 4) {
+                  $log.warn(
+                    'Too many directory results for term ' + $scope.searchTerm);
                   $scope.wiscDirectoryTooManyResults = true;
+                } else {
+                  $log.warn(
+                    'Directory search error [' + results.errors[1].error_msg +
+                    '] on term ' + $scope.searchTerm);
                 }
+
                 $scope.wiscDirectoryErrorMessage= results.errors[1].error_msg;
               }
             }
             return results;
           }).catch(function() {
+            $log.warn('Directory search error on term ' + $scope.searchTerm);
             $scope.wiscDirectoryLoading = false;
-            $scope.wiscDirectoryError = true;
+            $scope.wiscDirectoryErrorMessage =
+              'Error. Unable to search the directory.';
           }
         );
       };

diff --git a/web/src/main/webapp/my-app/search/partials/directory-results.html b/web/src/main/webapp/my-app/search/partials/directory-results.html
@@ -24,11 +24,22 @@ <h4 class="md-subhead">
 </h4>
 
 <div layout="row" layout-align="center center">
-  <loading-gif data-object="wiscDirectoryResults" data-empty="wiscDirectoryResultsEmpty"></loading-gif>
+  <loading-gif
+    ng-show="wiscDirectoryLoading"
+    data-object="wiscDirectoryResults"
+    data-empty="wiscDirectoryResultsEmpty"></loading-gif>
 </div>
 <div ng-show="wiscDirectoryResultsEmpty && !wiscDirectoryTooManyResults" class='no-result'>
   No directory results.
 </div>
+
+<div ng-if="wiscDirectoryErrorMessage"
+  layout="row" layout-align="center center">
+  <p>
+    {{wiscDirectoryErrorMessage}}
+  </p>
+</div>
+
 <div class="result" ng-repeat="item in wiscDirectoryResults | limitTo:wiscDirectoryResultLimit">
   <h4>{{item.fullName}}</h4>
   <p ng-if="item.formalName">Also known as {{item.formalName}}</p>
@@ -62,7 +73,4 @@ <h4>{{item.fullName}}</h4>
   <p ng-if="wiscDirectoryResultCount>wiscDirectoryResultLimit">
     <a href="" ng-click="showAllDirectoryResults()">See all {{wiscDirectoryResultCount}} directory results</a>
   </p>
-  <p ng-if="wiscDirectoryErrorMessage">
-    {{wiscDirectoryErrorMessage}}
-  </p>
 </div>