diff --git a/@overflow/noauth-probe/component/noauth-probe-detail.component.ts b/@overflow/noauth-probe/component/noauth-probe-detail.component.ts
index 9646248..8ddcd2c 100644
--- a/@overflow/noauth-probe/component/noauth-probe-detail.component.ts
+++ b/@overflow/noauth-probe/component/noauth-probe-detail.component.ts
@@ -51,7 +51,12 @@ export class NoAuthProbeDetailComponent implements OnInit {
}
accept() {
+ console.log(this.selectedNIC);
+
+ this.selectedNIC.address = '192.168.1.0/24';
+
let message = 'Start collecting data as a Probe.\n';
+ message += this.selectedNIC.iface + '\n';
message += this.selectedNIC.address;
this.confirmationService.confirm({
@@ -64,7 +69,8 @@ export class NoAuthProbeDetailComponent implements OnInit {
tap(() => {
this.pending$ = of(true);
}),
- map((noauthProbes: NoAuthProbe[]) => {
+ map((noauthProbes: NoAuthProbe) => {
+ console.log(noauthProbes);
this.back.emit();
}),
catchError(error => {
@@ -94,7 +100,7 @@ export class NoAuthProbeDetailComponent implements OnInit {
tap(() => {
this.pending$ = of(true);
}),
- map((noauthProbes: NoAuthProbe[]) => {
+ map((noauthProbes: NoAuthProbe) => {
this.back.emit();
}),
catchError(error => {
diff --git a/@overflow/noauth-probe/component/noauth-probe-list.component.ts b/@overflow/noauth-probe/component/noauth-probe-list.component.ts
index 72e696d..39d8d07 100644
--- a/@overflow/noauth-probe/component/noauth-probe-list.component.ts
+++ b/@overflow/noauth-probe/component/noauth-probe-list.component.ts
@@ -100,10 +100,9 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
return null;
}
let os = noauthProbe.infraHost.infraHostOS.os;
+
os += noauthProbe.infraHost.infraHostOS.platform ?
- noauthProbe.infraHost.infraHostOS.platform : '';
- os += noauthProbe.infraHost.infraHostOS.platformFamily ?
- noauthProbe.infraHost.infraHostOS.platformFamily : '';
+ ' (' + noauthProbe.infraHost.infraHostOS.platform + ') ' : '';
return os;
}
diff --git a/@overflow/noauth-probe/service/noauth-probe.service.ts b/@overflow/noauth-probe/service/noauth-probe.service.ts
index 4b71874..639db19 100644
--- a/@overflow/noauth-probe/service/noauth-probe.service.ts
+++ b/@overflow/noauth-probe/service/noauth-probe.service.ts
@@ -21,12 +21,12 @@ export class NoAuthProbeService {
return this.rpcService.call
('NoAuthProbeService.readAllByDomainID', domainID);
}
- public acceptNoAuthProbe(id: number, zoneCIDR: string): Observable {
- return this.rpcService.call('NoAuthProbeService.acceptNoAuthProbe', id, zoneCIDR);
+ public acceptNoAuthProbe(id: number, zoneCIDR: string): Observable {
+ return this.rpcService.call('NoAuthProbeService.acceptNoAuthProbe', id, zoneCIDR);
}
- public denyNoauthProbe(id: number): Observable {
- return this.rpcService.call('NoAuthProbeService.denyNoauthProbe', id);
+ public denyNoauthProbe(id: number): Observable {
+ return this.rpcService.call('NoAuthProbeService.denyNoauthProbe', id);
}
public read(id: number): Observable {
diff --git a/@overflow/probe/component/probe-general.component.html b/@overflow/probe/component/probe-general.component.html
index 03742f7..ec448ea 100644
--- a/@overflow/probe/component/probe-general.component.html
+++ b/@overflow/probe/component/probe-general.component.html
@@ -25,11 +25,12 @@
-
+
@@ -39,7 +40,8 @@
diff --git a/@overflow/probe/component/probe-list.component.html b/@overflow/probe/component/probe-list.component.html
index 3025e74..c606aca 100644
--- a/@overflow/probe/component/probe-list.component.html
+++ b/@overflow/probe/component/probe-list.component.html
@@ -18,10 +18,10 @@
- {{probeHost.probe.displayName}} |
+ {{probeHost.probe.name}} |
{{getUptime(probeHost.probe)}} |
- {{probeHost.infraHost.ipv4}} |
- {{probeHost.infraHost.infraOS.metaInfraVendor.name}} |
+ |
+ |
{{probeHost.probe.cidr}} |
{{probeHost.probe.targetCount}} |
{{probeHost.probe.authorizeDate | date: 'dd.MM.yyyy'}} |
diff --git a/@overflow/probe/component/probe-list.component.ts b/@overflow/probe/component/probe-list.component.ts
index be34b98..7850136 100644
--- a/@overflow/probe/component/probe-list.component.ts
+++ b/@overflow/probe/component/probe-list.component.ts
@@ -39,10 +39,11 @@ export class ProbeListComponent implements OnInit, OnDestroy {
}),
select(AuthSelector.selectDomainMember),
exhaustMap((domainMember: DomainMember) =>
- this.probeHostService.readAllByDomainID(domainMember.domain.id)
+ this.probeHostService.readAllByDomainID(domainMember.domain.id)
.pipe(
map((probeHosts: ProbeHost[]) => {
this.probeHosts = probeHosts;
+ console.log(this.probeHosts);
}),
catchError(error => {
this.error$ = of(error);
diff --git a/package-lock.json b/package-lock.json
index 2213e5c..6e5ddf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -453,9 +453,9 @@
}
},
"@overflow/commons-typescript": {
- "version": "0.0.12",
- "resolved": "https://nexus.loafle.net/repository/npm-all/@overflow/commons-typescript/-/commons-typescript-0.0.12.tgz",
- "integrity": "sha512-XIQMPF0F5zJUY8NsFW0jhTMyUcVHjz0u3/p+iwK+ZxmBJAzcRFOwBKqxMhqTKSZXye1+ktsQ+oyPr+RV5HPy3g=="
+ "version": "0.0.13",
+ "resolved": "https://nexus.loafle.net/repository/npm-all/@overflow/commons-typescript/-/commons-typescript-0.0.13.tgz",
+ "integrity": "sha512-tJjVIglL3rwoX1S3IooMQGAubRGCTqETNHDwcPRNFvWF1FP8puf/rLBMFMMX8cNfBrYqdPjZdqrppLRYJnrP8Q=="
},
"@schematics/angular": {
"version": "0.6.5",
diff --git a/package.json b/package.json
index ad597b8..df6d10c 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
"@ngrx/router-store": "^5.2.0",
"@ngrx/store": "^5.2.0",
"@ngrx/store-devtools": "^5.2.0",
- "@overflow/commons-typescript": "^0.0.12",
+ "@overflow/commons-typescript": "^0.0.13",
"angular-google-recaptcha": "^1.0.3",
"angular-l10n": "^5.0.0",
"angularx-qrcode": "^1.1.7",