From bb199466565b97a731f58438bea4778c5763ceae Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Fri, 23 Jun 2017 17:46:22 +0200
Subject: [PATCH] Display arch and version in download packages list.

---
 webapp/src/app/config/downloadXdsAgent.component.ts | 2 +-
 webapp/src/app/services/config.service.ts           | 9 ++++++++-
 webapp/src/app/services/xdsserver.service.ts        | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/webapp/src/app/config/downloadXdsAgent.component.ts b/webapp/src/app/config/downloadXdsAgent.component.ts
index 55aa203..7a08174 100644
--- a/webapp/src/app/config/downloadXdsAgent.component.ts
+++ b/webapp/src/app/config/downloadXdsAgent.component.ts
@@ -9,7 +9,7 @@ import { IxdsAgentPackage } from "../services/config.service";
             <h3>Download xds-agent packages:</h3>
             <ul>
                 <li *ngFor="let p of packageUrls">
-                    for <a href="{{p.url}}">{{p.os | capitalize}}</a>
+                    <a href="{{p.url}}">{{p.os | capitalize}} - {{p.arch}} ({{p.version}}) </a>
                 </li>
             </ul>
             <button type="button" class="btn btn-sm" (click)="pop.hide()"> Cancel </button>
diff --git a/webapp/src/app/services/config.service.ts b/webapp/src/app/services/config.service.ts
index 6b344e1..722c347 100644
--- a/webapp/src/app/services/config.service.ts
+++ b/webapp/src/app/services/config.service.ts
@@ -54,6 +54,8 @@ export interface ILocalSTConfig {
 
 export interface IxdsAgentPackage {
     os: string;
+    arch: string;
+    version: string;
     url: string;
 }
 
@@ -122,7 +124,12 @@ export class ConfigService {
         this.xdsServerSvr.getXdsAgentInfo().subscribe(nfo => {
             this.confStore.xdsAgentPackages = [];
             nfo.tarballs && nfo.tarballs.forEach(el =>
-                this.confStore.xdsAgentPackages.push({os: el.os, url: el.fileUrl})
+                this.confStore.xdsAgentPackages.push({
+                    os: el.os,
+                    arch: el.arch,
+                    version: el.version,
+                    url: el.fileUrl
+                })
             );
             this.confSubject.next(Object.assign({}, this.confStore));
         });
diff --git a/webapp/src/app/services/xdsserver.service.ts b/webapp/src/app/services/xdsserver.service.ts
index 22e4ac9..4d20fa4 100644
--- a/webapp/src/app/services/xdsserver.service.ts
+++ b/webapp/src/app/services/xdsserver.service.ts
@@ -50,6 +50,9 @@ interface IXDSConfig {
 
 export interface IXDSAgentTarball {
     os: string;
+    arch: string;
+    version: string;
+    rawVersion: string;
     fileUrl: string;
 }
 
-- 
2.16.6