From 3b5c813be71c4816f3c2ef40e4c1439a8026236f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 29 Jan 2015 12:10:14 +0100
Subject: [PATCH] worked on user frontend state, state like favorites, etc

---
 src/app/controllers/grafanaCtrl.js            | 24 +++++++------------
 .../features/grafanaDatasource/datasource.js  | 12 +++++-----
 src/app/partials/dasheditor.html              |  2 +-
 src/app/services/all.js                       |  1 +
 src/app/services/userSrv.js                   | 24 +++++++++++++++++++
 5 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 src/app/services/userSrv.js

diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js
index 9643328e5a3..8df9b4155d6 100644
--- a/src/app/controllers/grafanaCtrl.js
+++ b/src/app/controllers/grafanaCtrl.js
@@ -10,17 +10,17 @@ function (angular, config, _, $, store) {
 
   var module = angular.module('grafana.controllers');
 
-  module.controller('GrafanaCtrl', function($scope, alertSrv, utilSrv, grafanaVersion, $rootScope, $controller) {
-    $scope.grafanaVersion = grafanaVersion[0] === '@' ? 'master' : grafanaVersion;
-    $scope.grafana = {};
-
-    $rootScope.profilingEnabled = store.getBool('profilingEnabled');
-    $rootScope.performance = { loadStart: new Date().getTime() };
-    $rootScope.appSubUrl = config.appSubUrl;
+  module.controller('GrafanaCtrl', function($scope, alertSrv, utilSrv, grafanaVersion, $rootScope, $controller, userSrv) {
 
     $scope.init = function() {
+      $scope.grafana = {};
+      $scope.grafana.version = grafanaVersion;
       $scope._ = _;
 
+      $rootScope.profilingEnabled = store.getBool('profilingEnabled');
+      $rootScope.performance = { loadStart: new Date().getTime() };
+      $rootScope.appSubUrl = config.appSubUrl;
+
       if ($rootScope.profilingEnabled) { $scope.initProfiling(); }
 
       alertSrv.init();
@@ -28,16 +28,8 @@ function (angular, config, _, $, store) {
 
       $scope.dashAlerts = alertSrv;
       $scope.grafana.style = 'dark';
-      $scope.grafana.user = {};
-
-      if (window.grafanaBackend) {
-        $scope.initBackendFeatures();
-      }
-    };
-
-    $scope.initBackendFeatures = function() {
+      $scope.grafana.user = userSrv.getSignedInUser();
       $scope.grafana.sidemenu = store.getBool('grafana.sidemenu');
-      $scope.grafana.user = window.grafanaBootData.user;
 
       $scope.onAppEvent('logged-out', function() {
         $scope.grafana.sidemenu = false;
diff --git a/src/app/features/grafanaDatasource/datasource.js b/src/app/features/grafanaDatasource/datasource.js
index 329b430985c..b52068e464f 100644
--- a/src/app/features/grafanaDatasource/datasource.js
+++ b/src/app/features/grafanaDatasource/datasource.js
@@ -18,17 +18,17 @@ function (angular, _, kbn) {
       this.editorSrc = 'app/features/grafanaDatasource/partials/query.editor.html';
     }
 
-    GrafanaDatasource.prototype.getDashboard = function(id, isTemp) {
-      var url = '/dashboard/' + id;
+    GrafanaDatasource.prototype.getDashboard = function(slug, isTemp) {
+      var url = '/dashboard/' + slug;
 
       if (isTemp) {
-        url = '/temp/' + id;
+        url = '/temp/' + slug;
       }
 
-      return backendSrv.get('/api/dashboard/' + id)
+      return backendSrv.get('/api/dashboard/' + slug)
         .then(function(data) {
-          if (data) {
-            return angular.fromJson(data);
+          if (data && data.dashboard) {
+            return data.dashboard;
           } else {
             return false;
           }
diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html
index fdeb3a4db24..fd94432ba5f 100644
--- a/src/app/partials/dasheditor.html
+++ b/src/app/partials/dasheditor.html
@@ -96,7 +96,7 @@
 <div class="dashboard-editor-footer">
 	<div class="grafana-version-info" ng-show="editor.index === 0">
 		<span class="editor-option small">
-			Grafana version: {{grafanaVersion}} &nbsp;&nbsp;
+			Grafana version: {{grafana.version}} &nbsp;&nbsp;
 		</span>
 		<span grafana-version-check>
 		</span>
diff --git a/src/app/services/all.js b/src/app/services/all.js
index c4067274dd2..4d76a2e0957 100644
--- a/src/app/services/all.js
+++ b/src/app/services/all.js
@@ -2,6 +2,7 @@ define([
   './alertSrv',
   './utilSrv',
   './datasourceSrv',
+  './userSrv',
   './timer',
   './keyboardManager',
   './popoverSrv',
diff --git a/src/app/services/userSrv.js b/src/app/services/userSrv.js
new file mode 100644
index 00000000000..14f373f7b1b
--- /dev/null
+++ b/src/app/services/userSrv.js
@@ -0,0 +1,24 @@
+define([
+  'angular',
+  'lodash',
+],
+function (angular, _) {
+  'use strict';
+
+  var module = angular.module('grafana.services');
+
+  module.service('userSrv', function() {
+
+    function User() {
+      if (window.grafanaBootData.user) {
+        _.extend(this, window.grafanaBootData.user);
+      }
+    }
+
+    this.getSignedInUser = function() {
+      return new User();
+    };
+
+  });
+
+});