From 6f5bc2bda00b424240cc507beb1a14cc39b1a44c Mon Sep 17 00:00:00 2001
From: Alexey Velikiy <av@corpglory.com>
Date: Wed, 6 Feb 2019 10:57:44 +0300
Subject: [PATCH] fix: Missing No connection error after transfer to app #159

---
 src/panel/graph_panel/graph_ctrl.ts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/panel/graph_panel/graph_ctrl.ts b/src/panel/graph_panel/graph_ctrl.ts
index 39e26e9..51281fe 100644
--- a/src/panel/graph_panel/graph_ctrl.ts
+++ b/src/panel/graph_panel/graph_ctrl.ts
@@ -199,9 +199,8 @@ class GraphCtrl extends MetricsPanelCtrl {
     return _.keys(this._analyticUnitTypes);
   }
 
-  async runBackendConnectivityCheck() {
-    let backendURL = await this.getBackendURL();
-    if(backendURL === '' || backendURL === undefined) {
+  private _checkBackendUrlOk(backendURL: string): boolean {
+    if(backendURL === undefined || backendURL === '') {
       appEvents.emit(
         'alert-warning',
         [
@@ -209,9 +208,16 @@ class GraphCtrl extends MetricsPanelCtrl {
           `Please set it in config`
         ]
       );
-      return;
+      return false;
     }
+    return true;
+  }
 
+  async runBackendConnectivityCheck() {
+    let backendURL = await this.getBackendURL();
+    if(!this._checkBackendUrlOk(backendURL)) {
+      return;
+    }
     let connected = await this.analyticService.isBackendOk();
     if(connected) {
       this.updateAnalyticUnitTypes();
@@ -230,6 +236,10 @@ class GraphCtrl extends MetricsPanelCtrl {
     this.processor = new DataProcessor(this.panel);
 
     let backendURL = await this.getBackendURL();
+    if(!this._checkBackendUrlOk(backendURL)) {
+      return;
+    }
+
     this.analyticService = new AnalyticService(backendURL, this.$http);
 
     this.runBackendConnectivityCheck();