ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-21 16:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Before connection to the server we need to check minimal supported version

Browse Source
This commit is contained in:
Piotr Pekala
2019-11-19 02:01:20 -08:00
parent 58a02c7066
commit 91fa54cf9b
5 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/components/servers/add-server-dialog/add-server-dialog.component.ts
View File

@ -4,6 +4,7 @@ import { Server } from '../../../models/server';
import { ElectronService } from 'ngx-electron';
import { FormGroup, FormControl, Validators } from '@angular/forms';
import { ServerService } from '../../../services/server.service';
import { ToasterService } from '../../../services/toaster.service';
@Component({
@ -30,6 +31,7 @@ export class AddServerDialogComponent implements OnInit {
public dialogRef: MatDialogRef<AddServerDialogComponent>,
private electronService: ElectronService,
private serverService: ServerService,
private toasterService: ToasterService,
@Inject(MAT_DIALOG_DATA) public data: any,
) {}
@ -145,7 +147,21 @@ export class AddServerDialogComponent implements OnInit {
}
const server: Server = Object.assign({}, this.serverForm.value);
this.dialogRef.close(server);
this.serverService.checkServerVersion(server).subscribe(
(serverInfo) => {
if ((serverInfo.version.split('.')[1]>=2) && (serverInfo.version.split('.')[0]>=2)) {
this.dialogRef.close(server);
this.toasterService.success(`Server ${server.name} added.`)
} else {
this.dialogRef.close();
this.toasterService.error(`Server version is not supported.`)
}
},
error => {
this.dialogRef.close();
this.toasterService.error('Cannot connect to the server.')
}
);
}
onNoClick(): void {

12
src/app/components/servers/servers.component.ts
View File

@ -39,7 +39,17 @@ export class ServersComponent implements OnInit, OnDestroy {
server.status = 'running';
}
});
this.serverDatabase.addServers(servers);
servers.forEach((server) => {
this.serverService.checkServerVersion(server).subscribe(
(serverInfo) => {
if ((serverInfo.version.split('.')[1]>=2) && (serverInfo.version.split('.')[0]>=2)) {
if (!this.serverDatabase.find(server.name)) this.serverDatabase.addServer(server);
}
},
error => {}
);
});
});
this.dataSource = new ServerDataSource(this.serverDatabase);