Fix #310, display text of error message

mozilla-extensions · Sep 27, 2019 · 345b9bc · 345b9bc
1 parent ea2ed25
commit 345b9bc
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/extension/background/intentRunner.js b/extension/background/intentRunner.js
@@ -111,9 +111,20 @@ this.intentRunner = (function() {
       // isn't actually complete:
       telemetry.send();
     } catch (e) {
-      context.failed(`Internal error: ${e}`);
-      log.error("Error in intent", desc.name, ":", String(e), e.stack);
-      catcher.capture(e);
+      const display = e.displayMessage || `Internal error: ${e}`;
+      context.failed(display);
+      if (e.displayMessage) {
+        log.info(
+          "Expected error in intent",
+          desc.name,
+          ":",
+          String(e),
+          e.stack
+        );
+      } else {
+        log.error("Error in intent", desc.name, ":", String(e), e.stack);
+        catcher.capture(e);
+      }
     }
   };
 

diff --git a/extension/popup/popup.css b/extension/popup/popup.css
@@ -19,12 +19,13 @@ body,
   display: block;
 }
 
-.listening :-moz-any(#transcript, #popup-settings, #back-icon, #card) {
+.listening
+  :-moz-any(#transcript, #popup-settings, #back-icon, #card, #error-message) {
   display: none;
 }
 
 .processing
-  :-moz-any(#suggestions, #feedback, #popup-settings, #back-icon, #card) {
+  :-moz-any(#suggestions, #feedback, #popup-settings, #back-icon, #card, #error-message) {
   display: none;
 }
 
@@ -169,6 +170,12 @@ body,
   padding: 1.5rem 0;
 }
 
+#error-message {
+  font-weight: 600;
+  padding: 1.5rem 0;
+  color: #800;
+}
+
 #text-input-field {
   font-size: 20px;
   caret-color: transparent;

diff --git a/extension/popup/popup.html b/extension/popup/popup.html
@@ -55,6 +55,7 @@
             </div>
           </div>
           <div id="transcript"></div>
+          <div id="error-message"></div>
           <div id="feedback">
             <div id="feedback-prompt">
               How was your last experience?

diff --git a/extension/popup/popup.js b/extension/popup/popup.js
@@ -138,6 +138,9 @@ this.popup = (function() {
       ui.showCard(message.cardData);
     } else if (message.type === "displayFailure") {
       ui.setState("error");
+      if (message.message) {
+        ui.setErrorMessage(message.message);
+      }
     }
   }
 

diff --git a/extension/popup/ui.js b/extension/popup/ui.js
@@ -144,6 +144,10 @@ this.ui = (function() {
     document.querySelector("#transcript").textContent = transcript;
   };
 
+  exports.setErrorMessage = function setErrorMessage(message) {
+    document.querySelector("#error-message").textContent = message;
+  };
+
   exports.setIcon = function setIcon(state) {
     browser.browserAction.setIcon({
       16: `${state}-16.svg`,