ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-02-20 17:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into e2e

Browse Source
This commit is contained in:
piotrpekala7 2020-02-28 15:39:42 +01:00
commit a0043660e8
8 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@ import { PageNotFoundComponent } from './components/page-not-found/page-not-foun
import { Gns3vmComponent } from './components/preferences/gns3vm/gns3vm.component';
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';
const routes: Routes = [
@ -71,7 +72,11 @@ const routes: Routes = [
{ path: '', redirectTo: 'servers', pathMatch: 'full' },
{ path: 'servers', component: ServersComponent },
{ path: 'bundled', component: BundledServerFinderComponent },
{ path: 'server/:server_id/projects', component: ProjectsComponent },
{
path: 'server/:server_id/projects',
component: ProjectsComponent,
resolve: { server : ServerResolve }
},
{ path: 'help', component: HelpComponent },
{ path: 'settings', component: SettingsComponent },
{ path: 'settings/console', component: ConsoleComponent },
@ -79,7 +84,11 @@ const routes: Routes = [
{ path: 'server/:server_id/systemstatus', component: SystemStatusComponent },
{ path: 'server/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent},
{ path: 'server/:server_id/project/:project_id/snapshots', component: ListOfSnapshotsComponent },
{
path: 'server/:server_id/project/:project_id/snapshots',
component: ListOfSnapshotsComponent,
resolve: { server : ServerResolve }
},
{ path: 'server/:server_id/preferences', component: PreferencesComponent },
{ path: 'server/:server_id/preferences/gns3vm', component: Gns3vmComponent },
// { path: 'server/:server_id/preferences/general', component: GeneralPreferencesComponent },

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

@ -266,6 +266,7 @@ import { StatusChartComponent } from './components/system-status/status-chart/st
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';
if (environment.production) {
@ -540,6 +541,7 @@ if (environment.production) {
Gns3vmService,
ThemeService,
GoogleAnalyticsService,
ServerResolve,
ProjectMapGuard,
Title
],

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

@ -41,7 +41,6 @@ export class ProjectsComponent implements OnInit {
constructor(
private route: ActivatedRoute,
private serverService: ServerService,
private projectService: ProjectService,
private settingsService: SettingsService,
private progressService: ProgressService,
@ -53,24 +52,13 @@ export class ProjectsComponent implements OnInit {
) {}
ngOnInit() {
this.server = this.route.snapshot.data['server'];
this.refresh();
this.sort.sort(<MatSortable>{
id: 'name',
start: 'asc'
});
this.dataSource = new ProjectDataSource(this.projectDatabase, this.sort);
this.route.paramMap
.pipe(
switchMap((params: ParamMap) => {
const server_id = params.get('server_id');
return this.serverService.get(parseInt(server_id, 10));
})
)
.subscribe((server: Server) => {
this.server = server;
this.refresh();
});
this.settings = this.settingsService.getAll();
this.projectService.projectListSubject.subscribe(() => this.refresh());

18
src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
View File

@ -17,6 +17,7 @@ import { Server } from '../../../models/server';
import { Snapshot } from '../../../models/snapshot';
import { MockedToasterService } from '../../../services/toaster.service.spec';
import { NameFilter } from '../../../filters/nameFilter.pipe';
import { ServerResolve } from '../../../resolvers/server-resolve';
export class MockedActivatedRoute {
get() {
@ -32,6 +33,9 @@ export class MockedActivatedRoute {
get(name: string): string {
return '1';
}
},
data: {
'server': new Server()
}
},
};
@ -56,17 +60,25 @@ describe('ListOfSnapshotsComponent', () => {
let component: ListOfSnapshotsComponent;
let fixture: ComponentFixture<ListOfSnapshotsComponent>;
let activatedRoute = new MockedActivatedRoute().get();
let mockedServerService = new MockedServerService();
let mockedSnapshotService = new MockedSnapshotService();
let mockedToasterService = new MockedToasterService();
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [MatDialogModule, MatTableModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])],
imports: [MatDialogModule,
MatTableModule,
MatIconModule,
MatToolbarModule,
MatMenuModule,
MatCheckboxModule,
CommonModule,
NoopAnimationsModule,
RouterTestingModule.withRoutes([
{ path: 'server/:server_id/project/:project_id/snapshots', component: ListOfSnapshotsComponent, resolve: {server: ServerResolve} }
])],
providers: [
{ provide: SnapshotService, useValue: mockedSnapshotService },
{ provide: ActivatedRoute, useValue: activatedRoute },
{ provide: ServerService, useValue: mockedServerService },
{ provide: ProgressDialogService, useClass: ProgressDialogService },
{ provide: ToasterService, useValue: mockedToasterService }
],

10
src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts
View File

@ -23,20 +23,16 @@ export class ListOfSnapshotsComponent implements OnInit {
searchText: string;
constructor(
private snapshotService: SnapshotService,
private serverService: ServerService,
private route: ActivatedRoute,
private snapshotService: SnapshotService,
private progressDialogService: ProgressDialogService,
private toaster: ToasterService
) {}
ngOnInit() {
let serverId = this.route.snapshot.paramMap.get("server_id");
this.projectId = this.route.snapshot.paramMap.get("project_id");
this.serverService.get(parseInt(serverId, 10)).then((server: Server) => {
this.server = server;
this.getSnapshots();
});
this.server = this.route.snapshot.data['server'];
this.getSnapshots();
}
getSnapshots() {

15
src/app/resolvers/server-resolve.ts Normal file
View File

@ -0,0 +1,15 @@
import { Injectable } from "@angular/core";
import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
import { ServerService } from '../services/server.service';
import { Server } from '../models/server';
@Injectable()
export class ServerResolve implements Resolve<Server> {
constructor(
private serverService: ServerService
) {}
resolve(route: ActivatedRouteSnapshot) {
return this.serverService.get(parseInt(route.params['server_id']));
}
}

10
src/app/services/server.service.spec.ts
View File

@ -97,16 +97,6 @@ describe('ServerService', () => {
record.name = 'test';
});
it('should get an object', done => {
spyOn(db, 'getByKey').and.returnValue(Promise.resolve([record]));
service.get(1).then(result => {
expect(db.getByKey).toHaveBeenCalledWith('servers', 1);
expect(result).toEqual([record]);
done();
});
});
it('should create an object', done => {
const created = new Server();
created.id = 22;

4
src/app/services/server.service.ts
View File

@ -18,8 +18,8 @@ export class ServerService {
});
}
public get(id: number) {
return this.onReady(() => this.indexedDbService.get().getByKey(this.tablename, id));
public get(id: number): Promise<Server> {
return this.onReady(() => this.indexedDbService.get().getByKey(this.tablename, id)) as Promise<Server>;
}
public create(server: Server) {