IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Lots of work on search and dashboard loading, trying to generalize concepts and code, #960

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-05-12 14:11:30 +02:00
parent a40299b4dc
commit b3be51f17f
15 changed files with 120 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/app/routes/all.js
View File

@@ -12,22 +12,7 @@ define([
$routeProvider
.when('/', {
templateUrl: 'app/partials/dashboard.html',
controller : 'DashFromDBCtrl',
reloadOnSearch: false,
})
.when('/dashboard/db/:slug', {
templateUrl: 'app/partials/dashboard.html',
controller : 'DashFromDBCtrl',
reloadOnSearch: false,
})
.when('/dashboard/file/:jsonFile', {
templateUrl: 'app/partials/dashboard.html',
controller : 'DashFromFileCtrl',
reloadOnSearch: false,
})
.when('/dashboard/script/:jsFile', {
templateUrl: 'app/partials/dashboard.html',
controller : 'DashFromScriptCtrl',
controller : 'LoadDashboardCtrl',
reloadOnSearch: false,
})
.when('/dashboard/import/:file', {
@@ -35,9 +20,10 @@ define([
controller : 'DashFromImportCtrl',
reloadOnSearch: false,
})
.when('/dashboard/snapshot/:key', {
.when('/dashboard/:type/:slug', {
templateUrl: 'app/partials/dashboard.html',
controller : 'DashFromSnapshotCtrl',
controller : 'LoadDashboardCtrl',
reloadOnSearch: false,
})
.when('/dashboard/solo/db/:slug', {
templateUrl: 'app/features/panel/partials/soloPanel.html',

141
public/app/routes/dashLoadControllers.js
View File

@@ -10,12 +10,14 @@ function (angular, _, kbn, moment, $) {
var module = angular.module('grafana.routes');
module.controller('DashFromDBCtrl', function($scope, $routeParams, backendSrv) {
module.controller('LoadDashboardCtrl', function(
$scope, $routeParams, backendSrv, dashboardSrv, datasourceSrv, $http, $q, $timeout, contextSrv) {
function dashboardLoadFailed(title) {
$scope.initDashboard({meta: {}, dashboard: {title: title}}, $scope);
}
// Home dashboard
if (!$routeParams.slug) {
backendSrv.get('/api/dashboards/home').then(function(result) {
var meta = result.meta;
@@ -24,90 +26,10 @@ function (angular, _, kbn, moment, $) {
},function() {
dashboardLoadFailed('Not found');
});
return;
}
return backendSrv.getDashboard($routeParams.slug).then(function(result) {
$scope.initDashboard(result, $scope);
}, function() {
dashboardLoadFailed('Not found');
});
});
module.controller('DashFromSnapshotCtrl', function($scope, $routeParams, backendSrv, contextSrv) {
//don't show the sidemenu in snapshots.
contextSrv.sidemenu = false;
backendSrv.get('/api/snapshots/' + $routeParams.key).then(function(result) {
$scope.initDashboard(result, $scope);
}, function() {
$scope.initDashboard({
meta: {
isSnapshot: true,
canSave: false,
canEdit: false,
},
dashboard: {
title: 'Snapshot not found'
}
}, $scope);
});
});
module.controller('DashFromImportCtrl', function($scope, $location, alertSrv) {
if (!window.grafanaImportDashboard) {
alertSrv.set('Not found', 'Cannot reload page with unsaved imported dashboard', 'warning', 7000);
$location.path('');
return;
}
$scope.initDashboard({
meta: { canShare: false, canStar: false },
dashboard: window.grafanaImportDashboard
}, $scope);
});
module.controller('NewDashboardCtrl', function($scope) {
$scope.initDashboard({
meta: { canStar: false, canShare: false },
dashboard: {
title: "New dashboard",
rows: [{ height: '250px', panels:[] }]
},
}, $scope);
});
module.controller('DashFromFileCtrl', function($scope, $rootScope, $http, $routeParams) {
var file_load = function(file) {
return $http({
url: "public/dashboards/"+file.replace(/\.(?!json)/,"/")+'?' + new Date().getTime(),
method: "GET",
transformResponse: function(response) {
return angular.fromJson(response);
}
}).then(function(result) {
if(!result) {
return false;
}
return result.data;
},function() {
$scope.appEvent('alert-error', ["Dashboard load failed", "Could not load "+file+". Please make sure it exists"]);
return false;
});
};
file_load($routeParams.jsonFile).then(function(result) {
$scope.initDashboard({
meta: { canSave: false, canDelete: false },
dashboard: result
}, $scope);
});
});
module.controller('DashFromScriptCtrl', function($scope, $rootScope, $http, $routeParams, $q, dashboardSrv, datasourceSrv, $timeout) {
// Scripted dashboards
var execute_script = function(result) {
var services = {
dashboardSrv: dashboardSrv,
@@ -145,13 +67,58 @@ function (angular, _, kbn, moment, $) {
});
};
script_load($routeParams.jsFile).then(function(result) {
$scope.initDashboard({
meta: {fromScript: true, canDelete: false, canSave: false},
dashboard: result.data
}, $scope);
function loadScriptedDashboard() {
script_load($routeParams.slug).then(function(result) {
$scope.initDashboard({
meta: {fromScript: true, canDelete: false, canSave: false},
dashboard: result.data
}, $scope);
});
}
if ($routeParams.type === 'script') {
loadScriptedDashboard();
return;
}
if ($routeParams.type === 'snapshot') {
contextSrv.sidemenu = false;
backendSrv.get('/api/snapshots/' + $routeParams.slug).then(function(result) {
$scope.initDashboard(result, $scope);
}, function() {
$scope.initDashboard({meta:{isSnapshot: true, canSave: false, canEdit: false}, dashboard: {title: 'Snapshot not found'}}, $scope);
});
return;
}
return backendSrv.getDashboard($routeParams.type, $routeParams.slug).then(function(result) {
$scope.initDashboard(result, $scope);
}, function() {
dashboardLoadFailed('Not found');
});
});
module.controller('DashFromImportCtrl', function($scope, $location, alertSrv) {
if (!window.grafanaImportDashboard) {
alertSrv.set('Not found', 'Cannot reload page with unsaved imported dashboard', 'warning', 7000);
$location.path('');
return;
}
$scope.initDashboard({
meta: { canShare: false, canStar: false },
dashboard: window.grafanaImportDashboard
}, $scope);
});
module.controller('NewDashboardCtrl', function($scope) {
$scope.initDashboard({
meta: { canStar: false, canShare: false },
dashboard: {
title: "New dashboard",
rows: [{ height: '250px', panels:[] }]
},
}, $scope);
});
});