Skip to content

Commit a5f0f50

Browse files
committed
feat(inspector): fixed error handling, showing response body when data proxy returns text/html body
1 parent 58df60f commit a5f0f50

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

public/app/core/controllers/inspect_ctrl.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define([
77
function (angular, _, $, coreModule) {
88
'use strict';
99

10-
coreModule.default.controller('InspectCtrl', function($scope) {
10+
coreModule.default.controller('InspectCtrl', function($scope, $sanitize) {
1111
var model = $scope.inspector;
1212

1313
function getParametersFromQueryString(queryString) {
@@ -32,7 +32,11 @@ function (angular, _, $, coreModule) {
3232
if (_.isString(model.error.data)) {
3333
$scope.response = $("<div>" + model.error.data + "</div>").text();
3434
} else if (model.error.data) {
35-
$scope.response = angular.toJson(model.error.data, true);
35+
if (model.error.data.response) {
36+
$scope.response = $sanitize(model.error.data.response);
37+
} else {
38+
$scope.response = angular.toJson(model.error.data, true);
39+
}
3640
} else if (model.error.message) {
3741
$scope.message = model.error.message;
3842
}

public/app/core/services/backend_srv.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ export class BackendSrv {
138138
//populate error obj on Internal Error
139139
if (_.isString(err.data) && err.status === 500) {
140140
err.data = {
141-
error: err.statusText
141+
error: err.statusText,
142+
response: err.data,
142143
};
143144
}
144145

0 commit comments

Comments
 (0)