diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-05-22 21:35:15 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-05-22 21:56:45 +0200 |
| commit | 271ffeae46af55459270c3480816c76aa9c80638 (patch) | |
| tree | 2ca58c25e35926a0f642aaedc4664f4392ce37ad /webapp | |
| parent | 61ca475685c6b7b33654edaad637c7d53bdf8d34 (diff) | |
Fix Agent download link when no tarball detected.
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/src/app/common/config.service.ts | 16 | ||||
| -rw-r--r-- | webapp/src/app/config/config.component.html | 5 |
2 files changed, 15 insertions, 6 deletions
diff --git a/webapp/src/app/common/config.service.ts b/webapp/src/app/common/config.service.ts index a04ac13..091ee06 100644 --- a/webapp/src/app/common/config.service.ts +++ b/webapp/src/app/common/config.service.ts @@ -115,10 +115,14 @@ export class ConfigService { } // Update XDS Agent tarball url + this.confStore.xdsAgentZipUrl = ""; this.xdsServerSvr.getXdsAgentInfo().subscribe(nfo => { let os = this.utils.getOSName(true); let zurl = nfo.tarballs.filter(elem => elem.os === os); - this.confStore.xdsAgentZipUrl = zurl && zurl[0].fileUrl; + if (zurl && zurl.length) { + this.confStore.xdsAgentZipUrl = zurl[0].fileUrl; + this.confSubject.next(Object.assign({}, this.confStore)); + } }); } @@ -128,7 +132,7 @@ export class ConfigService { this.confSubject.next(Object.assign({}, this.confStore)); // Don't save projects in cookies (too big!) - let cfg = this.confStore; + let cfg = Object.assign({}, this.confStore); delete (cfg.projects); this.cookie.putObject("xds-config", cfg); } @@ -145,7 +149,7 @@ export class ConfigService { let cfg = this.confStore.xdsAgent; this.AgentConnectObs = this.xdsAgentSvr.connect(cfg.retry, cfg.URL) .subscribe((sts) => { - console.log("Agent sts", sts); + //console.log("Agent sts", sts); }, error => this.alert.error(error) ); @@ -195,8 +199,10 @@ export class ConfigService { if (error.indexOf("Syncthing local daemon not responding") !== -1) { let msg = "<span><strong>" + error + "<br></strong>"; msg += "You may need to download and execute XDS-Agent.<br>"; - msg += "<a class=\"fa fa-download\" href=\"" + this.confStore.xdsAgentZipUrl + "\" target=\"_blank\"></a>"; - msg += " Download XDS-Agent tarball."; + if (this.confStore.xdsAgentZipUrl !== "") { + msg += "<a class=\"fa fa-download\" href=\"" + this.confStore.xdsAgentZipUrl + "\" target=\"_blank\"></a>"; + msg += " Download XDS-Agent tarball."; + } msg += "</span>"; this.alert.error(msg); } else { diff --git a/webapp/src/app/config/config.component.html b/webapp/src/app/config/config.component.html index 77d90c5..f707bbe 100644 --- a/webapp/src/app/config/config.component.html +++ b/webapp/src/app/config/config.component.html @@ -20,7 +20,10 @@ <button class="btn btn-link" (click)="xdsAgentRestartConn()"><span class="fa fa-refresh fa-size-x2"></span></button> <!-- FIXME [XDS-Agent] <button *ngIf="!(agentStatus$ | async)?.connected" --> - <button *ngIf="!(localSTStatus$ | async)?.connected" class="btn btn-link"><a class="fa fa-download fa-size-x2" [href]="xdsAgentZipUrl" target="_blank"></a></button> + <button *ngIf="!(localSTStatus$ | async)?.connected" [disabled]="xdsAgentZipUrl==''" class="btn btn-link"> + <a *ngIf="xdsAgentZipUrl!=''" class="fa fa-download fa-size-x2" [href]="xdsAgentZipUrl" target="_blank"></a> + <a *ngIf="xdsAgentZipUrl==''" class="fa fa-download fa-size-x2" href="javascript:void(0);" target="_blank"></a> + </button> </td> </tr> <tr class="info"> |