From 5bea3986b26359eb98c62246c34729e2d0cc5a1b Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 12 Oct 2016 19:36:48 -0700
Subject: [PATCH] [hotfix] handling json errors in explore view

---
 caravel/assets/javascripts/modules/caravel.js | 16 +++++++++++++---
 caravel/assets/javascripts/modules/utils.js   |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/caravel/assets/javascripts/modules/caravel.js b/caravel/assets/javascripts/modules/caravel.js
index e2c3c72b9..ee70c8cfe 100644
--- a/caravel/assets/javascripts/modules/caravel.js
+++ b/caravel/assets/javascripts/modules/caravel.js
@@ -150,15 +150,25 @@ const px = function () {
         return msg;
       },
       error(msg, xhr) {
+        let errorMsg = msg;
         token.find('img.loading').hide();
-        let err = msg ? '<div class="alert alert-danger">' + msg + '</div>' : '';
+        let errHtml = '';
+        try {
+          const o = JSON.parse(msg);
+          if (o.error) {
+            errorMsg = o.error;
+          }
+        } catch (e) {
+          // pass
+        }
+        errHtml = `<div class="alert alert-danger">${errorMsg}</div>`;
         if (xhr) {
           const extendedMsg = this.getErrorMsg(xhr);
           if (extendedMsg) {
-            err += '<div class="alert alert-danger">' + extendedMsg + '</div>';
+            errHtml += `<div class="alert alert-danger">${extendedMsg}</div>`;
           }
         }
-        container.html(err);
+        container.html(errHtml);
         container.show();
         $('span.query').removeClass('disabled');
         $('#timer').addClass('btn-danger');
diff --git a/caravel/assets/javascripts/modules/utils.js b/caravel/assets/javascripts/modules/utils.js
index bc0c0c0b4..bcf44db42 100644
--- a/caravel/assets/javascripts/modules/utils.js
+++ b/caravel/assets/javascripts/modules/utils.js
@@ -116,6 +116,7 @@ const controllerInterface = {
   getFilters: () => false,
   clearFilter: () => {},
   removeFilter: () => {},
+  filters: {},
 };
 
 module.exports = {