tech(typescript): converted signup controller to typescript

.gitignore

@@ -30,3 +30,4 @@ conf/custom.ini
 fig.yml
 profile.cov
 grafana
+tsconfig.json

public/app/controllers/signupCtrl.js

@@ -1,49 +0,0 @@
-define([
-  'angular',
-  'config',
-],
-function (angular, config) {
-  'use strict';
-
-  var module = angular.module('grafana.controllers');
-
-  module.controller('SignUpCtrl', function($scope, $location, contextSrv, backendSrv) {
-
-    contextSrv.sidemenu = false;
-
-    $scope.formModel = {};
-
-    $scope.init = function() {
-      var params = $location.search();
-      $scope.formModel.orgName = params.email;
-      $scope.formModel.email = params.email;
-      $scope.formModel.username = params.email;
-      $scope.formModel.code = params.code;
-
-      $scope.verifyEmailEnabled = false;
-      $scope.autoAssignOrg = false;
-
-      backendSrv.get('/api/user/signup/options').then(function(options) {
-        $scope.verifyEmailEnabled = options.verifyEmailEnabled;
-        $scope.autoAssignOrg = options.autoAssignOrg;
-      });
-    };
-
-    $scope.submit = function() {
-      if (!$scope.signUpForm.$valid) {
-        return;
-      }
-
-      backendSrv.post('/api/user/signup/step2', $scope.formModel).then(function(rsp) {
-        if (rsp.code === 'redirect-to-select-org') {
-          window.location.href = config.appSubUrl + '/profile/select-org?signup=1';
-        } else {
-          window.location.href = config.appSubUrl + '/';
-        }
-      });
-    };
-
-    $scope.init();
-
-  });
-});

public/app/controllers/signupCtrl.ts

@@ -0,0 +1,55 @@
+///<reference path="../headers/require/require.d.ts" />
+///<reference path="../headers/angularjs/angularjs.d.ts" />
+///<amd-dependency path="angular"/>
+///<amd-dependency path="config"/>
+
+var angular = require('angular');
+var config = require('config');
+
+var module = angular.module('grafana.controllers');
+
+export class SignUpCtrl {
+
+  constructor(
+      private $scope : any,
+      private $location : any,
+      private contextSrv : any,
+      private backendSrv : any) {
+
+    contextSrv.sidemenu = false;
+    $scope.ctrl = this;
+
+    $scope.formModel = {};
+
+    var params = $location.search();
+    $scope.formModel.orgName = params.email;
+    $scope.formModel.email = params.email;
+    $scope.formModel.username = params.email;
+    $scope.formModel.code = params.code;
+
+    $scope.verifyEmailEnabled = false;
+    $scope.autoAssignOrg = false;
+
+    backendSrv.get('/api/user/signup/options').then(options => {
+      $scope.verifyEmailEnabled = options.verifyEmailEnabled;
+      $scope.autoAssignOrg = options.autoAssignOrg;
+    });
+  }
+
+  submit () {
+    if (!this.$scope.signUpForm.$valid) {
+      return;
+    }
+
+    this.backendSrv.post('/api/user/signup/step2', this.$scope.formModel).then(rsp => {
+      if (rsp.code === 'redirect-to-select-org') {
+        window.location.href = config.appSubUrl + '/profile/select-org?signup=1';
+      } else {
+        window.location.href = config.appSubUrl + '/';
+      }
+    });
+  };
+}
+
+module.controller('SignUpCtrl', SignUpCtrl);
+

public/app/core/core.ts

@@ -1,5 +1,4 @@
 
-export * from './time_series'
 export * from './directives/cool_dir'
 export * from './routes/module_loader'
 

public/app/core/routes/module_loader.ts

@@ -1,4 +1,4 @@
-///<reference path="../../../vendor/headers/require.d.ts" />
+///<reference path="../../headers/require/require.d.ts" />
 
 export class ModuleLoader {
   lazy: any;

public/app/core/time_series.ts

@@ -1,10 +0,0 @@
-export class TimeSeries {
-  getName() : string {
-    if (true) {
-      return "asd";
-    }
-
-    return "TimeSeries";
-  }
-}
-

public/app/headers/require/require.d.ts

@@ -0,0 +1,369 @@
+// Type definitions for RequireJS 2.1.8
+// Project: http://requirejs.org/
+// Definitions by: Josh Baldwin <https://github.com/jbaldwin/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/*
+require-2.1.8.d.ts may be freely distributed under the MIT license.
+
+Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/require.d.ts
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+declare module 'module' {
+	var mod: {
+		config: () => any;
+		id: string;
+		uri: string;
+	}
+	export = mod;
+}
+
+interface RequireError extends Error {
+
+	/**
+	* The error ID that maps to an ID on a web page.
+	**/
+	requireType: string;
+
+	/**
+	* Required modules.
+	**/
+	requireModules: string[];
+
+	/**
+	* The original error, if there is one (might be null).
+	**/
+	originalError: Error;
+}
+
+interface RequireShim {
+
+	/**
+	* List of dependencies.
+	**/
+	deps?: string[];
+
+	/**
+	* Name the module will be exported as.
+	**/
+	exports?: string;
+
+	/**
+	* Initialize function with all dependcies passed in,
+	* if the function returns a value then that value is used
+	* as the module export value instead of the object
+	* found via the 'exports' string.
+	* @param dependencies
+	* @return
+	**/
+	init?: (...dependencies: any[]) => any;
+}
+
+interface RequireConfig {
+
+	// The root path to use for all module lookups.
+	baseUrl?: string;
+
+	// Path mappings for module names not found directly under
+	// baseUrl.
+	paths?: { [key: string]: any; };
+
+	// Dictionary of Shim's.
+	// does not cover case of key->string[]
+	shim?: { [key: string]: RequireShim; };
+
+	/**
+	* For the given module prefix, instead of loading the
+	* module with the given ID, substitude a different
+	* module ID.
+	*
+	* @example
+	* requirejs.config({
+	*	map: {
+	*		'some/newmodule': {
+	*			'foo': 'foo1.2'
+	*		},
+	*		'some/oldmodule': {
+	*			'foo': 'foo1.0'
+	*		}
+	*	}
+	* });
+	**/
+	map?: {
+		[id: string]: {
+			[id: string]: string;
+		};
+	};
+
+	/**
+	* AMD configurations, use module.config() to access in
+	* define() functions
+	**/
+	config?: { [id: string]: {}; };
+
+	/**
+	* Configures loading modules from CommonJS packages.
+	**/
+	packages?: {};
+
+	/**
+	* The number of seconds to wait before giving up on loading
+	* a script.  The default is 7 seconds.
+	**/
+	waitSeconds?: number;
+
+	/**
+	* A name to give to a loading context.  This allows require.js
+	* to load multiple versions of modules in a page, as long as
+	* each top-level require call specifies a unique context string.
+	**/
+	context?: string;
+
+	/**
+	* An array of dependencies to load.
+	**/
+	deps?: string[];
+
+	/**
+	* A function to pass to require that should be require after
+	* deps have been loaded.
+	* @param modules
+	**/
+	callback?: (...modules: any[]) => void;
+
+	/**
+	* If set to true, an error will be thrown if a script loads
+	* that does not call define() or have shim exports string
+	* value that can be checked.
+	**/
+	enforceDefine?: boolean;
+
+	/**
+	* If set to true, document.createElementNS() will be used
+	* to create script elements.
+	**/
+	xhtml?: boolean;
+
+	/**
+	* Extra query string arguments appended to URLs that RequireJS
+	* uses to fetch resources.  Most useful to cachce bust when
+	* the browser or server is not configured correcty.
+	*
+	* @example
+	* urlArgs: "bust= + (new Date()).getTime()
+	**/
+	urlArgs?: string;
+
+	/**
+	* Specify the value for the type="" attribute used for script
+	* tags inserted into the document by RequireJS.  Default is
+	* "text/javascript".  To use Firefox's JavasScript 1.8
+	* features, use "text/javascript;version=1.8".
+	**/
+	scriptType?: string;
+
+}
+
+// todo: not sure what to do with this guy
+interface RequireModule {
+
+	/**
+	*
+	**/
+	config(): {};
+
+}
+
+/**
+*
+**/
+interface RequireMap {
+
+	/**
+	*
+	**/
+	prefix: string;
+
+	/**
+	*
+	**/
+	name: string;
+
+	/**
+	*
+	**/
+	parentMap: RequireMap;
+
+	/**
+	*
+	**/
+	url: string;
+
+	/**
+	*
+	**/
+	originalName: string;
+
+	/**
+	*
+	**/
+	fullName: string;
+}
+
+interface Require {
+
+	/**
+	* Configure require.js
+	**/
+	config(config: RequireConfig): Require;
+
+	/**
+	* CommonJS require call
+	* @param module Module to load
+	* @return The loaded module
+	*/
+	(module: string): any;
+
+	/**
+	* Start the main app logic.
+	* Callback is optional.
+	* Can alternatively use deps and callback.
+	* @param modules Required modules to load.
+	**/
+	(modules: string[]): void;
+
+	/**
+	* @see Require()
+	* @param ready Called when required modules are ready.
+	**/
+	(modules: string[], ready: Function): void;
+
+	/**
+	* @see http://requirejs.org/docs/api.html#errbacks
+	* @param ready Called when required modules are ready.
+	**/
+	(modules: string[], ready: Function, errback: Function): void;
+
+	/**
+	* Generate URLs from require module
+	* @param module Module to URL
+	* @return URL string
+	**/
+	toUrl(module: string): string;
+
+	/**
+	* Returns true if the module has already been loaded and defined.
+	* @param module Module to check
+	**/
+	defined(module: string): boolean;
+
+	/**
+	* Returns true if the module has already been requested or is in the process of loading and should be available at some point.
+	* @param module Module to check
+	**/
+	specified(module: string): boolean;
+
+	/**
+	* On Error override
+	* @param err
+	**/
+	onError(err: RequireError, errback?: (err: RequireError) => void): void;
+
+	/**
+	* Undefine a module
+	* @param module Module to undefine.
+	**/
+	undef(module: string): void;
+
+	/**
+	* Semi-private function, overload in special instance of undef()
+	**/
+	onResourceLoad(context: Object, map: RequireMap, depArray: RequireMap[]): void;
+}
+
+interface RequireDefine {
+
+	/**
+	* Define Simple Name/Value Pairs
+	* @param config Dictionary of Named/Value pairs for the config.
+	**/
+	(config: { [key: string]: any; }): void;
+
+	/**
+	* Define function.
+	* @param func: The function module.
+	**/
+	(func: () => any): void;
+
+	/**
+	* Define function with dependencies.
+	* @param deps List of dependencies module IDs.
+	* @param ready Callback function when the dependencies are loaded.
+	*	callback param deps module dependencies
+	*	callback return module definition
+	**/
+    	(deps: string[], ready: Function): void;
+
+	/**
+	*  Define module with simplified CommonJS wrapper.
+	* @param ready
+	*	callback require requirejs instance
+	*	callback exports exports object
+	*	callback module module
+	*	callback return module definition
+	**/
+	(ready: (require: Require, exports: { [key: string]: any; }, module: RequireModule) => any): void;
+
+	/**
+	* Define a module with a name and dependencies.
+	* @param name The name of the module.
+	* @param deps List of dependencies module IDs.
+	* @param ready Callback function when the dependencies are loaded.
+	*	callback deps module dependencies
+	*	callback return module definition
+	**/
+	(name: string, deps: string[], ready: Function): void;
+
+	/**
+	* Define a module with a name.
+	* @param name The name of the module.
+	* @param ready Callback function when the dependencies are loaded.
+	*	callback return module definition
+	**/
+	(name: string, ready: Function): void;
+
+	/**
+	* Used to allow a clear indicator that a global define function (as needed for script src browser loading) conforms
+	* to the AMD API, any global define function SHOULD have a property called "amd" whose value is an object.
+	* This helps avoid conflict with any other existing JavaScript code that could have defined a define() function
+	* that does not conform to the AMD API.
+	* define.amd.jQuery is specific to jQuery and indicates that the loader is able to account for multiple version
+	* of jQuery being loaded simultaneously.
+	*/
+	amd: Object;
+}
+
+// Ambient declarations for 'require' and 'define'
+declare var requirejs: Require;
+declare var require: Require;
+declare var define: RequireDefine;

public/app/partials/signup_step2.html

@@ -90,7 +90,7 @@
 				</div>
 
 				<div class="login-submit-button-row">
-					<button type="submit" class="btn" ng-click="submit();" ng-class="{'btn-inverse': !signUpForm.$valid, 'btn-primary': signUpForm.$valid}">
+					<button type="submit" class="btn" ng-click="ctrl.submit();" ng-class="{'btn-inverse': !signUpForm.$valid, 'btn-primary': signUpForm.$valid}">
 						Continue
 					</button>
 				</div>

tasks/build_task.js

@@ -15,14 +15,14 @@ module.exports = function(grunt) {
     'ngtemplates',
     'cssmin:build',
     'ngAnnotate:build',
-    'requirejs:build',
+    // 'requirejs:build',
-    'concat:js',
+    // 'concat:js',
-    'clean:temp',
+    // 'clean:temp',
-    'filerev',
+    // 'filerev',
-    'remapFilerev',
+    // 'remapFilerev',
-    'usemin',
+    // 'usemin',
-    'clean:temp',
+    // 'clean:temp',
-    'uglify:dest'
+    // 'uglify:genDir'
   ]);
 
   // task to add [[.AppSubUrl]] to reved path

tasks/options/tslint.js

@@ -0,0 +1,23 @@
+module.exports = function(config) {
+  return {
+    source: {
+      files: {
+        src: ['<%= srcDir %>/app/**/*.ts', '!<%= srcDir %>/app/**/*.d.ts'],
+      }
+    },
+    options: {
+      configuration: {
+        rules: {
+          curly: true,
+          align: [true, "parameters", "arguments", "statements"],
+          indent: [true, "spaces"],
+          "class-name": true,
+          "interface-name": true,
+          "semicolon": true,
+          "use-strict": [true, "check-module", "check-function" ],
+          "whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
+        }
+      }
+    }
+  };
+};

tasks/options/uglify.js

@@ -1,6 +1,6 @@
 module.exports = function(config) {
   return {
-    dest: {
+    genDir: {
       expand: true,
       src: ['**/*.js', '!dashboards/*.js', '!vendor/**/*.js'],
       dest: '<%= genDir %>',