From 3acf1063032c5a86a3947457e1ca6930198f6e6f Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Thu, 23 Nov 2017 17:05:08 +0100
Subject: [PATCH] migrated admin files to ts (#9975)

---
 public/app/features/admin/admin.ts             |  6 +++---
 ...inEditOrgCtrl.js => admin_edit_org_ctrl.ts} | 18 +++++++-----------
 ...EditUserCtrl.js => admin_edit_user_ctrl.ts} | 18 ++++++++----------
 ...ListOrgsCtrl.js => admin_list_orgs_ctrl.ts} | 18 +++++++-----------
 4 files changed, 25 insertions(+), 35 deletions(-)
 rename public/app/features/admin/{adminEditOrgCtrl.js => admin_edit_org_ctrl.ts} (81%)
 rename public/app/features/admin/{adminEditUserCtrl.js => admin_edit_user_ctrl.ts} (91%)
 rename public/app/features/admin/{adminListOrgsCtrl.js => admin_list_orgs_ctrl.ts} (76%)

diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts
index 669e4a9c982..5f640754aef 100644
--- a/public/app/features/admin/admin.ts
+++ b/public/app/features/admin/admin.ts
@@ -1,7 +1,7 @@
 import  AdminListUsersCtrl from './admin_list_users_ctrl';
-import  './adminListOrgsCtrl';
-import  './adminEditOrgCtrl';
-import  './adminEditUserCtrl';
+import  './admin_list_orgs_ctrl';
+import  './admin_edit_org_ctrl';
+import  './admin_edit_user_ctrl';
 
 import coreModule from 'app/core/core_module';
 
diff --git a/public/app/features/admin/adminEditOrgCtrl.js b/public/app/features/admin/admin_edit_org_ctrl.ts
similarity index 81%
rename from public/app/features/admin/adminEditOrgCtrl.js
rename to public/app/features/admin/admin_edit_org_ctrl.ts
index 3121f5eb27b..d7e8a5109d5 100644
--- a/public/app/features/admin/adminEditOrgCtrl.js
+++ b/public/app/features/admin/admin_edit_org_ctrl.ts
@@ -1,13 +1,9 @@
-define([
-  'angular',
-],
-function (angular) {
-  'use strict';
+import angular from 'angular';
 
-  var module = angular.module('grafana.controllers');
-
-  module.controller('AdminEditOrgCtrl', function($scope, $routeParams, backendSrv, $location, navModelSrv) {
+export class AdminEditOrgCtrl {
 
+  /** @ngInject */
+  constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
     $scope.init = function() {
       $scope.navModel = navModelSrv.getAdminNav();
 
@@ -48,7 +44,7 @@ function (angular) {
     };
 
     $scope.init();
+  }
+}
 
-  });
-
-});
+angular.module('grafana.controllers').controller('AdminEditOrgCtrl', AdminEditOrgCtrl);
diff --git a/public/app/features/admin/adminEditUserCtrl.js b/public/app/features/admin/admin_edit_user_ctrl.ts
similarity index 91%
rename from public/app/features/admin/adminEditUserCtrl.js
rename to public/app/features/admin/admin_edit_user_ctrl.ts
index 007a5d79153..0e56584aed1 100644
--- a/public/app/features/admin/adminEditUserCtrl.js
+++ b/public/app/features/admin/admin_edit_user_ctrl.ts
@@ -1,13 +1,10 @@
-define([
-  'angular',
-  'lodash',
-],
-function (angular, _) {
-  'use strict';
+import angular from 'angular';
+import _ from 'lodash';
 
-  var module = angular.module('grafana.controllers');
+export class AdminEditUserCtrl {
 
-  module.controller('AdminEditUserCtrl', function($scope, $routeParams, backendSrv, $location, navModelSrv) {
+  /** @ngInject */
+  constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
     $scope.user = {};
     $scope.newOrg = { name: '', role: 'Editor' };
     $scope.permissions = {};
@@ -106,6 +103,7 @@ function (angular, _) {
     };
 
     $scope.init();
+  }
+}
 
-  });
-});
+angular.module('grafana.controllers').controller('AdminEditUserCtrl', AdminEditUserCtrl);
diff --git a/public/app/features/admin/adminListOrgsCtrl.js b/public/app/features/admin/admin_list_orgs_ctrl.ts
similarity index 76%
rename from public/app/features/admin/adminListOrgsCtrl.js
rename to public/app/features/admin/admin_list_orgs_ctrl.ts
index c7f8225ea7e..34d1eca0f2f 100644
--- a/public/app/features/admin/adminListOrgsCtrl.js
+++ b/public/app/features/admin/admin_list_orgs_ctrl.ts
@@ -1,13 +1,9 @@
-define([
-  'angular',
-],
-function (angular) {
-  'use strict';
+import angular from 'angular';
 
-  var module = angular.module('grafana.controllers');
-
-  module.controller('AdminListOrgsCtrl', function($scope, backendSrv, navModelSrv) {
+export class AdminListOrgsCtrl {
 
+  /** @ngInject */
+  constructor($scope, backendSrv, navModelSrv) {
     $scope.init = function() {
       $scope.navModel = navModelSrv.getAdminNav();
       $scope.getOrgs();
@@ -35,7 +31,7 @@ function (angular) {
     };
 
     $scope.init();
+  }
+}
 
-  });
-
-});
+angular.module('grafana.controllers').controller('AdminListOrgsCtrl', AdminListOrgsCtrl);