X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=webapp%2Fsrc%2Fapp%2Fpages%2Fconfig%2Fconfig-xds%2Fconfig-xds.component.ts;h=58c8b7d177b8b4620972167fd061b0f2e8b696b2;hb=82ede02a56e12026b2dfb1baeacabfbd564006b1;hp=bd461459907d055b991eb5135026d7d012c14489;hpb=cd8d64e86de540aea78a253c5fcc7826e8f15456;p=src%2Fxds%2Fxds-agent.git

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..58c8b7d 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
@@ -1,3 +1,21 @@
+/**
+* @license
+* Copyright (C) 2017 "IoT.bzh"
+* Author Sebastien Douheret <sebastien@iot.bzh>
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 
@@ -29,10 +47,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 {