From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Thu, 30 Nov 2017 00:52:39 +0000 (+0100)
Subject: Fixed server config setup on Init
X-Git-Tag: v1.0.0-rc1~3
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-agent.git;a=commitdiff_plain;h=ff47ccb072076c16eadaee08419d6afac3e53790

Fixed server config setup on Init

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
---

diff --git a/webapp/src/app/pages/config/config-xds/config-xds.component.ts b/webapp/src/app/pages/config/config-xds/config-xds.component.ts
index bd46145..dddd210 100644
--- a/webapp/src/app/pages/config/config-xds/config-xds.component.ts
+++ b/webapp/src/app/pages/config/config-xds/config-xds.component.ts
@@ -29,10 +29,16 @@ export class ConfigXdsComponent {
     private alert: AlertService,
   ) {
     // FIXME support multiple servers
-    this.XdsConfigSvr.onCurServer().subscribe(svr => {
-      this.xdsServerUrl = svr.url;
-      this.server = Object.assign({}, svr);
-    });
+    this._updateServerCfg(this.XdsConfigSvr.getCurServer());
+    this.XdsConfigSvr.onCurServer().subscribe(svr => this._updateServerCfg(svr));
+  }
+
+  private _updateServerCfg(svr: IXDServerCfg) {
+    if (!svr || svr.url === '') {
+      return;
+    }
+    this.xdsServerUrl = svr.url;
+    this.server = Object.assign({}, svr);
   }
 
   isApplyBtnEnable(): boolean {