diff --git a/public/app/core/components/form_dropdown/form_dropdown.ts b/public/app/core/components/form_dropdown/form_dropdown.ts index 72a101388b7..d8212e2f55c 100644 --- a/public/app/core/components/form_dropdown/form_dropdown.ts +++ b/public/app/core/components/form_dropdown/form_dropdown.ts @@ -72,7 +72,9 @@ export class FormDropdownCtrl { this.inputElement.keydown(evt => { if (evt.keyCode === 13) { - this.inputElement.blur(); + setTimeout(() => { + this.inputElement.blur(); + }, 100); } }); diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index ea8eb21d6d6..085e2eef920 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -8,9 +8,9 @@ - - - + + +
diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index 17222cc7ecd..9a3893737ff 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -96,7 +96,7 @@ - Create New Folder + New Folder diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index f1615a0bd1c..bab27289aca 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -1,63 +1,95 @@ - - - - -
+ + + diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 06509bf9721..6bf5b6d563d 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -22,8 +22,8 @@ export class DashNavCtrl { private backendSrv, private $timeout, private datasourceSrv, - private navModelSrv) { - + private navModelSrv, + private contextSrv) { this.navModel = navModelSrv.getDashboardNav(this.dashboard, this); appEvents.on('save-dashboard', this.saveDashboard.bind(this), $scope); @@ -38,6 +38,10 @@ export class DashNavCtrl { } } + toggleSideMenu() { + this.contextSrv.toggleSideMenu(); + } + openEditView(editview) { var search = _.extend(this.$location.search(), {editview: editview}); this.$location.search(search); @@ -139,6 +143,17 @@ export class DashNavCtrl { onFolderChange(parentId) { this.dashboard.parentId = parentId; } + + showSearch() { + this.$rootScope.appEvent('show-dash-search'); + } + + navItemClicked(navItem, evt) { + if (navItem.clickHandler) { + navItem.clickHandler(); + evt.preventDefault(); + } + } } export function dashNavDirective() { diff --git a/public/app/features/dashboard/folder_picker/picker.ts b/public/app/features/dashboard/folder_picker/picker.ts index a378ac18b12..bb823db632b 100644 --- a/public/app/features/dashboard/folder_picker/picker.ts +++ b/public/app/features/dashboard/folder_picker/picker.ts @@ -45,7 +45,7 @@ export class FolderPickerCtrl { folderChanged() { const selected = _.find(this.folders, {title: this.selectedFolderSegment.value}); if (selected) { - this.onChange(selected.id); + this.onChange({$folderId: selected.id}); } } } @@ -70,7 +70,7 @@ export function folderPicker() { controllerAs: 'ctrl', scope: { selectedFolder: "<", - onChange: "<", + onChange: "&", rootFolderName: "@" } }; diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html index b8226aa6e74..8527c808e22 100644 --- a/public/app/features/dashboard/partials/settings.html +++ b/public/app/features/dashboard/partials/settings.html @@ -45,7 +45,7 @@ - +
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts index 988c1324b44..336b410f574 100644 --- a/public/app/features/dashboard/save_as_modal.ts +++ b/public/app/features/dashboard/save_as_modal.ts @@ -22,7 +22,8 @@ const template = `
- + +
diff --git a/public/app/plugins/panel/heatmap/heatmap_data_converter.ts b/public/app/plugins/panel/heatmap/heatmap_data_converter.ts index f7e32f3df7c..07057c53985 100644 --- a/public/app/plugins/panel/heatmap/heatmap_data_converter.ts +++ b/public/app/plugins/panel/heatmap/heatmap_data_converter.ts @@ -207,15 +207,20 @@ function pushToXBuckets(buckets, point, bucketNum, seriesName) { } function pushToYBuckets(buckets, bucketNum, value, point, bounds) { + var count = 1; + // Use the 3rd argument as scale/count + if (point.length > 2) { + count = parseInt(point[2]); + } if (buckets[bucketNum]) { buckets[bucketNum].values.push(value); - buckets[bucketNum].count += 1; + buckets[bucketNum].count += count; } else { buckets[bucketNum] = { y: bucketNum, bounds: bounds, values: [value], - count: 1, + count: count, }; } }