ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-02-27 19:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Comment Suggestions have been resolved

Browse Source
This commit is contained in:
Rajnikant Lodhi 2022-07-30 08:58:41 +05:30
parent c8188ebf9c
commit 2a44abadd5
4 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/components/project-map/new-template-dialog/new-template-dialog.component.scss
View File

@ -71,3 +71,6 @@
.selection-group {
padding-bottom: 20px;
}
.non-visible {
display: none;
}

8
src/app/components/project-map/project-map.component.html
View File

@ -96,14 +96,6 @@
<mat-icon>settings_applications</mat-icon>
<span>Template preferences</span>
</button>
<button mat-menu-item routerLink="/controller/{{ controller.id }}/systemstatus">
<mat-icon>info</mat-icon>
<span>Go to system status</span>
</button>
<button mat-menu-item [routerLink]="['/controller', controller.id, 'settings']">
<mat-icon>settings</mat-icon>
<span>Go to settings</span>
</button>
<button mat-menu-item [routerLink]="['/controller', controller.id, 'image-manager']">
<mat-icon>collections</mat-icon>
<span>Image manager</span>

28
src/app/layouts/default-layout/default-layout.component.html
View File

@ -25,20 +25,12 @@
<button mat-button *ngIf="!isLoginPage && router.url != '/controllers'" [matMenuTriggerFor]="menu">
<mat-icon>more_vert</mat-icon>
</button>
<!-- GNS3 right menu -->
<mat-menu #menu="matMenu">
<button mat-menu-item [disabled]="!controllerId" [routerLink]="['controller', controllerId, 'systemstatus']">
<mat-icon>info</mat-icon>
<span>System status</span>
</button>
<button mat-menu-item [disabled]="!controllerId" [routerLink]="['controller', controllerId, 'preferences']">
<mat-icon>settings_applications</mat-icon>
<span>Template preferences</span>
</button>
<button mat-menu-item [disabled]="!controllerId" [routerLink]="['controller', controllerId, 'image-manager']">
<mat-icon>collections</mat-icon>
<span>Image manager</span>
</button>
<button mat-menu-item [disabled]="!controllerId" [routerLink]="['controller', controllerId, 'settings']">
<mat-icon>settings</mat-icon>
<span>Settings</span>
@ -68,7 +60,7 @@
<span>Logout</span>
</button>
</mat-menu>
<!-- GNS3 menu -->
<!-- GNS3 left menu -->
<mat-menu #mainMenu="matMenu" [overlapTrigger]="false">
<button mat-menu-item [routerLink]="['/controllers']">
<mat-icon>developer_board</mat-icon>
@ -78,13 +70,17 @@
<mat-icon>work</mat-icon>
<span>Projects</span>
</button>
<button mat-menu-item routerLink="/controller/{{ controllerId }}/systemstatus">
<mat-icon>info</mat-icon>
<span>Go to system status</span>
<button mat-menu-item [disabled]="!controllerId" [routerLink]="['controller', controllerId, 'preferences']">
<mat-icon>settings_applications</mat-icon>
<span>Template preferences</span>
</button>
<button mat-menu-item [routerLink]="['/controller', controllerId, 'settings']">
<mat-icon>settings</mat-icon>
<span>Go to settings</span>
<button mat-menu-item [disabled]="!controllerId" [routerLink]="['controller', controllerId, 'image-manager']">
<mat-icon>collections</mat-icon>
<span>Image manager</span>
</button>
<button mat-menu-item (click)="addNewTemplate()">
<mat-icon>control_point</mat-icon>
<span>New template</span>
</button>
</mat-menu>
</mat-toolbar>

67
src/app/layouts/default-layout/default-layout.component.ts
View File

@ -1,15 +1,18 @@
import { Component, HostListener, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
import { NavigationEnd } from '@angular/router';
import { ActivatedRoute, ParamMap, Router } from '@angular/router';
import { ControllerService } from '../../services/controller.service';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { ProjectService } from '@services/project.service';
import { ElectronService } from 'ngx-electron';
import { Subscription } from 'rxjs';
import { ProgressService } from '../../common/progress/progress.service';
import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service';
import { NewTemplateDialogComponent } from '../../components/project-map/new-template-dialog/new-template-dialog.component';
import { Controller } from '../../models/controller';
import { Project } from '../../models/project';
import { ControllerManagementService } from '../../services/controller-management.service';
import { ControllerService } from '../../services/controller.service';
import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service';
import { ToasterService } from '../../services/toaster.service';
import { version } from './../../version';
import { Controller } from '../../models/controller';
@Component({
selector: 'app-default-layout',
@ -29,6 +32,9 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
recentlyOpenedProjectId: string;
controllerIdProjectList: string;
controllerId: string | undefined | null;
public controller: Controller;
public project: Project;
private projectMapSubscription: Subscription = new Subscription();
constructor(
private electronService: ElectronService,
@ -36,19 +42,21 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
private controllerManagement: ControllerManagementService,
private toasterService: ToasterService,
private progressService: ProgressService,
private dialog: MatDialog,
public router: Router,
private route: ActivatedRoute,
private controllerService: ControllerService
private controllerService: ControllerService,
private projectService: ProjectService
) {
this.router.events.subscribe((data) => {
if (data instanceof NavigationEnd) {
this.controllerId = this.route.children[0].snapshot.paramMap.get("controller_id");
this.controllerId = this.route.children[0].snapshot.paramMap.get('controller_id');
this.getData();
}
});
}
ngOnInit() {
this.checkIfUserIsLoginPage();
this.routeSubscription = this.router.events.subscribe((val) => {
if (val instanceof NavigationEnd) this.checkIfUserIsLoginPage();
@ -61,16 +69,18 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
this.isInstalledSoftwareAvailable = this.electronService.isElectronApp;
// attach to notification stream when any of running local controllers experienced issues
this.controllerStatusSubscription = this.controllerManagement.controllerStatusChanged.subscribe((controllerStatus) => {
if (controllerStatus.status === 'errored') {
console.error(controllerStatus.message);
this.toasterService.error(controllerStatus.message);
this.controllerStatusSubscription = this.controllerManagement.controllerStatusChanged.subscribe(
(controllerStatus) => {
if (controllerStatus.status === 'errored') {
console.error(controllerStatus.message);
this.toasterService.error(controllerStatus.message);
}
if (controllerStatus.status === 'stderr') {
console.error(controllerStatus.message);
this.toasterService.error(controllerStatus.message);
}
}
if (controllerStatus.status === 'stderr') {
console.error(controllerStatus.message);
this.toasterService.error(controllerStatus.message);
}
});
);
// stop controllers only when in Electron
this.shouldStopControllersOnClosing = this.electronService.isElectronApp;
@ -83,7 +93,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
}
checkIfUserIsLoginPage() {
if (this.router.url.includes("login")) {
if (this.router.url.includes('login')) {
this.isLoginPage = true;
} else {
this.isLoginPage = false;
@ -93,7 +103,9 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
logout() {
this.controllerService.get(+this.controllerId).then((controller: Controller) => {
controller.authToken = null;
this.controllerService.update(controller).then(val => this.router.navigate(['/controller', controller.id, 'login']));
this.controllerService
.update(controller)
.then((val) => this.router.navigate(['/controller', controller.id, 'login']));
});
}
@ -123,6 +135,23 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
window.close();
return false;
}
getData() {
this.controllerService.get(+this.controllerId).then((controller: Controller) => {
this.controller = controller;
});
}
public addNewTemplate() {
const dialogRef = this.dialog.open(NewTemplateDialogComponent, {
width: '1000px',
maxHeight: '700px',
autoFocus: false,
disableClose: true,
});
let instance = dialogRef.componentInstance;
instance.controller = this.controller;
instance.project = this.project;
}
ngOnDestroy() {
this.controllerStatusSubscription.unsubscribe();