|
|
@@ -1,63 +1,50 @@
|
|
|
-import angular from 'angular';
|
|
|
-import _ from 'lodash';
|
|
|
-
|
|
|
-var iconMap = {
|
|
|
- "external link": "fa-external-link",
|
|
|
- "dashboard": "fa-th-large",
|
|
|
- "question": "fa-question",
|
|
|
- "info": "fa-info",
|
|
|
- "bolt": "fa-bolt",
|
|
|
- "doc": "fa-file-text-o",
|
|
|
- "cloud": "fa-cloud",
|
|
|
-};
|
|
|
-
|
|
|
-function dashLinksEditor() {
|
|
|
- return {
|
|
|
- restrict: 'E',
|
|
|
- controller: 'DashLinkEditorCtrl',
|
|
|
- templateUrl: 'public/app/features/dashlinks/editor.html',
|
|
|
- link: function() {
|
|
|
- }
|
|
|
- };
|
|
|
-}
|
|
|
+import angular from "angular";
|
|
|
+import _ from "lodash";
|
|
|
+import { iconMap } from "./editor";
|
|
|
|
|
|
function dashLinksContainer() {
|
|
|
return {
|
|
|
scope: {
|
|
|
links: "="
|
|
|
},
|
|
|
- restrict: 'E',
|
|
|
- controller: 'DashLinksContainerCtrl',
|
|
|
- template: '<dash-link ng-repeat="link in generatedLinks" link="link"></dash-link>',
|
|
|
- link: function() { }
|
|
|
+ restrict: "E",
|
|
|
+ controller: "DashLinksContainerCtrl",
|
|
|
+ template:
|
|
|
+ '<dash-link ng-repeat="link in generatedLinks" link="link"></dash-link>',
|
|
|
+ link: function() {}
|
|
|
};
|
|
|
}
|
|
|
|
|
|
/** @ngInject */
|
|
|
function dashLink($compile, linkSrv) {
|
|
|
return {
|
|
|
- restrict: 'E',
|
|
|
+ restrict: "E",
|
|
|
link: function(scope, elem) {
|
|
|
var link = scope.link;
|
|
|
- var template = '<div class="gf-form">' +
|
|
|
+ var template =
|
|
|
+ '<div class="gf-form">' +
|
|
|
'<a class="pointer gf-form-label" data-placement="bottom"' +
|
|
|
- (link.asDropdown ? ' ng-click="fillDropdown(link)" data-toggle="dropdown"' : "") + '>' +
|
|
|
- '<i></i> <span></span></a>';
|
|
|
+ (link.asDropdown
|
|
|
+ ? ' ng-click="fillDropdown(link)" data-toggle="dropdown"'
|
|
|
+ : "") +
|
|
|
+ ">" +
|
|
|
+ "<i></i> <span></span></a>";
|
|
|
|
|
|
if (link.asDropdown) {
|
|
|
- template += '<ul class="dropdown-menu" role="menu">' +
|
|
|
+ template +=
|
|
|
+ '<ul class="dropdown-menu" role="menu">' +
|
|
|
'<li ng-repeat="dash in link.searchHits"><a href="{{dash.url}}">{{dash.title}}</a></li>' +
|
|
|
- '</ul>';
|
|
|
+ "</ul>";
|
|
|
}
|
|
|
|
|
|
- template += '</div>';
|
|
|
+ template += "</div>";
|
|
|
|
|
|
elem.html(template);
|
|
|
$compile(elem.contents())(scope);
|
|
|
|
|
|
- var anchor = elem.find('a');
|
|
|
- var icon = elem.find('i');
|
|
|
- var span = elem.find('span');
|
|
|
+ var anchor = elem.find("a");
|
|
|
+ var icon = elem.find("i");
|
|
|
+ var span = elem.find("span");
|
|
|
|
|
|
function update() {
|
|
|
var linkInfo = linkSrv.getAnchorInfo(link);
|
|
|
@@ -66,17 +53,19 @@ function dashLink($compile, linkSrv) {
|
|
|
}
|
|
|
|
|
|
// tooltip
|
|
|
- elem.find('a').tooltip({ title: scope.link.tooltip, html: true, container: 'body' });
|
|
|
- icon.attr('class', 'fa fa-fw ' + scope.link.icon);
|
|
|
- anchor.attr('target', scope.link.target);
|
|
|
+ elem
|
|
|
+ .find("a")
|
|
|
+ .tooltip({ title: scope.link.tooltip, html: true, container: "body" });
|
|
|
+ icon.attr("class", "fa fa-fw " + scope.link.icon);
|
|
|
+ anchor.attr("target", scope.link.target);
|
|
|
|
|
|
// fix for menus on the far right
|
|
|
if (link.asDropdown && scope.$last) {
|
|
|
- elem.find('.dropdown-menu').addClass('pull-right');
|
|
|
+ elem.find(".dropdown-menu").addClass("pull-right");
|
|
|
}
|
|
|
|
|
|
update();
|
|
|
- scope.$on('refresh', update);
|
|
|
+ scope.$on("refresh", update);
|
|
|
}
|
|
|
};
|
|
|
}
|
|
|
@@ -87,36 +76,40 @@ export class DashLinksContainerCtrl {
|
|
|
var currentDashId = dashboardSrv.getCurrent().id;
|
|
|
|
|
|
function buildLinks(linkDef) {
|
|
|
- if (linkDef.type === 'dashboards') {
|
|
|
+ if (linkDef.type === "dashboards") {
|
|
|
if (!linkDef.tags) {
|
|
|
- console.log('Dashboard link missing tag');
|
|
|
+ console.log("Dashboard link missing tag");
|
|
|
return $q.when([]);
|
|
|
}
|
|
|
|
|
|
if (linkDef.asDropdown) {
|
|
|
- return $q.when([{
|
|
|
- title: linkDef.title,
|
|
|
- tags: linkDef.tags,
|
|
|
- keepTime: linkDef.keepTime,
|
|
|
- includeVars: linkDef.includeVars,
|
|
|
- icon: "fa fa-bars",
|
|
|
- asDropdown: true
|
|
|
- }]);
|
|
|
+ return $q.when([
|
|
|
+ {
|
|
|
+ title: linkDef.title,
|
|
|
+ tags: linkDef.tags,
|
|
|
+ keepTime: linkDef.keepTime,
|
|
|
+ includeVars: linkDef.includeVars,
|
|
|
+ icon: "fa fa-bars",
|
|
|
+ asDropdown: true
|
|
|
+ }
|
|
|
+ ]);
|
|
|
}
|
|
|
|
|
|
return $scope.searchDashboards(linkDef, 7);
|
|
|
}
|
|
|
|
|
|
- if (linkDef.type === 'link') {
|
|
|
- return $q.when([{
|
|
|
- url: linkDef.url,
|
|
|
- title: linkDef.title,
|
|
|
- icon: iconMap[linkDef.icon],
|
|
|
- tooltip: linkDef.tooltip,
|
|
|
- target: linkDef.targetBlank ? "_blank" : "_self",
|
|
|
- keepTime: linkDef.keepTime,
|
|
|
- includeVars: linkDef.includeVars,
|
|
|
- }]);
|
|
|
+ if (linkDef.type === "link") {
|
|
|
+ return $q.when([
|
|
|
+ {
|
|
|
+ url: linkDef.url,
|
|
|
+ title: linkDef.title,
|
|
|
+ icon: iconMap[linkDef.icon],
|
|
|
+ tooltip: linkDef.tooltip,
|
|
|
+ target: linkDef.targetBlank ? "_blank" : "_self",
|
|
|
+ keepTime: linkDef.keepTime,
|
|
|
+ includeVars: linkDef.includeVars
|
|
|
+ }
|
|
|
+ ]);
|
|
|
}
|
|
|
|
|
|
return $q.when([]);
|
|
|
@@ -131,21 +124,27 @@ export class DashLinksContainerCtrl {
|
|
|
}
|
|
|
|
|
|
$scope.searchDashboards = function(link, limit) {
|
|
|
- return backendSrv.search({tag: link.tags, limit: limit}).then(function(results) {
|
|
|
- return _.reduce(results, function(memo, dash) {
|
|
|
- // do not add current dashboard
|
|
|
- if (dash.id !== currentDashId) {
|
|
|
- memo.push({
|
|
|
- title: dash.title,
|
|
|
- url: 'dashboard/' + dash.uri,
|
|
|
- icon: 'fa fa-th-large',
|
|
|
- keepTime: link.keepTime,
|
|
|
- includeVars: link.includeVars
|
|
|
- });
|
|
|
- }
|
|
|
- return memo;
|
|
|
- }, []);
|
|
|
- });
|
|
|
+ return backendSrv
|
|
|
+ .search({ tag: link.tags, limit: limit })
|
|
|
+ .then(function(results) {
|
|
|
+ return _.reduce(
|
|
|
+ results,
|
|
|
+ function(memo, dash) {
|
|
|
+ // do not add current dashboard
|
|
|
+ if (dash.id !== currentDashId) {
|
|
|
+ memo.push({
|
|
|
+ title: dash.title,
|
|
|
+ url: "dashboard/" + dash.uri,
|
|
|
+ icon: "fa fa-th-large",
|
|
|
+ keepTime: link.keepTime,
|
|
|
+ includeVars: link.includeVars
|
|
|
+ });
|
|
|
+ }
|
|
|
+ return memo;
|
|
|
+ },
|
|
|
+ []
|
|
|
+ );
|
|
|
+ });
|
|
|
};
|
|
|
|
|
|
$scope.fillDropdown = function(link) {
|
|
|
@@ -158,41 +157,14 @@ export class DashLinksContainerCtrl {
|
|
|
};
|
|
|
|
|
|
updateDashLinks();
|
|
|
- $rootScope.onAppEvent('dash-links-updated', updateDashLinks, $scope);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-export class DashLinkEditorCtrl {
|
|
|
- /** @ngInject */
|
|
|
- constructor($scope, $rootScope) {
|
|
|
- $scope.iconMap = iconMap;
|
|
|
- $scope.dashboard.links = $scope.dashboard.links || [];
|
|
|
-
|
|
|
- $scope.addLink = function() {
|
|
|
- $scope.dashboard.links.push({ type: 'dashboards', icon: 'external link' });
|
|
|
- $scope.dashboard.updateSubmenuVisibility();
|
|
|
- $scope.updated();
|
|
|
- };
|
|
|
-
|
|
|
- $scope.moveLink = function(index, dir) {
|
|
|
- _.move($scope.dashboard.links, index, index+dir);
|
|
|
- $scope.updated();
|
|
|
- };
|
|
|
-
|
|
|
- $scope.updated = function() {
|
|
|
- $rootScope.appEvent('dash-links-updated');
|
|
|
- };
|
|
|
-
|
|
|
- $scope.deleteLink = function(index) {
|
|
|
- $scope.dashboard.links.splice(index, 1);
|
|
|
- $scope.dashboard.updateSubmenuVisibility();
|
|
|
- $scope.updated();
|
|
|
- };
|
|
|
+ $rootScope.onAppEvent("dash-links-updated", updateDashLinks, $scope);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-angular.module('grafana.directives').directive('dashLinksEditor', dashLinksEditor);
|
|
|
-angular.module('grafana.directives').directive('dashLinksContainer', dashLinksContainer);
|
|
|
-angular.module('grafana.directives').directive('dashLink', dashLink);
|
|
|
-angular.module('grafana.directives').controller("DashLinksContainerCtrl", DashLinksContainerCtrl);
|
|
|
-angular.module('grafana.directives').controller('DashLinkEditorCtrl', DashLinkEditorCtrl);
|
|
|
+angular
|
|
|
+ .module("grafana.directives")
|
|
|
+ .directive("dashLinksContainer", dashLinksContainer);
|
|
|
+angular.module("grafana.directives").directive("dashLink", dashLink);
|
|
|
+angular
|
|
|
+ .module("grafana.directives")
|
|
|
+ .controller("DashLinksContainerCtrl", DashLinksContainerCtrl);
|
Torkel Ödegaard