Code Review
/
src
/
xds
/
xds-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
49b2d4d
)
Display arch and version in download packages list.
author
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 23 Jun 2017 15:46:22 +0000
(17:46 +0200)
committer
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 23 Jun 2017 15:46:22 +0000
(17:46 +0200)
webapp/src/app/config/downloadXdsAgent.component.ts
patch
|
blob
|
history
webapp/src/app/services/config.service.ts
patch
|
blob
|
history
webapp/src/app/services/xdsserver.service.ts
patch
|
blob
|
history
diff --git
a/webapp/src/app/config/downloadXdsAgent.component.ts
b/webapp/src/app/config/downloadXdsAgent.component.ts
index
55aa203
..
7a08174
100644
(file)
--- 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">
<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>
</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
(file)
--- 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;
export interface IxdsAgentPackage {
os: string;
+ arch: string;
+ version: string;
url: 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.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));
});
);
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
(file)
--- 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;
export interface IXDSAgentTarball {
os: string;
+ arch: string;
+ version: string;
+ rawVersion: string;
fileUrl: string;
}
fileUrl: string;
}