From ff47ccb072076c16eadaee08419d6afac3e53790 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 30 Nov 2017 01:52:39 +0100 Subject: [PATCH] Fixed server config setup on Init Signed-off-by: Sebastien Douheret --- .../app/pages/config/config-xds/config-xds.component.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 { -- 2.16.6