From 0b05d39804a7ef3000462feeb36d236bcc5219f2 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 26 Jan 2016 23:03:03 +0100 Subject: [PATCH 1/5] fix(search): fixes missing tags in result --- public/app/core/components/search/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index bbd4c66b170..dd858f6d08a 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -47,7 +47,7 @@ ng-class="{'selected': $index == selectedIndex}" ng-href="{{row.url}}"> - + {{tag}} From 269583a6a1d4ecd1b93c95c03cb16fee7929e804 Mon Sep 17 00:00:00 2001 From: Gueust Date: Tue, 26 Jan 2016 23:15:54 +0100 Subject: [PATCH 2/5] Serialize an elasticsearch error previously printed as 'Object' --- public/app/plugins/datasource/elasticsearch/datasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js index da31c6b50bb..0d2fd174c4d 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.js +++ b/public/app/plugins/datasource/elasticsearch/datasource.js @@ -146,7 +146,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes return { status: "success", message: "Data source is working", title: "Success" }; }, function(err) { if (err.data && err.data.error) { - return { status: "error", message: err.data.error, title: "Error" }; + return { status: "error", message: angular.toJson(err.data.error), title: "Error" }; } else { return { status: "error", message: err.status, title: "Error" }; } From f3845389593824754dc37d20cd6b4235186f3628 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 26 Jan 2016 23:18:10 +0100 Subject: [PATCH 3/5] fix(search): fixes broken esc button in search --- public/app/core/components/search/search.ts | 7 +++++-- public/app/features/dashboard/directives/dashSearchView.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts index 39c8686bbe3..7a92a2f18a1 100644 --- a/public/app/core/components/search/search.ts +++ b/public/app/core/components/search/search.ts @@ -14,6 +14,7 @@ export class SearchCtrl { currentSearchId: number; tagsMode: boolean; showImport: boolean; + dismiss: any; /** @ngInject */ constructor(private $scope, private $location, private $timeout, private backendSrv, private contextSrv) { @@ -32,7 +33,7 @@ export class SearchCtrl { keyDown(evt) { if (evt.keyCode === 27) { - this.$scope.dismiss(); + this.dismiss(); } if (evt.keyCode === 40) { this.moveSelection(1); @@ -137,7 +138,9 @@ export function searchDirective() { controller: SearchCtrl, bindToController: true, controllerAs: 'ctrl', - scope: {}, + scope: { + dismiss: '&' + }, }; } diff --git a/public/app/features/dashboard/directives/dashSearchView.js b/public/app/features/dashboard/directives/dashSearchView.js index cbc38a98901..cee97fee758 100644 --- a/public/app/features/dashboard/directives/dashSearchView.js +++ b/public/app/features/dashboard/directives/dashSearchView.js @@ -29,7 +29,7 @@ function (angular, $) { editorScope = null; }; - var view = $(''); + var view = $(''); elem.append(view); $compile(elem.contents())(editorScope); From 13d993a836989c7e2542049ff65f0522f26a1100 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 26 Jan 2016 23:28:06 +0100 Subject: [PATCH 4/5] fix(search): remove old search ctrl --- public/app/core/controllers/all.js | 1 - public/app/core/controllers/search_ctrl.js | 127 --------------------- 2 files changed, 128 deletions(-) delete mode 100644 public/app/core/controllers/search_ctrl.js diff --git a/public/app/core/controllers/all.js b/public/app/core/controllers/all.js index 5c4184e609a..54631586c2f 100644 --- a/public/app/core/controllers/all.js +++ b/public/app/core/controllers/all.js @@ -1,5 +1,4 @@ define([ - './search_ctrl', './inspect_ctrl', './json_editor_ctrl', './login_ctrl', diff --git a/public/app/core/controllers/search_ctrl.js b/public/app/core/controllers/search_ctrl.js deleted file mode 100644 index 589a9ce840f..00000000000 --- a/public/app/core/controllers/search_ctrl.js +++ /dev/null @@ -1,127 +0,0 @@ -define([ - 'angular', - 'lodash', - '../core_module', - 'app/core/config', -], -function (angular, _, coreModule, config) { - 'use strict'; - - coreModule.default.controller('SearchCtrl', function($scope, $location, $timeout, backendSrv) { - - $scope.init = function() { - $scope.giveSearchFocus = 0; - $scope.selectedIndex = -1; - $scope.results = []; - $scope.query = { query: '', tag: [], starred: false }; - $scope.currentSearchId = 0; - - $timeout(function() { - $scope.giveSearchFocus = $scope.giveSearchFocus + 1; - $scope.query.query = ''; - $scope.search(); - }, 100); - }; - - $scope.keyDown = function (evt) { - if (evt.keyCode === 27) { - $scope.dismiss(); - } - if (evt.keyCode === 40) { - $scope.moveSelection(1); - } - if (evt.keyCode === 38) { - $scope.moveSelection(-1); - } - if (evt.keyCode === 13) { - if ($scope.tagMode) { - var tag = $scope.results[$scope.selectedIndex]; - if (tag) { - $scope.filterByTag(tag.term); - } - return; - } - - var selectedDash = $scope.results[$scope.selectedIndex]; - if (selectedDash) { - $location.search({}); - $location.path(selectedDash.url); - } - } - }; - - $scope.moveSelection = function(direction) { - var max = ($scope.results || []).length; - var newIndex = $scope.selectedIndex + direction; - $scope.selectedIndex = ((newIndex %= max) < 0) ? newIndex + max : newIndex; - }; - - $scope.searchDashboards = function() { - $scope.tagsMode = false; - $scope.currentSearchId = $scope.currentSearchId + 1; - var localSearchId = $scope.currentSearchId; - - return backendSrv.search($scope.query).then(function(results) { - if (localSearchId < $scope.currentSearchId) { return; } - - $scope.results = _.map(results, function(dash) { - dash.url = 'dashboard/' + dash.uri; - return dash; - }); - - if ($scope.queryHasNoFilters()) { - $scope.results.unshift({ title: 'Home', url: config.appSubUrl + '/', type: 'dash-home' }); - } - }); - }; - - $scope.queryHasNoFilters = function() { - var query = $scope.query; - return query.query === '' && query.starred === false && query.tag.length === 0; - }; - - $scope.filterByTag = function(tag, evt) { - $scope.query.tag.push(tag); - $scope.search(); - $scope.giveSearchFocus = $scope.giveSearchFocus + 1; - if (evt) { - evt.stopPropagation(); - evt.preventDefault(); - } - }; - - $scope.removeTag = function(tag, evt) { - $scope.query.tag = _.without($scope.query.tag, tag); - $scope.search(); - $scope.giveSearchFocus = $scope.giveSearchFocus + 1; - evt.stopPropagation(); - evt.preventDefault(); - }; - - $scope.getTags = function() { - return backendSrv.get('/api/dashboards/tags').then(function(results) { - $scope.tagsMode = true; - $scope.results = results; - $scope.giveSearchFocus = $scope.giveSearchFocus + 1; - }); - }; - - $scope.showStarred = function() { - $scope.query.starred = !$scope.query.starred; - $scope.giveSearchFocus = $scope.giveSearchFocus + 1; - $scope.search(); - }; - - $scope.search = function() { - $scope.showImport = false; - $scope.selectedIndex = 0; - $scope.searchDashboards(); - }; - - $scope.newDashboard = function() { - $location.url('dashboard/new'); - }; - - }); - -}); From a352af5b9f0f0db4ab7288852e549cb8d311dce3 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Tue, 26 Jan 2016 18:48:13 -0800 Subject: [PATCH 5/5] Fixed broken tags search --- public/app/core/components/search/search.html | 4 ++-- public/app/core/components/search/search.ts | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index dd858f6d08a..7a78f1a4a3e 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -16,7 +16,7 @@ | - + {{tagName}} @@ -28,7 +28,7 @@
-
diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts index 7a92a2f18a1..e28f80a9099 100644 --- a/public/app/core/components/search/search.ts +++ b/public/app/core/components/search/search.ts @@ -108,9 +108,12 @@ export class SearchCtrl { getTags() { return this.backendSrv.get('/api/dashboards/tags').then((results) => { - this.tagsMode = true; + this.tagsMode = !this.tagsMode; this.results = results; this.giveSearchFocus = this.giveSearchFocus + 1; + if ( !this.tagsMode ) { + this.search(); + } }); };