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=396115b5b0eb8979d4d151d866dfd80a3a94e828;hb=afe1f83bdbec2c369c0840c94df1d12c8faa0eeb;hp=ffd236daaa1f3d686c4494c3034dc5585d7bff29;hpb=38c0c21a969e621c725245ce91c78e77076c5ce7;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 ffd236d..396115b 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
@@ -15,10 +15,10 @@ import 'rxjs/add/operator/catch';
   styleUrls: ['./config-xds.component.scss'],
   templateUrl: './config-xds.component.html',
 })
-export class ConfigXdsComponent implements OnInit {
+export class ConfigXdsComponent {
 
   // TODO: cleanup agentStatus$: Observable<IAgentStatus>;
-  connecting = false;
+  applying = false;
   xdsServerUrl = '';
   server: IXDServerCfg;
 
@@ -28,17 +28,10 @@ export class ConfigXdsComponent implements OnInit {
     private XdsConfigSvr: XDSConfigService,
     private alert: AlertService,
   ) {
-  }
-
-  ngOnInit() {
     // FIXME support multiple servers
-
-    this.server = this.XdsConfigSvr.getCurServer();
-    this.xdsServerUrl = this.server.url;
-
     this.XdsConfigSvr.onCurServer().subscribe(svr => {
       this.xdsServerUrl = svr.url;
-      this.server = svr;
+      this.server = Object.assign({}, svr);
     });
   }
 
@@ -47,14 +40,16 @@ export class ConfigXdsComponent implements OnInit {
       return;
     }
     this.configFormChanged = false;
-    this.connecting = true;
+    this.applying = true;
     this.server.url = this.xdsServerUrl;
     this.XdsConfigSvr.setCurServer(this.server)
       .subscribe(cfg => {
-        this.connecting = false;
-       },
+        this.alert.info('XDS Server successfully connected (' + cfg.url + ')');
+        this.server = Object.assign({}, cfg);
+        this.applying = false;
+      },
       err => {
-        this.connecting = false;
+        this.applying = false;
         this.alert.error(err);
       });
   }