Bug 1513485 - Properly fetch response (#4367)

mozilla · Dec 21, 2018 · bc3b45f · bc3b45f
1 parent 71e16cd
commit bc3b45f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/ui/partials/perf/graphsctrl.html b/ui/partials/perf/graphsctrl.html
@@ -101,7 +101,7 @@
           <i class="text-warning fa fa-exclamation-circle"></i>
           <a href="perf.html#/alerts?id={{tooltipContent.alertSummary.id}}">
             Alert #{{tooltipContent.alertSummary.id}}</a>
-        <span class="text-muted">- {{alertIsOfState(tooltipContent.alert, phAlertStatusMap.ACKNOWLEDGED) ? geAlertSummarytStatusText(tooltipContent.alertSummary) : getAlertStatusText(tooltipContent.alert)}}
+        <span class="text-muted">- {{tooltipContent.alert && (alertIsOfState(tooltipContent.alert, phAlertStatusMap.ACKNOWLEDGED) ? getAlertSummarytStatusText(tooltipContent.alertSummary) : getAlertStatusText(tooltipContent.alert))}}
             <span ng-show="tooltipContent.alert.related_summary_id">
               <span ng-if="tooltipContent.alert.related_summary_id !== tooltipContent.alertSummary.id">
               to <a href="#/alerts?id={{tooltipContent.alert.related_summary_id}}" target="_blank" rel="noopener">alert #{{tooltipContent.alert.related_summary_id}}</a>

diff --git a/ui/perfherder/helpers.js b/ui/perfherder/helpers.js
@@ -780,13 +780,15 @@ export const createAlert = data =>
     framework_id: data.series.frameworkId,
     push_id: data.resultSetId,
     prev_push_id: data.prevResultSetId,
-  }).then(({ data }) => {
-    const newAlertSummaryId = data.alert_summary_id;
-    return create(getApiUrl('/performance/alert/'), {
-      summary_id: newAlertSummaryId,
-      signature_id: data.series.id,
-    }).then(() => newAlertSummaryId);
-  });
+  })
+    .then(response => response.json())
+    .then(response => {
+      const newAlertSummaryId = response.alert_summary_id;
+      return create(getApiUrl('/performance/alert/'), {
+        summary_id: newAlertSummaryId,
+        signature_id: data.series.id,
+      }).then(() => newAlertSummaryId);
+    });
 
 export const findPushIdNeighbours = (dataPoint, resultSetData, direction) => {
   const pushId = dataPoint.resultSetId;