From b3b096e204a8ad6eb2aba6b98802589ab3d1fa28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 16 Dec 2014 12:02:06 +0100 Subject: [PATCH] Moved things around, started work on datasources view --- src/app/controllers/pro/datasourcesCtrl.js | 25 +++++ src/app/p_app.js | 2 +- src/app/panels/overview/module.html | 31 ------ src/app/panels/overview/module.js | 97 ------------------- src/app/partials/pro/account.html | 14 +-- src/app/partials/pro/datasources.html | 2 + .../{admin_datasources.html => navbar.html} | 4 +- src/app/routes/all.js | 9 +- src/app/routes/p_all.js | 7 -- src/app/routes/{p_admin.js => pro/admin.js} | 5 +- .../{p_dashboard.js => pro/dashboard.js} | 0 src/app/routes/{p_login.js => pro/login.js} | 2 +- 12 files changed, 40 insertions(+), 158 deletions(-) create mode 100644 src/app/controllers/pro/datasourcesCtrl.js delete mode 100644 src/app/panels/overview/module.html delete mode 100644 src/app/panels/overview/module.js create mode 100644 src/app/partials/pro/datasources.html rename src/app/partials/pro/{admin_datasources.html => navbar.html} (57%) delete mode 100644 src/app/routes/p_all.js rename src/app/routes/{p_admin.js => pro/admin.js} (74%) rename src/app/routes/{p_dashboard.js => pro/dashboard.js} (100%) rename src/app/routes/{p_login.js => pro/login.js} (96%) diff --git a/src/app/controllers/pro/datasourcesCtrl.js b/src/app/controllers/pro/datasourcesCtrl.js new file mode 100644 index 00000000000..d836b945e5a --- /dev/null +++ b/src/app/controllers/pro/datasourcesCtrl.js @@ -0,0 +1,25 @@ +define([ + 'angular', + 'services/pro/backendSrv', +], +function (angular) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('DataSourcesCtrl', function($scope, $http, backendSrv) { + + $scope.init = function() { + }; + + $scope.getAccount = function() { + backendSrv.get('/api/account/').then(function(account) { + $scope.account = account; + $scope.collaborators = account.collaborators; + }); + }; + + $scope.init(); + + }); +}); diff --git a/src/app/p_app.js b/src/app/p_app.js index 59bf53e1377..f9f295696be 100644 --- a/src/app/p_app.js +++ b/src/app/p_app.js @@ -85,7 +85,7 @@ function (angular, $, _, appLevelRequire, config) { 'directives/all', 'filters/all', 'components/partials', - 'routes/p_all', + 'routes/all', ]; _.each(config.plugins.dependencies, function(dep) { diff --git a/src/app/panels/overview/module.html b/src/app/panels/overview/module.html deleted file mode 100644 index b758e7945db..00000000000 --- a/src/app/panels/overview/module.html +++ /dev/null @@ -1,31 +0,0 @@ -
- -

hello

-
-
-

{{series.info.alias}}

- {{series.info.avg}} Avg -
-
-
- -
-
-
- - Panel settings -
- -
-
-
-
-
- -
-
-
-
-
-
-
diff --git a/src/app/panels/overview/module.js b/src/app/panels/overview/module.js deleted file mode 100644 index e369c404f78..00000000000 --- a/src/app/panels/overview/module.js +++ /dev/null @@ -1,97 +0,0 @@ -define([ - 'angular', - 'app', - 'lodash', - 'components/timeSeries', - 'services/panelSrv', -], -function (angular, app, _, timeSeries) { - 'use strict'; - - var module = angular.module('grafana.panels.overview', []); - app.useModule(module); - - module.controller('OverviewCtrl', function($scope, panelSrv, timeSrv) { - - $scope.panelMeta = { - description : "A panel to show an overview of different metrics through avg, total, current numbers and sparklines", - fullEditorTabs : [ - { - title: 'General', - src:'app/partials/panelgeneral.html' - }, - { - title: 'Metrics', - src:'app/partials/metrics.html' - } - ], - fullscreenEdit: true, - }; - - // Set and populate defaults - var _d = { - targets: [{}] - }; - - _.defaults($scope.panel, _d); - - $scope.init = function() { - }; - - $scope.get_data = function() { - $scope.rangeUnparsed = timeSrv.timeRange(false); - - var metricsQuery = { - range: $scope.rangeUnparsed, - interval: '1min', - targets: $scope.panel.targets, - maxDataPoints: 100, - }; - - return $scope.datasource.query($scope.filter, metricsQuery) - .then($scope.dataHandler) - .then(null, function(err) { - $scope.panelMeta.loading = false; - $scope.panel.error = err.message || "Timeseries data request error"; - $scope.inspector.error = err; - $scope.render([]); - }); - }; - - $scope.dataHandler = function(results) { - $scope.panelMeta.loading = false; - $scope.series = _.map(results.data, $scope.seriesHandler); - - console.log($scope.series); - }; - - $scope.seriesHandler = function(seriesData) { - var datapoints = seriesData.datapoints; - var alias = seriesData.target; - - var seriesInfo = { - alias: alias, - enable: true, - }; - - var series = new timeSeries.ZeroFilled({ - datapoints: datapoints, - info: seriesInfo, - }); - - series.points = series.getFlotPairs('connected', 'short'); - - return series; - }; - - $scope.render = function() { - - }; - - $scope.openEditor = function() { - }; - - panelSrv.init($scope); - - }); -}); diff --git a/src/app/partials/pro/account.html b/src/app/partials/pro/account.html index 1fbd415a756..fa757a9e843 100644 --- a/src/app/partials/pro/account.html +++ b/src/app/partials/pro/account.html @@ -1,15 +1,5 @@ -
-
-
- - - - - Account Settings - -
-
-
+ +
diff --git a/src/app/partials/pro/datasources.html b/src/app/partials/pro/datasources.html new file mode 100644 index 00000000000..fa2acfa6554 --- /dev/null +++ b/src/app/partials/pro/datasources.html @@ -0,0 +1,2 @@ + +
diff --git a/src/app/partials/pro/admin_datasources.html b/src/app/partials/pro/navbar.html similarity index 57% rename from src/app/partials/pro/admin_datasources.html rename to src/app/partials/pro/navbar.html index 10276b5a136..85ed6f93a2e 100644 --- a/src/app/partials/pro/admin_datasources.html +++ b/src/app/partials/pro/navbar.html @@ -3,9 +3,9 @@
- + - Admin / Data sources + {{pageTitle}}
diff --git a/src/app/routes/all.js b/src/app/routes/all.js index c09d09dc46f..1b8588c1741 100644 --- a/src/app/routes/all.js +++ b/src/app/routes/all.js @@ -1,8 +1,7 @@ define([ - './dashboard-from-db', - './solo-panel-route', - './dashboard-from-file', - './dashboard-from-script', - './dashboard-default', + './pro/dashboard', + './pro/admin', + './pro/solo-panel', + './pro/login', ], function () {}); diff --git a/src/app/routes/p_all.js b/src/app/routes/p_all.js deleted file mode 100644 index a5799d5108f..00000000000 --- a/src/app/routes/p_all.js +++ /dev/null @@ -1,7 +0,0 @@ -define([ - './p_dashboard', - './pro/solo-panel', - './p_admin', - './p_login', -], -function () {}); diff --git a/src/app/routes/p_admin.js b/src/app/routes/pro/admin.js similarity index 74% rename from src/app/routes/p_admin.js rename to src/app/routes/pro/admin.js index cc3c4ef47a9..af1fb62afe6 100644 --- a/src/app/routes/p_admin.js +++ b/src/app/routes/pro/admin.js @@ -1,6 +1,7 @@ define([ 'angular', 'controllers/pro/accountCtrl', + 'controllers/pro/datasourcesCtrl', ], function (angular) { "use strict"; @@ -10,8 +11,8 @@ function (angular) { module.config(function($routeProvider) { $routeProvider .when('/admin/datasources', { - templateUrl: 'app/partials/pro/admin_datasources.html', - controller : 'AdminCtrl', + templateUrl: 'app/partials/pro/datasources.html', + controller : 'DataSourcesCtrl', }) .when('/account', { templateUrl: 'app/partials/pro/account.html', diff --git a/src/app/routes/p_dashboard.js b/src/app/routes/pro/dashboard.js similarity index 100% rename from src/app/routes/p_dashboard.js rename to src/app/routes/pro/dashboard.js diff --git a/src/app/routes/p_login.js b/src/app/routes/pro/login.js similarity index 96% rename from src/app/routes/p_login.js rename to src/app/routes/pro/login.js index 2440e70e7b9..6da24f01c65 100644 --- a/src/app/routes/p_login.js +++ b/src/app/routes/pro/login.js @@ -1,6 +1,6 @@ define([ 'angular', - '../controllers/pro/loginCtrl', + 'controllers/pro/loginCtrl', ], function (angular) { "use strict";