Merge branch 'upgrade_typescript' of https://github.com/Nepomuceno/grafana into Nepomuceno-upgrade_typescript

public/app/core/services/keyboard_manager.js

@@ -175,17 +175,17 @@ function (angular, _, coreModule) {
         // Foreach keys in label (split on +)
         for (var i = 0, l = keys.length; k = keys[i], i < l; i++) {
           switch (k) {
-          case 'ctrl':
-          case 'control':
-            kp++;
-            modifiers.ctrl.wanted = true;
-            break;
-          case 'shift':
-          case 'alt':
-          case 'meta':
-            kp++;
-            modifiers[k].wanted = true;
-            break;
+            case 'ctrl':
+            case 'control':
+              kp++;
+              modifiers.ctrl.wanted = true;
+              break;
+            case 'shift':
+            case 'alt':
+            case 'meta':
+              kp++;
+              modifiers[k].wanted = true;
+              break;
           }
 
           if (k.length > 1) { // If it is a special key

public/app/core/utils/kbn.js

@@ -16,95 +16,95 @@ function($, _) {
 
   kbn.round_interval = function(interval) {
     switch (true) {
-    // 0.015s
-    case (interval <= 15):
-      return 10;      // 0.01s
-    // 0.035s
-    case (interval <= 35):
-      return 20;      // 0.02s
-    // 0.075s
-    case (interval <= 75):
-      return 50;       // 0.05s
-    // 0.15s
-    case (interval <= 150):
-      return 100;      // 0.1s
-    // 0.35s
-    case (interval <= 350):
-      return 200;      // 0.2s
-    // 0.75s
-    case (interval <= 750):
-      return 500;       // 0.5s
-    // 1.5s
-    case (interval <= 1500):
-      return 1000;      // 1s
-    // 3.5s
-    case (interval <= 3500):
-      return 2000;      // 2s
-    // 7.5s
-    case (interval <= 7500):
-      return 5000;      // 5s
-    // 12.5s
-    case (interval <= 12500):
-      return 10000;     // 10s
-    // 17.5s
-    case (interval <= 17500):
-      return 15000;     // 15s
-    // 25s
-    case (interval <= 25000):
-      return 20000;     // 20s
-    // 45s
-    case (interval <= 45000):
-      return 30000;     // 30s
-    // 1.5m
-    case (interval <= 90000):
-      return 60000;     // 1m
-    // 3.5m
-    case (interval <= 210000):
-      return 120000;    // 2m
-    // 7.5m
-    case (interval <= 450000):
-      return 300000;    // 5m
-    // 12.5m
-    case (interval <= 750000):
-      return 600000;    // 10m
-    // 12.5m
-    case (interval <= 1050000):
-      return 900000;    // 15m
-    // 25m
-    case (interval <= 1500000):
-      return 1200000;   // 20m
-    // 45m
-    case (interval <= 2700000):
-      return 1800000;   // 30m
-    // 1.5h
-    case (interval <= 5400000):
-      return 3600000;   // 1h
-    // 2.5h
-    case (interval <= 9000000):
-      return 7200000;   // 2h
-    // 4.5h
-    case (interval <= 16200000):
-      return 10800000;  // 3h
-    // 9h
-    case (interval <= 32400000):
-      return 21600000;  // 6h
-    // 24h
-    case (interval <= 86400000):
-      return 43200000;  // 12h
-    // 48h
-    case (interval <= 172800000):
-      return 86400000;  // 24h
-    // 1w
-    case (interval <= 604800000):
-      return 86400000;  // 24h
-    // 3w
-    case (interval <= 1814400000):
-      return 604800000; // 1w
-    // 2y
-    case (interval < 3628800000):
-      return 2592000000; // 30d
-    default:
-      return 31536000000; // 1y
+      // 0.015s
+      case (interval <= 15):
+        return 10;      // 0.01s
+      // 0.035s
+      case (interval <= 35):
+        return 20;      // 0.02s
+      // 0.075s
+      case (interval <= 75):
+        return 50;       // 0.05s
+      // 0.15s
+      case (interval <= 150):
+        return 100;      // 0.1s
+      // 0.35s
+      case (interval <= 350):
+        return 200;      // 0.2s
+      // 0.75s
+      case (interval <= 750):
+        return 500;       // 0.5s
+      // 1.5s
+      case (interval <= 1500):
+        return 1000;      // 1s
+      // 3.5s
+      case (interval <= 3500):
+        return 2000;      // 2s
+      // 7.5s
+      case (interval <= 7500):
+        return 5000;      // 5s
+      // 12.5s
+      case (interval <= 12500):
+        return 10000;     // 10s
+      // 17.5s
+      case (interval <= 17500):
+        return 15000;     // 15s
+      // 25s
+      case (interval <= 25000):
+        return 20000;     // 20s
+      // 45s
+      case (interval <= 45000):
+        return 30000;     // 30s
+      // 1.5m
+      case (interval <= 90000):
+        return 60000;     // 1m
+      // 3.5m
+      case (interval <= 210000):
+        return 120000;    // 2m
+      // 7.5m
+      case (interval <= 450000):
+        return 300000;    // 5m
+      // 12.5m
+      case (interval <= 750000):
+        return 600000;    // 10m
+      // 12.5m
+      case (interval <= 1050000):
+        return 900000;    // 15m
+      // 25m
+      case (interval <= 1500000):
+        return 1200000;   // 20m
+      // 45m
+      case (interval <= 2700000):
+        return 1800000;   // 30m
+      // 1.5h
+      case (interval <= 5400000):
+        return 3600000;   // 1h
+      // 2.5h
+      case (interval <= 9000000):
+        return 7200000;   // 2h
+      // 4.5h
+      case (interval <= 16200000):
+        return 10800000;  // 3h
+      // 9h
+      case (interval <= 32400000):
+        return 21600000;  // 6h
+      // 24h
+      case (interval <= 86400000):
+        return 43200000;  // 12h
+      // 48h
+      case (interval <= 172800000):
+        return 86400000;  // 24h
+      // 1w
+      case (interval <= 604800000):
+        return 86400000;  // 24h
+      // 3w
+      case (interval <= 1814400000):
+        return 604800000; // 1w
+      // 2y
+      case (interval < 3628800000):
+        return 2592000000; // 30d
+      default:
+        return 31536000000; // 1y
     }
   };
 

public/app/features/playlist/playlist_routes.js

@@ -1,4 +1,4 @@
-  define([
+define([
   'angular',
   'app/core/config',
   'lodash'

public/app/plugins/datasource/elasticsearch/datasource.js

@@ -89,8 +89,10 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
         "bool": {
           "must": [
             { "range": range },
-            { "query_string": {
-              "query": queryInterpolated }
+            {
+              "query_string": {
+                "query": queryInterpolated
+              }
             }
           ]
         }

public/app/plugins/datasource/elasticsearch/query_builder.js

@@ -135,9 +135,10 @@ function (queryDef) {
         "bool": {
           "must": [
             {"range": this.getRangeFilter()},
-            {"query_string": {
-              "analyze_wildcard": true,
-              "query": '$lucene_query'
+            {
+              "query_string": {
+                "analyze_wildcard": true,
+                "query": '$lucene_query'
               }
             }
           ]

public/app/plugins/panel/graph/data_processor.ts

@@ -130,14 +130,8 @@ export class DataProcessor {
 
     let fields = [];
     var firstItem = dataList[0];
-    if (firstItem.type === 'docs'){
-      if (firstItem.datapoints.length === 0) {
-        return [];
-      }
-
-      let fieldParts = [];
-
-      function getPropertiesRecursive(obj) {
+    let fieldParts = [];
+    function getPropertiesRecursive(obj) {
         _.forEach(obj, (value, key) => {
           if (_.isObject(value)) {
             fieldParts.push(key);
@@ -150,8 +144,11 @@ export class DataProcessor {
           }
         });
         fieldParts.pop();
+    }
+    if (firstItem.type === 'docs'){
+      if (firstItem.datapoints.length === 0) {
+        return [];
       }
-
       getPropertiesRecursive(firstItem.datapoints[0]);
       return fields;
     }