From d338b7ea7bf5b4561b77d779233030fc40c5dec8 Mon Sep 17 00:00:00 2001
From: David Kaltschmidt <david.kaltschmidt@gmail.com>
Date: Fri, 27 Apr 2018 11:49:11 +0200
Subject: [PATCH] Import and typescript fixups

---
 public/app/containers/Explore/ElapsedTime.tsx | 4 ++--
 public/app/routes/ReactContainer.tsx          | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/app/containers/Explore/ElapsedTime.tsx b/public/app/containers/Explore/ElapsedTime.tsx
index 123299fd96a..9cd8f674186 100644
--- a/public/app/containers/Explore/ElapsedTime.tsx
+++ b/public/app/containers/Explore/ElapsedTime.tsx
@@ -4,7 +4,7 @@ const INTERVAL = 150;
 
 export default class ElapsedTime extends PureComponent<any, any> {
   offset: number;
-  timer: NodeJS.Timer;
+  timer: number;
 
   state = {
     elapsed: 0,
@@ -12,7 +12,7 @@ export default class ElapsedTime extends PureComponent<any, any> {
 
   start() {
     this.offset = Date.now();
-    this.timer = setInterval(this.tick, INTERVAL);
+    this.timer = window.setInterval(this.tick, INTERVAL);
   }
 
   tick = () => {
diff --git a/public/app/routes/ReactContainer.tsx b/public/app/routes/ReactContainer.tsx
index deb16f68bf7..d6d34372090 100644
--- a/public/app/routes/ReactContainer.tsx
+++ b/public/app/routes/ReactContainer.tsx
@@ -21,8 +21,12 @@ export function reactContainer($route, $location, backendSrv: BackendSrv, dataso
     restrict: 'E',
     template: '',
     link(scope, elem) {
-      let component = $route.current.locals.component.default;
-      let props = {
+      let component = $route.current.locals.component;
+      // Dynamic imports return whole module, need to extract default export
+      if (component.default) {
+        component = component.default;
+      }
+      const props = {
         backendSrv: backendSrv,
         datasourceSrv: datasourceSrv,
       };