ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-04-25 21:40:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update server-discovery.component.ts

Browse Source
This commit is contained in:
piotrpekala7 2020-09-29 15:07:36 +02:00
parent c11d32e253
commit e16152edaf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/components/servers/server-discovery/server-discovery.component.ts
View File

@ -9,6 +9,7 @@ import { Version } from '../../../models/version';
import { forkJoin } from 'rxjs'; import { forkJoin } from 'rxjs';
import { ServerService } from '../../../services/server.service'; import { ServerService } from '../../../services/server.service';
import { ServerDatabase } from '../../../services/server.database'; import { ServerDatabase } from '../../../services/server.database';
import { from } from 'rxjs';
@Component({ @Component({
selector: 'app-server-discovery', selector: 'app-server-discovery',
@ -43,8 +44,8 @@ export class ServerDiscoveryComponent implements OnInit {
discoverFirstAvailableServer() { discoverFirstAvailableServer() {
forkJoin( forkJoin(
Observable.fromPromise(this.serverService.findAll()).pipe(map((s: Server[]) => s)), [from(this.serverService.findAll()).pipe(map((s: Server[]) => s)),
this.discovery() this.discovery()]
).subscribe(([local, discovered]) => { ).subscribe(([local, discovered]) => {
local.forEach(added => { local.forEach(added => {
discovered = discovered.filter(server => { discovered = discovered.filter(server => {