Merge pull request #1267 from adsabs/fix-metrics-widget

Fix Metrics Widget
adsabs · Oct 6, 2017 · 6ae55a3 · 6ae55a3
2 parents 419c348 + 088a42a
commit 6ae55a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/src/js/page_managers/templates/results-page-layout.html b/src/js/page_managers/templates/results-page-layout.html
@@ -36,7 +36,7 @@ <h2 class="sr-only">Filters for the Current Search</h2>
                             <div data-widget="ExportWidget"/>
                             <div data-widget="AuthorNetwork"/>
                             <div data-widget="PaperNetwork"/>
-                            <div data-widget="Metrics"/>
+                            <div data-widget="Metrics" data-allow-redirect="true"/>
                             <div data-widget="BubbleChart"/>
                             <div data-widget="ConceptCloud"/>
                             <div data-widget="CitationHelper"/>

diff --git a/src/js/widgets/metrics/widget.js b/src/js/widgets/metrics/widget.js
@@ -1182,8 +1182,12 @@ define([
 
       function onResponse() {
         //the promise is used by paper metrics widget
-        d.resolve();
-        this.processMetrics.apply(this, arguments);
+        try {
+          this.processMetrics.apply(this, arguments);
+          d.resolve();
+        } catch (e) {
+          d.reject();
+        }
       }
 
       onResponse = onResponse.bind(this);
@@ -1211,24 +1215,9 @@ define([
       response = response.attributes ? response.attributes : response;
 
       // the response might contain an error
-      if ((response.Error && response.Error.indexOf('Unable to get results') > -1) || (response.status === 500)) {
+      if (response.Error || response.status === 500) {
         this.closeWidget();
-
-        var pubsub = null;
-        try {
-          pubsub = this.getPubSub();
-        } catch (e) {
-          console.error(e);
-        }
-
-        if (pubsub) {
-          pubsub.publish(pubsub.ALERT, new ApiFeedback({
-            code: ApiFeedback.CODES.ALERT,
-            msg: 'Unfortunately, the metrics service returned error (it affects only some queries). Please try with different search parameters.',
-            modal: true
-          }));
-        }
-        return;
+        throw new Error('Metrics Service Error');
       }
 
       if (response["basic stats"]["number of papers"] === 1){

diff --git a/src/js/wraps/paper_metrics.js b/src/js/wraps/paper_metrics.js
@@ -26,11 +26,21 @@ define([
           var self = this;
           this.containerModel.set("title", data.title);
           this.getMetrics([bibcode]).done(function() {
+
+            // Everything worked, show the widget
             self.trigger('page-manager-event', 'widget-ready', {isActive: true, widget : self});
             if (self._waiting) {
               self.onShow();
               self._waiting = false;
             }
+          }).fail(function () {
+
+            // if the metrics fail, kill it
+            self.trigger('page-manager-event', 'widget-ready', {
+              isActive: false,
+              widget : self
+            });
+            self.destroy();
           });
         },