From e4bdca9c95f7645fb4e206031f73bd70e284bae3 Mon Sep 17 00:00:00 2001
From: Owen Stephens <owen@ostephens.com>
Date: Fri, 27 Oct 2017 10:59:03 +0100
Subject: [PATCH] Catch and display errors on compute-facet

---
 .../core/scripts/project/browsing-engine.js    | 17 +++++++++++++++--
 .../modules/core/styles/project/sidebar.less   | 18 ++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/main/webapp/modules/core/scripts/project/browsing-engine.js b/main/webapp/modules/core/scripts/project/browsing-engine.js
index 04bc571b2..a96738dc8 100644
--- a/main/webapp/modules/core/scripts/project/browsing-engine.js
+++ b/main/webapp/modules/core/scripts/project/browsing-engine.js
@@ -101,6 +101,7 @@ BrowsingEngine.prototype._initializeUI = function() {
     '<p>'+$.i18n._('core-project')["not-sure"]+'<br /><a href="https://github.com/OpenRefine/OpenRefine/wiki/Screencasts" target="_blank"><b>'+$.i18n._('core-project')["watch-cast"]+'</b></a></p>' +
     '</div>' +
     '<div class="browsing-panel-header" bind="header">' +
+    '<div class="browsing-panel-errors" bind="errors"></div>' +
     '<div class="browsing-panel-indicator" bind="indicator">' +
     '<img src="images/small-spinner.gif" /> '+$.i18n._('core-project')["refreshing-facet"]+'' +
     '</div>' +
@@ -240,19 +241,31 @@ BrowsingEngine.prototype.update = function(onDone) {
 
   this._elmts.header.show();
   this._elmts.controls.css("visibility", "hidden");
-  this._elmts.indicator.css("visibility", "visible");
+  this._elmts.indicator.css("display", "block");
 
   $.post(
     "command/core/compute-facets?" + $.param({ project: theProject.id }),
     { engine: JSON.stringify(this.getJSON(true)) },
     function(data) {
+      if(data.code === 'error') {
+        var clearErr = $('#err-text').remove();
+        var err = $('<div id="err-text">')
+                  .text(data.message)
+                  .appendTo(self._elmts.errors);
+         self._elmts.errors.css("display", "block");
+        if (onDone) {
+          onDone();
+        }
+        return;
+      }
       var facetData = data.facets;
 
       for (var i = 0; i < facetData.length; i++) {
         self._facets[i].facet.updateState(facetData[i]);
       }
 
-      self._elmts.indicator.css("visibility", "hidden");
+      self._elmts.indicator.css("display", "none");
+      self._elmts.errors.css("display", "none");
       if (self._facets.length > 0) {
         self._elmts.header.show();
         self._elmts.controls.css("visibility", "visible");
diff --git a/main/webapp/modules/core/styles/project/sidebar.less b/main/webapp/modules/core/styles/project/sidebar.less
index 482fe93e8..9d8c36d4b 100644
--- a/main/webapp/modules/core/styles/project/sidebar.less
+++ b/main/webapp/modules/core/styles/project/sidebar.less
@@ -38,9 +38,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   display: none;
   }
 
+.browsing-panel-errors {
+  display: none;
+  position: relative;
+  height: auto;
+  margin: 5px;
+  text-align: center;
+  background: #fff0f4; 
+  color: #c51244;
+  padding: 4px 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border: 1px solid #ccc;
+  }
+
 .browsing-panel-indicator {
-  visibility: hidden;
-  position: absolute;
+  display: none;
+  position: relative;
   width: 50%;
   margin: 5px;
   top: 0em;