jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-19 17:37:19 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1129 from getredash/fix-viz-options

Browse Source 
Feature: support for JSON query formatting (Mongo, ElasticSearch)
This commit is contained in:
Arik Fraimovich
2016-06-15 15:21:41 +03:00
committed by GitHub
parent c01d266030 c495250a54
commit 87e25f2107
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rd_ui/app/scripts/directives/query_directives.js
View File

@@ -156,7 +156,7 @@
}; };
} }
function queryFormatter($http) { function queryFormatter($http, growl) {
return { return {
restrict: 'E', restrict: 'E',
// don't create new scope to avoid ui-codemirror bug // don't create new scope to avoid ui-codemirror bug
@@ -165,18 +165,29 @@
template: '<button type="button" class="btn btn-default btn-s"\ template: '<button type="button" class="btn btn-default btn-s"\
ng-click="formatQuery()">\ ng-click="formatQuery()">\
<span class="zmdi zmdi-format-indent-increase"></span>\ <span class="zmdi zmdi-format-indent-increase"></span>\
Format SQL\ Format Query\
</button>', </button>',
link: function($scope) { link: function($scope) {
$scope.formatQuery = function formatQuery() { $scope.formatQuery = function formatQuery() {
if ($scope.dataSource.syntax == 'json') {
try {
$scope.query.query = JSON.stringify(JSON.parse($scope.query.query), ' ', 4);
} catch(err) {
growl.addErrorMessage(err);
}
} else if ($scope.dataSource.syntax =='sql') {
$scope.queryFormatting = true; $scope.queryFormatting = true;
$http.post('api/queries/format', { $http.post('api/queries/format', {
'query': $scope.query.query 'query': $scope.query.query
}).success(function (response) { }).success(function (response) {
$scope.query.query = response; $scope.query.query = response;
}).finally(function () { }).finally(function () {
$scope.queryFormatting = false; $scope.queryFormatting = false;
}); });
} else {
growl.addInfoMessage("Query formatting is not supported for your data source syntax.");
}
}; };
} }
} }
@@ -290,5 +301,5 @@
.directive('queryEditor', queryEditor) .directive('queryEditor', queryEditor)
.directive('queryRefreshSelect', queryRefreshSelect) .directive('queryRefreshSelect', queryRefreshSelect)
.directive('queryTimePicker', queryTimePicker) .directive('queryTimePicker', queryTimePicker)
.directive('queryFormatter', ['$http', queryFormatter]); .directive('queryFormatter', ['$http', 'growl', queryFormatter]);
})(); })();