ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2024-12-24 23:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #419 from GNS3/Display-progress-when-server-is-starting

Browse Source 
Display progress when server is starting #390
This commit is contained in:
ziajka 2019-06-28 08:59:09 +02:00 committed by GitHub
commit 3a358d199c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/components/servers/servers.component.html
View File

@ -13,8 +13,9 @@
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef> Name </mat-header-cell> <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
<mat-cell *matCellDef="let row"> <mat-cell *matCellDef="let row">
<a [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a></mat-cell <a *ngIf="getServerStatus(row) === 'running' || row.location === 'remote'" [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a>
> <span *ngIf="getServerStatus(row) != 'running' && row.location !== 'remote'">{{ row.name }}</span>
</mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="location"> <ng-container matColumnDef="location">
@ -43,6 +44,8 @@
<mat-icon aria-label="Stop server">stop</mat-icon> <mat-icon aria-label="Stop server">stop</mat-icon>
</button> </button>
<mat-spinner [diameter]="24" *ngIf="row.location === 'local' && getServerStatus(row) === 'starting'"></mat-spinner>
<button mat-icon-button (click)="deleteServer(row)"> <button mat-icon-button (click)="deleteServer(row)">
<mat-icon aria-label="Remove server">delete</mat-icon> <mat-icon aria-label="Remove server">delete</mat-icon>
</button> </button>

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

@ -49,6 +49,9 @@ export class ServersComponent implements OnInit, OnDestroy {
if(!server) { if(!server) {
return; return;
} }
if(serverStatus.status === 'starting') {
server.status = 'starting';
}
if(serverStatus.status === 'stopped') { if(serverStatus.status === 'stopped') {
server.status = 'stopped'; server.status = 'stopped';
} }

8
src/app/services/server-management.service.ts
View File

@ -5,7 +5,7 @@ import { Subject } from 'rxjs';
export interface ServerStateEvent { export interface ServerStateEvent {
serverName: string; serverName: string;
status: "started" | "errored" | "stopped" | "stderr"; status: "starting" | "started" | "errored" | "stopped" | "stderr";
message: string; message: string;
} }
@ -29,6 +29,12 @@ export class ServerManagementService implements OnDestroy {
} }
async start(server: Server) { async start(server: Server) {
var startingEvent : ServerStateEvent = {
serverName: server.name,
status: "starting",
message: ''
};
this.serverStatusChanged.next(startingEvent);
return await this.electronService.remote.require('./local-server.js').startLocalServer(server); return await this.electronService.remote.require('./local-server.js').startLocalServer(server);
} }