ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-04-18 23:36:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code cleaned up

Browse Source
This commit is contained in:
piotrpekala7 2020-06-17 10:55:39 +02:00
parent 0f4890fd10
commit e853849cc9
4 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/app-routing.module.ts
View File

@ -62,7 +62,6 @@ import { Gns3vmComponent } from './components/preferences/gns3vm/gns3vm.componen
import { DirectLinkComponent } from './components/direct-link/direct-link.component';
import { SystemStatusComponent } from './components/system-status/system-status.component';
import { ServerResolve } from './resolvers/server-resolve';
import { ProjectMapGuard } from './guards/project-map-guard';
import { WebConsoleFullWindowComponent } from './components/web-console-full-window/web-console-full-window.component';
import { ConsoleGuard } from './guards/console-guard';
@ -154,13 +153,11 @@ const routes: Routes = [
{
path: 'server/:server_id/project/:project_id',
component: ProjectMapComponent,
canActivate: [ProjectMapGuard],
canDeactivate: [ConsoleGuard]
},
{
path: 'server/:server_id/project/:project_id/nodes/:node_id',
component: WebConsoleFullWindowComponent,
canActivate: [ProjectMapGuard]
component: WebConsoleFullWindowComponent
},
{
path: '**',

2
src/app/app.module.ts
View File

@ -267,7 +267,6 @@ import { NgCircleProgressModule } from 'ng-circle-progress';
import { OpenFileExplorerActionComponent } from './components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component';
import { NgxChildProcessModule } from 'ngx-childprocess';
import { ServerResolve } from './resolvers/server-resolve';
import { ProjectMapGuard } from './guards/project-map-guard';
import { HttpConsoleActionComponent } from './components/project-map/context-menu/actions/http-console/http-console-action.component';
import { WebConsoleComponent } from './components/project-map/web-console/web-console.component';
import { ConsoleWrapperComponent } from './components/project-map/console-wrapper/console-wrapper.component';
@ -559,7 +558,6 @@ if (environment.production) {
GoogleAnalyticsService,
NodeConsoleService,
ServerResolve,
ProjectMapGuard,
ConsoleGuard,
Title
],

2
src/app/components/projects/projects.component.ts
View File

@ -53,6 +53,8 @@ export class ProjectsComponent implements OnInit {
ngOnInit() {
this.server = this.route.snapshot.data['server'];
if(!this.server) this.router.navigate(['/servers']);
this.refresh();
this.sort.sort(<MatSortable>{
id: 'name',

44
src/app/guards/project-map-guard.ts
View File

@ -1,44 +0,0 @@
import { Injectable } from "@angular/core";
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
import { ProjectMapComponent } from '../components/project-map/project-map.component';
import { Observable, pipe, timer, from } from 'rxjs';
import { ProjectService } from '../services/project.service';
import { Server } from '../models/server';
import { ServerService } from '../services/server.service';
import { switchMap, map } from 'rxjs/operators';
import { ToasterService } from '../services/toaster.service';
@Injectable()
export class ProjectMapGuard implements CanActivate {
constructor(
private projectService: ProjectService,
private serverService: ServerService,
private toasterService: ToasterService,
private router: Router
) {}
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
const server_id = route.paramMap.get("server_id");
const project_id = route.paramMap.get("project_id");
// return from(this.serverService.tryToCreateDb()).pipe(
// switchMap(response => {
// return this.serverService.get(parseInt(server_id, 10));
// }),
// switchMap(response => {
// if (!response) this.router.navigate(['/servers']);
// return this.projectService.list(response as Server)
// }),
// map(response => {
// let projectToOpen = response.find(n => n.project_id === project_id);
// if (projectToOpen) return true;
// this.toasterService.error('Project could not be opened');
// this.projectService.projectListUpdated();
// return false;
// })
// )
return true;
}
}