Chore: Let kbn util infer types (grafana#26907)

* Chore: Let kbn util infer types Type fixes where needed * Address review comments + test fix * Modify kbn method and property names to pascalCase
fredr · Aug 13, 2020 · 75e14aa · 75e14aa
1 parent 6b1b52b
commit 75e14aa
Show file tree

Hide file tree

Showing 23 changed files with 305 additions and 332 deletions.
diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts
@@ -43,7 +43,7 @@ export interface QueryResultMeta {
    * Legacy data source specific, should be moved to custom
    * */
   gmdMeta?: any[]; // used by cloudwatch
-  alignmentPeriod?: string; // used by cloud monitoring
+  alignmentPeriod?: number; // used by cloud monitoring
   searchWords?: string[]; // used by log models and loki
   limit?: number; // used by log models and loki
   json?: boolean; // used to keep track of old json doc values

diff --git a/packages/grafana-data/src/valueFormats/valueFormats.ts b/packages/grafana-data/src/valueFormats/valueFormats.ts
@@ -32,7 +32,7 @@ export interface ValueFormatCategory {
   formats: ValueFormat[];
 }
 
-interface ValueFormatterIndex {
+export interface ValueFormatterIndex {
   [id: string]: ValueFormatter;
 }
 

diff --git a/public/app/core/directives/misc.ts b/public/app/core/directives/misc.ts
@@ -14,7 +14,7 @@ function tip($compile: any) {
         '<i class="grafana-tip fa fa-' +
         (attrs.icon || 'question-circle') +
         '" bs-tooltip="\'' +
-        kbn.addslashes(elem.text()) +
+        kbn.addSlashes(elem.text()) +
         '\'"></i>';
       _t = _t.replace(/{/g, '\\{').replace(/}/g, '\\}');
       elem.replaceWith($compile(angular.element(_t))(scope));

diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
@@ -61,7 +61,7 @@ export class ContextSrv {
     if (!config.minRefreshInterval) {
       return true;
     }
-    return kbn.interval_to_ms(interval) >= kbn.interval_to_ms(config.minRefreshInterval);
+    return kbn.intervalToMs(interval) >= kbn.intervalToMs(config.minRefreshInterval);
   }
 
   getValidInterval(interval: string) {

diff --git a/public/app/core/utils/kbn.test.ts b/public/app/core/utils/kbn.test.ts
@@ -53,23 +53,23 @@ describe('Chcek KBN value formats', () => {
 
 describe('describe_interval', () => {
   it('falls back to seconds if input is a number', () => {
-    expect(kbn.describe_interval('123')).toEqual({
+    expect(kbn.describeInterval('123')).toEqual({
       sec: 1,
       type: 's',
       count: 123,
     });
   });
 
   it('parses a valid time unt string correctly', () => {
-    expect(kbn.describe_interval('123h')).toEqual({
+    expect(kbn.describeInterval('123h')).toEqual({
       sec: 3600,
       type: 'h',
       count: 123,
     });
   });
 
   it('fails if input is invalid', () => {
-    expect(() => kbn.describe_interval('123xyz')).toThrow();
-    expect(() => kbn.describe_interval('xyz')).toThrow();
+    expect(() => kbn.describeInterval('123xyz')).toThrow();
+    expect(() => kbn.describeInterval('xyz')).toThrow();
   });
 });